yazid138 il y a 2 ans
Parent
commit
98e0ecb233
2 fichiers modifiés avec 9 ajouts et 2 suppressions
  1. 2 1
      controller/graph.controller.js
  2. 7 1
      utils/cekData.js

+ 2 - 1
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) => {

+ 7 - 1
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