@7365admin1/module-hygiene 4.29.1-staging.16 → 4.29.1-staging.18

package/dist/index.mjs

@@ -2968,6 +2968,18 @@ function useParentChecklistRepo() {
       throw error;
     }
   }
+  async function reopenParentChecklist(_id) {
+    const res = await collection.updateOne(
+      { _id: new ObjectId7(_id), status: "completed" },
+      { $set: { status: "ongoing", updatedAt: /* @__PURE__ */ new Date() }, $unset: { completedAt: "" } }
+    );
+    if (res.modifiedCount > 0) {
+      delNamespace().catch((err) => {
+        logger14.error(`Failed to clear cache for namespace: ${namespace_collection}`, err);
+      });
+    }
+    return res.modifiedCount;
+  }
   async function getHygieneSiteIds() {
     const query = {
       status: { $ne: "deleted" }
@@ -3074,6 +3086,7 @@ function useParentChecklistRepo() {
     getAllParentChecklist,
     getParentChecklistById,
     updateParentChecklistStatuses,
+    reopenParentChecklist,
     getHygieneSiteIds,
     closeExpiredParentChecklists,
     getTodayParentChecklists,
@@ -3186,7 +3199,9 @@ var areaChecklistSchema = Joi9.object({
         }).required()
       ).min(1).required(),
       isScheduleTask: Joi9.boolean().optional().default(false),
-      scheduleTaskId: Joi9.string().hex().optional().allow(null)
+      scheduleTaskId: Joi9.string().hex().optional().allow(null),
+      scheduleTaskTitle: Joi9.string().optional().allow("", null),
+      scheduleTaskTime: Joi9.string().optional().allow("", null)
     }).required()
   ).optional().default([])
 });
@@ -3216,6 +3231,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 ObjectId8(unit.unit),
           name: unit.name,
@@ -3710,6 +3727,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",
@@ -3746,6 +3766,9 @@ function useAreaChecklistRepo() {
           $group: {
             _id: "$set",
             isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskId: { $first: "$scheduleTaskId" },
+            scheduleTaskTitle: { $first: "$scheduleTaskTitle" },
+            scheduleTaskTime: { $first: "$scheduleTaskTime" },
             units: {
               $push: {
                 unit: "$unit",
@@ -3766,6 +3789,9 @@ function useAreaChecklistRepo() {
             _id: 0,
             set: "$_id",
             isScheduleTask: 1,
+            scheduleTaskId: 1,
+            scheduleTaskTitle: 1,
+            scheduleTaskTime: 1,
             units: 1
           }
         },
@@ -3897,6 +3923,8 @@ function useAreaChecklistRepo() {
             isScheduleTask: {
               $ifNull: ["$checklist.isScheduleTask", false]
             },
+            scheduleTaskTitle: { $ifNull: ["$checklist.scheduleTaskTitle", null] },
+            scheduleTaskTime: { $ifNull: ["$checklist.scheduleTaskTime", null] },
             scheduleTaskId: {
               $ifNull: ["$checklist.scheduleTaskId", null]
             },
@@ -3937,6 +3965,8 @@ function useAreaChecklistRepo() {
           $group: {
             _id: "$set",
             isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskTitle: { $first: "$scheduleTaskTitle" },
+            scheduleTaskTime: { $first: "$scheduleTaskTime" },
             scheduleTaskId: { $first: "$scheduleTaskId" },
             remarks: { $first: "$remarks" },
             attachment: { $first: "$attachment" },
@@ -3961,6 +3991,8 @@ function useAreaChecklistRepo() {
             _id: 0,
             set: "$_id",
             isScheduleTask: 1,
+            scheduleTaskTitle: 1,
+            scheduleTaskTime: 1,
             scheduleTaskId: 1,
             remarks: "$remarks",
             attachment: "$attachment",
@@ -4283,6 +4315,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) => {
           logger17.error(
             `Failed to clear cache for namespace: ${namespace_collection}`,
@@ -4579,6 +4615,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)) {
@@ -4945,6 +4984,8 @@ import { AppServiceType as AppServiceType10 } from "@7365admin1/core";
 import { launch } from "puppeteer";
 import { InternalServerError as InternalServerError6, useAtlas as useAtlas8 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId11 } from "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;");
 }
@@ -4957,7 +4998,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>`
@@ -5094,6 +5135,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;
@@ -5109,6 +5156,8 @@ function buildChecklistHtml(areaChecklists) {
 </body>
 </html>`;
 }
+
+// src/services/hygiene-checklist-pdf.service.ts
 function useChecklistPdfService() {
   async function generateChecklistPdf(scheduleId) {
     const db = useAtlas8.getDb();
@@ -7029,7 +7078,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 = useAtlas14.getDb();
@@ -7274,7 +7327,6 @@ function useScheduleTaskRepository() {
             description: 1,
             areas: 1,
             status: 1,
-            createdAt: 1,
             site: 1,
             serviceType: 1,
             ...SCHEDULE_FIELDS
@@ -7399,11 +7451,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
 import { ObjectId as ObjectId20 } from "mongodb";
 import { logger as logger32 } from "@7365admin1/node-server-utils";
 function useScheduleTaskService() {
-  const { createParentChecklist } = useParentChecklistRepo();
+  const { createParentChecklist, reopenParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask, markScheduleTaskRan } = useScheduleTaskRepository();
   const {
     createAreaChecklist,
@@ -7474,7 +7538,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;
           logger32.info(
@@ -7537,22 +7601,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,
@@ -7563,7 +7618,7 @@ function useScheduleTaskService() {
                 if (modified > 0) {
                   addedAreas.push(area.name);
                   logger32.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 {
                   logger32.info(
@@ -7571,17 +7626,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,
@@ -7603,6 +7648,13 @@ function useScheduleTaskService() {
               continue;
             }
           }
+          if (addedAreas.length > 0) {
+            try {
+              await reopenParentChecklist(parentChecklistId);
+            } catch (error) {
+              logger32.error(`Could not reopen day list ${parentChecklistId}`, error);
+            }
+          }
           const attemptKey = `${scheduleTask._id}:${today}`;
           const tried = (attempts.get(attemptKey) ?? 0) + 1;
           attempts.set(attemptKey, tried);
@@ -7752,8 +7804,8 @@ function useScheduleTaskController() {
     const optional = Object.fromEntries(
       Object.entries(scheduleTaskFields).map(([key, rule]) => [
         key,
-        key === "dates" ? Joi19.array().min(1).items(scheduleDate).optional().messages({
-          "array.min": "Pick at least one date, or choose a repeat."
+        key === "dates" ? Joi19.array().items(scheduleDate).optional().messages({
+          "array.base": "Dates must be a list of dates."
         }) : rule.optional()
       ])
     );