@7365admin1/core 3.52.3-staging.246 → 3.52.3-staging.247

package/.changeset/csv-import-expiry-timezone.md

@@ -0,0 +1,18 @@
+---
+"@7365admin1/core": patch
+---
+
+Read the season pass CSV/Excel expiry cell in the site's time zone
+
+A spreadsheet cell carries a wall clock and no zone, but every step before the
+import read it as UTC: `Joi.date().iso()` converted the text before the
+controller saw it, ExcelJS turns a date-formatted cell into UTC midnight, and
+`new Date()` on a UTC container did the same. A pass imported as `2026-12-05`
+came back to a Singapore reader as 8am on the 5th, and `2026-12-05T18:45`
+rolled over into the 6th.
+
+`parseExpiryDate` now moves to `src/utils/vehicle-import.util.ts` and reads the
+cell in `Asia/Singapore` before storing the instant — the same convention
+`date-format.util.ts`, the patrol logs and the attendance reports already use
+server-side, and the server-side equivalent of the `v-model:utc` binding the
+season pass form uses in the browser.

package/dist/index.js

@@ -39835,6 +39835,29 @@ var deleteVehicleRequestSchema = import_joi55.default.object({
   bypass: import_joi55.default.boolean().optional().default(false)
 });
 
+// src/utils/vehicle-import.util.ts
+var import_moment_timezone2 = __toESM(require("moment-timezone"));
+var SITE_TIME_ZONE = "Asia/Singapore";
+var DEFAULT_YEARS = 10;
+var CELL_FORMATS = [
+  "YYYY-MM-DDTHH:mm:ss.SSS",
+  "YYYY-MM-DDTHH:mm:ss",
+  "YYYY-MM-DDTHH:mm",
+  "YYYY-MM-DD",
+  "D-MMM-YY"
+];
+function parseExpiryDate(value) {
+  if (!value) {
+    return import_moment_timezone2.default.tz(SITE_TIME_ZONE).add(DEFAULT_YEARS, "years").toISOString();
+  }
+  const wallClock = value instanceof Date ? import_moment_timezone2.default.utc(value).format("YYYY-MM-DDTHH:mm:ss") : String(value).trim();
+  if (!wallClock) {
+    return import_moment_timezone2.default.tz(SITE_TIME_ZONE).add(DEFAULT_YEARS, "years").toISOString();
+  }
+  const parsed = import_moment_timezone2.default.tz(wallClock, CELL_FORMATS, SITE_TIME_ZONE);
+  return parsed.isValid() ? parsed.toISOString() : void 0;
+}
+
 // src/controllers/vehicle.controller.ts
 var import_exceljs2 = __toESM(require("exceljs"));
 var import_csv_parser2 = __toESM(require("csv-parser"));
@@ -39898,38 +39921,6 @@ function useVehicleController() {
       end: parseExpiryDate(cleanRow.subscriptionExpiry)
     };
   }
-  function parseExpiryDate(value) {
-    if (!value) {
-      const today = /* @__PURE__ */ new Date();
-      today.setFullYear(today.getFullYear() + 10);
-      return today.toISOString();
-    }
-    const date = new Date(value);
-    if (!isNaN(date.getTime())) {
-      return date.toISOString();
-    }
-    const [day, monthStr, yearShort] = value.split("-");
-    const months = {
-      Jan: 0,
-      Feb: 1,
-      Mar: 2,
-      Apr: 3,
-      May: 4,
-      Jun: 5,
-      Jul: 6,
-      Aug: 7,
-      Sep: 8,
-      Oct: 9,
-      Nov: 10,
-      Dec: 11
-    };
-    const month = months[monthStr];
-    if (month === void 0)
-      return void 0;
-    const year = 2e3 + Number(yearShort);
-    const fallbackDate = new Date(year, month, Number(day));
-    return isNaN(fallbackDate.getTime()) ? void 0 : fallbackDate.toISOString();
-  }
   async function uploadSpreadsheetVehicles(req, res, next) {
     try {
       if (!req.file) {
@@ -42054,7 +42045,7 @@ function MAttendance(value) {
 
 // src/repositories/attendance.repository.ts
 var import_mongodb77 = require("mongodb");
-var import_moment_timezone2 = __toESM(require("moment-timezone"));
+var import_moment_timezone3 = __toESM(require("moment-timezone"));
 var import_node_server_utils124 = require("@7365admin1/node-server-utils");
 function useAttendanceRepository() {
   const db2 = import_node_server_utils124.useAtlas.getDb();
@@ -42119,11 +42110,11 @@ function useAttendanceRepository() {
       cacheOptions.search = search;
     }
     const singaporeTz = "Asia/Singapore";
-    const normalizedStartDate = typeof startDate === "string" ? startDate : (0, import_moment_timezone2.default)(startDate).tz(singaporeTz).format("YYYY-MM-DD");
-    const normalizedEndDate = typeof endDate === "string" ? endDate : (0, import_moment_timezone2.default)(endDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedStartDate = typeof startDate === "string" ? startDate : (0, import_moment_timezone3.default)(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : (0, import_moment_timezone3.default)(endDate).tz(singaporeTz).format("YYYY-MM-DD");
     if (startDate && endDate) {
-      const startOfDay = import_moment_timezone2.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
-      const endOfDay = import_moment_timezone2.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
+      const startOfDay = import_moment_timezone3.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = import_moment_timezone3.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
       query2.$expr = {
         $and: [
           { $gte: [{ $toDate: "$checkIn.timestamp" }, startOfDay] },
@@ -42136,7 +42127,7 @@ function useAttendanceRepository() {
       query2.$expr = {
         $gte: [
           { $toDate: "$checkIn.timestamp" },
-          import_moment_timezone2.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+          import_moment_timezone3.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
         ]
       };
       cacheOptions.startDate = normalizedStartDate;
@@ -42144,7 +42135,7 @@ function useAttendanceRepository() {
       query2.$expr = {
         $lte: [
           { $toDate: "$checkIn.timestamp" },
-          import_moment_timezone2.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+          import_moment_timezone3.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
         ]
       };
       cacheOptions.endDate = normalizedEndDate;
@@ -42257,11 +42248,11 @@ function useAttendanceRepository() {
       cacheOptions.search = search;
     }
     const singaporeTz = "Asia/Singapore";
-    const normalizedStartDate = typeof startDate === "string" ? startDate : (0, import_moment_timezone2.default)(startDate).tz(singaporeTz).format("YYYY-MM-DD");
-    const normalizedEndDate = typeof endDate === "string" ? endDate : (0, import_moment_timezone2.default)(endDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedStartDate = typeof startDate === "string" ? startDate : (0, import_moment_timezone3.default)(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : (0, import_moment_timezone3.default)(endDate).tz(singaporeTz).format("YYYY-MM-DD");
     if (startDate && endDate) {
-      const startOfDay = import_moment_timezone2.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
-      const endOfDay = import_moment_timezone2.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
+      const startOfDay = import_moment_timezone3.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = import_moment_timezone3.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
       query2.$expr = {
         $and: [
           { $gte: [{ $toDate: "$checkIn.timestamp" }, startOfDay] },
@@ -42274,7 +42265,7 @@ function useAttendanceRepository() {
       query2.$expr = {
         $gte: [
           { $toDate: "$checkIn.timestamp" },
-          import_moment_timezone2.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+          import_moment_timezone3.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
         ]
       };
       cacheOptions.startDate = normalizedStartDate;
@@ -42282,7 +42273,7 @@ function useAttendanceRepository() {
       query2.$expr = {
         $lte: [
           { $toDate: "$checkIn.timestamp" },
-          import_moment_timezone2.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+          import_moment_timezone3.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
         ]
       };
       cacheOptions.endDate = normalizedEndDate;
@@ -52150,7 +52141,7 @@ function useVisitorTransactionService() {
 
 // src/controllers/visitor-transaction.controller.ts
 var import_joi67 = __toESM(require("joi"));
-var import_moment_timezone3 = __toESM(require("moment-timezone"));
+var import_moment_timezone4 = __toESM(require("moment-timezone"));
 var import_mongodb88 = require("mongodb");
 var import_node_server_utils137 = require("@7365admin1/node-server-utils");
 
@@ -56226,7 +56217,7 @@ async function sendSelfServicePassEmail(record, occasion, remarks) {
   if (!to)
     return;
   const previewLink = `${APP_PROPERTY_MANAGEMENT}/public-view/visitor-onboarding/pass/${String(record._id ?? "")}`;
-  const arrivalDate = record.expectedCheckIn ? (0, import_moment_timezone3.default)(record.expectedCheckIn).format("DD/MM/YYYY") : "N/A";
+  const arrivalDate = record.expectedCheckIn ? (0, import_moment_timezone4.default)(record.expectedCheckIn).format("DD/MM/YYYY") : "N/A";
   const html = occasion === "rejected" ? compile_handlebars_default({
     handlebar: "self-service-visitor-rejected",
     context: {
@@ -77175,7 +77166,7 @@ var import_mongodb147 = require("mongodb");
 var import_moment = __toESM(require("moment"));
 
 // src/utils/dashboard-metrics.util.ts
-var import_moment_timezone4 = __toESM(require("moment-timezone"));
+var import_moment_timezone5 = __toESM(require("moment-timezone"));
 var DASHBOARD_TIMEZONE = "Asia/Singapore";
 var PERIOD_UNITS = {
   thisWeek: { boundary: "isoWeek", step: "week" },
@@ -77186,7 +77177,7 @@ function unitsOf(period) {
   return PERIOD_UNITS[period] ?? DAY_UNIT;
 }
 function at(now) {
-  return now === void 0 || now === null ? import_moment_timezone4.default.tz(DASHBOARD_TIMEZONE) : import_moment_timezone4.default.tz(now, DASHBOARD_TIMEZONE);
+  return now === void 0 || now === null ? import_moment_timezone5.default.tz(DASHBOARD_TIMEZONE) : import_moment_timezone5.default.tz(now, DASHBOARD_TIMEZONE);
 }
 function getPeriodRange(period, now) {
   const { boundary } = unitsOf(period);
@@ -78920,7 +78911,7 @@ var import_node_server_utils238 = require("@7365admin1/node-server-utils");
 
 // src/utils/hrmlabs-attendance.util.ts
 var import_axios3 = __toESM(require("axios"));
-var import_moment_timezone5 = __toESM(require("moment-timezone"));
+var import_moment_timezone6 = __toESM(require("moment-timezone"));
 var default_early_checkIn = 4;
 async function hrmLabsAuthentication({
   authUrl,
@@ -78992,13 +78983,13 @@ function filterByShiftTime(attendance, shiftData, timezone, format2) {
   return attendance.filter((item) => {
     if (!item.checkIn)
       return false;
-    const checkInLocal = (0, import_moment_timezone5.default)(item.checkIn, format2);
+    const checkInLocal = (0, import_moment_timezone6.default)(item.checkIn, format2);
     if (!checkInLocal.isValid())
       return false;
     const [startHour, startMinute] = shiftData.checkIn.split(":").map(Number);
     const [endHour, endMinute] = shiftData.checkOut.split(":").map(Number);
-    const shiftStart = (0, import_moment_timezone5.default)(checkInLocal).set({ hour: startHour, minute: startMinute, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-    const shiftEnd = (0, import_moment_timezone5.default)(checkInLocal).set({
+    const shiftStart = (0, import_moment_timezone6.default)(checkInLocal).set({ hour: startHour, minute: startMinute, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+    const shiftEnd = (0, import_moment_timezone6.default)(checkInLocal).set({
       hour: endHour,
       minute: endMinute,
       second: 0,
@@ -79090,18 +79081,18 @@ function totalCountPerShift(attendance, shiftData, timezone, format2) {
     data = uniqueAttendanceData.filter((item) => {
       if (!item.checkIn)
         return false;
-      const checkInLocal = (0, import_moment_timezone5.default)(item.checkIn, format2);
+      const checkInLocal = (0, import_moment_timezone6.default)(item.checkIn, format2);
       if (!checkInLocal.isValid())
         return false;
       const [startHour, startMinute] = shift.checkIn.split(":").map(Number);
       const [endHour, endMinute] = shift.checkOut.split(":").map(Number);
-      const shiftStart = (0, import_moment_timezone5.default)(checkInLocal).set({
+      const shiftStart = (0, import_moment_timezone6.default)(checkInLocal).set({
         hour: startHour,
         minute: startMinute,
         second: 0,
         millisecond: 0
       }).subtract(default_early_checkIn, "hour");
-      const shiftEnd = (0, import_moment_timezone5.default)(checkInLocal).set({
+      const shiftEnd = (0, import_moment_timezone6.default)(checkInLocal).set({
         hour: endHour,
         minute: endMinute,
         second: 0,
@@ -79131,11 +79122,11 @@ function filterByStatus(attendance, shiftData, timezone, format2, status) {
   return attendance.filter((item) => {
     if (!item.checkIn)
       return false;
-    const checkInLocal = (0, import_moment_timezone5.default)(item.checkIn, format2);
+    const checkInLocal = (0, import_moment_timezone6.default)(item.checkIn, format2);
     if (!checkInLocal.isValid())
       return false;
     const [lateHour, lateMinute] = shiftData.lateCheckInAlert.split(":").map(Number);
-    const lateLoginTime = (0, import_moment_timezone5.default)(checkInLocal).set({
+    const lateLoginTime = (0, import_moment_timezone6.default)(checkInLocal).set({
       hour: lateHour,
       minute: lateMinute,
       second: 0,
@@ -79207,14 +79198,14 @@ async function totalCountPerStatus(attendance, shiftName, shiftData, timezone, f
       } = item;
       if (!checkInStr || seenGlobal.has(identificationNumber))
         continue;
-      const checkIn = (0, import_moment_timezone5.default)(checkInStr, format2);
-      const checkOut = checkOutStr ? (0, import_moment_timezone5.default)(checkOutStr, format2) : null;
-      const checkOutChecker = checkOut ? (0, import_moment_timezone5.default)(checkOutStr, format2) : checkIn;
+      const checkIn = (0, import_moment_timezone6.default)(checkInStr, format2);
+      const checkOut = checkOutStr ? (0, import_moment_timezone6.default)(checkOutStr, format2) : null;
+      const checkOutChecker = checkOut ? (0, import_moment_timezone6.default)(checkOutStr, format2) : checkIn;
       if (!checkIn.isValid())
         continue;
-      const shiftStart = (0, import_moment_timezone5.default)(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
-      const shiftEnd = (0, import_moment_timezone5.default)(checkOutChecker).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-      const lateCheckIn = (0, import_moment_timezone5.default)(checkIn).set({
+      const shiftStart = (0, import_moment_timezone6.default)(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
+      const shiftEnd = (0, import_moment_timezone6.default)(checkOutChecker).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+      const lateCheckIn = (0, import_moment_timezone6.default)(checkIn).set({
         ...lateTime,
         second: 59,
         millisecond: 59
@@ -79252,8 +79243,8 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
     const [hour, minute] = timeStr.split(":").map(Number);
     return { hour, minute };
   };
-  const startDate = (0, import_moment_timezone5.default)(startDateStr, "DD-MM-YYYY");
-  const endDate = (0, import_moment_timezone5.default)(endDateStr, "DD-MM-YYYY");
+  const startDate = (0, import_moment_timezone6.default)(startDateStr, "DD-MM-YYYY");
+  const endDate = (0, import_moment_timezone6.default)(endDateStr, "DD-MM-YYYY");
   const daysInRange = [];
   for (let day = startDate.clone(); day.isSameOrBefore(endDate); day.add(1, "day")) {
     daysInRange.push(day.format("DD-MM-YYYY"));
@@ -79324,7 +79315,7 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
           } = item;
           if (!checkInStr)
             continue;
-          const checkIn = (0, import_moment_timezone5.default)(checkInStr, format2);
+          const checkIn = (0, import_moment_timezone6.default)(checkInStr, format2);
           if (!checkIn.isValid())
             continue;
           const dayKey = `${identificationNumber}-${checkIn.format(
@@ -79333,10 +79324,10 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
           if (seenPerDay.has(dayKey))
             continue;
           seenPerDay.add(dayKey);
-          const checkOut = checkOutStr ? (0, import_moment_timezone5.default)(checkOutStr, format2) : checkIn;
-          const shiftStart = (0, import_moment_timezone5.default)(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
-          const shiftEnd = (0, import_moment_timezone5.default)(checkOut).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-          const lateCheckIn = (0, import_moment_timezone5.default)(checkIn).set({
+          const checkOut = checkOutStr ? (0, import_moment_timezone6.default)(checkOutStr, format2) : checkIn;
+          const shiftStart = (0, import_moment_timezone6.default)(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
+          const shiftEnd = (0, import_moment_timezone6.default)(checkOut).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+          const lateCheckIn = (0, import_moment_timezone6.default)(checkIn).set({
             ...lateTime,
             second: 59,
             millisecond: 59
@@ -79639,7 +79630,7 @@ var MManpowerRemarks = class {
 
 // src/repositories/manpower-remarks.repo.ts
 var import_mongodb151 = require("mongodb");
-var import_moment_timezone6 = __toESM(require("moment-timezone"));
+var import_moment_timezone7 = __toESM(require("moment-timezone"));
 function useManpowerRemarksRepo() {
   const db2 = import_node_server_utils239.useAtlas.getDb();
   if (!db2) {
@@ -79693,7 +79684,7 @@ function useManpowerRemarksRepo() {
       page = page ? page - 1 : 0;
       limit = limit || 10;
       const searchQuery = {};
-      const nowSGT = (0, import_moment_timezone6.default)().tz("Asia/Singapore");
+      const nowSGT = (0, import_moment_timezone7.default)().tz("Asia/Singapore");
       searchQuery.serviceProviderId = new import_mongodb151.ObjectId(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
@@ -79805,7 +79796,7 @@ function useManpowerRemarksRepo() {
 }
 
 // src/services/manpower-monitoring.service.ts
-var import_moment_timezone7 = __toESM(require("moment-timezone"));
+var import_moment_timezone8 = __toESM(require("moment-timezone"));
 function useManpowerMonitoringSrvc() {
   const {
     createManpowerMonitoringSettings: _createManpowerMonitoringSettings
@@ -79823,10 +79814,10 @@ function useManpowerMonitoringSrvc() {
     const morningAlertFrequencyMins = payload?.shifts?.[payload.shiftType][0]?.alertFrequencyMins;
     const afternoonAlertFrequencyMins = payload.shiftType == "3-shifts" ? payload?.shifts?.[payload.shiftType][1]?.alertFrequencyMins : null;
     const nightAlertFrequencyMins = payload.shiftType == "3-shifts" ? payload?.shifts?.[payload.shiftType][2]?.alertFrequencyMins : payload?.shifts?.[payload.shiftType][1]?.alertFrequencyMins;
-    const morningAlertTime = import_moment_timezone7.default.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
-    const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone7.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
-    const nightAlertTime = import_moment_timezone7.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
-    const nowSGT = (0, import_moment_timezone7.default)().tz("Asia/Singapore");
+    const morningAlertTime = import_moment_timezone8.default.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
+    const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone8.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
+    const nightAlertTime = import_moment_timezone8.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
+    const nowSGT = (0, import_moment_timezone8.default)().tz("Asia/Singapore");
     try {
       const remarksPayload = {
         siteId: payload.siteId,
@@ -82198,7 +82189,7 @@ function useManpowerSitesCtrl() {
 // src/utils/cron.util.ts
 var import_node_server_utils256 = require("@7365admin1/node-server-utils");
 var import_mongodb156 = require("mongodb");
-var import_moment_timezone8 = __toESM(require("moment-timezone"));
+var import_moment_timezone9 = __toESM(require("moment-timezone"));
 var createManpowerRemarksDaily = async () => {
   const db2 = import_node_server_utils256.useAtlas.getDb();
   if (!db2) {
@@ -82209,9 +82200,9 @@ var createManpowerRemarksDaily = async () => {
   const remarks = db2.collection("manpower-remarks");
   const serviceProviders = db2.collection("site.service-providers");
   const items = [];
-  const yesterday = (0, import_moment_timezone8.default)().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
+  const yesterday = (0, import_moment_timezone9.default)().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
   try {
-    const nowSGT = (0, import_moment_timezone8.default)().tz("Asia/Singapore");
+    const nowSGT = (0, import_moment_timezone9.default)().tz("Asia/Singapore");
     const servideProvider = await serviceProviders.findOne({
       name: { $regex: process.env.HRMLABS_DOMAIN, $options: "i" }
     });
@@ -82249,9 +82240,9 @@ var createManpowerRemarksDaily = async () => {
         const morningAlertFrequencyMins = setting?.shifts?.[shiftType][0]?.alertFrequencyMins;
         const afternoonAlertFrequencyMins = shiftType == "3-shifts" ? setting?.shifts?.[shiftType][1]?.alertFrequencyMins : null;
         const nightAlertFrequencyMins = shiftType == "3-shifts" ? setting?.shifts?.[shiftType][2]?.alertFrequencyMins : setting?.shifts?.[shiftType][1]?.alertFrequencyMins;
-        const morningAlertTime = import_moment_timezone8.default.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
-        const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone8.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
-        const nightAlertTime = import_moment_timezone8.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
+        const morningAlertTime = import_moment_timezone9.default.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
+        const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone9.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
+        const nightAlertTime = import_moment_timezone9.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
         const remark2 = {
           siteId: site.siteId,
           siteName: site.siteName,
@@ -82308,14 +82299,14 @@ var createManpowerRemarksDaily = async () => {
 };
 var updateRemarksisAcknowledged = async () => {
   const { getAttendanceDataCount: _getAttendanceDataCount } = useHrmLabsAttendanceSrvc();
-  const nowSGT = (0, import_moment_timezone8.default)().tz("Asia/Singapore").format("DD-MM-YYYY");
+  const nowSGT = (0, import_moment_timezone9.default)().tz("Asia/Singapore").format("DD-MM-YYYY");
   const db2 = import_node_server_utils256.useAtlas.getDb();
   if (!db2) {
     throw new Error("Unable to connect to server.");
   }
   const namespace_collection = "manpower-remarks";
   const remarks = db2.collection(namespace_collection);
-  const timeNow = (0, import_moment_timezone8.default)().tz("Asia/Singapore").format("HH:mm");
+  const timeNow = (0, import_moment_timezone9.default)().tz("Asia/Singapore").format("HH:mm");
   const settings = db2.collection("manpower-settings");
   try {
     const matchingDocs = await remarks.find({
@@ -82443,9 +82434,9 @@ var updateRemarksStatusEod = async () => {
   }
   const remarks = db2.collection("manpower-remarks");
   const settings = db2.collection("manpower-settings");
-  const nowSGT = (0, import_moment_timezone8.default)().tz("Asia/Singapore").format("DD-MM-YYYY");
-  const yesterdaySGT = (0, import_moment_timezone8.default)().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
-  const timeNow = (0, import_moment_timezone8.default)().tz("Asia/Singapore").format("HH:mm");
+  const nowSGT = (0, import_moment_timezone9.default)().tz("Asia/Singapore").format("DD-MM-YYYY");
+  const yesterdaySGT = (0, import_moment_timezone9.default)().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
+  const timeNow = (0, import_moment_timezone9.default)().tz("Asia/Singapore").format("HH:mm");
   const docs = await remarks.find({
     $or: [
       // Morning & Afternoon from today
@@ -82581,7 +82572,7 @@ var isWithinHour = (alertTime, timeNow) => {
 // src/events/manpower.event.ts
 var import_node_server_utils257 = require("@7365admin1/node-server-utils");
 var import_mongodb157 = require("mongodb");
-var import_moment_timezone9 = __toESM(require("moment-timezone"));
+var import_moment_timezone10 = __toESM(require("moment-timezone"));
 async function manpowerEvents(io) {
   let intervalId = null;
   let activeConnections = 0;
@@ -82593,9 +82584,9 @@ async function manpowerEvents(io) {
     }
     const remarks = db2.collection("manpower-remarks");
     const settings = db2.collection("manpower-settings");
-    const selectedDateMoment = import_moment_timezone9.default.tz(date, "DD-MM-YYYY", "Asia/Singapore");
+    const selectedDateMoment = import_moment_timezone10.default.tz(date, "DD-MM-YYYY", "Asia/Singapore");
     const selectedDateSGT = selectedDateMoment.format("DD-MM-YYYY");
-    const currentSGT = (0, import_moment_timezone9.default)().tz("Asia/Singapore");
+    const currentSGT = (0, import_moment_timezone10.default)().tz("Asia/Singapore");
     const docs = await remarks.find({
       createdAtSGT: selectedDateSGT,
       $or: [
@@ -82617,7 +82608,7 @@ async function manpowerEvents(io) {
       }
       if (currentSGT.isSame(selectedDateMoment, "day")) {
         if (currentSGT.isSameOrAfter(
-          import_moment_timezone9.default.tz("19:55", "HH:mm", "Asia/Singapore")
+          import_moment_timezone10.default.tz("19:55", "HH:mm", "Asia/Singapore")
         )) {
           shiftsToCheck.push({ index: 2, key: "nightShift" });
         }