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

package/dist/index.mjs

@@ -3186,7 +3186,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 +3218,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 +3714,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 +3753,9 @@ function useAreaChecklistRepo() {
           $group: {
             _id: "$set",
             isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskId: { $first: "$scheduleTaskId" },
+            scheduleTaskTitle: { $first: "$scheduleTaskTitle" },
+            scheduleTaskTime: { $first: "$scheduleTaskTime" },
             units: {
               $push: {
                 unit: "$unit",
@@ -3766,6 +3776,9 @@ function useAreaChecklistRepo() {
             _id: 0,
             set: "$_id",
             isScheduleTask: 1,
+            scheduleTaskId: 1,
+            scheduleTaskTitle: 1,
+            scheduleTaskTime: 1,
             units: 1
           }
         },
@@ -3897,6 +3910,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 +3952,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 +3978,8 @@ function useAreaChecklistRepo() {
             _id: 0,
             set: "$_id",
             isScheduleTask: 1,
+            scheduleTaskTitle: 1,
+            scheduleTaskTime: 1,
             scheduleTaskId: 1,
             remarks: "$remarks",
             attachment: "$attachment",
@@ -4945,6 +4964,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 +4978,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 +5115,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 +5136,8 @@ function buildChecklistHtml(areaChecklists) {
 </body>
 </html>`;
 }
+
+// src/services/hygiene-checklist-pdf.service.ts
 function useChecklistPdfService() {
   async function generateChecklistPdf(scheduleId) {
     const db = useAtlas8.getDb();
@@ -7399,6 +7428,18 @@ function useScheduleTaskRepository() {
   };
 }
 
+// src/utils/schedule-task-set.util.ts
+function buildScheduleTaskSets(task, units, startSet, count) {
+  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";
@@ -7544,15 +7585,7 @@ function useScheduleTaskService() {
                   )
                 ) : 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, areaSetConfig);
                 const modified = await pushScheduleTaskSets(
                   parentChecklistId.toString(),
                   serviceType,
@@ -7572,16 +7605,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, areaSetConfig);
                 const checklistData = {
                   schedule: parentChecklistId.toString(),
                   serviceType,