@7365admin1/module-hygiene 4.8.0 → 4.10.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: "",
@@ -2745,17 +2808,37 @@ function useAreaChecklistRepo() {
             preserveNullAndEmptyArrays: true
           }
         },
+        {
+          $addFields: {
+            statusOrder: {
+              $switch: {
+                branches: [
+                  { case: { $eq: ["$status", "open"] }, then: 0 },
+                  { case: { $eq: ["$status", "ongoing"] }, then: 1 },
+                  { case: { $eq: ["$status", "completed"] }, then: 3 },
+                  { case: { $eq: ["$status", "closed"] }, then: 4 }
+                ],
+                default: 2
+              }
+            }
+          }
+        },
+        { $sort: { statusOrder: 1, _id: -1 } },
         {
           $project: {
             name: 1,
             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"
@@ -2780,7 +2863,6 @@ function useAreaChecklistRepo() {
             createdByName: "$createdByDoc.name"
           }
         },
-        { $sort: { _id: -1 } },
         { $skip: page * limit },
         { $limit: limit }
       ];
@@ -2857,11 +2939,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 +3012,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 +3080,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"
@@ -3138,16 +3232,21 @@ function useAreaChecklistRepo() {
             name: "$checklist.units.name",
             approve: "$checklist.units.approve",
             reject: "$checklist.units.reject",
+            timestamp: "$checklist.units.timestamp",
             status: {
               $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"
@@ -3168,6 +3267,7 @@ function useAreaChecklistRepo() {
                 name: "$name",
                 approve: "$approve",
                 reject: "$reject",
+                timestamp: "$timestamp",
                 status: "$status",
                 remarks: "$remarks",
                 completedByName: "$completedByName"
@@ -3280,7 +3380,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;
@@ -3406,6 +3506,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,
@@ -3419,7 +3555,8 @@ function useAreaChecklistRepo() {
     updateAreaChecklist,
     updateAreaChecklistStatus,
     updateAreaChecklistUnits,
-    getMaxSetNumberForArea
+    getMaxSetNumberForArea,
+    closeExpiredAreaChecklists
   };
 }
 
@@ -3515,12 +3652,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"
@@ -3528,8 +3665,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";
         }
@@ -3548,18 +3685,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";
           }
@@ -3570,7 +3707,7 @@ function useAreaChecklistService() {
           );
         } else {
           logger18.info(
-            "No area checklists found, keeping parent status as ready"
+            "No area checklists found, keeping parent status as open"
           );
         }
       }
@@ -5158,7 +5295,7 @@ function useCheckOutItemService() {
     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) {
@@ -5169,7 +5306,7 @@ function useCheckOutItemService() {
             supply: item.supply,
             supplyName: supplyData?.name || "",
             qty: item.qty,
-            attachment,
+            attachment: item.attachment,
             createdBy,
             createdByName: createdByData?.name || ""
           },
@@ -5260,12 +5397,12 @@ 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()
     });
@@ -5353,8 +5490,9 @@ 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({
@@ -5400,8 +5538,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",
@@ -5623,8 +5760,7 @@ function useScheduleTaskRepository() {
           $project: {
             title: 1,
             time: 1,
-            startDate: 1,
-            endDate: 1,
+            dates: 1,
             description: 1,
             areas: 1,
             status: 1,
@@ -5721,29 +5857,24 @@ function useScheduleTaskService() {
         timeZone: "Asia/Singapore"
       });
       const [currentHour, currentMinute] = timeString.split(":").map(Number);
-      const currentDateString = now.toLocaleDateString("en-US", {
-        timeZone: "Asia/Singapore"
-      });
       logger32.info(
-        `Checking schedule ${schedule._id}: Current time ${currentHour}:${currentMinute}, Current date ${currentDateString}, Schedule time ${schedule.time}, Start date ${schedule.startDate}, End date ${schedule.endDate}`
+        `Checking schedule ${schedule._id}: Current time ${currentHour}:${currentMinute}, Schedule time ${schedule.time}, Dates ${JSON.stringify(schedule.dates)}`
       );
-      const startDate = /* @__PURE__ */ new Date(schedule.startDate + "T00:00:00");
-      const currentDateOnly = /* @__PURE__ */ new Date(currentDateString + "T00:00:00");
-      if (currentDateOnly < startDate) {
+      const currentDateFormatted = now.toLocaleDateString("en-CA", {
+        timeZone: "Asia/Singapore"
+      });
+      if (!schedule.dates || !Array.isArray(schedule.dates) || schedule.dates.length === 0) {
+        logger32.info(`Schedule ${schedule._id}: No dates configured, skipping`);
+        return false;
+      }
+      if (!schedule.dates.includes(currentDateFormatted)) {
         logger32.info(
-          `Schedule ${schedule._id}: Current date ${currentDateString} is before start date ${schedule.startDate}`
+          `Schedule ${schedule._id}: Current date ${currentDateFormatted} is not in scheduled dates [${schedule.dates.join(
+            ", "
+          )}]`
         );
         return false;
       }
-      if (schedule.endDate) {
-        const endDate = /* @__PURE__ */ new Date(schedule.endDate + "T00:00:00");
-        if (currentDateOnly > endDate) {
-          logger32.info(
-            `Schedule ${schedule._id}: Current date ${currentDateString} is after end date ${schedule.endDate}`
-          );
-          return false;
-        }
-      }
       const [scheduleHour, scheduleMinute] = schedule.time.split(":").map(Number);
       const timeMatches = currentHour === scheduleHour && currentMinute === scheduleMinute;
       if (!timeMatches) {
@@ -5779,7 +5910,9 @@ function useScheduleTaskService() {
       for (const scheduleTask of scheduleTasks) {
         try {
           logger32.info(
-            `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, startDate=${scheduleTask.startDate}, endDate=${scheduleTask.endDate}`
+            `Checking schedule ${scheduleTask._id} - ${scheduleTask.title}: time=${scheduleTask.time}, dates=${JSON.stringify(
+              scheduleTask.dates
+            )}`
           );
           const shouldRun = checkScheduleConditions(scheduleTask, currentDate);
           if (!shouldRun) {
@@ -6089,8 +6222,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({
@@ -6204,7 +6338,7 @@ function useQRService() {
       throw error;
     }
   }
-  async function generateQRPDF(qrUrl, title) {
+  async function generateQRPDF(qrUrl, title, subtitle) {
     try {
       const qrDataUrl = await generateQRDataUrl(qrUrl);
       const browser = await launch2({
@@ -6218,6 +6352,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>
@@ -6245,10 +6380,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;
@@ -6283,6 +6424,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>
@@ -6343,6 +6485,7 @@ 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 };
@@ -6353,9 +6496,9 @@ function useQRController() {
       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.");
         }