commit

controller/auto.controller.js

@@ -45,8 +45,8 @@ exports.keberatan = handleError(async (req, res) => {
           },
           {
             key: '3',
-            value: 'no_sanksi',
-            value_text: sanksi.no_sanksi,
+            value: 'no_laporan',
+            value_text: sanksi.laporan.no_laporan,
           },
         ])
     )
@@ -96,8 +96,8 @@ exports.banding = handleError(async (req, res) => {
           },
           {
             key: '3',
-            value: 'no_sanksi',
-            value_text: sanksi.no_sanksi,
+            value: 'no_laporan',
+            value_text: sanksi.laporan.no_laporan,
           },
         ])
     )
@@ -137,8 +137,8 @@ exports.reminderKeberatan = handleError(async (req, res) => {
           await notifWA(TEMPLATE_REMINDER, [
             {
               key: '1',
-              value: 'no_sanksi',
-              value_text: e.no_sanksi,
+              value: 'no_laporan',
+              value_text: e.laporan.no_laporan,
             },
             {
               key: '2',
@@ -204,8 +204,8 @@ exports.reminderBanding = handleError(async (req, res) => {
           await notifWA(TEMPLATE_REMINDER, [
             {
               key: '1',
-              value: 'no_sanksi',
-              value_text: e.no_sanksi,
+              value: 'no_laporan',
+              value_text: e.laporan.no_laporan,
             },
             {
               key: '2',

controller/graph.controller.js

@@ -404,10 +404,11 @@ exports.jumlahStatusLaporan = handleError(async (req, res) => {
       dataPembina.map((e) => `${e.pt.pembina.id};${e.pt.pembina.nama}`)
     ),
   ]
+
   dataPembina = dataPembina.map((e) => ({
     id: e.split(';')[0],
     name: e.split(';')[1],
-  }))
+  })).sort((a, b) => a.name < b.name ? -1 : 1)
 
   let data = await Promise.all(
     dataPembina.map(async (e) => {

controller/pelanggaran.controller.js

@@ -35,9 +35,9 @@ exports.sanksi = handleError(async (req, res) => {
   if (user.role.id === 2021) {
     w.level_sanksi = 1
   } else {
-    w.level_sanksi = { $nin: [0, 1] }
+    w.level_sanksi = 3
     if (down === 'true') {
-      w.level_sanksi = 1
+      w.level_sanksi = { $in: [1, 2] }
     }
   }
   let data = await pelanggaranModel.find(w)

controller/sanksi/banding.controller.js

@@ -62,7 +62,7 @@ exports.create = handleError(async (req, res) => {
       value: 'pemberi_sanksi',
       value_text: `${sanksi.user.nama} - ${sanksi.user.role.nama}`,
     },
-    { key: '3', value: 'no_sanksi', value_text: sanksi.no_sanksi },
+    { key: '3', value: 'no_laporan', value_text: sanksi.laporan.no_laporan },
   ])
 
   let contacts = await kontakModel.find()

controller/sanksi/keberatan.controller.js

@@ -66,7 +66,7 @@ exports.create = handleError(async (req, res) => {
       value: 'pemberi_sanksi',
       value_text: `${sanksi.user.nama} - ${sanksi.user.role.nama}`,
     },
-    { key: '3', value: 'no_sanksi', value_text: sanksi.no_sanksi },
+    { key: '3', value: 'no_laporan', value_text: sanksi.laporan.no_laporan },
   ])
 
   let contacts = await kontakModel.find()

controller/sanksi/perbaikan.controller.js

@@ -36,6 +36,7 @@ exports.add = handleError(async (req, res) => {
     {
       laporan: sanksi.laporan._id,
       _id: sanksi._id,
+      aktif: true,
       ['pengajuan.banding']: { $exists: true, $ne: null },
       // ['pengajuan.cabut_sanksi']: {
       //   $exists: false,
@@ -72,7 +73,7 @@ exports.add = handleError(async (req, res) => {
       value: 'pemberi_sanksi',
       value_text: `${sanksi.user.nama} - ${sanksi.user.role.nama}`,
     },
-    { key: '3', value: 'no_sanksi', value_text: sanksi.no_sanksi },
+    { key: '3', value: 'no_laporan', value_text: sanksi.laporan.no_laporan },
   ])
 
   let contacts = await kontakModel.find()

routes/v1/laporan/index.js

@@ -5,7 +5,7 @@ const roleId = require('../../../middleware/role')
 
 router.get('/', laporan.getAll)
 router.get('/jumlah', laporan.jumlahLaporan)
-router.get('/byPembina/:idPembina', roleId(2020),laporan.laporanByPembina)
+router.get('/byPembina/:idPembina', roleId([2020,2023]),laporan.laporanByPembina)
 router.get('/:id', laporan.getOne)
 router.post('/create', handleDokumen.array('dokumen'), laporan.create)
 router.put('/update/:id', laporan.update)

utils/cekData.js

@@ -172,11 +172,17 @@ exports.cekBanyakDataSanksi = async (user, where = {}, q = {}) => {
       else if (where.delegasi) {
         w.role_data = 'lldikti'
         w.role_asal = 'dikti'
-      } else if (!where.banding) w.role_data = 'dikti'
+      } else if (where.banding)
+        w.level_sanksi = {
+          $in: [2, 3],
+        }
+      else w.role_data = 'dikti'
+      // else if (!where.banding) w.role_data = 'dikti'
       break
     case 2021:
       w['role_data'] = 'lldikti'
       w['pt.pembina.id'] = user.lembaga.id
+      if (where.banding) w.level_sanksi = 1
       break
     case 2022:
       w['pt.id'] = user.lembaga.id