commit

controller/v1/laporan.controller.js

@@ -279,8 +279,8 @@ exports.getAll = handleError(async (req, res) => {
       $ne: null,
     }
   } else if (tuntas === 'true') {
-    let dataLaporan = (await cekBanyakDataLaporan(user, { aktif: 'empty', all: true,  }, {lean: true}))
-      .filter(e => e.tuntas?.keterangan || e.aktif === false || e.aktif === true && e.sanksi?.jawaban?.cabut_sanksi?.status === 'Diterima' || e.sanksi?.aktif === false && !e.sanksi?.masa_berlaku?.from_date)
+    let dataLaporan = (await cekBanyakDataLaporan(user, { aktif: 'empty', all: true, }, { lean: true }))
+      .filter(e => e.aktif === false || e.sanksi?.aktif === false)
       .map(e => ({ ...e, status: e.aktif === false || e.tuntas?.keterangan ? 'Ditutup' : e.sanksi?.jawaban?.cabut_sanksi?.status === 'Diterima' ? 'Diterima' : !e.sanksi?.masa_berlaku ? 'Selesai' : 'Ditutup' }))
     // let dataSanksi = await cekBanyakDataSanksi(user, {
     //   aktif: false, 'jawaban.cabut_sanksi.status': 'Diterima'
@@ -312,7 +312,8 @@ exports.getAll = handleError(async (req, res) => {
     })
   }
 
-  let data = (await cekBanyakDataLaporan(user, where)).filter(e => !e.sanksi || e.sanksi.aktif === true)
+  let data = (await cekBanyakDataLaporan(user, where))
+  if (!all) data = data.filter(e => !e.sanksi || e.sanksi?.aktif === true)
   return response.success(res, {
     message: 'Berhasil ambil data laporan',
     data,
@@ -339,7 +340,7 @@ exports.update = handleError(async (req, res) => {
   const { id } = req.params
   const user = req.user
   const files = req.files
-  const laporan = await cekSatuDataLaporan(res, user, id, {normal: true})
+  const laporan = await cekSatuDataLaporan(res, user, id, { normal: true })
   if (!laporan) return
 
   const isValid = validate(res, req.body, {
@@ -511,7 +512,7 @@ exports.laporanByPembina = handleError(async (req, res) => {
     isLaporan = false
     isSanksi = true
   }
-  if(delegasi === 'true') {
+  if (delegasi === 'true') {
     where = {
       role_asal: 'dikti',
       role_data: 'lldikti'
@@ -519,12 +520,12 @@ exports.laporanByPembina = handleError(async (req, res) => {
     isLaporan = true
     isSanksi = false
   }
-  if(ditutup === 'true') {
+  if (ditutup === 'true') {
     where.aktif = false
     isLaporan = true
     isSanksi = false
   }
-  if(diterima === 'true') {
+  if (diterima === 'true') {
     where2 = {
       'jawaban.cabut_sanksi.status': 'Diterima',
       aktif: false

controller/v1/sanksi.controller.js

@@ -300,6 +300,7 @@ exports.updatePt = handleError(async (req, res) => {
 
   if (is_dokumen_perbaikan === TRUE) {
     last_step = 'Dokumen Perbaikan'
+    keterangan = 'Mengupload Dokumen Perbaikan'
     flag = PERBAIKAN
   }