Bladeren bron

commit issue 21-09-2022

andi 3 jaren geleden
bovenliggende
commit
c59a810c54

+ 19 - 0
controller/graph.controller.js

@@ -4,6 +4,7 @@ const response = require('../utils/responseHandler')
 const {
   cekBanyakDataLaporan,
   dataLaporanAggregate,
+  cekBanyakDataSanksi,
 } = require('../utils/cekData')
 const laporanModel = require('../model/laporan.model')
 const moment = require('moment')
@@ -373,3 +374,21 @@ exports.excel = handleError(async (req, res) => {
   )
   return res.end(Buffer.from(buffer))
 })
+
+exports.laporanSelesai = handleError(async (req, res) => {
+  const user = req.user
+
+  laporan = await cekBanyakDataLaporan(user, { aktif: false })
+  sanksi = await cekBanyakDataSanksi(user, { aktif: false })
+  const data = {
+    laporan,
+    sanksi,
+    jumlah_selesai: sanksi.length,
+    jumlah_ditutup: laporan.length,
+  }
+
+  return response.success(res, {
+    message: 'Berhasil menganalisis data',
+    data,
+  })
+})

+ 5 - 5
controller/laporan.controller.js

@@ -363,11 +363,11 @@ exports.update = handleError(async (req, res) => {
     }`
     alasan = keterangan2
     data.alasan_delegasi = keterangan2
-    if (laporan.jadwal) {
-      await laporanModel.findByIdAndUpdate(laporan._id, {
-        $unset: { jadwal: 1 },
-      })
-    }
+    // if (laporan.jadwal) {
+    //   await laporanModel.findByIdAndUpdate(laporan._id, {
+    //     $unset: { jadwal: 1 },
+    //   })
+    // }
   }
   if (aktif) {
     data.aktif = aktif === 'true'

+ 1 - 1
controller/sanksi/cabutSanksi.controller.js

@@ -84,7 +84,7 @@ exports.createJawaban = handleError(async (req, res) => {
       ['pengajuan.cabut_sanksi']: { $exists: true, $ne: null },
     },
     {
-      aktif: false,
+      aktif: status === 'Diterima' ? false : true,
       ['jawaban.cabut_sanksi']: {
         status,
         keterangan,

+ 6 - 0
routes/v1/graph.routes.js

@@ -4,6 +4,12 @@ const auth = require('../../middleware/verifyToken')
 const roleId = require('../../middleware/role')
 
 router.get('/', auth, roleId([2020, 2021, 2023]), graph.laporan)
+router.get(
+  '/laporanSelesai',
+  auth,
+  roleId([2020, 2021, 2023]),
+  graph.laporanSelesai
+)
 router.get('/:token/:nama_file', auth, roleId([2020, 2021, 2023]), graph.excel)
 
 module.exports = router