@7365admin1/module-hygiene 4.31.0 → 4.32.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @7365admin1/module-hygiene
 
+## 4.32.1
+
+### Patch Changes
+
+- 98ff56f: Extra visits: editing a repeating visit no longer fails; one extra visit adds one round; an area or day already Done is reopened when an extra round is added; Next visit is right for a task saved after today's time.
+
+## 4.32.0
+
+### Minor Changes
+
+- 8b89acd: Extra-visit sets now store `scheduleTaskId`, `scheduleTaskTitle` and `scheduleTaskTime`, returned by the area-checklist unit/set responses (null on older sets). The history PDF marks not-done items "Missed".
+
 ## 4.31.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -242,6 +242,7 @@ declare function useParentChecklistRepo(): {
         _id: ObjectId;
     }>;
     updateParentChecklistStatuses: (_id: string | ObjectId, status: (typeof allowedStatus)[number], session?: ClientSession) => Promise<number>;
+    reopenParentChecklist: (_id: string | ObjectId) => Promise<number>;
     getHygieneSiteIds: () => Promise<any[]>;
     closeExpiredParentChecklists: () => Promise<number>;
     getTodayParentChecklists: () => Promise<{
@@ -281,6 +282,8 @@ type TAreaChecklist = {
     attachment?: string[];
     isScheduleTask?: boolean;
     scheduleTaskId?: string | ObjectId;
+    scheduleTaskTitle?: string;
+    scheduleTaskTime?: string;
 };
 type TAreaChecklistUnits = {
     unit: string | ObjectId;

package/dist/index.js

@@ -3015,6 +3015,18 @@ function useParentChecklistRepo() {
       throw error;
     }
   }
+  async function reopenParentChecklist(_id) {
+    const res = await collection.updateOne(
+      { _id: new import_mongodb7.ObjectId(_id), status: "completed" },
+      { $set: { status: "ongoing", updatedAt: /* @__PURE__ */ new Date() }, $unset: { completedAt: "" } }
+    );
+    if (res.modifiedCount > 0) {
+      delNamespace().catch((err) => {
+        import_node_server_utils14.logger.error(`Failed to clear cache for namespace: ${namespace_collection}`, err);
+      });
+    }
+    return res.modifiedCount;
+  }
   async function getHygieneSiteIds() {
     const query = {
       status: { $ne: "deleted" }
@@ -3121,6 +3133,7 @@ function useParentChecklistRepo() {
     getAllParentChecklist,
     getParentChecklistById,
     updateParentChecklistStatuses,
+    reopenParentChecklist,
     getHygieneSiteIds,
     closeExpiredParentChecklists,
     getTodayParentChecklists,
@@ -3233,7 +3246,9 @@ var areaChecklistSchema = import_joi9.default.object({
         }).required()
       ).min(1).required(),
       isScheduleTask: import_joi9.default.boolean().optional().default(false),
-      scheduleTaskId: import_joi9.default.string().hex().optional().allow(null)
+      scheduleTaskId: import_joi9.default.string().hex().optional().allow(null),
+      scheduleTaskTitle: import_joi9.default.string().optional().allow("", null),
+      scheduleTaskTime: import_joi9.default.string().optional().allow("", null)
     }).required()
   ).optional().default([])
 });
@@ -3263,6 +3278,8 @@ function MAreaChecklist(value) {
         set: checklistItem.set,
         isScheduleTask: checklistItem.isScheduleTask ?? false,
         scheduleTaskId: checklistItem.scheduleTaskId ?? void 0,
+        scheduleTaskTitle: checklistItem.scheduleTaskTitle ?? void 0,
+        scheduleTaskTime: checklistItem.scheduleTaskTime ?? void 0,
         units: checklistItem.units.map((unit) => ({
           unit: new import_mongodb8.ObjectId(unit.unit),
           name: unit.name,
@@ -3745,6 +3762,9 @@ function useAreaChecklistRepo() {
             isScheduleTask: {
               $ifNull: ["$checklist.isScheduleTask", false]
             },
+            scheduleTaskId: { $ifNull: ["$checklist.scheduleTaskId", null] },
+            scheduleTaskTitle: { $ifNull: ["$checklist.scheduleTaskTitle", null] },
+            scheduleTaskTime: { $ifNull: ["$checklist.scheduleTaskTime", null] },
             unit: "$checklist.units.unit",
             name: "$checklist.units.name",
             approve: "$checklist.units.approve",
@@ -3781,6 +3801,9 @@ function useAreaChecklistRepo() {
           $group: {
             _id: "$set",
             isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskId: { $first: "$scheduleTaskId" },
+            scheduleTaskTitle: { $first: "$scheduleTaskTitle" },
+            scheduleTaskTime: { $first: "$scheduleTaskTime" },
             units: {
               $push: {
                 unit: "$unit",
@@ -3801,6 +3824,9 @@ function useAreaChecklistRepo() {
             _id: 0,
             set: "$_id",
             isScheduleTask: 1,
+            scheduleTaskId: 1,
+            scheduleTaskTitle: 1,
+            scheduleTaskTime: 1,
             units: 1
           }
         },
@@ -3932,6 +3958,8 @@ function useAreaChecklistRepo() {
             isScheduleTask: {
               $ifNull: ["$checklist.isScheduleTask", false]
             },
+            scheduleTaskTitle: { $ifNull: ["$checklist.scheduleTaskTitle", null] },
+            scheduleTaskTime: { $ifNull: ["$checklist.scheduleTaskTime", null] },
             scheduleTaskId: {
               $ifNull: ["$checklist.scheduleTaskId", null]
             },
@@ -3972,6 +4000,8 @@ function useAreaChecklistRepo() {
           $group: {
             _id: "$set",
             isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskTitle: { $first: "$scheduleTaskTitle" },
+            scheduleTaskTime: { $first: "$scheduleTaskTime" },
             scheduleTaskId: { $first: "$scheduleTaskId" },
             remarks: { $first: "$remarks" },
             attachment: { $first: "$attachment" },
@@ -3996,6 +4026,8 @@ function useAreaChecklistRepo() {
             _id: 0,
             set: "$_id",
             isScheduleTask: 1,
+            scheduleTaskTitle: 1,
+            scheduleTaskTime: 1,
             scheduleTaskId: 1,
             remarks: "$remarks",
             attachment: "$attachment",
@@ -4318,6 +4350,10 @@ function useAreaChecklistRepo() {
         }
       );
       if (result.modifiedCount > 0) {
+        await collection.updateOne(
+          { schedule, serviceType, area, status: "completed" },
+          { $set: { status: "ongoing", updatedAt: /* @__PURE__ */ new Date() }, $unset: { completedAt: "" } }
+        );
         delNamespace().catch((err) => {
           import_node_server_utils17.logger.error(
             `Failed to clear cache for namespace: ${namespace_collection}`,
@@ -4614,6 +4650,9 @@ function validateScheduleRules(task, now = /* @__PURE__ */ new Date()) {
   }
   if (task.endDate && task.endDate < today)
     return "The end date has already passed.";
+  if (!repeating && !(task.dates ?? []).length) {
+    return "Pick at least one date, or choose a repeat.";
+  }
   if (!repeating) {
     const dates = (task.dates ?? []).filter((d) => !task.endDate || d <= task.endDate);
     if (dates.length && dates.every((d) => d < today)) {
@@ -4976,6 +5015,8 @@ var import_core11 = require("@7365admin1/core");
 var import_puppeteer = require("puppeteer");
 var import_node_server_utils19 = require("@7365admin1/node-server-utils");
 var import_mongodb11 = require("mongodb");
+
+// src/utils/checklist-pdf-html.util.ts
 function escapeHtml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
@@ -4988,7 +5029,7 @@ function buildChecklistHtml(areaChecklists) {
       const unitRows = (setItem.units || []).map(
         (unit) => `
               <tr>
-                <td class="unit-name">${escapeHtml(unit.name || "")}</td>
+                <td class="unit-name">${escapeHtml(unit.name || "")}${unit.approve || unit.reject ? "" : ' <span class="missed-label">Missed</span>'}</td>
                 <td class="icon-cell">${unit.reject ? '<span class="reject-icon">&#10007;</span>' : ""}</td>
                 <td class="icon-cell">${unit.approve ? '<span class="approve-icon">&#10003;</span>' : ""}</td>
               </tr>`
@@ -5125,6 +5166,12 @@ function buildChecklistHtml(areaChecklists) {
       font-size: 16px;
       font-weight: bold;
     }
+    .missed-label {
+      color: #b3261e;
+      font-size: 11px;
+      font-weight: bold;
+      margin-left: 6px;
+    }
     .reject-icon {
       color: #e74c3c;
       font-size: 16px;
@@ -5140,6 +5187,8 @@ function buildChecklistHtml(areaChecklists) {
 </body>
 </html>`;
 }
+
+// src/services/hygiene-checklist-pdf.service.ts
 function useChecklistPdfService() {
   async function generateChecklistPdf(scheduleId) {
     const db = import_node_server_utils19.useAtlas.getDb();
@@ -7021,7 +7070,11 @@ var SCHEDULE_FIELDS = {
   startDate: 1,
   endDate: 1,
   paused: 1,
-  lastRunDate: 1
+  lastRunDate: 1,
+  // when it was saved: a task saved after its time today waits for its next
+  // day, so Next visit must know it (else it says "today" for a visit that never comes)
+  createdAt: 1,
+  updatedAt: 1
 };
 function useScheduleTaskRepository() {
   const db = import_node_server_utils33.useAtlas.getDb();
@@ -7266,7 +7319,6 @@ function useScheduleTaskRepository() {
             description: 1,
             areas: 1,
             status: 1,
-            createdAt: 1,
             site: 1,
             serviceType: 1,
             ...SCHEDULE_FIELDS
@@ -7391,11 +7443,23 @@ function useScheduleTaskRepository() {
   };
 }
 
+// src/utils/schedule-task-set.util.ts
+function buildScheduleTaskSets(task, units, startSet, count = 1) {
+  return Array.from({ length: count }, (_, i) => ({
+    set: startSet + i,
+    units,
+    isScheduleTask: true,
+    scheduleTaskId: task._id,
+    scheduleTaskTitle: task.title,
+    scheduleTaskTime: task.time
+  }));
+}
+
 // src/services/hygiene-schedule-task.service.ts
 var import_mongodb20 = require("mongodb");
 var import_node_server_utils34 = require("@7365admin1/node-server-utils");
 function useScheduleTaskService() {
-  const { createParentChecklist } = useParentChecklistRepo();
+  const { createParentChecklist, reopenParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask, markScheduleTaskRan } = useScheduleTaskRepository();
   const {
     createAreaChecklist,
@@ -7466,7 +7530,7 @@ function useScheduleTaskService() {
           const parentChecklistIds = await createParentChecklist({
             site: scheduleTask.site.toString(),
             serviceType,
-            createdAt: /* @__PURE__ */ new Date()
+            createdAt: currentDate ?? /* @__PURE__ */ new Date()
           });
           const parentChecklistId = Array.isArray(parentChecklistIds) ? parentChecklistIds[0] : parentChecklistIds;
           import_node_server_utils34.logger.info(
@@ -7529,22 +7593,13 @@ function useScheduleTaskService() {
                 );
               }
               if (existingAreaChecklist) {
-                const areaSetConfig = Number(areaDetails.set) || 1;
                 const maxSetInChecklist = existingAreaChecklist.checklist?.length ? Math.max(
                   ...existingAreaChecklist.checklist.map(
                     (c) => c.set
                   )
                 ) : 0;
                 const startSetNumber = maxSetInChecklist + 1;
-                const newSets = Array.from(
-                  { length: areaSetConfig },
-                  (_, index) => ({
-                    set: startSetNumber + index,
-                    units,
-                    isScheduleTask: true,
-                    scheduleTaskId: scheduleTask._id
-                  })
-                );
+                const newSets = buildScheduleTaskSets(scheduleTask, units, startSetNumber);
                 const modified = await pushScheduleTaskSets(
                   parentChecklistId.toString(),
                   serviceType,
@@ -7555,7 +7610,7 @@ function useScheduleTaskService() {
                 if (modified > 0) {
                   addedAreas.push(area.name);
                   import_node_server_utils34.logger.info(
-                    `Appended ${areaSetConfig} set(s) starting from ${startSetNumber} to area checklist for area ${area.name}`
+                    `Appended extra-visit set ${startSetNumber} to area checklist for area ${area.name}`
                   );
                 } else {
                   import_node_server_utils34.logger.info(
@@ -7563,17 +7618,7 @@ function useScheduleTaskService() {
                   );
                 }
               } else {
-                const areaSetConfig = Number(areaDetails.set) || 1;
-                const schedTaskId = scheduleTask._id;
-                const schedTaskSets = Array.from(
-                  { length: areaSetConfig },
-                  (_, index) => ({
-                    set: index + 1,
-                    units,
-                    isScheduleTask: true,
-                    scheduleTaskId: schedTaskId
-                  })
-                );
+                const schedTaskSets = buildScheduleTaskSets(scheduleTask, units, 1);
                 const checklistData = {
                   schedule: parentChecklistId.toString(),
                   serviceType,
@@ -7595,6 +7640,13 @@ function useScheduleTaskService() {
               continue;
             }
           }
+          if (addedAreas.length > 0) {
+            try {
+              await reopenParentChecklist(parentChecklistId);
+            } catch (error) {
+              import_node_server_utils34.logger.error(`Could not reopen day list ${parentChecklistId}`, error);
+            }
+          }
           const attemptKey = `${scheduleTask._id}:${today}`;
           const tried = (attempts.get(attemptKey) ?? 0) + 1;
           attempts.set(attemptKey, tried);
@@ -7744,8 +7796,8 @@ function useScheduleTaskController() {
     const optional = Object.fromEntries(
       Object.entries(scheduleTaskFields).map(([key, rule]) => [
         key,
-        key === "dates" ? import_joi19.default.array().min(1).items(scheduleDate).optional().messages({
-          "array.min": "Pick at least one date, or choose a repeat."
+        key === "dates" ? import_joi19.default.array().items(scheduleDate).optional().messages({
+          "array.base": "Dates must be a list of dates."
         }) : rule.optional()
       ])
     );