fix data graph

controller/graph.controller.js

@@ -199,6 +199,7 @@ exports.laporan = handleError(async (req, res) => {
     data.list_jadwal = await dataLaporanAggregate(
       user,
       {
+        aktif: true,
         ...date,
         jadwal: {
           $ne: null,

utils/cekData.js

@@ -193,14 +193,14 @@ exports.dataLaporanAggregate = async (user, where, aggregate) => {
   const w = { ...where }
   switch (user.role.id) {
     case 2020:
-      w.role_asal = 'dikti'
+      w['$or'] = [{ role_asal: 'dikti' }, { role_data: 'dikti' }]
       break
     case 2021:
-      w.role_asal = 'lldikti'
+      w['$or'] = [{ role_asal: 'lldikti' }, { role_data: 'lldikti' }]
       w['pt.pembina.id'] = user.lembaga.id
       break
   }
-  
+
   const laporan = await laporanModel.aggregate([
     { $match: w },
     { $group: aggregate },