@7365admin1/module-hygiene 4.30.1 → 4.30.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @7365admin1/module-hygiene
 
+## 4.30.2
+
+### Patch Changes
+
+- 6f02fc2: Decide which approve finishes a checklist set from approve/reject, the same rule
+  the units list uses, instead of the unit `status` field. Units at rest carry
+  "open" or "closed", so the old check never saw a set as finished: a set holding a
+  rejected unit could not be completed, and the finishing tick was not recognised.
+  No change to when a photo is required, and no schema or data change.
+
 ## 4.30.1
 
 ### Patch Changes

package/dist/index.js

@@ -3288,6 +3288,39 @@ var import_core10 = require("@7365admin1/core");
 // src/repositories/hygiene-area-checklist.repository.ts
 var import_mongodb9 = require("mongodb");
 var import_node_server_utils17 = require("@7365admin1/node-server-utils");
+
+// src/utils/completion-photo.util.ts
+var COMPLETION_PHOTO_MESSAGE = "A photo is required to complete this task. Take or upload at least one photo before marking it complete.";
+function readCompletion(units, unitId) {
+  if (units.length === 0)
+    return { completesSet: false, hasEvidence: false };
+  const others = units.filter((unit) => String(unit.unit) !== String(unitId));
+  return {
+    completesSet: others.every(
+      (unit) => unit.approve === true || unit.reject === true
+    ),
+    hasEvidence: others.some(
+      (unit) => Array.isArray(unit.attachment) && unit.attachment.length > 0
+    )
+  };
+}
+function requiresCompletionPhoto({
+  decision,
+  attachment,
+  completesSet,
+  hasEvidence
+}) {
+  if (decision !== "approve")
+    return false;
+  if (!completesSet)
+    return false;
+  if (hasEvidence)
+    return false;
+  const carriesEvidence = Array.isArray(attachment) && attachment.some((id) => typeof id === "string" && id.trim().length > 0);
+  return !carriesEvidence;
+}
+
+// src/repositories/hygiene-area-checklist.repository.ts
 function useAreaChecklistRepo() {
   const db = import_node_server_utils17.useAtlas.getDb();
   if (!db) {
@@ -4132,18 +4165,7 @@ function useAreaChecklistRepo() {
     const group = (doc?.checklist ?? []).find(
       (entry) => entry.set === set
     );
-    const units = group?.units ?? [];
-    if (units.length === 0)
-      return { completesSet: false, hasEvidence: false };
-    const others = units.filter(
-      (unit) => String(unit.unit) !== String(unitId)
-    );
-    return {
-      completesSet: others.every((unit) => unit.status === "completed"),
-      hasEvidence: others.some(
-        (unit) => Array.isArray(unit.attachment) && unit.attachment.length > 0
-      )
-    };
+    return readCompletion(group?.units ?? [], unitId);
   }
   async function updateAreaChecklist(_id, value, session) {
     try {
@@ -4681,24 +4703,6 @@ var import_joi9 = __toESM(require("joi"));
 var import_node_server_utils20 = require("@7365admin1/node-server-utils");
 var import_core11 = require("@7365admin1/core");
 
-// src/utils/completion-photo.util.ts
-var COMPLETION_PHOTO_MESSAGE = "A photo is required to complete this task. Take or upload at least one photo before marking it complete.";
-function requiresCompletionPhoto({
-  decision,
-  attachment,
-  completesSet,
-  hasEvidence
-}) {
-  if (decision !== "approve")
-    return false;
-  if (!completesSet)
-    return false;
-  if (hasEvidence)
-    return false;
-  const carriesEvidence = Array.isArray(attachment) && attachment.some((id) => typeof id === "string" && id.trim().length > 0);
-  return !carriesEvidence;
-}
-
 // src/services/hygiene-checklist-pdf.service.ts
 var import_puppeteer = require("puppeteer");
 var import_node_server_utils19 = require("@7365admin1/node-server-utils");