yazid138 3 年之前
父節點
當前提交
0cf37b540f

+ 1 - 0
controller/laporan/evaluasi.controller.js

@@ -42,6 +42,7 @@ exports.add = handleError(async (req, res) => {
     {
       $push: {
         evaluasi: {
+          dari: user._id,
           judul,
           tanggal,
           dokumen: dokumen_id,

+ 11 - 0
controller/pelanggaran.controller.js

@@ -27,3 +27,14 @@ exports.public = handleError(async (req, res) => {
     data,
   })
 })
+
+exports.sanksi = handleError(async (req, res) => {
+  const user = req.user
+  const w = {} 
+  if(user.role.id === 2021) {w.level_sanksi = 1} else {w.level_sanksi = {$nin: [0, 1] }}
+  const data = await pelanggaranModel.find(w).distinct('sanksi')
+  return response.success(res, {
+    message: 'Berhasil ambil data Pelanggaran',
+    data,
+  })
+})

+ 1 - 0
model/laporan.model.js

@@ -42,6 +42,7 @@ module.exports = mongoose.model(
       evaluasi: [
         new Schema(
           {
+            dari: { type: Types.ObjectId, ref: user },
             judul: String,
             tanggal: Date,
             dokumen: [

+ 2 - 0
routes/v1/pelanggaran.routes.js

@@ -1,7 +1,9 @@
 const router = require('express').Router()
 const pelanggaran = require('../../controller/pelanggaran.controller')
 const roleId = require('../../middleware/role')
+const auth = require('../../middleware/verifyToken')
 
 router.get('/', roleId([2020, 2021, 2023]), pelanggaran.getAll)
+router.get('/sanksi', auth,roleId([2020, 2021, 2023]), pelanggaran.sanksi)
 
 module.exports = router

+ 3 - 2
utils/cekData.js

@@ -37,7 +37,8 @@ exports.cekSatuDataLaporan = async (
     .populate({ path: 'user', populate: 'foto' })
     .populate({ path: 'pelanggaran', select: 'pelanggaran' })
     .populate('dokumen')
-    .populate('evaluasi.dokumen')
+    .populate({path: 'evaluasi', populate: ['user', 'dokumen']})
+    // .populate('evaluasi.user')
   if (!laporan) {
     response.error(res, {
       message: 'laporan_id tidak ada',
@@ -150,7 +151,7 @@ exports.cekBanyakDataSanksi = async (user, where = { banding: false }) => {
     .find({ aktif: where.aktif || true, ...where })
     .populate({
       path: 'laporan',
-      select: 'pt',
+      select: 'pt no_laporan',
       match: w,
     })
     .populate('user')