yazid138 3 лет назад
Родитель
Сommit
68751b305f
3 измененных файлов с 11 добавлено и 3 удалено
  1. 5 1
      controller/sanksi.controller.js
  2. 1 0
      controller/sanksi/cabutSanksi.controller.js
  3. 5 2
      utils/cekData.js

+ 5 - 1
controller/sanksi.controller.js

@@ -88,8 +88,12 @@ exports.create = handleError(async (req, res) => {
 
 exports.getAll = handleError(async (req, res) => {
   const user = req.user
-  const { keberatan, jawaban, banding, cabutSanksi, perbaikan } = req.query
+  const { keberatan, jawaban, banding, cabutSanksi, perbaikan, aktif } =
+    req.query
   const where = {}
+  if (aktif && aktif === 'false') {
+    where.aktif = false
+  }
   if (keberatan === 'true') {
     where['pengajuan.keberatan'] = { $exists: true, $ne: null }
     if (jawaban === 'true') {

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

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

+ 5 - 2
utils/cekData.js

@@ -132,8 +132,11 @@ exports.cekSatuDataSanksi = async (
   return sanksi
 }
 
-exports.cekBanyakDataSanksi = async (user, where = { banding: false }) => {
-  const w = { aktif: true }
+exports.cekBanyakDataSanksi = async (
+  user,
+  where = { banding: false, aktif: true }
+) => {
+  const w = { aktif: where.aktif }
   switch (user.role.id) {
     case 2020:
       if (!where.banding) {