@7365admin1/module-hygiene 4.23.1 → 4.24.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @7365admin1/module-hygiene
 
+## 4.24.0
+
+### Minor Changes
+
+- Update hygiene package
+
 ## 4.23.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -287,6 +287,7 @@ type TAreaChecklistUnits = {
     reject?: boolean;
     status?: (typeof allowedChecklistStatus)[number];
     remarks?: string;
+    attachment?: string[];
     completedBy?: string | ObjectId;
     timestamp?: Date | string;
 };
@@ -302,7 +303,7 @@ type TCleaningScheduleAreaGetQuery = {
     status?: (typeof allowedStatus)[number] | "all";
 } & Pick<TCleaningScheduleArea, "schedule" | "serviceType">;
 type TAreaChecklistUpdate = Pick<TCleaningScheduleArea, "checklist">;
-type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "completedBy"> & Pick<TAreaChecklist, "attachment">;
+type TAreaChecklistUnitsUpdate = Pick<TAreaChecklistUnits, "approve" | "reject" | "remarks" | "attachment" | "completedBy">;
 declare const areaChecklistSchema: Joi.ObjectSchema<any>;
 declare function MAreaChecklist(value: TAreaChecklistCreate): {
     schedule: string | ObjectId;

package/dist/index.js

@@ -3119,6 +3119,7 @@ function MAreaChecklist(value) {
           reject: false,
           status: "open",
           remarks: "",
+          attachment: [],
           completedBy: "",
           timestamp: ""
         }))
@@ -3544,7 +3545,12 @@ function useAreaChecklistRepo() {
             },
             unit: "$checklist.units.unit",
             name: "$checklist.units.name",
+            approve: "$checklist.units.approve",
+            reject: "$checklist.units.reject",
             remarks: "$checklist.units.remarks",
+            attachment: {
+              $ifNull: ["$checklist.units.attachment", []]
+            },
             status: {
               $switch: {
                 branches: [
@@ -3577,8 +3583,11 @@ function useAreaChecklistRepo() {
               $push: {
                 unit: "$unit",
                 name: "$name",
+                approve: "$approve",
+                reject: "$reject",
                 status: "$status",
                 remarks: "$remarks",
+                attachment: "$attachment",
                 completedByName: "$completedByName",
                 timestamp: "$timestamp"
               }
@@ -3730,6 +3739,10 @@ function useAreaChecklistRepo() {
             name: "$checklist.units.name",
             approve: "$checklist.units.approve",
             reject: "$checklist.units.reject",
+            unitRemarks: "$checklist.units.remarks",
+            unitAttachment: {
+              $ifNull: ["$checklist.units.attachment", []]
+            },
             timestamp: "$checklist.units.timestamp",
             status: {
               $switch: {
@@ -3769,7 +3782,8 @@ function useAreaChecklistRepo() {
                 reject: "$reject",
                 timestamp: "$timestamp",
                 status: "$status",
-                remarks: "$remarks",
+                remarks: "$unitRemarks",
+                attachment: "$unitAttachment",
                 completedByName: "$completedByName"
               }
             }
@@ -3917,16 +3931,13 @@ function useAreaChecklistRepo() {
       } else if (value.reject === true) {
         updateValue["checklist.$[checklist].units.$[unit].approve"] = false;
         updateValue["checklist.$[checklist].units.$[unit].reject"] = true;
-        updateValue["checklist.$[checklist].units.$[unit].status"] = "open";
+        updateValue["checklist.$[checklist].units.$[unit].status"] = "completed";
       }
-      if (value.remarks) {
-        updateValue["checklist.$[checklist].units.$[unit].remarks"] = value.remarks;
+      if (value.remarks !== void 0) {
+        updateValue["checklist.$[checklist].units.$[unit].remarks"] = value.remarks ?? "";
       }
-      if (value.attachment) {
-        updateValue["checklist.$[checklist].attachment"] = value.attachment;
-        if (value.remarks) {
-          updateValue["checklist.$[checklist].remarks"] = value.remarks;
-        }
+      if (value.attachment !== void 0) {
+        updateValue["checklist.$[checklist].units.$[unit].attachment"] = value.attachment ?? [];
       }
       if (value.completedBy) {
         updateValue["checklist.$[checklist].units.$[unit].completedBy"] = new import_mongodb9.ObjectId(value.completedBy);
@@ -4354,6 +4365,7 @@ function useAreaChecklistService() {
                     reject: false,
                     status: "open",
                     remarks: "",
+                    attachment: [],
                     completedBy: "",
                     timestamp: ""
                   }))
@@ -6784,6 +6796,7 @@ function useScheduleTaskService() {
                   reject: false,
                   status: "open",
                   remarks: "",
+                  attachment: [],
                   completedBy: "",
                   timestamp: ""
                 }));