@7365admin1/module-hygiene 4.9.0 → 4.10.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @7365admin1/module-hygiene
 
+## 4.10.0
+
+### Minor Changes
+
+- Update Hygiene App Enhancements
+
 ## 4.9.0
 
 ### Minor Changes

package/dist/index.js

@@ -2843,6 +2843,22 @@ function useAreaChecklistRepo() {
             preserveNullAndEmptyArrays: true
           }
         },
+        {
+          $addFields: {
+            statusOrder: {
+              $switch: {
+                branches: [
+                  { case: { $eq: ["$status", "open"] }, then: 0 },
+                  { case: { $eq: ["$status", "ongoing"] }, then: 1 },
+                  { case: { $eq: ["$status", "completed"] }, then: 3 },
+                  { case: { $eq: ["$status", "closed"] }, then: 4 }
+                ],
+                default: 2
+              }
+            }
+          }
+        },
+        { $sort: { statusOrder: 1, _id: -1 } },
         {
           $project: {
             name: 1,
@@ -2882,7 +2898,6 @@ function useAreaChecklistRepo() {
             createdByName: "$createdByDoc.name"
           }
         },
-        { $sort: { _id: -1 } },
         { $skip: page * limit },
         { $limit: limit }
       ];
@@ -3252,6 +3267,7 @@ function useAreaChecklistRepo() {
             name: "$checklist.units.name",
             approve: "$checklist.units.approve",
             reject: "$checklist.units.reject",
+            timestamp: "$checklist.units.timestamp",
             status: {
               $switch: {
                 branches: [
@@ -3286,6 +3302,7 @@ function useAreaChecklistRepo() {
                 name: "$name",
                 approve: "$approve",
                 reject: "$reject",
+                timestamp: "$timestamp",
                 status: "$status",
                 remarks: "$remarks",
                 completedByName: "$completedByName"