@7365admin1/module-hygiene 4.7.0 → 4.9.0

package/dist/index.mjs

@@ -1,6 +1,11 @@
 // src/models/hygiene-base.model.ts
 var allowedTypes = ["common", "toilet"];
-var allowedStatus = ["ready", "ongoing", "completed"];
+var allowedStatus = [
+  "open",
+  "ongoing",
+  "completed",
+  "closed"
+];
 var allowedPeriods = ["today", "thisWeek", "thisMonth"];
 
 // src/repositories/hygiene-dashboard.repository.ts
@@ -1310,10 +1315,14 @@ function useAreaService() {
     try {
       dataArray = JSON.parse(dataJson);
     } catch (error) {
-      throw new BadRequestError7("Invalid JSON format for data in excel");
+      throw new BadRequestError7(
+        "We couldn't read the uploaded file. Please make sure you're uploading the correct file and try again."
+      );
     }
     if (!dataArray || dataArray.length === 0) {
-      throw new NotFoundError2("No data found in the uploaded file");
+      throw new NotFoundError2(
+        "The uploaded file is empty. Please make sure your file contains data and try again."
+      );
     }
     let availableUnits = [];
     try {
@@ -1414,33 +1423,35 @@ function useAreaService() {
           }
         }
       }
-      let message = `Upload completed: ${insertedAreaIds.length} areas successfully created`;
+      let message = `Upload complete! ${insertedAreaIds.length} ${insertedAreaIds.length === 1 ? "area was" : "areas were"} successfully added`;
       if (duplicateAreas.length > 0) {
-        message += `, ${duplicateAreas.length} areas skipped (already exist)`;
+        message += `, ${duplicateAreas.length} ${duplicateAreas.length === 1 ? "area was" : "areas were"} skipped because they already exist`;
       }
       if (failedAreas.length > 0) {
-        message += `, ${failedAreas.length} areas failed`;
+        message += `, ${failedAreas.length} ${failedAreas.length === 1 ? "area" : "areas"} could not be saved`;
       }
       if (skippedRows.length > 0) {
-        message += `, ${skippedRows.length} rows skipped (invalid data)`;
+        message += `, ${skippedRows.length} ${skippedRows.length === 1 ? "row was" : "rows were"} skipped due to missing information`;
       }
       logger8.info(message);
       if (insertedAreaIds.length === 0) {
         if (duplicateAreas.length > 0 && failedAreas.length === 0 && skippedRows.length === 0) {
           return {
-            message: `No new areas were created. All ${duplicateAreas.length} areas already exist in the system: ${duplicateAreas.join(", ")}`
+            message: `No new areas were added. All ${duplicateAreas.length} ${duplicateAreas.length === 1 ? "area" : "areas"} in your file already exist in the system: ${duplicateAreas.join(
+              ", "
+            )}.`
           };
         } else if (failedAreas.length > 0) {
           throw new BadRequestError7(
-            `No areas were created. ${failedAreas.length} areas failed due to errors. Please check your data format and ensure area names are valid.`
+            `No areas were added. ${failedAreas.length} ${failedAreas.length === 1 ? "area" : "areas"} could not be saved. Please review the area names and information in your file, then try again.`
           );
         } else if (skippedRows.length > 0 && duplicateAreas.length === 0) {
           throw new BadRequestError7(
-            `No areas were created. All ${skippedRows.length} rows contained invalid or missing data.`
+            `No areas were added. ${skippedRows.length} ${skippedRows.length === 1 ? "row" : "rows"} in your file had missing or incomplete information. Please fill in all required fields and try again.`
           );
         } else {
           return {
-            message: `No new areas were created. ${duplicateAreas.length} areas already exist, ${skippedRows.length} rows had invalid data.`
+            message: `No new areas were added. ${duplicateAreas.length} ${duplicateAreas.length === 1 ? "area" : "areas"} already exist${skippedRows.length > 0 ? `, and ${skippedRows.length} ${skippedRows.length === 1 ? "row" : "rows"} had missing or incomplete information` : ""}.`
           };
         }
       }
@@ -1451,11 +1462,11 @@ function useAreaService() {
         throw error;
       } else if (error.message.includes("validation")) {
         throw new BadRequestError7(
-          "Upload failed due to invalid data format. Please check that all required fields are properly filled."
+          "Upload failed because some required information is missing or incorrect. Please review your file and make sure all fields are filled in properly."
         );
       } else {
         throw new BadRequestError7(
-          `Upload failed: ${error.message || "Please check your data format and try again."}`
+          "Something went wrong while uploading. Please check your file and try again."
         );
       }
     }
@@ -1464,11 +1475,15 @@ function useAreaService() {
     try {
       const areas = await getAreasForChecklist(site);
       if (!areas || !Array.isArray(areas) || areas.length === 0) {
-        throw new BadRequestError7("No data found to export");
+        throw new BadRequestError7(
+          "There are no areas to export yet. Please add some areas first, then try again."
+        );
       }
       const excelBuffer = await generateAreaExcel(areas);
       if (!excelBuffer || excelBuffer.length === 0) {
-        throw new Error("Generated Excel file is empty or invalid.");
+        throw new Error(
+          "Something went wrong while preparing your export file. Please try again."
+        );
       }
       return excelBuffer;
     } catch (error) {
@@ -1773,10 +1788,14 @@ function useUnitService() {
     try {
       dataArray = JSON.parse(dataJson);
     } catch (error) {
-      throw new BadRequestError9("Invalid JSON format for data in excel");
+      throw new BadRequestError9(
+        "We couldn't read the uploaded file. Please make sure you're uploading the correct file and try again."
+      );
     }
     if (!dataArray || dataArray.length === 0) {
-      throw new NotFoundError3("No data found in the uploaded file");
+      throw new NotFoundError3(
+        "The uploaded file is empty. Please make sure your file contains data and try again."
+      );
     }
     const insertedUnitIds = [];
     const duplicateUnits = [];
@@ -1817,29 +1836,31 @@ function useUnitService() {
           }
         }
       }
-      let message = `Upload completed: ${insertedUnitIds.length} units successfully created`;
+      let message = `Upload complete! ${insertedUnitIds.length} ${insertedUnitIds.length === 1 ? "unit was" : "units were"} successfully added`;
       if (duplicateUnits.length > 0) {
-        message += `, ${duplicateUnits.length} units skipped (already exist)`;
+        message += `, ${duplicateUnits.length} ${duplicateUnits.length === 1 ? "unit was" : "units were"} skipped because they already exist`;
       }
       if (failedUnits.length > 0) {
-        message += `, ${failedUnits.length} units failed`;
+        message += `, ${failedUnits.length} ${failedUnits.length === 1 ? "unit" : "units"} could not be saved`;
       }
       if (skippedRows.length > 0) {
-        message += `, ${skippedRows.length} rows skipped (invalid data)`;
+        message += `, ${skippedRows.length} ${skippedRows.length === 1 ? "row was" : "rows were"} skipped due to missing information`;
       }
       logger11.info(message);
       if (insertedUnitIds.length === 0) {
         if (duplicateUnits.length > 0 && failedUnits.length === 0) {
           throw new BadRequestError9(
-            `No new units were created. All ${duplicateUnits.length} units already exist in the system: ${duplicateUnits.join(", ")}`
+            `No new units were added. All ${duplicateUnits.length} ${duplicateUnits.length === 1 ? "unit" : "units"} in your file already exist in the system: ${duplicateUnits.join(
+              ", "
+            )}.`
           );
         } else if (failedUnits.length > 0) {
           throw new BadRequestError9(
-            `No units were created. Please check your data format and ensure unit names are valid.`
+            `No units were added. ${failedUnits.length} ${failedUnits.length === 1 ? "unit" : "units"} could not be saved. Please review the unit names in your file and try again.`
           );
         } else if (skippedRows.length > 0) {
           throw new BadRequestError9(
-            `No units were created. All rows contained invalid or missing unit names.`
+            `No units were added. ${skippedRows.length} ${skippedRows.length === 1 ? "row" : "rows"} in your file had missing or incomplete information. Please fill in all required fields and try again.`
           );
         }
       }
@@ -1850,15 +1871,15 @@ function useUnitService() {
         throw error;
       } else if (error.message.includes("duplicate")) {
         throw new BadRequestError9(
-          "Upload failed due to duplicate unit names. Please ensure all unit names are unique."
+          "Upload failed because some unit names are already taken. Please make sure each unit has a unique name and try again."
         );
       } else if (error.message.includes("validation")) {
         throw new BadRequestError9(
-          "Upload failed due to invalid data format. Please check that all required fields are properly filled."
+          "Upload failed because some required information is missing or incorrect. Please review your file and make sure all fields are filled in properly."
         );
       } else {
         throw new BadRequestError9(
-          `Upload failed: ${error.message || "Please check your data format and try again."}`
+          "Something went wrong while uploading. Please check your file and try again."
         );
       }
     }
@@ -1890,7 +1911,9 @@ function useUnitService() {
       session?.startTransaction();
       const isExistingArea = await verifyAreaByUnitId(_id);
       if (isExistingArea) {
-        throw new BadRequestError9("Failed to delete unit, unit is in use.");
+        throw new BadRequestError9(
+          "This unit can't be deleted because it's currently being used in one or more areas. Please remove it from those areas first, then try again."
+        );
       }
       const result = await _deleteUnit(_id, session);
       await session?.commitTransaction();
@@ -1916,11 +1939,15 @@ function useUnitService() {
         site
       });
       if (!data || !data.items || data.items.length === 0) {
-        throw new BadRequestError9("No data found to export");
+        throw new BadRequestError9(
+          "There are no units to export yet. Please add some units first, then try again."
+        );
       }
       const excelBuffer = await _generateUnitExcel(data.items);
       if (!excelBuffer || excelBuffer.length === 0) {
-        throw new Error("Generated Excel file is empty or invalid.");
+        throw new Error(
+          "Something went wrong while preparing your export file. Please try again."
+        );
       }
       return excelBuffer;
     } catch (error) {
@@ -2127,7 +2154,7 @@ function MParentChecklist(value) {
   }
   return {
     site: value.site,
-    status: "ready",
+    status: "open",
     createdAt: value.createdAt ?? /* @__PURE__ */ new Date(),
     updatedAt: value.updatedAt ?? ""
   };
@@ -2325,18 +2352,23 @@ function useParentChecklistRepo() {
           status: {
             $switch: {
               branches: [
-                { case: { $eq: ["$status", "ready"] }, then: "Ready" },
+                { case: { $eq: ["$status", "open"] }, then: "Open" },
                 {
                   case: { $eq: ["$status", "ongoing"] },
                   then: "Ongoing"
                 },
-                { case: { $eq: ["$status", "completed"] }, then: "Completed" }
+                { case: { $eq: ["$status", "completed"] }, then: "Completed" },
+                {
+                  case: { $eq: ["$status", "closed"] },
+                  then: "Closed"
+                }
               ],
               default: "$status"
             }
           },
           completedAt: 1,
-          createdAt: 1
+          createdAt: 1,
+          closeIn: { $add: ["$createdAt", 24 * 60 * 60 * 1e3] }
         }
       });
       pipeline.push(
@@ -2424,11 +2456,42 @@ function useParentChecklistRepo() {
       throw error;
     }
   }
+  async function closeExpiredParentChecklists() {
+    try {
+      const expiryDate = new Date(Date.now() - 24 * 60 * 60 * 1e3);
+      const result = await collection.updateMany(
+        {
+          status: { $in: ["open", "ongoing", "completed"] },
+          createdAt: { $lte: expiryDate }
+        },
+        {
+          $set: {
+            status: "closed",
+            updatedAt: /* @__PURE__ */ new Date()
+          }
+        }
+      );
+      if (result.modifiedCount > 0) {
+        delNamespace().catch((err) => {
+          logger14.error(
+            "Failed to invalidate cache after closing expired parent checklists",
+            err
+          );
+        });
+        logger14.info(`Closed ${result.modifiedCount} expired parent checklists`);
+      }
+      return result.modifiedCount;
+    } catch (error) {
+      logger14.error("Failed to close expired parent checklists", error);
+      throw error;
+    }
+  }
   return {
     createIndex,
     createParentChecklist,
     getAllParentChecklist,
-    updateParentChecklistStatuses
+    updateParentChecklistStatuses,
+    closeExpiredParentChecklists
   };
 }
 
@@ -2510,7 +2573,7 @@ function useParentChecklistController() {
 import Joi8 from "joi";
 import { ObjectId as ObjectId8 } from "mongodb";
 import { BadRequestError as BadRequestError14, logger as logger16 } from "@7365admin1/node-server-utils";
-var allowedChecklistStatus = ["ready", "completed"];
+var allowedChecklistStatus = ["open", "completed", "closed"];
 var areaChecklistSchema = Joi8.object({
   schedule: Joi8.string().hex().required(),
   area: Joi8.string().hex().required(),
@@ -2558,7 +2621,7 @@ function MAreaChecklist(value) {
           name: unit.name,
           approve: false,
           reject: false,
-          status: "ready",
+          status: "open",
           remarks: "",
           completedBy: "",
           timestamp: ""
@@ -2579,7 +2642,7 @@ function MAreaChecklist(value) {
     name: value.name,
     type: value.type,
     checklist: value.checklist || [],
-    status: "ready",
+    status: "open",
     createdBy: value.createdBy,
     createdAt: /* @__PURE__ */ new Date(),
     completedAt: "",
@@ -2751,11 +2814,15 @@ function useAreaChecklistRepo() {
             status: {
               $switch: {
                 branches: [
-                  { case: { $eq: ["$status", "ready"] }, then: "Ready" },
+                  { case: { $eq: ["$status", "open"] }, then: "Open" },
                   { case: { $eq: ["$status", "ongoing"] }, then: "Ongoing" },
                   {
                     case: { $eq: ["$status", "completed"] },
                     then: "Completed"
+                  },
+                  {
+                    case: { $eq: ["$status", "closed"] },
+                    then: "Closed"
                   }
                 ],
                 default: "$status"
@@ -2857,11 +2924,15 @@ function useAreaChecklistRepo() {
             status: {
               $switch: {
                 branches: [
-                  { case: { $eq: ["$status", "ready"] }, then: "Ready" },
+                  { case: { $eq: ["$status", "open"] }, then: "Open" },
                   { case: { $eq: ["$status", "ongoing"] }, then: "Ongoing" },
                   {
                     case: { $eq: ["$status", "completed"] },
                     then: "Completed"
+                  },
+                  {
+                    case: { $eq: ["$status", "closed"] },
+                    then: "Closed"
                   }
                 ],
                 default: "$status"
@@ -2926,11 +2997,15 @@ function useAreaChecklistRepo() {
             status: {
               $switch: {
                 branches: [
-                  { case: { $eq: ["$status", "ready"] }, then: "Ready" },
+                  { case: { $eq: ["$status", "open"] }, then: "Open" },
                   { case: { $eq: ["$status", "ongoing"] }, then: "Ongoing" },
                   {
                     case: { $eq: ["$status", "completed"] },
                     then: "Completed"
+                  },
+                  {
+                    case: { $eq: ["$status", "closed"] },
+                    then: "Closed"
                   }
                 ],
                 default: "$status"
@@ -2990,12 +3065,16 @@ function useAreaChecklistRepo() {
               $switch: {
                 branches: [
                   {
-                    case: { $eq: ["$checklist.units.status", "ready"] },
-                    then: "Ready"
+                    case: { $eq: ["$checklist.units.status", "open"] },
+                    then: "Open"
                   },
                   {
                     case: { $eq: ["$checklist.units.status", "completed"] },
                     then: "Completed"
+                  },
+                  {
+                    case: { $eq: ["$checklist.units.status", "closed"] },
+                    then: "Closed"
                   }
                 ],
                 default: "$checklist.units.status"
@@ -3096,6 +3175,38 @@ function useAreaChecklistRepo() {
             preserveNullAndEmptyArrays: false
           }
         },
+        {
+          $addFields: {
+            isCompleted: { $ne: ["$checklist.units.completedBy", ""] }
+          }
+        },
+        {
+          $lookup: {
+            from: "users",
+            let: { completedById: "$checklist.units.completedBy" },
+            pipeline: [
+              {
+                $match: {
+                  $expr: {
+                    $and: [
+                      { $ne: ["$$completedById", ""] },
+                      { $eq: ["$_id", "$$completedById"] }
+                    ]
+                  }
+                }
+              },
+              { $project: { name: 1 } }
+            ],
+            as: "completedBy"
+          }
+        },
+        {
+          $unwind: {
+            path: "$completedBy",
+            preserveNullAndEmptyArrays: true
+          }
+        },
+        { $sort: { set: 1, isCompleted: -1, "checklist.units.timestamp": 1 } },
         {
           $project: {
             _id: 0,
@@ -3110,25 +3221,30 @@ function useAreaChecklistRepo() {
               $switch: {
                 branches: [
                   {
-                    case: { $eq: ["$checklist.units.status", "ready"] },
-                    then: "Ready"
+                    case: { $eq: ["$checklist.units.status", "open"] },
+                    then: "Open"
                   },
                   {
                     case: { $eq: ["$checklist.units.status", "completed"] },
                     then: "Completed"
+                  },
+                  {
+                    case: { $eq: ["$checklist.units.status", "closed"] },
+                    then: "Closed"
                   }
                 ],
                 default: "$checklist.units.status"
               }
-            }
+            },
+            completedByName: "$completedBy.name"
           }
         },
-        { $sort: { set: 1, name: 1 } },
         {
           $group: {
             _id: "$set",
             remarks: { $first: "$remarks" },
             attachment: { $first: "$attachment" },
+            completedByName: { $first: "$completedByName" },
             units: {
               $push: {
                 unit: "$unit",
@@ -3136,7 +3252,8 @@ function useAreaChecklistRepo() {
                 approve: "$approve",
                 reject: "$reject",
                 status: "$status",
-                remarks: "$remarks"
+                remarks: "$remarks",
+                completedByName: "$completedByName"
               }
             }
           }
@@ -3147,6 +3264,7 @@ function useAreaChecklistRepo() {
             set: "$_id",
             remarks: "$remarks",
             attachment: "$attachment",
+            completedByName: 1,
             units: 1
           }
         },
@@ -3245,7 +3363,7 @@ function useAreaChecklistRepo() {
       } else if (value.reject === true) {
         updateValue["checklist.$[checklist].units.$[unit].approve"] = false;
         updateValue["checklist.$[checklist].units.$[unit].reject"] = true;
-        updateValue["checklist.$[checklist].units.$[unit].status"] = "ready";
+        updateValue["checklist.$[checklist].units.$[unit].status"] = "open";
       }
       if (value.remarks) {
         updateValue["checklist.$[checklist].units.$[unit].remarks"] = value.remarks;
@@ -3371,6 +3489,42 @@ function useAreaChecklistRepo() {
       return 0;
     }
   }
+  async function closeExpiredAreaChecklists() {
+    try {
+      const expiryDate = new Date(Date.now() - 24 * 60 * 60 * 1e3);
+      const result = await collection.updateMany(
+        {
+          status: { $in: ["open", "ongoing", "completed"] },
+          createdAt: { $lte: expiryDate }
+        },
+        {
+          $set: {
+            status: "closed",
+            updatedAt: /* @__PURE__ */ new Date(),
+            "checklist.$[].units.$[unit].status": "closed"
+          }
+        },
+        {
+          arrayFilters: [{ "unit.status": { $in: ["open", "completed"] } }]
+        }
+      );
+      if (result.modifiedCount > 0) {
+        delNamespace().catch((err) => {
+          logger17.error(
+            "Failed to invalidate cache after closing expired area checklists",
+            err
+          );
+        });
+        logger17.info(
+          `Closed ${result.modifiedCount} expired area checklists and their units`
+        );
+      }
+      return result.modifiedCount;
+    } catch (error) {
+      logger17.error("Failed to close expired area checklists", error);
+      throw error;
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -3384,7 +3538,8 @@ function useAreaChecklistRepo() {
     updateAreaChecklist,
     updateAreaChecklistStatus,
     updateAreaChecklistUnits,
-    getMaxSetNumberForArea
+    getMaxSetNumberForArea,
+    closeExpiredAreaChecklists
   };
 }
 
@@ -3480,12 +3635,12 @@ function useAreaChecklistService() {
         },
         session
       );
-      let areaStatus = "ready";
+      let areaStatus = "open";
       if (allUnitsResult && allUnitsResult.items && allUnitsResult.items.length > 0) {
         const sets = allUnitsResult.items;
         const allUnits = sets.flatMap((set2) => set2.units || []);
-        const readyCount = allUnits.filter(
-          (unit) => unit.status === "Ready"
+        const openCount = allUnits.filter(
+          (unit) => unit.status === "Open"
         ).length;
         const completedCount = allUnits.filter(
           (unit) => unit.status === "Completed"
@@ -3493,8 +3648,8 @@ function useAreaChecklistService() {
         const totalCount = allUnits.length;
         if (completedCount === totalCount) {
           areaStatus = "completed";
-        } else if (readyCount === totalCount) {
-          areaStatus = "ready";
+        } else if (openCount === totalCount) {
+          areaStatus = "open";
         } else {
           areaStatus = "ongoing";
         }
@@ -3513,18 +3668,18 @@ function useAreaChecklistService() {
         );
         if (allAreasResult && allAreasResult.items && allAreasResult.items.length > 0) {
           const areas = allAreasResult.items;
-          const readyAreasCount = areas.filter(
-            (area) => area.status === "Ready"
+          const openAreasCount = areas.filter(
+            (area) => area.status === "Open"
           ).length;
           const completedAreasCount = areas.filter(
             (area) => area.status === "Completed"
           ).length;
           const totalAreasCount = areas.length;
-          let parentStatus = "ready";
+          let parentStatus = "open";
           if (completedAreasCount === totalAreasCount) {
             parentStatus = "completed";
-          } else if (readyAreasCount === totalAreasCount) {
-            parentStatus = "ready";
+          } else if (openAreasCount === totalAreasCount) {
+            parentStatus = "open";
           } else {
             parentStatus = "ongoing";
           }
@@ -3535,7 +3690,7 @@ function useAreaChecklistService() {
           );
         } else {
           logger18.info(
-            "No area checklists found, keeping parent status as ready"
+            "No area checklists found, keeping parent status as open"
           );
         }
       }
@@ -3556,7 +3711,223 @@ function useAreaChecklistService() {
 
 // src/controllers/hygiene-area-checklist.controller.ts
 import Joi9 from "joi";
-import { BadRequestError as BadRequestError16, logger as logger19 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError16, InternalServerError as InternalServerError7, logger as logger20 } from "@7365admin1/node-server-utils";
+
+// src/services/hygiene-checklist-pdf.service.ts
+import { launch } from "puppeteer";
+import { InternalServerError as InternalServerError6, useAtlas as useAtlas8 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId10 } from "mongodb";
+function escapeHtml(text) {
+  return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+}
+function buildChecklistHtml(areaChecklists) {
+  const areaSections = areaChecklists.map((area) => {
+    const sortedChecklist = [...area.checklist || []].sort(
+      (a, b) => a.set - b.set
+    );
+    const setRows = sortedChecklist.map((setItem) => {
+      const unitRows = (setItem.units || []).map(
+        (unit) => `
+              <tr>
+                <td class="unit-name">${escapeHtml(unit.name || "")}</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>`
+      ).join("");
+      return `
+            <tr class="set-header-row">
+              <td colspan="3">Set ${setItem.set}</td>
+            </tr>
+            ${unitRows}`;
+    }).join("");
+    return `
+        <div class="area-section">
+          <div class="area-header">
+            <span class="area-name">${escapeHtml(area.name || "")}</span>
+            <span class="area-type">${escapeHtml(area.type || "")}</span>
+          </div>
+          <table class="checklist-table">
+            <thead>
+              <tr>
+                <th class="col-unit">Unit</th>
+                <th class="col-icon">&#10007;</th>
+                <th class="col-icon">&#10003;</th>
+              </tr>
+            </thead>
+            <tbody>
+              ${setRows}
+            </tbody>
+          </table>
+        </div>`;
+  }).join("");
+  return `<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Checklist</title>
+  <style>
+    * {
+      margin: 0;
+      padding: 0;
+      box-sizing: border-box;
+    }
+    body {
+      font-family: Arial, Helvetica, sans-serif;
+      background: #ffffff;
+      padding: 30px 35px;
+      color: #1a1a1a;
+      font-size: 13px;
+    }
+    .page-header {
+      display: flex;
+      align-items: center;
+      justify-content: flex-start;
+      background: #1a3a6b;
+      margin-bottom: 24px;
+      padding: 12px 16px;
+      border-radius: 4px;
+    }
+    .page-logo {
+      height: 40px;
+      width: auto;
+      object-fit: contain;
+    }
+    .area-section {
+      margin-bottom: 22px;
+      border: 1px solid #dce1e7;
+      border-radius: 4px;
+      overflow: hidden;
+      page-break-inside: avoid;
+    }
+    .area-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      background: #2c3e50;
+      color: #ffffff;
+      padding: 9px 12px;
+    }
+    .area-name {
+      font-size: 14px;
+      font-weight: 600;
+    }
+    .area-type {
+      font-size: 11px;
+      text-transform: capitalize;
+      background: rgba(255,255,255,0.2);
+      padding: 2px 8px;
+      border-radius: 10px;
+    }
+    .checklist-table {
+      width: 100%;
+      border-collapse: collapse;
+    }
+    .checklist-table thead tr th {
+      background: #34495e;
+      color: #ffffff;
+      padding: 7px 10px;
+      text-align: left;
+      font-size: 12px;
+      font-weight: 600;
+      letter-spacing: 0.3px;
+    }
+    .checklist-table thead tr th.col-icon {
+      text-align: center;
+      width: 52px;
+    }
+    .checklist-table thead tr th.col-unit {
+      width: auto;
+    }
+    .set-header-row td {
+      background: #ecf0f1;
+      color: #555;
+      font-weight: 700;
+      font-size: 12px;
+      padding: 5px 10px;
+      border-bottom: 1px solid #dce1e7;
+      text-transform: uppercase;
+      letter-spacing: 0.4px;
+    }
+    .checklist-table tbody tr td {
+      padding: 7px 10px;
+      border-bottom: 1px solid #f0f2f4;
+      font-size: 13px;
+    }
+    .checklist-table tbody tr:last-child td {
+      border-bottom: none;
+    }
+    .icon-cell {
+      text-align: center;
+      width: 52px;
+    }
+    .approve-icon {
+      color: #27ae60;
+      font-size: 16px;
+      font-weight: bold;
+    }
+    .reject-icon {
+      color: #e74c3c;
+      font-size: 16px;
+      font-weight: bold;
+    }
+  </style>
+</head>
+<body>
+  <div class="page-header">
+    <img class="page-logo" src="https://seven365-storage.sgp1.cdn.digitaloceanspaces.com/seven365-public/images/seven365-logo.png" alt="Seven365 Logo" />
+  </div>
+  ${areaSections}
+</body>
+</html>`;
+}
+function useChecklistPdfService() {
+  async function generateChecklistPdf(scheduleId) {
+    const db = useAtlas8.getDb();
+    if (!db) {
+      throw new InternalServerError6("Unable to connect to server.");
+    }
+    const collection = db.collection("site.cleaning.schedule.areas");
+    let scheduleObjectId;
+    try {
+      scheduleObjectId = new ObjectId10(scheduleId);
+    } catch {
+      throw new InternalServerError6("Invalid schedule ID format.");
+    }
+    const areaChecklists = await collection.find({ schedule: scheduleObjectId }).sort({ createdAt: 1, name: 1 }).toArray();
+    const html = buildChecklistHtml(areaChecklists);
+    const browser = await launch({
+      headless: true,
+      executablePath: process.env.CHROME_BINARY,
+      args: ["--no-sandbox", "--disable-gpu", "--disable-dev-shm-usage"]
+    });
+    try {
+      const page = await browser.newPage();
+      await page.setViewport({ width: 794, height: 1123 });
+      await page.setContent(html, {
+        waitUntil: ["load", "networkidle0"]
+      });
+      const pdfBuffer = await page.pdf({
+        format: "A4",
+        printBackground: true,
+        margin: {
+          top: "15mm",
+          right: "15mm",
+          bottom: "15mm",
+          left: "15mm"
+        }
+      });
+      return pdfBuffer;
+    } finally {
+      await browser.close();
+    }
+  }
+  return {
+    generateChecklistPdf
+  };
+}
+
+// src/controllers/hygiene-area-checklist.controller.ts
 function useAreaChecklistController() {
   const {
     getAllAreaChecklist: _getAllAreaChecklist,
@@ -3568,6 +3939,7 @@ function useAreaChecklistController() {
     createAreaChecklist: _createAreaChecklist,
     updateAreaChecklistUnits: _updateAreaChecklistUnits
   } = useAreaChecklistService();
+  const { generateChecklistPdf: _generateChecklistPdf } = useChecklistPdfService();
   async function createAreaChecklist(req, res, next) {
     const cookies = req.headers.cookie ? req.headers.cookie.split(";").map((cookie) => cookie.trim().split("=")).reduce(
       (acc, [key, value2]) => ({ ...acc, [key]: value2 }),
@@ -3586,7 +3958,7 @@ function useAreaChecklistController() {
     });
     const { error, value } = validation.validate(payload);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger20.log({ level: "error", message: error.message });
       next(new BadRequestError16(error.message));
       return;
     }
@@ -3595,7 +3967,7 @@ function useAreaChecklistController() {
       res.status(201).json({ message: "Area checklist generated successfully." });
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger20.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -3612,7 +3984,7 @@ function useAreaChecklistController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger20.log({ level: "error", message: error.message });
       next(new BadRequestError16(error.message));
       return;
     }
@@ -3634,7 +4006,7 @@ function useAreaChecklistController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger20.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -3652,7 +4024,7 @@ function useAreaChecklistController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger20.log({ level: "error", message: error.message });
       next(new BadRequestError16(error.message));
       return;
     }
@@ -3676,7 +4048,7 @@ function useAreaChecklistController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger20.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -3686,7 +4058,7 @@ function useAreaChecklistController() {
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger20.log({ level: "error", message: error.message });
       next(new BadRequestError16(error.message));
       return;
     }
@@ -3695,7 +4067,7 @@ function useAreaChecklistController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger20.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -3710,7 +4082,7 @@ function useAreaChecklistController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger20.log({ level: "error", message: error.message });
       next(new BadRequestError16(error.message));
       return;
     }
@@ -3728,7 +4100,7 @@ function useAreaChecklistController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger20.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -3767,7 +4139,7 @@ function useAreaChecklistController() {
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger19.log({ level: "error", message: error.message });
+      logger20.log({ level: "error", message: error.message });
       next(new BadRequestError16(error.message));
       return;
     }
@@ -3777,7 +4149,39 @@ function useAreaChecklistController() {
       res.json({ message: "Area checklist updated successfully." });
       return;
     } catch (error2) {
-      logger19.log({ level: "error", message: error2.message });
+      logger20.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
+  async function downloadChecklistPdf(req, res, next) {
+    const validation = Joi9.string().hex().required();
+    const schedule = req.params.schedule;
+    const { error, value } = validation.validate(schedule);
+    if (error) {
+      logger20.log({ level: "error", message: error.message });
+      next(new BadRequestError16(error.message));
+      return;
+    }
+    try {
+      const pdfBuffer = await _generateChecklistPdf(value);
+      if (!pdfBuffer || pdfBuffer.length === 0) {
+        throw new InternalServerError7("Generated checklist PDF is empty or invalid.");
+      }
+      const date = /* @__PURE__ */ new Date();
+      const formattedDate = `${String(date.getDate()).padStart(2, "0")}_${String(
+        date.getMonth() + 1
+      ).padStart(2, "0")}_${date.getFullYear()}`;
+      res.setHeader("Content-Type", "application/pdf");
+      res.setHeader(
+        "Content-Disposition",
+        `attachment; filename="CHECKLIST_${formattedDate}.pdf"`
+      );
+      res.setHeader("Content-Length", pdfBuffer.length);
+      res.end(pdfBuffer);
+      return;
+    } catch (error2) {
+      logger20.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -3788,14 +4192,15 @@ function useAreaChecklistController() {
     getAreaChecklistHistory,
     getAreaChecklistHistoryDetails,
     getAreaChecklistUnits,
-    updateAreaChecklistUnits
+    updateAreaChecklistUnits,
+    downloadChecklistPdf
   };
 }
 
 // src/models/hygiene-supply.model.ts
 import Joi10 from "joi";
-import { ObjectId as ObjectId10 } from "mongodb";
-import { BadRequestError as BadRequestError17, logger as logger20 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId11 } from "mongodb";
+import { BadRequestError as BadRequestError17, logger as logger21 } from "@7365admin1/node-server-utils";
 var supplySchema = Joi10.object({
   site: Joi10.string().hex().required(),
   name: Joi10.string().required(),
@@ -3804,12 +4209,12 @@ var supplySchema = Joi10.object({
 function MSupply(value) {
   const { error } = supplySchema.validate(value);
   if (error) {
-    logger20.info(`Hygiene Supply Model: ${error.message}`);
+    logger21.info(`Hygiene Supply Model: ${error.message}`);
     throw new BadRequestError17(error.message);
   }
   if (value.site) {
     try {
-      value.site = new ObjectId10(value.site);
+      value.site = new ObjectId11(value.site);
     } catch (error2) {
       throw new BadRequestError17("Invalid site ID format.");
     }
@@ -3827,21 +4232,21 @@ function MSupply(value) {
 }
 
 // src/repositories/hygiene-supply.repository.ts
-import { ObjectId as ObjectId11 } from "mongodb";
+import { ObjectId as ObjectId12 } from "mongodb";
 import {
-  useAtlas as useAtlas8,
-  InternalServerError as InternalServerError6,
+  useAtlas as useAtlas9,
+  InternalServerError as InternalServerError8,
   paginate as paginate5,
   BadRequestError as BadRequestError18,
   useCache as useCache6,
-  logger as logger21,
+  logger as logger22,
   makeCacheKey as makeCacheKey6,
   NotFoundError as NotFoundError4
 } from "@7365admin1/node-server-utils";
 function useSupplyRepository() {
-  const db = useAtlas8.getDb();
+  const db = useAtlas9.getDb();
   if (!db) {
-    throw new InternalServerError6("Unable to connect to server.");
+    throw new InternalServerError8("Unable to connect to server.");
   }
   const namespace_collection = "site.supplies";
   const collection = db.collection(namespace_collection);
@@ -3850,7 +4255,7 @@ function useSupplyRepository() {
     try {
       await collection.createIndexes([{ key: { site: 1 } }]);
     } catch (error) {
-      throw new InternalServerError6(
+      throw new InternalServerError8(
         "Failed to create index on hygiene supply."
       );
     }
@@ -3859,7 +4264,7 @@ function useSupplyRepository() {
     try {
       await collection.createIndex({ name: "text" });
     } catch (error) {
-      throw new InternalServerError6(
+      throw new InternalServerError8(
         "Failed to create text index on hygiene supply."
       );
     }
@@ -3871,7 +4276,7 @@ function useSupplyRepository() {
         { unique: true }
       );
     } catch (error) {
-      throw new InternalServerError6(
+      throw new InternalServerError8(
         "Failed to create unique index on hygiene supply."
       );
     }
@@ -3881,9 +4286,9 @@ function useSupplyRepository() {
       value = MSupply(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger21.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger22.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger21.error(
+        logger22.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -3912,7 +4317,7 @@ function useSupplyRepository() {
       limit
     };
     try {
-      site = new ObjectId11(site);
+      site = new ObjectId12(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -3925,7 +4330,7 @@ function useSupplyRepository() {
     const cacheKey = makeCacheKey6(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger21.info(`Cache hit for key: ${cacheKey}`);
+      logger22.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -3945,9 +4350,9 @@ function useSupplyRepository() {
       const length = await collection.countDocuments(query);
       const data = paginate5(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger21.info(`Cache set for key: ${cacheKey}`);
+        logger22.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger21.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger22.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -3956,7 +4361,7 @@ function useSupplyRepository() {
   }
   async function getSupplyById(_id, session) {
     try {
-      _id = new ObjectId11(_id);
+      _id = new ObjectId12(_id);
     } catch (error) {
       throw new BadRequestError18("Invalid supply ID format.");
     }
@@ -3970,11 +4375,11 @@ function useSupplyRepository() {
     if (!session) {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger21.info(`Cache hit for key: ${cacheKey}`);
+        logger22.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
     } else {
-      logger21.info(`Skipping cache during transaction for key: ${cacheKey}`);
+      logger22.info(`Skipping cache during transaction for key: ${cacheKey}`);
     }
     try {
       const data = await collection.aggregate([
@@ -3991,9 +4396,9 @@ function useSupplyRepository() {
         throw new NotFoundError4("Supply not found.");
       }
       setCache(cacheKey, data[0], 15 * 60).then(() => {
-        logger21.info(`Cache set for key: ${cacheKey}`);
+        logger22.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger21.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger22.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data[0];
     } catch (error) {
@@ -4002,7 +4407,7 @@ function useSupplyRepository() {
   }
   async function updateSupply(_id, value, session) {
     try {
-      _id = new ObjectId11(_id);
+      _id = new ObjectId12(_id);
     } catch (error) {
       throw new BadRequestError18("Invalid supply ID format.");
     }
@@ -4014,12 +4419,12 @@ function useSupplyRepository() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError6("Unable to update cleaning supply.");
+        throw new InternalServerError8("Unable to update cleaning supply.");
       }
       delNamespace().then(() => {
-        logger21.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger22.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger21.error(
+        logger22.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -4035,7 +4440,7 @@ function useSupplyRepository() {
   }
   async function deleteSupply(_id, session) {
     try {
-      _id = new ObjectId11(_id);
+      _id = new ObjectId12(_id);
     } catch (error) {
       throw new BadRequestError18("Invalid supply ID format.");
     }
@@ -4051,12 +4456,12 @@ function useSupplyRepository() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError6("Unable to delete supply.");
+        throw new InternalServerError8("Unable to delete supply.");
       }
       delNamespace().then(() => {
-        logger21.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger22.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger21.error(
+        logger22.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -4080,7 +4485,7 @@ function useSupplyRepository() {
 
 // src/controllers/hygiene-supply.controller.ts
 import Joi11 from "joi";
-import { BadRequestError as BadRequestError19, logger as logger22 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError19, logger as logger23 } from "@7365admin1/node-server-utils";
 function useSupplyController() {
   const {
     createSupply: _createSupply,
@@ -4093,7 +4498,7 @@ function useSupplyController() {
     const payload = { ...req.body, ...req.params };
     const { error } = supplySchema.validate(payload);
     if (error) {
-      logger22.log({ level: "error", message: error.message });
+      logger23.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
       return;
     }
@@ -4102,7 +4507,7 @@ function useSupplyController() {
       res.status(201).json({ message: "Supply created successfully.", id });
       return;
     } catch (error2) {
-      logger22.log({ level: "error", message: error2.message });
+      logger23.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4117,7 +4522,7 @@ function useSupplyController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger22.log({ level: "error", message: error.message });
+      logger23.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
       return;
     }
@@ -4135,7 +4540,7 @@ function useSupplyController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger22.log({ level: "error", message: error2.message });
+      logger23.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4145,7 +4550,7 @@ function useSupplyController() {
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
-      logger22.log({ level: "error", message: error.message });
+      logger23.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
       return;
     }
@@ -4154,7 +4559,7 @@ function useSupplyController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger22.log({ level: "error", message: error2.message });
+      logger23.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4169,7 +4574,7 @@ function useSupplyController() {
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger22.log({ level: "error", message: error.message });
+      logger23.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
       return;
     }
@@ -4179,7 +4584,7 @@ function useSupplyController() {
       res.json({ message: "Supply updated successfully." });
       return;
     } catch (error2) {
-      logger22.log({ level: "error", message: error2.message });
+      logger23.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4191,7 +4596,7 @@ function useSupplyController() {
     });
     const { error, value } = validation.validate({ id });
     if (error) {
-      logger22.log({ level: "error", message: error.message });
+      logger23.log({ level: "error", message: error.message });
       next(new BadRequestError19(error.message));
       return;
     }
@@ -4200,7 +4605,7 @@ function useSupplyController() {
       res.json({ message: "Supply deleted successfully." });
       return;
     } catch (error2) {
-      logger22.log({ level: "error", message: error2.message });
+      logger23.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4216,8 +4621,8 @@ function useSupplyController() {
 
 // src/models/hygiene-stock.model.ts
 import Joi12 from "joi";
-import { ObjectId as ObjectId12 } from "mongodb";
-import { BadRequestError as BadRequestError20, logger as logger23 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId13 } from "mongodb";
+import { BadRequestError as BadRequestError20, logger as logger24 } from "@7365admin1/node-server-utils";
 var stockSchema = Joi12.object({
   site: Joi12.string().hex().required(),
   supply: Joi12.string().hex().required(),
@@ -4229,19 +4634,19 @@ var stockSchema = Joi12.object({
 function MStock(value) {
   const { error } = stockSchema.validate(value);
   if (error) {
-    logger23.info(`Hygiene Stock Model: ${error.message}`);
+    logger24.info(`Hygiene Stock Model: ${error.message}`);
     throw new BadRequestError20(error.message);
   }
   if (value.site) {
     try {
-      value.site = new ObjectId12(value.site);
+      value.site = new ObjectId13(value.site);
     } catch (error2) {
       throw new BadRequestError20("Invalid site ID format.");
     }
   }
   if (value.supply) {
     try {
-      value.supply = new ObjectId12(value.supply);
+      value.supply = new ObjectId13(value.supply);
     } catch (error2) {
       throw new BadRequestError20("Invalid supply ID format.");
     }
@@ -4261,20 +4666,20 @@ function MStock(value) {
 }
 
 // src/repositories/hygiene-stock.repository.ts
-import { ObjectId as ObjectId13 } from "mongodb";
+import { ObjectId as ObjectId14 } from "mongodb";
 import {
-  useAtlas as useAtlas9,
-  InternalServerError as InternalServerError7,
+  useAtlas as useAtlas10,
+  InternalServerError as InternalServerError9,
   BadRequestError as BadRequestError21,
   useCache as useCache7,
-  logger as logger24,
+  logger as logger25,
   makeCacheKey as makeCacheKey7,
   paginate as paginate6
 } from "@7365admin1/node-server-utils";
 function useStockRepository() {
-  const db = useAtlas9.getDb();
+  const db = useAtlas10.getDb();
   if (!db) {
-    throw new InternalServerError7("Unable to connect to server.");
+    throw new InternalServerError9("Unable to connect to server.");
   }
   const namespace_collection = "site.supply.stocks";
   const supply_collection = "site.supplies";
@@ -4290,7 +4695,7 @@ function useStockRepository() {
         { key: { status: 1 } }
       ]);
     } catch (error) {
-      throw new InternalServerError7("Failed to create index on hygiene stock.");
+      throw new InternalServerError9("Failed to create index on hygiene stock.");
     }
   }
   async function createStock(value, session) {
@@ -4298,17 +4703,17 @@ function useStockRepository() {
       value = MStock(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger24.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger25.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger24.error(
+        logger25.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
       });
       delSupplyNamespace().then(() => {
-        logger24.info(`Cache cleared for namespace: ${supply_collection}`);
+        logger25.info(`Cache cleared for namespace: ${supply_collection}`);
       }).catch((err) => {
-        logger24.error(
+        logger25.error(
           `Failed to clear cache for namespace: ${supply_collection}`,
           err
         );
@@ -4334,14 +4739,14 @@ function useStockRepository() {
       limit
     };
     try {
-      site = new ObjectId13(site);
+      site = new ObjectId14(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
       throw new BadRequestError21("Invalid site ID format.");
     }
     try {
-      supply = new ObjectId13(supply);
+      supply = new ObjectId14(supply);
       query.supply = supply;
       cacheOptions.supply = supply.toString();
     } catch (error) {
@@ -4354,7 +4759,7 @@ function useStockRepository() {
     const cacheKey = makeCacheKey7(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger24.info(`Cache hit for key: ${cacheKey}`);
+      logger25.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -4375,9 +4780,9 @@ function useStockRepository() {
       const length = await collection.countDocuments(query);
       const data = paginate6(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger24.info(`Cache set for key: ${cacheKey}`);
+        logger25.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger24.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger25.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -4394,7 +4799,7 @@ function useStockRepository() {
 // src/services/hygiene-stock.service.ts
 import {
   NotFoundError as NotFoundError5,
-  useAtlas as useAtlas10,
+  useAtlas as useAtlas11,
   BadRequestError as BadRequestError22
 } from "@7365admin1/node-server-utils";
 function useStockService() {
@@ -4403,7 +4808,7 @@ function useStockService() {
   async function createStock(value, out = false, session) {
     let ownSession = false;
     if (!session) {
-      session = useAtlas10.getClient()?.startSession();
+      session = useAtlas11.getClient()?.startSession();
       ownSession = true;
     }
     try {
@@ -4447,7 +4852,7 @@ function useStockService() {
 
 // src/controllers/hygiene-stock.controller.ts
 import Joi13 from "joi";
-import { BadRequestError as BadRequestError23, logger as logger25 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError23, logger as logger26 } from "@7365admin1/node-server-utils";
 function useStockController() {
   const { getStocksBySupplyId: _getStocksBySupplyId } = useStockRepository();
   const { createStock: _createStock } = useStockService();
@@ -4461,7 +4866,7 @@ function useStockController() {
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger25.log({ level: "error", message: error.message });
+      logger26.log({ level: "error", message: error.message });
       next(new BadRequestError23(error.message));
       return;
     }
@@ -4470,7 +4875,7 @@ function useStockController() {
       res.status(201).json({ message: "Stock created successfully.", id });
       return;
     } catch (error2) {
-      logger25.log({ level: "error", message: error2.message });
+      logger26.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4486,7 +4891,7 @@ function useStockController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger25.log({ level: "error", message: error.message });
+      logger26.log({ level: "error", message: error.message });
       next(new BadRequestError23(error.message));
       return;
     }
@@ -4506,7 +4911,7 @@ function useStockController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger25.log({ level: "error", message: error2.message });
+      logger26.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4519,8 +4924,8 @@ function useStockController() {
 
 // src/models/hygiene-checkout-item.model.ts
 import Joi14 from "joi";
-import { ObjectId as ObjectId14 } from "mongodb";
-import { BadRequestError as BadRequestError24, logger as logger26 } from "@7365admin1/node-server-utils";
+import { ObjectId as ObjectId15 } from "mongodb";
+import { BadRequestError as BadRequestError24, logger as logger27 } from "@7365admin1/node-server-utils";
 var allowedCheckOutItemStatus = ["pending", "completed"];
 var checkOutItemSchema = Joi14.object({
   site: Joi14.string().hex().required(),
@@ -4534,19 +4939,19 @@ var checkOutItemSchema = Joi14.object({
 function MCheckOutItem(value) {
   const { error } = checkOutItemSchema.validate(value);
   if (error) {
-    logger26.info(`Hygiene Check Out Item Model: ${error.message}`);
+    logger27.info(`Hygiene Check Out Item Model: ${error.message}`);
     throw new BadRequestError24(error.message);
   }
   if (value.site) {
     try {
-      value.site = new ObjectId14(value.site);
+      value.site = new ObjectId15(value.site);
     } catch (error2) {
       throw new BadRequestError24("Invalid site ID format.");
     }
   }
   if (value.supply) {
     try {
-      value.supply = new ObjectId14(value.supply);
+      value.supply = new ObjectId15(value.supply);
     } catch (error2) {
       throw new BadRequestError24("Invalid supply ID format.");
     }
@@ -4567,21 +4972,21 @@ function MCheckOutItem(value) {
 }
 
 // src/repositories/hygiene-checkout-item.repository.ts
-import { ObjectId as ObjectId15 } from "mongodb";
+import { ObjectId as ObjectId16 } from "mongodb";
 import {
-  useAtlas as useAtlas11,
-  InternalServerError as InternalServerError8,
+  useAtlas as useAtlas12,
+  InternalServerError as InternalServerError10,
   useCache as useCache8,
-  logger as logger27,
+  logger as logger28,
   makeCacheKey as makeCacheKey8,
   paginate as paginate7,
   BadRequestError as BadRequestError25,
   NotFoundError as NotFoundError6
 } from "@7365admin1/node-server-utils";
 function useCheckOutItemRepository() {
-  const db = useAtlas11.getDb();
+  const db = useAtlas12.getDb();
   if (!db) {
-    throw new InternalServerError8("Unable to connect to server.");
+    throw new InternalServerError10("Unable to connect to server.");
   }
   const namespace_collection = "site.supply.checkouts";
   const collection = db.collection(namespace_collection);
@@ -4594,7 +4999,7 @@ function useCheckOutItemRepository() {
         { key: { status: 1 } }
       ]);
     } catch (error) {
-      throw new InternalServerError8(
+      throw new InternalServerError10(
         "Failed to create index on hygiene check out item."
       );
     }
@@ -4603,7 +5008,7 @@ function useCheckOutItemRepository() {
     try {
       await collection.createIndex({ supplyName: "text" });
     } catch (error) {
-      throw new InternalServerError8(
+      throw new InternalServerError10(
         "Failed to create text index on hygiene supply."
       );
     }
@@ -4613,9 +5018,9 @@ function useCheckOutItemRepository() {
       value = MCheckOutItem(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger27.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger28.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger27.error(
+        logger28.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -4640,7 +5045,7 @@ function useCheckOutItemRepository() {
       limit
     };
     try {
-      site = new ObjectId15(site);
+      site = new ObjectId16(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -4653,7 +5058,7 @@ function useCheckOutItemRepository() {
     const cacheKey = makeCacheKey8(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger27.info(`Cache hit for key: ${cacheKey}`);
+      logger28.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -4702,9 +5107,9 @@ function useCheckOutItemRepository() {
       const length = await collection.countDocuments(query);
       const data = paginate7(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger28.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger28.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -4713,7 +5118,7 @@ function useCheckOutItemRepository() {
   }
   async function getCheckOutItemById(_id, session) {
     try {
-      _id = new ObjectId15(_id);
+      _id = new ObjectId16(_id);
     } catch (error) {
       throw new BadRequestError25("Invalid check out item ID format.");
     }
@@ -4724,11 +5129,11 @@ function useCheckOutItemRepository() {
     if (!session) {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger27.info(`Cache hit for key: ${cacheKey}`);
+        logger28.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
     } else {
-      logger27.info(`Skipping cache during transaction for key: ${cacheKey}`);
+      logger28.info(`Skipping cache during transaction for key: ${cacheKey}`);
     }
     try {
       const data = await collection.aggregate(
@@ -4766,9 +5171,9 @@ function useCheckOutItemRepository() {
         throw new NotFoundError6("Check out item not found.");
       }
       setCache(cacheKey, data[0], 15 * 60).then(() => {
-        logger27.info(`Cache set for key: ${cacheKey}`);
+        logger28.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger27.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger28.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data[0];
     } catch (error) {
@@ -4777,7 +5182,7 @@ function useCheckOutItemRepository() {
   }
   async function completeCheckOutItem(_id, session) {
     try {
-      _id = new ObjectId15(_id);
+      _id = new ObjectId16(_id);
     } catch (error) {
       throw new BadRequestError25("Invalid check out item ID format.");
     }
@@ -4792,12 +5197,12 @@ function useCheckOutItemRepository() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError8("Unable to complete check out item.");
+        throw new InternalServerError10("Unable to complete check out item.");
       }
       delNamespace().then(() => {
-        logger27.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger28.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger27.error(
+        logger28.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -4819,7 +5224,7 @@ function useCheckOutItemRepository() {
 
 // src/services/hygiene-checkout-item.service.ts
 import { useUserRepo } from "@7365admin1/core";
-import { BadRequestError as BadRequestError26, useAtlas as useAtlas12 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError26, useAtlas as useAtlas13 } from "@7365admin1/node-server-utils";
 function useCheckOutItemService() {
   const {
     createCheckOutItem: _createCheckOutItem,
@@ -4830,7 +5235,7 @@ function useCheckOutItemService() {
   const { getUserById } = useUserRepo();
   const { createStock } = useStockService();
   async function createCheckOutItem(value) {
-    const session = useAtlas12.getClient()?.startSession();
+    const session = useAtlas13.getClient()?.startSession();
     try {
       session?.startTransaction();
       const supplyData = await getSupplyById(value.supply);
@@ -4870,10 +5275,10 @@ function useCheckOutItemService() {
     }
   }
   async function createCheckOutItemByBatch(value) {
-    const session = useAtlas12.getClient()?.startSession();
+    const session = useAtlas13.getClient()?.startSession();
     try {
       session?.startTransaction();
-      const { site, attachment, createdBy, items } = value;
+      const { site, createdBy, items } = value;
       const createdByData = await getUserById(createdBy);
       const createdCheckOutItemIds = [];
       for (const item of items) {
@@ -4884,7 +5289,7 @@ function useCheckOutItemService() {
             supply: item.supply,
             supplyName: supplyData?.name || "",
             qty: item.qty,
-            attachment,
+            attachment: item.attachment,
             createdBy,
             createdByName: createdByData?.name || ""
           },
@@ -4918,7 +5323,7 @@ function useCheckOutItemService() {
 
 // src/controllers/hygiene-checkout-item.controller.ts
 import Joi15 from "joi";
-import { BadRequestError as BadRequestError27, logger as logger28 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError27, logger as logger29 } from "@7365admin1/node-server-utils";
 function useCheckOutItemController() {
   const {
     getCheckOutItems: _getCheckOutItems,
@@ -4948,7 +5353,7 @@ function useCheckOutItemController() {
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger28.log({ level: "error", message: error.message });
+      logger29.log({ level: "error", message: error.message });
       next(new BadRequestError27(error.message));
       return;
     }
@@ -4957,7 +5362,7 @@ function useCheckOutItemController() {
       res.status(201).json({ message: "Check out item created successfully.", id });
       return;
     } catch (error2) {
-      logger28.log({ level: "error", message: error2.message });
+      logger29.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -4975,18 +5380,18 @@ function useCheckOutItemController() {
     };
     const validation = Joi15.object({
       site: Joi15.string().hex().required(),
-      attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
       createdBy: Joi15.string().hex().required(),
       items: Joi15.array().items(
         Joi15.object({
           supply: Joi15.string().hex().required(),
-          qty: Joi15.number().min(0).required()
+          qty: Joi15.number().min(0).required(),
+          attachment: Joi15.array().items(Joi15.string()).optional().allow(null)
         })
       ).min(1).required()
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger28.log({ level: "error", message: error.message });
+      logger29.log({ level: "error", message: error.message });
       next(new BadRequestError27(error.message));
       return;
     }
@@ -4995,7 +5400,7 @@ function useCheckOutItemController() {
       res.status(201).json({ message: "Check out items created successfully." });
       return;
     } catch (error2) {
-      logger28.log({ level: "error", message: error2.message });
+      logger29.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5010,7 +5415,7 @@ function useCheckOutItemController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger28.log({ level: "error", message: error.message });
+      logger29.log({ level: "error", message: error.message });
       next(new BadRequestError27(error.message));
       return;
     }
@@ -5028,7 +5433,7 @@ function useCheckOutItemController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger28.log({ level: "error", message: error2.message });
+      logger29.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5038,7 +5443,7 @@ function useCheckOutItemController() {
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
-      logger28.log({ level: "error", message: error.message });
+      logger29.log({ level: "error", message: error.message });
       next(new BadRequestError27(error.message));
       return;
     }
@@ -5047,7 +5452,7 @@ function useCheckOutItemController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger28.log({ level: "error", message: error2.message });
+      logger29.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5061,15 +5466,16 @@ function useCheckOutItemController() {
 }
 
 // src/models/hygiene-schedule-task.model.ts
-import { BadRequestError as BadRequestError28, logger as logger29 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError28, logger as logger30 } from "@7365admin1/node-server-utils";
 import Joi16 from "joi";
-import { ObjectId as ObjectId16 } from "mongodb";
+import { ObjectId as ObjectId17 } from "mongodb";
 var scheduleTaskSchema = Joi16.object({
   site: Joi16.string().hex().required(),
   title: Joi16.string().required(),
   time: Joi16.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
-  startDate: Joi16.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required(),
-  endDate: Joi16.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+  dates: Joi16.array().min(1).items(
+    Joi16.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required()
+  ).required(),
   description: Joi16.string().optional().allow("", null),
   areas: Joi16.array().min(1).items(
     Joi16.object({
@@ -5082,12 +5488,12 @@ var scheduleTaskSchema = Joi16.object({
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
   if (error) {
-    logger29.info(`Hygiene Schedule Task Model: ${error.message}`);
+    logger30.info(`Hygiene Schedule Task Model: ${error.message}`);
     throw new BadRequestError28(error.message);
   }
   if (value.site) {
     try {
-      value.site = new ObjectId16(value.site);
+      value.site = new ObjectId17(value.site);
     } catch (error2) {
       throw new BadRequestError28("Invalid site ID format.");
     }
@@ -5097,7 +5503,7 @@ function MScheduleTask(value) {
       try {
         return {
           name: area.name,
-          value: new ObjectId16(area.value.toString())
+          value: new ObjectId17(area.value.toString())
         };
       } catch (error2) {
         throw new BadRequestError28(`Invalid area value format: ${area.name}`);
@@ -5106,7 +5512,7 @@ function MScheduleTask(value) {
   }
   if (value.createdBy) {
     try {
-      value.createdBy = new ObjectId16(value.createdBy);
+      value.createdBy = new ObjectId17(value.createdBy);
     } catch (error2) {
       throw new BadRequestError28("Invalid createdBy ID format.");
     }
@@ -5115,8 +5521,7 @@ function MScheduleTask(value) {
     site: value.site,
     title: value.title,
     time: value.time,
-    startDate: value.startDate,
-    endDate: value.endDate,
+    dates: value.dates,
     description: value.description,
     areas: value.areas,
     status: "active",
@@ -5128,21 +5533,21 @@ function MScheduleTask(value) {
 }
 
 // src/repositories/hygiene-schedule-task.repository.ts
-import { ObjectId as ObjectId17 } from "mongodb";
+import { ObjectId as ObjectId18 } from "mongodb";
 import {
-  useAtlas as useAtlas13,
-  InternalServerError as InternalServerError9,
+  useAtlas as useAtlas14,
+  InternalServerError as InternalServerError11,
   paginate as paginate8,
   BadRequestError as BadRequestError29,
   useCache as useCache9,
-  logger as logger30,
+  logger as logger31,
   makeCacheKey as makeCacheKey9,
   NotFoundError as NotFoundError7
 } from "@7365admin1/node-server-utils";
 function useScheduleTaskRepository() {
-  const db = useAtlas13.getDb();
+  const db = useAtlas14.getDb();
   if (!db) {
-    throw new InternalServerError9("Unable to connect to server.");
+    throw new InternalServerError11("Unable to connect to server.");
   }
   const namespace_collection = "site.schedule-tasks";
   const collection = db.collection(namespace_collection);
@@ -5154,7 +5559,7 @@ function useScheduleTaskRepository() {
         { key: { status: 1 } }
       ]);
     } catch (error) {
-      throw new InternalServerError9(
+      throw new InternalServerError11(
         "Failed to create index on hygiene schedule task."
       );
     }
@@ -5163,7 +5568,7 @@ function useScheduleTaskRepository() {
     try {
       await collection.createIndex({ title: "text", description: "text" });
     } catch (error) {
-      throw new InternalServerError9(
+      throw new InternalServerError11(
         "Failed to create text index on hygiene schedule task."
       );
     }
@@ -5173,9 +5578,9 @@ function useScheduleTaskRepository() {
       value = MScheduleTask(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger30.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger31.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger30.error(
+        logger31.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -5200,7 +5605,7 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new ObjectId17(site);
+      site = new ObjectId18(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -5213,7 +5618,7 @@ function useScheduleTaskRepository() {
     const cacheKey = makeCacheKey9(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger30.info(`Cache hit for key: ${cacheKey}`);
+      logger31.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -5233,9 +5638,9 @@ function useScheduleTaskRepository() {
       const length = await collection.countDocuments(query);
       const data = paginate8(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger30.info(`Cache set for key: ${cacheKey}`);
+        logger31.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger30.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -5268,7 +5673,7 @@ function useScheduleTaskRepository() {
       limit
     };
     try {
-      site = new ObjectId17(site);
+      site = new ObjectId18(site);
       query.site = site;
       cacheOptions.site = site.toString();
     } catch (error) {
@@ -5281,7 +5686,7 @@ function useScheduleTaskRepository() {
     const cacheKey = makeCacheKey9(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger30.info(`Cache hit for key: ${cacheKey}`);
+      logger31.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -5300,9 +5705,9 @@ function useScheduleTaskRepository() {
       const length = await collection.countDocuments(query);
       const data = paginate8(items, page, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger30.info(`Cache set for key: ${cacheKey}`);
+        logger31.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger30.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -5311,7 +5716,7 @@ function useScheduleTaskRepository() {
   }
   async function getScheduleTaskById(_id, session) {
     try {
-      _id = new ObjectId17(_id);
+      _id = new ObjectId18(_id);
     } catch (error) {
       throw new BadRequestError29("Invalid schedule task ID format.");
     }
@@ -5325,11 +5730,11 @@ function useScheduleTaskRepository() {
     if (!session) {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger30.info(`Cache hit for key: ${cacheKey}`);
+        logger31.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
     } else {
-      logger30.info(`Skipping cache during transaction for key: ${cacheKey}`);
+      logger31.info(`Skipping cache during transaction for key: ${cacheKey}`);
     }
     try {
       const data = await collection.aggregate([
@@ -5338,8 +5743,7 @@ function useScheduleTaskRepository() {
           $project: {
             title: 1,
             time: 1,
-            startDate: 1,
-            endDate: 1,
+            dates: 1,
             description: 1,
             areas: 1,
             status: 1,
@@ -5351,9 +5755,9 @@ function useScheduleTaskRepository() {
         throw new NotFoundError7("Schedule task not found.");
       }
       setCache(cacheKey, data[0], 15 * 60).then(() => {
-        logger30.info(`Cache set for key: ${cacheKey}`);
+        logger31.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger30.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data[0];
     } catch (error) {
@@ -5362,7 +5766,7 @@ function useScheduleTaskRepository() {
   }
   async function updateScheduleTask(_id, value, session) {
     try {
-      _id = new ObjectId17(_id);
+      _id = new ObjectId18(_id);
     } catch (error) {
       throw new BadRequestError29("Invalid schedule task ID format.");
     }
@@ -5371,7 +5775,7 @@ function useScheduleTaskRepository() {
         try {
           return {
             name: area.name,
-            value: new ObjectId17(area.value.toString())
+            value: new ObjectId18(area.value.toString())
           };
         } catch (error) {
           throw new BadRequestError29(`Invalid area value format: ${area.name}`);
@@ -5386,14 +5790,14 @@ function useScheduleTaskRepository() {
         { session }
       );
       if (res.modifiedCount === 0) {
-        throw new InternalServerError9(
+        throw new InternalServerError11(
           "Unable to update hygiene schedule task."
         );
       }
       delNamespace().then(() => {
-        logger30.info(`Cache cleared for namespace: ${namespace_collection}`);
+        logger31.info(`Cache cleared for namespace: ${namespace_collection}`);
       }).catch((err) => {
-        logger30.error(
+        logger31.error(
           `Failed to clear cache for namespace: ${namespace_collection}`,
           err
         );
@@ -5416,7 +5820,7 @@ function useScheduleTaskRepository() {
 }
 
 // src/services/hygiene-schedule-task.service.ts
-import { logger as logger31 } from "@7365admin1/node-server-utils";
+import { logger as logger32 } from "@7365admin1/node-server-utils";
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
   const { getAllScheduleTask } = useScheduleTaskRepository();
@@ -5436,43 +5840,38 @@ function useScheduleTaskService() {
         timeZone: "Asia/Singapore"
       });
       const [currentHour, currentMinute] = timeString.split(":").map(Number);
-      const currentDateString = now.toLocaleDateString("en-US", {
+      logger32.info(
+        `Checking schedule ${schedule._id}: Current time ${currentHour}:${currentMinute}, Schedule time ${schedule.time}, Dates ${JSON.stringify(schedule.dates)}`
+      );
+      const currentDateFormatted = now.toLocaleDateString("en-CA", {
         timeZone: "Asia/Singapore"
       });
-      logger31.info(
-        `Checking schedule ${schedule._id}: Current time ${currentHour}:${currentMinute}, Current date ${currentDateString}, Schedule time ${schedule.time}, Start date ${schedule.startDate}, End date ${schedule.endDate}`
-      );
-      const startDate = /* @__PURE__ */ new Date(schedule.startDate + "T00:00:00");
-      const currentDateOnly = /* @__PURE__ */ new Date(currentDateString + "T00:00:00");
-      if (currentDateOnly < startDate) {
-        logger31.info(
-          `Schedule ${schedule._id}: Current date ${currentDateString} is before start date ${schedule.startDate}`
-        );
+      if (!schedule.dates || !Array.isArray(schedule.dates) || schedule.dates.length === 0) {
+        logger32.info(`Schedule ${schedule._id}: No dates configured, skipping`);
         return false;
       }
-      if (schedule.endDate) {
-        const endDate = /* @__PURE__ */ new Date(schedule.endDate + "T00:00:00");
-        if (currentDateOnly > endDate) {
-          logger31.info(
-            `Schedule ${schedule._id}: Current date ${currentDateString} is after end date ${schedule.endDate}`
-          );
-          return false;
-        }
+      if (!schedule.dates.includes(currentDateFormatted)) {
+        logger32.info(
+          `Schedule ${schedule._id}: Current date ${currentDateFormatted} is not in scheduled dates [${schedule.dates.join(
+            ", "
+          )}]`
+        );
+        return false;
       }
       const [scheduleHour, scheduleMinute] = schedule.time.split(":").map(Number);
       const timeMatches = currentHour === scheduleHour && currentMinute === scheduleMinute;
       if (!timeMatches) {
-        logger31.info(
+        logger32.info(
           `Schedule ${schedule._id}: Time does not match. Current: ${currentHour}:${currentMinute}, Expected: ${scheduleHour}:${scheduleMinute}`
         );
         return false;
       }
-      logger31.info(
+      logger32.info(
         `Schedule ${schedule._id}: All conditions matched - Date is within range and time matches`
       );
       return true;
     } catch (error) {
-      logger31.error(
+      logger32.error(
         `Error checking schedule conditions for ${schedule._id}:`,
         error
       );
@@ -5481,40 +5880,42 @@ function useScheduleTaskService() {
   }
   async function processScheduledTasks(currentDate) {
     try {
-      logger31.info("Starting scheduled task processing...");
+      logger32.info("Starting scheduled task processing...");
       const scheduleTasks = await getAllScheduleTask();
       if (!scheduleTasks || scheduleTasks.length === 0) {
-        logger31.info("No schedule tasks found to process");
+        logger32.info("No schedule tasks found to process");
         return { processed: 0, validated: 0 };
       }
-      logger31.info(`Found ${scheduleTasks.length} schedule tasks to check`);
+      logger32.info(`Found ${scheduleTasks.length} schedule tasks to check`);
       let processedCount = 0;
       let validatedCount = 0;
       const validatedTasks = [];
       for (const scheduleTask of scheduleTasks) {
         try {
-          logger31.info(
-            `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, startDate=${scheduleTask.startDate}, endDate=${scheduleTask.endDate}`
+          logger32.info(
+            `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, dates=${JSON.stringify(
+              scheduleTask.dates
+            )}`
           );
           const shouldRun = checkScheduleConditions(scheduleTask, currentDate);
           if (!shouldRun) {
-            logger31.info(
+            logger32.info(
               `Schedule ${scheduleTask._id} conditions not met, skipping`
             );
             continue;
           }
-          logger31.info(
+          logger32.info(
             `Schedule ${scheduleTask._id} conditions validated, creating area checklists`
           );
           if (!scheduleTask._id) {
-            logger31.warn(`Schedule ${scheduleTask.title} has no _id, skipping`);
+            logger32.warn(`Schedule ${scheduleTask.title} has no _id, skipping`);
             continue;
           }
           if (!scheduleTask.site) {
-            logger31.warn(`Schedule ${scheduleTask._id} has no site, skipping`);
+            logger32.warn(`Schedule ${scheduleTask._id} has no site, skipping`);
             continue;
           }
-          logger31.info(
+          logger32.info(
             `Getting or creating parent checklist for schedule ${scheduleTask._id} in site ${scheduleTask.site}`
           );
           const parentChecklistIds = await createParentChecklist({
@@ -5522,7 +5923,7 @@ function useScheduleTaskService() {
             createdAt: /* @__PURE__ */ new Date()
           });
           const parentChecklistId = Array.isArray(parentChecklistIds) ? parentChecklistIds[0] : parentChecklistIds;
-          logger31.info(
+          logger32.info(
             `Using parent checklist ${parentChecklistId}, now creating/updating area checklists`
           );
           for (const area of scheduleTask.areas) {
@@ -5535,14 +5936,14 @@ function useScheduleTaskService() {
                   unit: unit.unit.toString(),
                   name: unit.name
                 }));
-                logger31.info(
+                logger32.info(
                   `Area ${area.name} (${areaId}): Using units from area details: ${JSON.stringify(
                     units
                   )}`
                 );
               }
               if (units.length === 0) {
-                logger31.warn(
+                logger32.warn(
                   `Area ${area.name} (${areaId}): No units found, skipping area.`
                 );
                 continue;
@@ -5553,11 +5954,11 @@ function useScheduleTaskService() {
                   parentChecklistId.toString(),
                   areaId
                 );
-                logger31.info(
+                logger32.info(
                   `Area ${area.name} (${areaId}): Existing area checklist found: ${existingAreaChecklist ? "Yes" : "No"}`
                 );
                 if (existingAreaChecklist) {
-                  logger31.info(
+                  logger32.info(
                     `Area ${area.name} (${areaId}): Existing checklist content: ${JSON.stringify(
                       existingAreaChecklist.checklist
                     )}`
@@ -5565,7 +5966,7 @@ function useScheduleTaskService() {
                 }
               } catch (error) {
                 existingAreaChecklist = null;
-                logger31.info(
+                logger32.info(
                   `Area ${area.name} (${areaId}): No existing area checklist found (exception).`
                 );
               }
@@ -5579,7 +5980,7 @@ function useScheduleTaskService() {
                   ...existingAreaChecklist.checklist || [],
                   newSet
                 ];
-                logger31.info(
+                logger32.info(
                   `Area ${area.name} (${areaId}): Appending new set ${newSet.set} to checklist. Updated checklist: ${JSON.stringify(
                     updatedChecklist
                   )}`
@@ -5587,7 +5988,7 @@ function useScheduleTaskService() {
                 await updateAreaChecklist(existingAreaChecklist._id, {
                   checklist: updatedChecklist
                 });
-                logger31.info(
+                logger32.info(
                   `Appended set ${newSet.set} to area checklist for area ${area.name}`
                 );
                 try {
@@ -5595,13 +5996,13 @@ function useScheduleTaskService() {
                     parentChecklistId.toString(),
                     areaId
                   );
-                  logger31.info(
+                  logger32.info(
                     `Area ${area.name} (${areaId}): Checklist after update: ${JSON.stringify(
                       verifyChecklist.checklist
                     )}`
                   );
                 } catch (verifyError) {
-                  logger31.warn(
+                  logger32.warn(
                     `Area ${area.name} (${areaId}): Error verifying checklist after update:`,
                     verifyError
                   );
@@ -5620,50 +6021,50 @@ function useScheduleTaskService() {
                   ],
                   createdBy: scheduleTask.createdBy
                 };
-                logger31.info(
+                logger32.info(
                   `Area ${area.name} (${areaId}): Creating new area checklist with data: ${JSON.stringify(
                     checklistData
                   )}`
                 );
                 await createAreaChecklist(checklistData);
-                logger31.info(`Created new area checklist for area ${area.name}`);
+                logger32.info(`Created new area checklist for area ${area.name}`);
                 try {
                   const verifyChecklist = await getAreaChecklistByAreaAndSchedule(
                     parentChecklistId.toString(),
                     areaId
                   );
-                  logger31.info(
+                  logger32.info(
                     `Area ${area.name} (${areaId}): Checklist after creation: ${JSON.stringify(
                       verifyChecklist.checklist
                     )}`
                   );
                 } catch (verifyError) {
-                  logger31.warn(
+                  logger32.warn(
                     `Area ${area.name} (${areaId}): Error verifying checklist after creation:`,
                     verifyError
                   );
                 }
               }
             } catch (error) {
-              logger31.error(`Error processing area ${area.name}:`, error);
+              logger32.error(`Error processing area ${area.name}:`, error);
               continue;
             }
           }
           processedCount++;
           validatedCount++;
           validatedTasks.push(scheduleTask);
-          logger31.info(
+          logger32.info(
             `Successfully processed schedule ${scheduleTask._id}, created/updated area checklists for all areas.`
           );
         } catch (error) {
-          logger31.error(
+          logger32.error(
             `Error processing schedule task ${scheduleTask._id}:`,
             error
           );
           continue;
         }
       }
-      logger31.info(
+      logger32.info(
         `Scheduled task processing completed. Processed: ${processedCount}, Validated: ${validatedCount} tasks`
       );
       return {
@@ -5672,7 +6073,7 @@ function useScheduleTaskService() {
         tasks: validatedTasks
       };
     } catch (error) {
-      logger31.error("Error processing scheduled tasks:", error);
+      logger32.error("Error processing scheduled tasks:", error);
       throw error;
     }
   }
@@ -5681,7 +6082,7 @@ function useScheduleTaskService() {
 
 // src/controllers/hygiene-schedule-task.controller.ts
 import Joi17 from "joi";
-import { BadRequestError as BadRequestError30, logger as logger32 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError30, logger as logger33 } from "@7365admin1/node-server-utils";
 function useScheduleTaskController() {
   const {
     createScheduleTask: _createScheduleTask,
@@ -5699,7 +6100,7 @@ function useScheduleTaskController() {
     const payload = { ...req.body, ...req.params, createdBy };
     const { error } = scheduleTaskSchema.validate(payload);
     if (error) {
-      logger32.log({ level: "error", message: error.message });
+      logger33.log({ level: "error", message: error.message });
       next(new BadRequestError30(error.message));
       return;
     }
@@ -5708,7 +6109,7 @@ function useScheduleTaskController() {
       res.status(201).json({ message: "Schedule task created successfully.", id });
       return;
     } catch (error2) {
-      logger32.log({ level: "error", message: error2.message });
+      logger33.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5723,7 +6124,7 @@ function useScheduleTaskController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger32.log({ level: "error", message: error.message });
+      logger33.log({ level: "error", message: error.message });
       next(new BadRequestError30(error.message));
       return;
     }
@@ -5741,7 +6142,7 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger32.log({ level: "error", message: error2.message });
+      logger33.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5756,7 +6157,7 @@ function useScheduleTaskController() {
     });
     const { error } = validation.validate(query);
     if (error) {
-      logger32.log({ level: "error", message: error.message });
+      logger33.log({ level: "error", message: error.message });
       next(new BadRequestError30(error.message));
       return;
     }
@@ -5774,7 +6175,7 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger32.log({ level: "error", message: error2.message });
+      logger33.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5784,7 +6185,7 @@ function useScheduleTaskController() {
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
-      logger32.log({ level: "error", message: error.message });
+      logger33.log({ level: "error", message: error.message });
       next(new BadRequestError30(error.message));
       return;
     }
@@ -5793,7 +6194,7 @@ function useScheduleTaskController() {
       res.json(data);
       return;
     } catch (error2) {
-      logger32.log({ level: "error", message: error2.message });
+      logger33.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5804,8 +6205,9 @@ function useScheduleTaskController() {
       id: Joi17.string().hex().required(),
       title: Joi17.string().optional().allow("", null),
       time: Joi17.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
-      startDate: Joi17.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
-      endDate: Joi17.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow("", null),
+      dates: Joi17.array().min(1).items(
+        Joi17.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required()
+      ).optional(),
       description: Joi17.string().optional().allow("", null),
       areas: Joi17.array().min(1).items(
         Joi17.object({
@@ -5816,7 +6218,7 @@ function useScheduleTaskController() {
     });
     const { error } = validation.validate(payload);
     if (error) {
-      logger32.log({ level: "error", message: error.message });
+      logger33.log({ level: "error", message: error.message });
       next(new BadRequestError30(error.message));
       return;
     }
@@ -5826,7 +6228,7 @@ function useScheduleTaskController() {
       res.json({ message: "Schedule task updated successfully." });
       return;
     } catch (error2) {
-      logger32.log({ level: "error", message: error2.message });
+      logger33.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }
@@ -5841,8 +6243,8 @@ function useScheduleTaskController() {
 }
 
 // src/services/hygiene-qr.service.ts
-import { logger as logger33 } from "@7365admin1/node-server-utils";
-import { launch } from "puppeteer";
+import { logger as logger34 } from "@7365admin1/node-server-utils";
+import { launch as launch2 } from "puppeteer";
 import QRCode from "qrcode";
 function useQRService() {
   async function generateQRDataUrl(qrUrl) {
@@ -5859,7 +6261,7 @@ function useQRService() {
   async function generateQRImage(qrUrl) {
     try {
       const qrDataUrl = await generateQRDataUrl(qrUrl);
-      const browser = await launch({
+      const browser = await launch2({
         headless: true,
         executablePath: process.env.CHROME_BINARY,
         args: [`--no-sandbox`, `--disable-gpu`, `--disable-dev-shm-usage`]
@@ -5912,17 +6314,17 @@ function useQRService() {
       await browser.close();
       return imageBuffer;
     } catch (error) {
-      logger33.log({
+      logger34.log({
         level: "error",
         message: `Failed to generate QR image: ${error.message}`
       });
       throw error;
     }
   }
-  async function generateQRPDF(qrUrl, title) {
+  async function generateQRPDF(qrUrl, title, subtitle) {
     try {
       const qrDataUrl = await generateQRDataUrl(qrUrl);
-      const browser = await launch({
+      const browser = await launch2({
         headless: true,
         executablePath: process.env.CHROME_BINARY,
         args: [`--no-sandbox`, `--disable-gpu`, `--disable-dev-shm-usage`]
@@ -5933,6 +6335,7 @@ function useQRService() {
         height: 1100
       });
       const escapedTitle = (title || "Cleaning Schedule QR Code").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
+      const escapedSubtitle = subtitle ? subtitle.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;") : "";
       const html = `
         <!DOCTYPE html>
         <html>
@@ -5960,10 +6363,16 @@ function useQRService() {
               padding: 0;
             }
             h1 {
-              font-size: 28px;
+              font-size: 38px;
               color: #333;
-              margin-bottom: 20px;
-              font-weight: 600;
+              margin-bottom: 8px;
+              font-weight: 700;
+            }
+            .subtitle {
+              font-size: 26px;
+              color: #555;
+              margin-bottom: 12px;
+              font-weight: 500;
             }
             .qr-wrapper {
               display: inline-block;
@@ -5998,6 +6407,7 @@ function useQRService() {
         <body>
           <div class="qr-container">
             <h1>${escapedTitle}</h1>
+            ${escapedSubtitle ? `<p class="subtitle">${escapedSubtitle}</p>` : ""}
             <div class="qr-wrapper">
               <img id="qr-image" src="${qrDataUrl}" alt="QR Code" />
             </div>
@@ -6035,7 +6445,7 @@ function useQRService() {
       await browser.close();
       return pdfBuffer;
     } catch (error) {
-      logger33.log({
+      logger34.log({
         level: "error",
         message: `Failed to generate QR PDF: ${error.message}`
       });
@@ -6050,7 +6460,7 @@ function useQRService() {
 
 // src/controllers/hygiene-qr.controller.ts
 import Joi18 from "joi";
-import { BadRequestError as BadRequestError31, logger as logger34 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError31, logger as logger35 } from "@7365admin1/node-server-utils";
 function useQRController() {
   const { generateQRImage: _generateQRImage, generateQRPDF: _generateQRPDF } = useQRService();
   async function generateQR(req, res, next) {
@@ -6058,19 +6468,20 @@ function useQRController() {
       url: Joi18.string().uri().required(),
       filename: Joi18.string().optional().allow("", null),
       title: Joi18.string().optional().allow("", null),
+      subtitle: Joi18.string().optional().allow("", null),
       download: Joi18.boolean().optional().default(false)
     });
     const query = { ...req.query };
     const { error, value } = validation.validate(query);
     if (error) {
-      logger34.log({ level: "error", message: error.message });
+      logger35.log({ level: "error", message: error.message });
       next(new BadRequestError31(error.message));
       return;
     }
     try {
-      const { url, filename, title, download } = value;
+      const { url, filename, title, subtitle, download } = value;
       if (download) {
-        const pdfBuffer = await _generateQRPDF(url, title);
+        const pdfBuffer = await _generateQRPDF(url, title, subtitle);
         if (!pdfBuffer || pdfBuffer.length === 0) {
           throw new Error("Generated QR PDF is empty or invalid.");
         }
@@ -6099,7 +6510,7 @@ function useQRController() {
       }
       return;
     } catch (error2) {
-      logger34.log({ level: "error", message: error2.message });
+      logger35.log({ level: "error", message: error2.message });
       next(error2);
       return;
     }