yazid138 2 gadi atpakaļ
vecāks
revīzija
7238856e46
3 mainītis faili ar 9 papildinājumiem un 6 dzēšanām
  1. 7 6
      controller/sanksi.controller.js
  2. 1 0
      model/sanksi.model.js
  3. 1 0
      model/sanksi2.model.js

+ 7 - 6
controller/sanksi.controller.js

@@ -89,7 +89,7 @@ exports.create = handleError(async (req, res) => {
 
 exports.update = handleError(async (req, res) => {
   const { no_sanksi, keterangan, from_date, to_date } = req.body
-  let { pelanggaran_id } = req.body
+  let sanksiBody = req.body.sanksi
   const { sanksi_id } = req.params
   const files = req.files
   const user = req.user
@@ -97,7 +97,7 @@ exports.update = handleError(async (req, res) => {
   const isValid = validate(res, req.body, {
     no_sanksi: 'string',
     keterangan: 'string',
-    pelanggaran_id: 'string',
+    sanksi: 'string',
     from_date: 'string',
     to_date: 'string',
   })
@@ -106,10 +106,10 @@ exports.update = handleError(async (req, res) => {
   const sanksi = await cekSatuDataSanksi(res, user, sanksi_id, { all: true })
   if (!sanksi) return
 
-  pelanggaran_id = await cekBanyakDataPelanggaran(res, pelanggaran_id)
-  if (!pelanggaran_id) return
+  // pelanggaran_id = await cekBanyakDataPelanggaran(res, pelanggaran_id)
+  // if (!pelanggaran_id) return
 
-  // sanksiBody = JSON.parse(sanksiBody)
+  sanksiBody = JSON.parse(sanksiBody)
 
   // const sanksi = await sanksiModel.findOne({ laporan: laporan_id })
   // if (sanksi) {
@@ -130,7 +130,8 @@ exports.update = handleError(async (req, res) => {
     { _id: sanksi._id },
     {
       no_sanksi,
-      pelanggaran: pelanggaran_id,
+      // pelanggaran: pelanggaran_id,
+      sanksi: sanksiBody,
       keterangan,
       dokumen: dokumen_id,
       masa_berlaku: {

+ 1 - 0
model/sanksi.model.js

@@ -12,6 +12,7 @@ module.exports = mongoose.model(
       no_sanksi: String,
       laporan: { type: Types.ObjectId, unique: true, ref: laporan },
       user: { type: Types.ObjectId, ref: user },
+      sanksi: [{ description: String, label: String, level: Number }],
       pelanggaran: [{ type: Types.ObjectId, ref: pelanggaran }],
       keterangan: String,
       aktif: { type: Boolean, default: true },

+ 1 - 0
model/sanksi2.model.js

@@ -11,6 +11,7 @@ module.exports = mongoose.model(
       no_sanksi: String,
       user: { type: Types.ObjectId, ref: user },
       pelanggaran: [{ type: Types.ObjectId, ref: pelanggaran }],
+      sanksi: [{ description: String, label: String, level: Number }],
       keterangan: String,
       aktif: { type: Boolean, default: true },
       dokumen: [