@7365admin1/module-hygiene 4.30.3 → 4.32.0

package/dist/index.mjs

@@ -930,6 +930,11 @@ function capitalizeText(text) {
   return text.toLowerCase().split(" ").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
 }
 
+// src/utils/escape-regex.util.ts
+function escapeRegex(value) {
+  return String(value ?? "").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 // src/repositories/hygiene-area.repository.ts
 function useAreaRepo() {
   const db = useAtlas2.getDb();
@@ -1026,7 +1031,7 @@ function useAreaRepo() {
       cacheOptions.type = type;
     }
     if (search) {
-      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      query.$or = [{ name: { $regex: escapeRegex(search), $options: "i" } }];
       cacheOptions.search = search;
     }
     const cacheKey = makeCacheKey2(namespace_collection, cacheOptions);
@@ -1500,7 +1505,7 @@ function useUnitRepository() {
       throw new BadRequestError6("Invalid site ID format.");
     }
     if (search) {
-      query.$or = [{ name: { $regex: search, $options: "i" } }];
+      query.$or = [{ name: { $regex: escapeRegex(search), $options: "i" } }];
       cacheOptions.search = search;
     }
     const cacheKey = makeCacheKey3(namespace_collection, cacheOptions);
@@ -3181,7 +3186,9 @@ var areaChecklistSchema = Joi9.object({
         }).required()
       ).min(1).required(),
       isScheduleTask: Joi9.boolean().optional().default(false),
-      scheduleTaskId: Joi9.string().hex().optional().allow(null)
+      scheduleTaskId: Joi9.string().hex().optional().allow(null),
+      scheduleTaskTitle: Joi9.string().optional().allow("", null),
+      scheduleTaskTime: Joi9.string().optional().allow("", null)
     }).required()
   ).optional().default([])
 });
@@ -3211,6 +3218,8 @@ function MAreaChecklist(value) {
         set: checklistItem.set,
         isScheduleTask: checklistItem.isScheduleTask ?? false,
         scheduleTaskId: checklistItem.scheduleTaskId ?? void 0,
+        scheduleTaskTitle: checklistItem.scheduleTaskTitle ?? void 0,
+        scheduleTaskTime: checklistItem.scheduleTaskTime ?? void 0,
         units: checklistItem.units.map((unit) => ({
           unit: new ObjectId8(unit.unit),
           name: unit.name,
@@ -3705,6 +3714,9 @@ function useAreaChecklistRepo() {
             isScheduleTask: {
               $ifNull: ["$checklist.isScheduleTask", false]
             },
+            scheduleTaskId: { $ifNull: ["$checklist.scheduleTaskId", null] },
+            scheduleTaskTitle: { $ifNull: ["$checklist.scheduleTaskTitle", null] },
+            scheduleTaskTime: { $ifNull: ["$checklist.scheduleTaskTime", null] },
             unit: "$checklist.units.unit",
             name: "$checklist.units.name",
             approve: "$checklist.units.approve",
@@ -3741,6 +3753,9 @@ function useAreaChecklistRepo() {
           $group: {
             _id: "$set",
             isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskId: { $first: "$scheduleTaskId" },
+            scheduleTaskTitle: { $first: "$scheduleTaskTitle" },
+            scheduleTaskTime: { $first: "$scheduleTaskTime" },
             units: {
               $push: {
                 unit: "$unit",
@@ -3761,6 +3776,9 @@ function useAreaChecklistRepo() {
             _id: 0,
             set: "$_id",
             isScheduleTask: 1,
+            scheduleTaskId: 1,
+            scheduleTaskTitle: 1,
+            scheduleTaskTime: 1,
             units: 1
           }
         },
@@ -3892,6 +3910,8 @@ function useAreaChecklistRepo() {
             isScheduleTask: {
               $ifNull: ["$checklist.isScheduleTask", false]
             },
+            scheduleTaskTitle: { $ifNull: ["$checklist.scheduleTaskTitle", null] },
+            scheduleTaskTime: { $ifNull: ["$checklist.scheduleTaskTime", null] },
             scheduleTaskId: {
               $ifNull: ["$checklist.scheduleTaskId", null]
             },
@@ -3932,6 +3952,8 @@ function useAreaChecklistRepo() {
           $group: {
             _id: "$set",
             isScheduleTask: { $first: "$isScheduleTask" },
+            scheduleTaskTitle: { $first: "$scheduleTaskTitle" },
+            scheduleTaskTime: { $first: "$scheduleTaskTime" },
             scheduleTaskId: { $first: "$scheduleTaskId" },
             remarks: { $first: "$remarks" },
             attachment: { $first: "$attachment" },
@@ -3956,6 +3978,8 @@ function useAreaChecklistRepo() {
             _id: 0,
             set: "$_id",
             isScheduleTask: 1,
+            scheduleTaskTitle: 1,
+            scheduleTaskTime: 1,
             scheduleTaskId: 1,
             remarks: "$remarks",
             attachment: "$attachment",
@@ -4431,6 +4455,265 @@ function useAreaChecklistRepo() {
   };
 }
 
+// src/utils/schedule-task-rules.util.ts
+import Joi10 from "joi";
+var REPEATS = ["none", "daily", "weekdays", "weekly", "monthly"];
+var SGT_MS = 8 * 60 * 60 * 1e3;
+var DATE_RE = /^\d{4}-\d{2}-\d{2}$/;
+var TIME_RE = /^([0-1]\d|2[0-3]):([0-5]\d)$/;
+var pad = (n) => String(n).padStart(2, "0");
+function sgtParts(now) {
+  const s = new Date(now.getTime() + SGT_MS);
+  const date = `${s.getUTCFullYear()}-${pad(s.getUTCMonth() + 1)}-${pad(s.getUTCDate())}`;
+  return { date, minutes: s.getUTCHours() * 60 + s.getUTCMinutes(), weekday: s.getUTCDay() };
+}
+function isRealDate(value) {
+  if (typeof value !== "string" || !DATE_RE.test(value))
+    return false;
+  const [y, m, d] = value.split("-").map(Number);
+  const t = new Date(Date.UTC(y, m - 1, d));
+  return t.getUTCFullYear() === y && t.getUTCMonth() === m - 1 && t.getUTCDate() === d;
+}
+var toMinutes = (time) => {
+  const [h, m] = time.split(":").map(Number);
+  return h * 60 + m;
+};
+var weekdayOf = (date) => {
+  const [y, m, d] = date.split("-").map(Number);
+  return new Date(Date.UTC(y, m - 1, d)).getUTCDay();
+};
+var daysInMonth = (date) => {
+  const [y, m] = date.split("-").map(Number);
+  return new Date(Date.UTC(y, m, 0)).getUTCDate();
+};
+var addDays = (date, n) => {
+  const [y, m, d] = date.split("-").map(Number);
+  const t = new Date(Date.UTC(y, m - 1, d + n));
+  return `${t.getUTCFullYear()}-${pad(t.getUTCMonth() + 1)}-${pad(t.getUTCDate())}`;
+};
+var isRepeating = (task) => Boolean(task.repeat) && task.repeat !== "none";
+function occursOn(task, date) {
+  if (task.endDate && date > task.endDate)
+    return false;
+  if (!isRepeating(task))
+    return Array.isArray(task.dates) && task.dates.includes(date);
+  if (task.startDate && date < task.startDate)
+    return false;
+  const weekday = weekdayOf(date);
+  switch (task.repeat) {
+    case "daily":
+      return true;
+    case "weekdays":
+      return weekday >= 1 && weekday <= 5;
+    case "weekly":
+      return Array.isArray(task.daysOfWeek) && task.daysOfWeek.includes(weekday);
+    case "monthly": {
+      const wanted = task.dayOfMonth ?? (task.startDate ? Number(task.startDate.slice(8, 10)) : 1);
+      return Number(date.slice(8, 10)) === Math.min(wanted, daysInMonth(date));
+    }
+    default:
+      return false;
+  }
+}
+function savedTodayAt(task, today) {
+  const stamp = task.updatedAt || task.createdAt;
+  if (!stamp)
+    return null;
+  const saved = new Date(stamp);
+  if (Number.isNaN(saved.getTime()))
+    return null;
+  const p = sgtParts(saved);
+  return p.date === today ? p.minutes : null;
+}
+function shouldRunNow(task, now = /* @__PURE__ */ new Date()) {
+  if (task.paused || !TIME_RE.test(task.time ?? ""))
+    return false;
+  const { date, minutes } = sgtParts(now);
+  if (task.lastRunDate === date || !occursOn(task, date))
+    return false;
+  const due = toMinutes(task.time);
+  if (minutes < due)
+    return false;
+  const saved = savedTodayAt(task, date);
+  return !(saved !== null && saved >= due);
+}
+var iso = (date, time) => `${date}T${time}:00+08:00`;
+function upcoming(task, now) {
+  if (typeof task.time !== "string" || !TIME_RE.test(task.time))
+    return null;
+  const { date: today, minutes } = sgtParts(now);
+  const due = toMinutes(task.time);
+  if (occursOn(task, today) && (minutes < due || shouldRunNow({ ...task, paused: false }, now))) {
+    return iso(today, task.time);
+  }
+  if (!isRepeating(task)) {
+    const later = (task.dates ?? []).filter((d) => d > today && (!task.endDate || d <= task.endDate)).sort();
+    return later.length ? iso(later[0], task.time) : null;
+  }
+  const from = task.startDate && task.startDate > today ? task.startDate : today;
+  for (let i = from === today ? 1 : 0; i <= 400; i++) {
+    const d = addDays(from, i);
+    if (task.endDate && d > task.endDate)
+      return null;
+    if (occursOn(task, d))
+      return iso(d, task.time);
+  }
+  return null;
+}
+function nextRun(task, now = /* @__PURE__ */ new Date()) {
+  return task.paused ? null : upcoming(task, now);
+}
+function scheduleState(task, now = /* @__PURE__ */ new Date()) {
+  if (task.paused)
+    return "paused";
+  return upcoming(task, now) ? "active" : "ended";
+}
+function lastRun(task) {
+  return task.lastRunDate && TIME_RE.test(task.time ?? "") ? iso(task.lastRunDate, task.time) : null;
+}
+function scheduleDisplay(task, now = /* @__PURE__ */ new Date()) {
+  try {
+    return {
+      nextRun: nextRun(task, now),
+      lastRun: lastRun(task),
+      scheduleStatus: scheduleState(task, now)
+    };
+  } catch {
+    return { nextRun: null, lastRun: null, scheduleStatus: null };
+  }
+}
+function validateScheduleRules(task, now = /* @__PURE__ */ new Date()) {
+  const repeating = isRepeating(task);
+  const { date: today, minutes } = sgtParts(now);
+  if (repeating) {
+    if (!task.startDate)
+      return "Please choose a start date for a repeating schedule.";
+    if (task.repeat === "weekly" && !(task.daysOfWeek && task.daysOfWeek.length)) {
+      return "Pick at least one weekday for a weekly repeat.";
+    }
+  }
+  const start = repeating ? task.startDate : [...task.dates ?? []].sort()[0];
+  if (task.endDate && start && start > task.endDate) {
+    return "The end date must be on or after the start date.";
+  }
+  if (task.endDate && task.endDate < today)
+    return "The end date has already passed.";
+  if (!repeating) {
+    const dates = (task.dates ?? []).filter((d) => !task.endDate || d <= task.endDate);
+    if (dates.length && dates.every((d) => d < today)) {
+      return "All the dates you picked have already passed. Pick today or a later date.";
+    }
+    if (dates.length && dates.every((d) => d <= today) && dates.includes(today) && TIME_RE.test(task.time) && toMinutes(task.time) <= minutes) {
+      return "That time has already passed today. Pick a later time or another date.";
+    }
+  }
+  if (!upcoming({ ...task, paused: false, updatedAt: now }, now)) {
+    return "This schedule would never run. Check the dates, end date and time.";
+  }
+  return null;
+}
+var scheduleDate = Joi10.string().pattern(DATE_RE).custom((value, helpers) => isRealDate(value) ? value : helpers.error("date.invalid")).messages({
+  "string.pattern.base": "Dates must look like 2026-10-21.",
+  "string.empty": "Please choose a date.",
+  "date.invalid": "That date does not exist. Dates must look like 2026-10-21.",
+  "string.base": "Dates must look like 2026-10-21."
+});
+var REPEATING = Joi10.valid("daily", "weekdays", "weekly", "monthly").required();
+var scheduleTaskFields = {
+  title: Joi10.string().trim().required().messages({
+    "any.required": "Please enter a title.",
+    "string.empty": "Please enter a title.",
+    "string.base": "Please enter a title."
+  }),
+  time: Joi10.string().pattern(TIME_RE).required().messages({
+    "any.required": "Please choose a time.",
+    "string.empty": "Please choose a time.",
+    "string.pattern.base": "Time must be in 24-hour format like 08:30.",
+    "string.base": "Time must be in 24-hour format like 08:30."
+  }),
+  dates: Joi10.when("repeat", {
+    is: REPEATING,
+    then: Joi10.array().items(scheduleDate).optional().default([]),
+    otherwise: Joi10.array().min(1).items(scheduleDate).required()
+  }).messages({
+    "any.required": "Pick at least one date, or choose a repeat.",
+    "array.min": "Pick at least one date, or choose a repeat.",
+    "array.base": "Dates must be a list of dates."
+  }),
+  description: Joi10.string().optional().allow("", null),
+  areas: Joi10.array().min(1).items(
+    Joi10.object({
+      name: Joi10.string().required(),
+      value: Joi10.any().required()
+    })
+  ).required().messages({
+    "any.required": "Pick at least one area.",
+    "array.min": "Pick at least one area.",
+    "array.base": "Pick at least one area."
+  }),
+  repeat: Joi10.string().valid(...REPEATS).optional().allow("", null).messages({ "any.only": "Repeat must be one of: none, daily, weekdays, weekly, monthly." }),
+  daysOfWeek: Joi10.array().items(Joi10.number().integer().min(0).max(6)).unique().optional().allow(null).messages({
+    "number.base": "Weekdays must be numbers from 0 (Sunday) to 6 (Saturday).",
+    "number.min": "Weekdays must be numbers from 0 (Sunday) to 6 (Saturday).",
+    "number.max": "Weekdays must be numbers from 0 (Sunday) to 6 (Saturday).",
+    "number.integer": "Weekdays must be numbers from 0 (Sunday) to 6 (Saturday).",
+    "array.unique": "Each weekday can only be picked once."
+  }),
+  dayOfMonth: Joi10.number().integer().min(1).max(31).optional().allow(null).messages({ "number.base": "Day of the month must be 1 to 31.", "number.min": "Day of the month must be 1 to 31.", "number.max": "Day of the month must be 1 to 31." }),
+  startDate: scheduleDate.optional().allow("", null),
+  endDate: scheduleDate.optional().allow("", null),
+  paused: Joi10.boolean().optional().allow(null).messages({ "boolean.base": "Paused must be true or false." })
+};
+var OPTIONAL_KEYS = ["repeat", "daysOfWeek", "dayOfMonth", "startDate", "endDate", "paused"];
+var isBlank = (v) => v === "" || v === null;
+function cleanScheduleInput(value) {
+  const out = { ...value };
+  for (const key of OPTIONAL_KEYS)
+    if (isBlank(out[key]))
+      delete out[key];
+  if (out.repeat === "none") {
+    delete out.daysOfWeek;
+    delete out.dayOfMonth;
+    delete out.startDate;
+  }
+  return out;
+}
+var TIMING_KEYS = ["time", "dates", "repeat", "daysOfWeek", "dayOfMonth", "startDate", "endDate"];
+function splitScheduleUpdate(payload) {
+  const set = {};
+  const unset = [];
+  for (const [key, value] of Object.entries(payload)) {
+    if (OPTIONAL_KEYS.includes(key) && isBlank(value))
+      unset.push(key);
+    else if (value !== void 0)
+      set[key] = value;
+  }
+  if (set.repeat === "none") {
+    for (const key of ["daysOfWeek", "dayOfMonth", "startDate"]) {
+      if (!unset.includes(key))
+        unset.push(key);
+      delete set[key];
+    }
+  }
+  return { set, unset };
+}
+function regularSetsMissing(checklist, setCount) {
+  const regular = (checklist ?? []).filter((c) => c.isScheduleTask !== true).length;
+  return Math.max(0, setCount - regular);
+}
+var normTiming = (t) => ({
+  time: t.time ?? null,
+  dates: [...Array.isArray(t.dates) ? t.dates : []].sort(),
+  repeat: !t.repeat || t.repeat === "none" ? "none" : t.repeat,
+  daysOfWeek: [...Array.isArray(t.daysOfWeek) ? t.daysOfWeek : []].sort(),
+  dayOfMonth: t.dayOfMonth ?? null,
+  startDate: t.startDate || null,
+  endDate: t.endDate || null
+});
+function timingChanged(stored, after) {
+  return JSON.stringify(normTiming(stored)) !== JSON.stringify(normTiming(after));
+}
+
 // src/services/hygiene-area-checklist.service.ts
 function useAreaChecklistService() {
   const { getAreasForChecklist } = useAreaRepo();
@@ -4498,10 +4781,10 @@ function useAreaChecklistService() {
                 `Area checklist for area ${area.name} exists but has no auto-gen sets. Inserting auto-gen sets.`
               );
               const setCount2 = Number(area.set) || 1;
-              const totalExistingSets = existing.checklist?.length ?? 0;
-              if (totalExistingSets >= setCount2) {
+              const setsToAdd = regularSetsMissing(existing.checklist, setCount2);
+              if (setsToAdd <= 0) {
                 logger18.info(
-                  `Area checklist for area ${area.name} already has ${totalExistingSets} set(s) (configured: ${setCount2}). Skipping auto-gen sets.`
+                  `Area checklist for area ${area.name} already has its ${setCount2} regular set(s). Skipping auto-gen sets.`
                 );
                 return existing._id;
               }
@@ -4509,7 +4792,6 @@ function useAreaChecklistService() {
                 (max, c) => Math.max(max, c.set ?? 0),
                 0
               ) ?? 0;
-              const setsToAdd = setCount2 - totalExistingSets;
               const autoGenSets = Array.from(
                 { length: setsToAdd },
                 (_, index) => ({
@@ -4670,7 +4952,7 @@ function useAreaChecklistService() {
 }
 
 // src/controllers/hygiene-area-checklist.controller.ts
-import Joi10 from "joi";
+import Joi11 from "joi";
 import {
   BadRequestError as BadRequestError16,
   InternalServerError as InternalServerError7,
@@ -4682,6 +4964,8 @@ import { AppServiceType as AppServiceType10 } from "@7365admin1/core";
 import { launch } from "puppeteer";
 import { InternalServerError as InternalServerError6, useAtlas as useAtlas8 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId11 } from "mongodb";
+
+// src/utils/checklist-pdf-html.util.ts
 function escapeHtml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
 }
@@ -4694,7 +4978,7 @@ function buildChecklistHtml(areaChecklists) {
       const unitRows = (setItem.units || []).map(
         (unit) => `
               <tr>
-                <td class="unit-name">${escapeHtml(unit.name || "")}</td>
+                <td class="unit-name">${escapeHtml(unit.name || "")}${unit.approve || unit.reject ? "" : ' <span class="missed-label">Missed</span>'}</td>
                 <td class="icon-cell">${unit.reject ? '<span class="reject-icon">&#10007;</span>' : ""}</td>
                 <td class="icon-cell">${unit.approve ? '<span class="approve-icon">&#10003;</span>' : ""}</td>
               </tr>`
@@ -4831,6 +5115,12 @@ function buildChecklistHtml(areaChecklists) {
       font-size: 16px;
       font-weight: bold;
     }
+    .missed-label {
+      color: #b3261e;
+      font-size: 11px;
+      font-weight: bold;
+      margin-left: 6px;
+    }
     .reject-icon {
       color: #e74c3c;
       font-size: 16px;
@@ -4846,6 +5136,8 @@ function buildChecklistHtml(areaChecklists) {
 </body>
 </html>`;
 }
+
+// src/services/hygiene-checklist-pdf.service.ts
 function useChecklistPdfService() {
   async function generateChecklistPdf(scheduleId) {
     const db = useAtlas8.getDb();
@@ -4915,9 +5207,9 @@ function useAreaChecklistController() {
       site: req.params.site,
       schedule: req.params.schedule
     };
-    const validation = Joi10.object({
-      site: Joi10.string().hex().required(),
-      schedule: Joi10.string().hex().required()
+    const validation = Joi11.object({
+      site: Joi11.string().hex().required(),
+      schedule: Joi11.string().hex().required()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -4937,14 +5229,14 @@ function useAreaChecklistController() {
   }
   async function getAllAreaChecklist(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi10.object({
-      page: Joi10.number().min(1).optional().allow("", null),
-      limit: Joi10.number().min(1).optional().allow("", null),
-      search: Joi10.string().optional().allow("", null),
-      type: Joi10.string().valid(...allowedTypes, "all").optional().allow("", null),
-      status: Joi10.string().valid(...allowedStatus, "all").optional().allow("", null),
-      schedule: Joi10.string().hex().required(),
-      serviceType: Joi10.string().valid(...Object.values(AppServiceType10)).required()
+    const validation = Joi11.object({
+      page: Joi11.number().min(1).optional().allow("", null),
+      limit: Joi11.number().min(1).optional().allow("", null),
+      search: Joi11.string().optional().allow("", null),
+      type: Joi11.string().valid(...allowedTypes, "all").optional().allow("", null),
+      status: Joi11.string().valid(...allowedStatus, "all").optional().allow("", null),
+      schedule: Joi11.string().hex().required(),
+      serviceType: Joi11.string().valid(...Object.values(AppServiceType10)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -4979,14 +5271,14 @@ function useAreaChecklistController() {
   }
   async function getAreaChecklistHistory(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi10.object({
-      page: Joi10.number().min(1).optional().allow("", null),
-      limit: Joi10.number().min(1).optional().allow("", null),
-      search: Joi10.string().optional().allow("", null),
-      type: Joi10.string().optional().allow("", ...allowedTypes),
-      schedule: Joi10.string().hex().required(),
-      status: Joi10.string().allow("", null, ...allowedStatus),
-      createdAt: Joi10.alternatives().try(Joi10.date(), Joi10.string()).optional().allow("", null)
+    const validation = Joi11.object({
+      page: Joi11.number().min(1).optional().allow("", null),
+      limit: Joi11.number().min(1).optional().allow("", null),
+      search: Joi11.string().optional().allow("", null),
+      type: Joi11.string().optional().allow("", ...allowedTypes),
+      schedule: Joi11.string().hex().required(),
+      status: Joi11.string().allow("", null, ...allowedStatus),
+      createdAt: Joi11.alternatives().try(Joi11.date(), Joi11.string()).optional().allow("", null)
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5020,7 +5312,7 @@ function useAreaChecklistController() {
     }
   }
   async function getAreaChecklistHistoryDetails(req, res, next) {
-    const validation = Joi10.string().hex().required();
+    const validation = Joi11.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -5040,12 +5332,12 @@ function useAreaChecklistController() {
   }
   async function getAreaChecklistUnits(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi10.object({
-      page: Joi10.number().min(1).optional().allow("", null),
-      limit: Joi10.number().min(1).optional().allow("", null),
-      search: Joi10.string().optional().allow("", null),
-      serviceType: Joi10.string().valid(...Object.values(AppServiceType10)).required(),
-      id: Joi10.string().hex().required()
+    const validation = Joi11.object({
+      page: Joi11.number().min(1).optional().allow("", null),
+      limit: Joi11.number().min(1).optional().allow("", null),
+      search: Joi11.string().optional().allow("", null),
+      serviceType: Joi11.string().valid(...Object.values(AppServiceType10)).required(),
+      id: Joi11.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5095,21 +5387,21 @@ function useAreaChecklistController() {
       ...decisionValues,
       completedBy
     };
-    const validation = Joi10.object({
-      id: Joi10.string().hex().required(),
-      set: Joi10.number().integer().min(1).required(),
-      unit: Joi10.string().hex().required(),
-      decision: Joi10.string().valid("approve", "reject").required(),
-      approve: Joi10.boolean().optional(),
-      reject: Joi10.boolean().optional(),
-      remarks: Joi10.string().optional().allow("", null),
+    const validation = Joi11.object({
+      id: Joi11.string().hex().required(),
+      set: Joi11.number().integer().min(1).required(),
+      unit: Joi11.string().hex().required(),
+      decision: Joi11.string().valid("approve", "reject").required(),
+      approve: Joi11.boolean().optional(),
+      reject: Joi11.boolean().optional(),
+      remarks: Joi11.string().optional().allow("", null),
       /*
        * Shape only. WHETHER a photo is required depends on the set's current
        * state in the database, which Joi cannot see — see the check below.
        * Each entry must still be a real id: a blank string carries no evidence.
        */
-      attachment: Joi10.array().items(Joi10.string().trim().min(1)).optional(),
-      completedBy: Joi10.string().hex().required()
+      attachment: Joi11.array().items(Joi11.string().trim().min(1)).optional(),
+      completedBy: Joi11.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -5146,7 +5438,7 @@ function useAreaChecklistController() {
     }
   }
   async function downloadChecklistPdf(req, res, next) {
-    const validation = Joi10.string().hex().required();
+    const validation = Joi11.string().hex().required();
     const schedule = req.params.schedule;
     const { error, value } = validation.validate(schedule);
     if (error) {
@@ -5192,16 +5484,16 @@ function useAreaChecklistController() {
 }
 
 // src/models/hygiene-supply.model.ts
-import Joi11 from "joi";
+import Joi12 from "joi";
 import { ObjectId as ObjectId12 } from "mongodb";
 import { BadRequestError as BadRequestError17, logger as logger21 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType11 } from "@7365admin1/core";
-var supplySchema = Joi11.object({
-  site: Joi11.string().hex().required(),
-  serviceType: Joi11.string().valid(...Object.values(AppServiceType11)).required(),
-  name: Joi11.string().required(),
-  unitOfMeasurement: Joi11.string().required(),
-  attachment: Joi11.string().allow(null, "").optional()
+var supplySchema = Joi12.object({
+  site: Joi12.string().hex().required(),
+  serviceType: Joi12.string().valid(...Object.values(AppServiceType11)).required(),
+  name: Joi12.string().required(),
+  unitOfMeasurement: Joi12.string().required(),
+  attachment: Joi12.string().allow(null, "").optional()
 });
 function MSupply(value) {
   const { error } = supplySchema.validate(value);
@@ -5338,7 +5630,7 @@ function useSupplyRepository() {
       throw new BadRequestError18("Invalid site ID format.");
     }
     if (search) {
-      query.name = { $regex: search, $options: "i" };
+      query.name = { $regex: escapeRegex(search), $options: "i" };
       cacheOptions.search = search;
     }
     const cacheKey = makeCacheKey6(namespace_collection, cacheOptions);
@@ -5500,7 +5792,7 @@ function useSupplyRepository() {
 }
 
 // src/controllers/hygiene-supply.controller.ts
-import Joi12 from "joi";
+import Joi13 from "joi";
 import { BadRequestError as BadRequestError19, logger as logger23 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType12 } from "@7365admin1/core";
 function useSupplyController() {
@@ -5531,12 +5823,12 @@ function useSupplyController() {
   }
   async function getSupplies(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi12.object({
-      page: Joi12.number().min(1).optional().allow("", null),
-      limit: Joi12.number().min(1).optional().allow("", null),
-      search: Joi12.string().optional().allow("", null),
-      site: Joi12.string().hex().required(),
-      serviceType: Joi12.string().valid(...Object.values(AppServiceType12)).required()
+    const validation = Joi13.object({
+      page: Joi13.number().min(1).optional().allow("", null),
+      limit: Joi13.number().min(1).optional().allow("", null),
+      search: Joi13.string().optional().allow("", null),
+      site: Joi13.string().hex().required(),
+      serviceType: Joi13.string().valid(...Object.values(AppServiceType12)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5566,7 +5858,7 @@ function useSupplyController() {
     }
   }
   async function getSupplyById(req, res, next) {
-    const validation = Joi12.string().hex().required();
+    const validation = Joi13.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -5586,12 +5878,12 @@ function useSupplyController() {
   }
   async function updateSupply(req, res, next) {
     const payload = { id: req.params.id, ...req.body };
-    const validation = Joi12.object({
-      id: Joi12.string().hex().required(),
-      name: Joi12.string().optional().allow("", null),
-      unitOfMeasurement: Joi12.string().optional().allow("", null),
-      qty: Joi12.number().min(0).optional().allow("", null),
-      attachment: Joi12.string().optional().allow("", null)
+    const validation = Joi13.object({
+      id: Joi13.string().hex().required(),
+      name: Joi13.string().optional().allow("", null),
+      unitOfMeasurement: Joi13.string().optional().allow("", null),
+      qty: Joi13.number().min(0).optional().allow("", null),
+      attachment: Joi13.string().optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -5612,7 +5904,7 @@ function useSupplyController() {
   }
   async function deleteSupply(req, res, next) {
     const id = req.params.id;
-    const validation = Joi12.string().hex().required();
+    const validation = Joi13.string().hex().required();
     const { error, value } = validation.validate(id);
     if (error) {
       logger23.log({ level: "error", message: error.message });
@@ -5639,18 +5931,18 @@ function useSupplyController() {
 }
 
 // src/models/hygiene-stock.model.ts
-import Joi13 from "joi";
+import Joi14 from "joi";
 import { ObjectId as ObjectId14 } from "mongodb";
 import { BadRequestError as BadRequestError20, logger as logger24 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType13 } from "@7365admin1/core";
-var stockSchema = Joi13.object({
-  site: Joi13.string().hex().required(),
-  serviceType: Joi13.string().valid(...Object.values(AppServiceType13)).required(),
-  supply: Joi13.string().hex().required(),
-  in: Joi13.number().min(0).optional(),
-  out: Joi13.number().min(0).optional(),
-  balance: Joi13.number().min(0).required(),
-  remarks: Joi13.string().optional().allow("", null)
+var stockSchema = Joi14.object({
+  site: Joi14.string().hex().required(),
+  serviceType: Joi14.string().valid(...Object.values(AppServiceType13)).required(),
+  supply: Joi14.string().hex().required(),
+  in: Joi14.number().min(0).optional(),
+  out: Joi14.number().min(0).optional(),
+  balance: Joi14.number().min(0).required(),
+  remarks: Joi14.string().optional().allow("", null)
 });
 function MStock(value) {
   const { error } = stockSchema.validate(value);
@@ -5877,7 +6169,7 @@ function useStockService() {
 }
 
 // src/controllers/hygiene-stock.controller.ts
-import Joi14 from "joi";
+import Joi15 from "joi";
 import { BadRequestError as BadRequestError23, logger as logger26 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType14 } from "@7365admin1/core";
 function useStockController() {
@@ -5885,12 +6177,12 @@ function useStockController() {
   const { createStock: _createStock } = useStockService();
   async function createStock(req, res, next) {
     const payload = { ...req.body, ...req.params };
-    const validation = Joi14.object({
-      site: Joi14.string().hex().required(),
-      serviceType: Joi14.string().valid(...Object.values(AppServiceType14)).required(),
-      supply: Joi14.string().hex().required(),
-      qty: Joi14.number().min(0).required(),
-      remarks: Joi14.string().optional().allow("", null)
+    const validation = Joi15.object({
+      site: Joi15.string().hex().required(),
+      serviceType: Joi15.string().valid(...Object.values(AppServiceType14)).required(),
+      supply: Joi15.string().hex().required(),
+      qty: Joi15.number().min(0).required(),
+      remarks: Joi15.string().optional().allow("", null)
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -5910,13 +6202,13 @@ function useStockController() {
   }
   async function getStocksBySupplyId(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi14.object({
-      page: Joi14.number().min(1).optional().allow("", null),
-      limit: Joi14.number().min(1).optional().allow("", null),
-      search: Joi14.string().optional().allow("", null),
-      site: Joi14.string().hex().required(),
-      serviceType: Joi14.string().valid(...Object.values(AppServiceType14)).required(),
-      supply: Joi14.string().hex().required()
+    const validation = Joi15.object({
+      page: Joi15.number().min(1).optional().allow("", null),
+      limit: Joi15.number().min(1).optional().allow("", null),
+      search: Joi15.string().optional().allow("", null),
+      site: Joi15.string().hex().required(),
+      serviceType: Joi15.string().valid(...Object.values(AppServiceType14)).required(),
+      supply: Joi15.string().hex().required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -5978,21 +6270,21 @@ async function applyCheckOutDecision(decision, decide, returnStock) {
 }
 
 // src/models/hygiene-checkout-item.model.ts
-import Joi15 from "joi";
+import Joi16 from "joi";
 import { ObjectId as ObjectId16 } from "mongodb";
 import { BadRequestError as BadRequestError24, logger as logger27 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType15 } from "@7365admin1/core";
 var allowedCheckOutItemStatus = ["pending", "completed"];
-var checkOutItemSchema = Joi15.object({
-  site: Joi15.string().hex().required(),
-  serviceType: Joi15.string().valid(...Object.values(AppServiceType15)).required(),
-  supply: Joi15.string().hex().required(),
-  supplyName: Joi15.string().required(),
-  supplyQty: Joi15.number().min(0).required(),
-  qty: Joi15.number().min(0).required(),
-  attachment: Joi15.array().items(Joi15.string()).optional().allow(null),
-  createdBy: Joi15.string().hex().required(),
-  createdByName: Joi15.string().required()
+var checkOutItemSchema = Joi16.object({
+  site: Joi16.string().hex().required(),
+  serviceType: Joi16.string().valid(...Object.values(AppServiceType15)).required(),
+  supply: Joi16.string().hex().required(),
+  supplyName: Joi16.string().required(),
+  supplyQty: Joi16.number().min(0).required(),
+  qty: Joi16.number().min(0).required(),
+  attachment: Joi16.array().items(Joi16.string()).optional().allow(null),
+  createdBy: Joi16.string().hex().required(),
+  createdByName: Joi16.string().required()
 });
 function MCheckOutItem(value) {
   const { error } = checkOutItemSchema.validate(value);
@@ -6125,7 +6417,7 @@ function useCheckOutItemRepository() {
       throw new BadRequestError25("Invalid site ID format.");
     }
     if (search) {
-      query.supplyName = { $regex: search, $options: "i" };
+      query.supplyName = { $regex: escapeRegex(search), $options: "i" };
       cacheOptions.search = search;
     }
     const cacheKey = makeCacheKey8(namespace_collection, cacheOptions);
@@ -6481,7 +6773,7 @@ function useCheckOutItemService() {
 }
 
 // src/controllers/hygiene-checkout-item.controller.ts
-import Joi16 from "joi";
+import Joi17 from "joi";
 import { BadRequestError as BadRequestError27, logger as logger29 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType16 } from "@7365admin1/core";
 function useCheckOutItemController() {
@@ -6505,13 +6797,13 @@ function useCheckOutItemController() {
       ...req.params,
       createdBy
     };
-    const validation = Joi16.object({
-      site: Joi16.string().hex().required(),
-      serviceType: Joi16.string().valid(...Object.values(AppServiceType16)).required(),
-      supply: Joi16.string().hex().required(),
-      qty: Joi16.number().min(0).required(),
-      attachment: Joi16.array().items(Joi16.string()).optional().allow(null),
-      createdBy: Joi16.string().hex().required()
+    const validation = Joi17.object({
+      site: Joi17.string().hex().required(),
+      serviceType: Joi17.string().valid(...Object.values(AppServiceType16)).required(),
+      supply: Joi17.string().hex().required(),
+      qty: Joi17.number().min(0).required(),
+      attachment: Joi17.array().items(Joi17.string()).optional().allow(null),
+      createdBy: Joi17.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -6540,15 +6832,15 @@ function useCheckOutItemController() {
       ...req.params,
       createdBy
     };
-    const validation = Joi16.object({
-      site: Joi16.string().hex().required(),
-      serviceType: Joi16.string().valid(...Object.values(AppServiceType16)).required(),
-      createdBy: Joi16.string().hex().required(),
-      items: Joi16.array().items(
-        Joi16.object({
-          supply: Joi16.string().hex().required(),
-          qty: Joi16.number().min(0).required(),
-          attachment: Joi16.array().items(Joi16.string()).optional().allow(null)
+    const validation = Joi17.object({
+      site: Joi17.string().hex().required(),
+      serviceType: Joi17.string().valid(...Object.values(AppServiceType16)).required(),
+      createdBy: Joi17.string().hex().required(),
+      items: Joi17.array().items(
+        Joi17.object({
+          supply: Joi17.string().hex().required(),
+          qty: Joi17.number().min(0).required(),
+          attachment: Joi17.array().items(Joi17.string()).optional().allow(null)
         })
       ).min(1).required()
     });
@@ -6570,12 +6862,12 @@ function useCheckOutItemController() {
   }
   async function getCheckOutItems(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi16.object({
-      page: Joi16.number().min(1).optional().allow("", null),
-      limit: Joi16.number().min(1).optional().allow("", null),
-      search: Joi16.string().optional().allow("", null),
-      site: Joi16.string().hex().required(),
-      serviceType: Joi16.string().valid(...Object.values(AppServiceType16)).required()
+    const validation = Joi17.object({
+      page: Joi17.number().min(1).optional().allow("", null),
+      limit: Joi17.number().min(1).optional().allow("", null),
+      search: Joi17.string().optional().allow("", null),
+      site: Joi17.string().hex().required(),
+      serviceType: Joi17.string().valid(...Object.values(AppServiceType16)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -6605,7 +6897,7 @@ function useCheckOutItemController() {
     }
   }
   async function getCheckOutItemById(req, res, next) {
-    const validation = Joi16.string().hex().required();
+    const validation = Joi17.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -6644,13 +6936,13 @@ function useCheckOutItemController() {
       ...decisionValues,
       completedBy
     };
-    const validation = Joi16.object({
-      id: Joi16.string().hex().required(),
-      decision: Joi16.string().valid("approve", "disapprove").required(),
-      approve: Joi16.boolean().required(),
-      reject: Joi16.boolean().required(),
-      remarks: Joi16.string().optional().allow("", null),
-      completedBy: Joi16.string().hex().required()
+    const validation = Joi17.object({
+      id: Joi17.string().hex().required(),
+      decision: Joi17.string().valid("approve", "disapprove").required(),
+      approve: Joi17.boolean().required(),
+      reject: Joi17.boolean().required(),
+      remarks: Joi17.string().optional().allow("", null),
+      completedBy: Joi17.string().hex().required()
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -6683,23 +6975,15 @@ function useCheckOutItemController() {
 // src/models/hygiene-schedule-task.model.ts
 import { BadRequestError as BadRequestError28, logger as logger30 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType17 } from "@7365admin1/core";
-import Joi17 from "joi";
+import Joi18 from "joi";
 import { ObjectId as ObjectId18 } from "mongodb";
-var scheduleTaskSchema = Joi17.object({
-  site: Joi17.string().hex().required(),
-  serviceType: Joi17.string().valid(...Object.values(AppServiceType17)).required(),
-  title: Joi17.string().required(),
-  time: Joi17.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).required(),
-  dates: Joi17.array().min(1).items(
-    Joi17.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required()
-  ).required(),
-  description: Joi17.string().optional().allow("", null),
-  areas: Joi17.array().min(1).items(
-    Joi17.object({
-      name: Joi17.string().required(),
-      value: Joi17.any().required()
-    })
-  ).required()
+var scheduleTaskSchema = Joi18.object({
+  site: Joi18.string().hex().required(),
+  serviceType: Joi18.string().valid(...Object.values(AppServiceType17)).required(),
+  ...scheduleTaskFields
+}).custom((value, helpers) => {
+  const message = validateScheduleRules(cleanScheduleInput(value));
+  return message ? helpers.message({ custom: message }) : value;
 });
 function MScheduleTask(value) {
   const { error } = scheduleTaskSchema.validate(value);
@@ -6726,14 +7010,26 @@ function MScheduleTask(value) {
       }
     });
   }
+  const extra = cleanScheduleInput({
+    repeat: value.repeat,
+    daysOfWeek: value.daysOfWeek,
+    dayOfMonth: value.dayOfMonth,
+    startDate: value.startDate,
+    endDate: value.endDate,
+    paused: value.paused
+  });
+  for (const key of Object.keys(extra))
+    if (extra[key] === void 0)
+      delete extra[key];
   return {
     site: value.site,
     serviceType: value.serviceType,
     title: value.title,
     time: value.time,
-    dates: value.dates,
+    dates: value.dates ?? [],
     description: value.description,
     areas: value.areas,
+    ...extra,
     status: "active",
     createdAt: /* @__PURE__ */ new Date(),
     updatedAt: "",
@@ -6753,11 +7049,23 @@ import {
   makeCacheKey as makeCacheKey9,
   NotFoundError as NotFoundError7
 } from "@7365admin1/node-server-utils";
+var SCHEDULE_FIELDS = {
+  time: 1,
+  dates: 1,
+  repeat: 1,
+  daysOfWeek: 1,
+  dayOfMonth: 1,
+  startDate: 1,
+  endDate: 1,
+  paused: 1,
+  lastRunDate: 1
+};
 function useScheduleTaskRepository() {
   const db = useAtlas14.getDb();
   if (!db) {
     throw new InternalServerError11("Unable to connect to server.");
   }
+  const database = db;
   const namespace_collection = "site.schedule-tasks";
   const collection = db.collection(namespace_collection);
   const { delNamespace, setCache, getCache } = useCache9(namespace_collection);
@@ -6825,14 +7133,14 @@ function useScheduleTaskRepository() {
       throw new BadRequestError29("Invalid site ID format.");
     }
     if (search) {
-      query.$or = [{ title: { $regex: search, $options: "i" } }];
+      query.$or = [{ title: { $regex: escapeRegex(search), $options: "i" } }];
       cacheOptions.search = search;
     }
     const cacheKey = makeCacheKey9(namespace_collection, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
       logger31.info(`Cache hit for key: ${cacheKey}`);
-      return cachedData;
+      return enrichList(cachedData, site, serviceType);
     }
     try {
       const items = await collection.aggregate([
@@ -6841,7 +7149,8 @@ function useScheduleTaskRepository() {
           $project: {
             title: 1,
             areas: 1,
-            status: 1
+            status: 1,
+            ...SCHEDULE_FIELDS
           }
         },
         { $sort: { _id: -1 } },
@@ -6855,15 +7164,104 @@ function useScheduleTaskRepository() {
       }).catch((err) => {
         logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
-      return data;
+      return enrichList(data, site, serviceType);
     } catch (error) {
       throw error;
     }
   }
-  async function getAllScheduleTask() {
+  async function enrichList(data, site, serviceType) {
+    const items = data?.items ?? [];
+    const now = /* @__PURE__ */ new Date();
+    let statuses = /* @__PURE__ */ new Map();
+    try {
+      statuses = await getRunStatuses(items, site, serviceType);
+    } catch (error) {
+      logger31.error("Could not read schedule task run status", error);
+    }
+    return {
+      ...data,
+      items: items.map((item) => {
+        try {
+          return {
+            ...item,
+            ...scheduleDisplay(item, now),
+            lastRunStatus: statuses.get(String(item._id)) ?? null
+          };
+        } catch (error) {
+          logger31.error(`Could not enrich schedule task ${item?._id}`, error);
+          return { ...item, nextRun: null, lastRun: null, scheduleStatus: null, lastRunStatus: null };
+        }
+      })
+    };
+  }
+  async function getRunStatuses(items, site, serviceType) {
+    const result = /* @__PURE__ */ new Map();
+    const ran = items.filter((i) => i.lastRunDate);
+    if (!ran.length)
+      return result;
+    const parents = await database.collection("site.cleaning.schedules").find(
+      {
+        site,
+        serviceType,
+        dateStr: { $in: [...new Set(ran.map((i) => i.lastRunDate))] }
+      },
+      { projection: { dateStr: 1 } }
+    ).toArray();
+    if (!parents.length)
+      return result;
+    const dateOf = new Map(parents.map((p) => [String(p._id), p.dateStr]));
+    const taskIds = ran.map((i) => new ObjectId19(i._id));
+    const rows = await database.collection("site.cleaning.schedule.areas").aggregate([
+      {
+        $match: {
+          schedule: { $in: parents.map((p) => p._id) },
+          "checklist.scheduleTaskId": { $in: taskIds }
+        }
+      },
+      { $unwind: "$checklist" },
+      { $match: { "checklist.scheduleTaskId": { $in: taskIds } } },
+      { $unwind: "$checklist.units" },
+      {
+        $group: {
+          _id: { task: "$checklist.scheduleTaskId", schedule: "$schedule" },
+          total: { $sum: 1 },
+          completed: {
+            $sum: { $cond: [{ $eq: ["$checklist.units.status", "completed"] }, 1, 0] }
+          },
+          closed: {
+            $sum: { $cond: [{ $eq: ["$checklist.units.status", "closed"] }, 1, 0] }
+          }
+        }
+      }
+    ]).toArray();
+    const sums = /* @__PURE__ */ new Map();
+    for (const row of rows) {
+      const task = ran.find((i) => String(i._id) === String(row._id.task));
+      if (!task || dateOf.get(String(row._id.schedule)) !== task.lastRunDate)
+        continue;
+      const sum = sums.get(String(task._id)) ?? { total: 0, completed: 0, closed: 0 };
+      sum.total += row.total;
+      sum.completed += row.completed;
+      sum.closed += row.closed;
+      sums.set(String(task._id), sum);
+    }
+    for (const [id, sum] of sums) {
+      result.set(id, sum.completed === sum.total ? "done" : sum.closed > 0 ? "missed" : "pending");
+    }
+    return result;
+  }
+  async function getAllScheduleTask(today) {
     const query = {
       status: { $ne: "deleted" }
     };
+    if (today) {
+      query.paused = { $ne: true };
+      query.lastRunDate = { $ne: today };
+      query.$or = [
+        { dates: today },
+        { repeat: { $in: ["daily", "weekdays", "weekly", "monthly"] } }
+      ];
+    }
     try {
       const items = await collection.aggregate([{ $match: query }, { $sort: { _id: -1 } }]).toArray();
       return items;
@@ -6871,6 +7269,9 @@ function useScheduleTaskRepository() {
       throw error;
     }
   }
+  function withScheduleDisplay(row) {
+    return { ...row, ...scheduleDisplay(row, /* @__PURE__ */ new Date()) };
+  }
   async function getScheduleTaskById(_id, session) {
     try {
       _id = new ObjectId19(_id);
@@ -6888,7 +7289,7 @@ function useScheduleTaskRepository() {
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
         logger31.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
+        return withScheduleDisplay(cachedData);
       }
     } else {
       logger31.info(`Skipping cache during transaction for key: ${cacheKey}`);
@@ -6899,12 +7300,13 @@ function useScheduleTaskRepository() {
         {
           $project: {
             title: 1,
-            time: 1,
-            dates: 1,
             description: 1,
             areas: 1,
             status: 1,
-            createdAt: 1
+            createdAt: 1,
+            site: 1,
+            serviceType: 1,
+            ...SCHEDULE_FIELDS
           }
         }
       ]).toArray();
@@ -6916,7 +7318,7 @@ function useScheduleTaskRepository() {
       }).catch((err) => {
         logger31.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
-      return data[0];
+      return withScheduleDisplay(data[0]);
     } catch (error) {
       throw error;
     }
@@ -6940,16 +7342,20 @@ function useScheduleTaskRepository() {
       });
     }
     try {
-      const updateValue = { ...value, updatedAt: /* @__PURE__ */ new Date() };
+      const { set, unset } = splitScheduleUpdate(value);
+      const update = {
+        $set: { ...set, updatedAt: /* @__PURE__ */ new Date() }
+      };
+      if (unset.length) {
+        update.$unset = Object.fromEntries(unset.map((key) => [key, ""]));
+      }
       const res = await collection.updateOne(
-        { _id },
-        { $set: updateValue },
+        { _id, status: { $ne: "deleted" } },
+        update,
         { session }
       );
-      if (res.modifiedCount === 0) {
-        throw new InternalServerError11(
-          "Unable to update hygiene schedule task."
-        );
+      if (res.matchedCount === 0) {
+        throw new NotFoundError7("Schedule task not found.");
       }
       delNamespace().then(() => {
         logger31.info(`Cache cleared for namespace: ${namespace_collection}`);
@@ -6964,6 +7370,18 @@ function useScheduleTaskRepository() {
       throw error;
     }
   }
+  async function markScheduleTaskRan(_id, date) {
+    await collection.updateOne(
+      { _id: new ObjectId19(_id) },
+      { $set: { lastRunDate: date, lastRunAt: /* @__PURE__ */ new Date() } }
+    );
+    delNamespace().catch((err) => {
+      logger31.error(
+        `Failed to clear cache for namespace: ${namespace_collection}`,
+        err
+      );
+    });
+  }
   async function deleteScheduleTask(_id, session) {
     try {
       _id = new ObjectId19(_id);
@@ -7003,18 +7421,31 @@ function useScheduleTaskRepository() {
     createScheduleTask,
     getScheduleTasks,
     getAllScheduleTask,
+    markScheduleTaskRan,
     getScheduleTaskById,
     updateScheduleTask,
     deleteScheduleTask
   };
 }
 
+// src/utils/schedule-task-set.util.ts
+function buildScheduleTaskSets(task, units, startSet, count) {
+  return Array.from({ length: count }, (_, i) => ({
+    set: startSet + i,
+    units,
+    isScheduleTask: true,
+    scheduleTaskId: task._id,
+    scheduleTaskTitle: task.title,
+    scheduleTaskTime: task.time
+  }));
+}
+
 // src/services/hygiene-schedule-task.service.ts
 import { ObjectId as ObjectId20 } from "mongodb";
 import { logger as logger32 } from "@7365admin1/node-server-utils";
 function useScheduleTaskService() {
   const { createParentChecklist } = useParentChecklistRepo();
-  const { getAllScheduleTask } = useScheduleTaskRepository();
+  const { getAllScheduleTask, markScheduleTaskRan } = useScheduleTaskRepository();
   const {
     createAreaChecklist,
     getAreaChecklistByAreaAndSchedule,
@@ -7023,73 +7454,7 @@ function useScheduleTaskService() {
   const { getAreaById } = useAreaRepo();
   function checkScheduleConditions(schedule, serviceType, currentDate = /* @__PURE__ */ new Date()) {
     try {
-      const now = currentDate;
-      const timeString = now.toLocaleTimeString("en-US", {
-        hour: "2-digit",
-        minute: "2-digit",
-        hour12: false,
-        timeZone: "Asia/Singapore"
-      });
-      const [currentHour, currentMinute] = timeString.split(":").map(Number);
-      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"
-      });
-      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 ${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) {
-        logger32.info(
-          `Schedule ${schedule._id}: Time does not match. Current: ${currentHour}:${currentMinute}, Expected: ${scheduleHour}:${scheduleMinute}`
-        );
-        return false;
-      }
-      const relevantTimestamp = schedule.updatedAt || schedule.createdAt;
-      if (relevantTimestamp) {
-        const savedAt = new Date(relevantTimestamp);
-        const savedHour = parseInt(
-          savedAt.toLocaleTimeString("en-US", {
-            hour: "2-digit",
-            hour12: false,
-            timeZone: "Asia/Singapore"
-          }),
-          10
-        );
-        const savedMinute = savedAt.toLocaleString("en-US", {
-          minute: "2-digit",
-          timeZone: "Asia/Singapore"
-        });
-        const savedDateFormatted = savedAt.toLocaleDateString("en-CA", {
-          timeZone: "Asia/Singapore"
-        });
-        const savedMinNum = parseInt(savedMinute, 10);
-        const wasSavedThisMinute = savedDateFormatted === currentDateFormatted && savedHour === currentHour && savedMinNum === currentMinute;
-        if (wasSavedThisMinute) {
-          logger32.info(
-            `Schedule ${schedule._id}: Skipping \u2014 task was saved this minute (${savedHour}:${String(
-              savedMinNum
-            ).padStart(2, "0")}). Will fire on next occurrence.`
-          );
-          return false;
-        }
-      }
-      logger32.info(
-        `Schedule ${schedule._id}: All conditions matched - Date is within range and time matches`
-      );
-      return true;
+      return shouldRunNow(schedule, currentDate);
     } catch (error) {
       logger32.error(
         `Error checking schedule conditions for ${schedule._id}:`,
@@ -7098,18 +7463,22 @@ function useScheduleTaskService() {
       return false;
     }
   }
+  const MAX_ATTEMPTS = 5;
+  const attempts = /* @__PURE__ */ new Map();
   async function processScheduledTasks(currentDate) {
     try {
       logger32.info("Starting scheduled task processing...");
-      const scheduleTasks = await getAllScheduleTask();
+      const today = sgtParts(currentDate ?? /* @__PURE__ */ new Date()).date;
+      const scheduleTasks = await getAllScheduleTask(today);
       if (!scheduleTasks || scheduleTasks.length === 0) {
         logger32.info("No schedule tasks found to process");
-        return { processed: 0, validated: 0 };
+        return { processed: 0, validated: 0, fired: [] };
       }
       logger32.info(`Found ${scheduleTasks.length} schedule tasks to check`);
       let processedCount = 0;
       let validatedCount = 0;
       const validatedTasks = [];
+      const fired = [];
       for (const scheduleTask of scheduleTasks) {
         try {
           const serviceType = scheduleTask.serviceType;
@@ -7152,6 +7521,8 @@ function useScheduleTaskService() {
           logger32.info(
             `Using parent checklist ${parentChecklistId}, now creating/updating area checklists`
           );
+          let failedAreas = 0;
+          const addedAreas = [];
           for (const area of scheduleTask.areas) {
             try {
               const areaId = area.value.toString();
@@ -7214,15 +7585,7 @@ function useScheduleTaskService() {
                   )
                 ) : 0;
                 const startSetNumber = maxSetInChecklist + 1;
-                const newSets = Array.from(
-                  { length: areaSetConfig },
-                  (_, index) => ({
-                    set: startSetNumber + index,
-                    units,
-                    isScheduleTask: true,
-                    scheduleTaskId: scheduleTask._id
-                  })
-                );
+                const newSets = buildScheduleTaskSets(scheduleTask, units, startSetNumber, areaSetConfig);
                 const modified = await pushScheduleTaskSets(
                   parentChecklistId.toString(),
                   serviceType,
@@ -7231,6 +7594,7 @@ function useScheduleTaskService() {
                   newSets
                 );
                 if (modified > 0) {
+                  addedAreas.push(area.name);
                   logger32.info(
                     `Appended ${areaSetConfig} set(s) starting from ${startSetNumber} to area checklist for area ${area.name}`
                   );
@@ -7241,16 +7605,7 @@ function useScheduleTaskService() {
                 }
               } else {
                 const areaSetConfig = Number(areaDetails.set) || 1;
-                const schedTaskId = scheduleTask._id;
-                const schedTaskSets = Array.from(
-                  { length: areaSetConfig },
-                  (_, index) => ({
-                    set: index + 1,
-                    units,
-                    isScheduleTask: true,
-                    scheduleTaskId: schedTaskId
-                  })
-                );
+                const schedTaskSets = buildScheduleTaskSets(scheduleTask, units, 1, areaSetConfig);
                 const checklistData = {
                   schedule: parentChecklistId.toString(),
                   serviceType,
@@ -7263,13 +7618,32 @@ function useScheduleTaskService() {
                   `Area ${area.name} (${areaId}): Creating new area checklist with schedule-task sets only`
                 );
                 await createAreaChecklist(checklistData);
+                addedAreas.push(area.name);
                 logger32.info(`Created new area checklist for area ${area.name}`);
               }
             } catch (error) {
               logger32.error(`Error processing area ${area.name}:`, error);
+              failedAreas++;
               continue;
             }
           }
+          const attemptKey = `${scheduleTask._id}:${today}`;
+          const tried = (attempts.get(attemptKey) ?? 0) + 1;
+          attempts.set(attemptKey, tried);
+          if (failedAreas === 0 || tried >= MAX_ATTEMPTS) {
+            await markScheduleTaskRan(scheduleTask._id, today);
+            attempts.delete(attemptKey);
+          }
+          if (addedAreas.length > 0) {
+            fired.push({
+              _id: scheduleTask._id,
+              site: scheduleTask.site,
+              serviceType,
+              title: scheduleTask.title,
+              time: scheduleTask.time,
+              areas: addedAreas
+            });
+          }
           processedCount++;
           validatedCount++;
           validatedTasks.push(scheduleTask);
@@ -7281,6 +7655,17 @@ function useScheduleTaskService() {
             `Error processing schedule task ${scheduleTask._id}:`,
             error
           );
+          try {
+            const key = `${scheduleTask._id}:${today}`;
+            const tried = (attempts.get(key) ?? 0) + 1;
+            attempts.set(key, tried);
+            if (tried >= MAX_ATTEMPTS && scheduleTask._id) {
+              await markScheduleTaskRan(scheduleTask._id, today);
+              attempts.delete(key);
+            }
+          } catch (markError) {
+            logger32.error("Could not mark failing schedule task", markError);
+          }
           continue;
         }
       }
@@ -7290,7 +7675,8 @@ function useScheduleTaskService() {
       return {
         processed: processedCount,
         validated: validatedCount,
-        tasks: validatedTasks
+        tasks: validatedTasks,
+        fired
       };
     } catch (error) {
       logger32.error("Error processing scheduled tasks:", error);
@@ -7301,7 +7687,7 @@ function useScheduleTaskService() {
 }
 
 // src/controllers/hygiene-schedule-task.controller.ts
-import Joi18 from "joi";
+import Joi19 from "joi";
 import { BadRequestError as BadRequestError30, logger as logger33 } from "@7365admin1/node-server-utils";
 import { AppServiceType as AppServiceType18 } from "@7365admin1/core";
 function useScheduleTaskController() {
@@ -7332,12 +7718,12 @@ function useScheduleTaskController() {
   }
   async function getScheduleTasks(req, res, next) {
     const query = { ...req.query, ...req.params };
-    const validation = Joi18.object({
-      page: Joi18.number().min(1).optional().allow("", null),
-      limit: Joi18.number().min(1).optional().allow("", null),
-      search: Joi18.string().optional().allow("", null),
-      site: Joi18.string().hex().required(),
-      serviceType: Joi18.string().valid(...Object.values(AppServiceType18)).required()
+    const validation = Joi19.object({
+      page: Joi19.number().min(1).optional().allow("", null),
+      limit: Joi19.number().min(1).optional().allow("", null),
+      search: Joi19.string().optional().allow("", null),
+      site: Joi19.string().hex().required(),
+      serviceType: Joi19.string().valid(...Object.values(AppServiceType18)).required()
     });
     const { error } = validation.validate(query);
     if (error) {
@@ -7345,8 +7731,8 @@ function useScheduleTaskController() {
       next(new BadRequestError30(error.message));
       return;
     }
-    const page = parseInt(req.query.page) ?? 1;
-    const limit = parseInt(req.query.limit) ?? 10;
+    const page = parseInt(req.query.page) || 1;
+    const limit = parseInt(req.query.limit) || 10;
     const search = req.query.search ?? "";
     const site = req.params.site ?? "";
     const serviceType = req.query.serviceType ?? "";
@@ -7367,7 +7753,7 @@ function useScheduleTaskController() {
     }
   }
   async function getScheduleTaskById(req, res, next) {
-    const validation = Joi18.string().hex().required();
+    const validation = Joi19.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -7387,20 +7773,17 @@ function useScheduleTaskController() {
   }
   async function updateScheduleTask(req, res, next) {
     const payload = { id: req.params.id, ...req.body };
-    const validation = Joi18.object({
-      id: Joi18.string().hex().required(),
-      title: Joi18.string().optional().allow("", null),
-      time: Joi18.string().pattern(/^([0-1]\d|2[0-3]):([0-5]\d)$/).optional().allow("", null),
-      dates: Joi18.array().min(1).items(
-        Joi18.string().pattern(/^\d{4}-\d{2}-\d{2}$/).required()
-      ).optional(),
-      description: Joi18.string().optional().allow("", null),
-      areas: Joi18.array().min(1).items(
-        Joi18.object({
-          name: Joi18.string().required(),
-          value: Joi18.any().required()
-        })
-      ).optional()
+    const optional = Object.fromEntries(
+      Object.entries(scheduleTaskFields).map(([key, rule]) => [
+        key,
+        key === "dates" ? Joi19.array().min(1).items(scheduleDate).optional().messages({
+          "array.min": "Pick at least one date, or choose a repeat."
+        }) : rule.optional()
+      ])
+    );
+    const validation = Joi19.object({
+      id: Joi19.string().hex().required(),
+      ...optional
     });
     const { error } = validation.validate(payload);
     if (error) {
@@ -7408,6 +7791,24 @@ function useScheduleTaskController() {
       next(new BadRequestError30(error.message));
       return;
     }
+    try {
+      const { set, unset } = splitScheduleUpdate(req.body ?? {});
+      if (TIMING_KEYS.some((key) => key in set || unset.includes(key))) {
+        const stored = await _getScheduleTaskById(req.params.id);
+        const merged = { ...stored, ...set };
+        for (const key of unset)
+          delete merged[key];
+        const problem = timingChanged(stored, merged) ? validateScheduleRules(cleanScheduleInput(merged)) : null;
+        if (problem) {
+          next(new BadRequestError30(problem));
+          return;
+        }
+      }
+    } catch (error2) {
+      logger33.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
     try {
       const { id, ...value } = payload;
       await _updateScheduleTask(id, value);
@@ -7420,7 +7821,7 @@ function useScheduleTaskController() {
     }
   }
   async function deleteScheduleTask(req, res, next) {
-    const validation = Joi18.string().hex().required();
+    const validation = Joi19.string().hex().required();
     const _id = req.params.id;
     const { error, value } = validation.validate(_id);
     if (error) {
@@ -7664,17 +8065,17 @@ function useQRService() {
 }
 
 // src/controllers/hygiene-qr.controller.ts
-import Joi19 from "joi";
+import Joi20 from "joi";
 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) {
-    const validation = Joi19.object({
-      url: Joi19.string().uri().required(),
-      filename: Joi19.string().optional().allow("", null),
-      title: Joi19.string().optional().allow("", null),
-      subtitle: Joi19.string().optional().allow("", null),
-      download: Joi19.boolean().optional().default(false)
+    const validation = Joi20.object({
+      url: Joi20.string().uri().required(),
+      filename: Joi20.string().optional().allow("", null),
+      title: Joi20.string().optional().allow("", null),
+      subtitle: Joi20.string().optional().allow("", null),
+      download: Joi20.boolean().optional().default(false)
     });
     const query = { ...req.query };
     const { error, value } = validation.validate(query);