@7365admin1/core 3.32.2-staging.33 → 3.32.2-staging.35

package/dist/index.d.ts

@@ -2627,8 +2627,8 @@ type TGetAttendancesQuery = {
     page?: number;
     limit?: number;
     search?: string;
-    startDate?: string;
-    endDate?: string;
+    startDate?: string | Date;
+    endDate?: string | Date;
 } & Pick<TAttendance, "site" | "serviceType">;
 type TGetAttendancesByUserQuery = Pick<TGetAttendancesQuery, "page" | "limit" | "search" | "site" | "serviceType" | "startDate" | "endDate"> & Pick<TAttendance, "user">;
 declare const attendanceSchema: Joi.ObjectSchema<any>;

package/dist/index.js

@@ -25328,9 +25328,9 @@ function usePersonRepo() {
           { email: { $regex: search, $options: "i" } },
           { nric: { $regex: search, $options: "i" } },
           { "plates.plateNumber": { $regex: search, $options: "i" } },
-          { contact: { $regex: makeContainsRegex(contact) } },
-          { contacts: { $regex: makeContainsRegex(contact) } },
-          { plateNumbers: { $regex: makeContainsRegex(plateNumber) } }
+          { contact: { $regex: makeContainsRegex(search) } },
+          { contacts: { $regex: makeContainsRegex(search) } },
+          { plateNumbers: { $regex: makeContainsRegex(search) } }
         ]
       },
       ...import_mongodb45.ObjectId.isValid(org) && { org: new import_mongodb45.ObjectId(org) },
@@ -33099,7 +33099,7 @@ function MAttendance(value) {
 
 // src/repositories/attendance.repository.ts
 var import_mongodb60 = require("mongodb");
-var import_moment = __toESM(require("moment"));
+var import_moment_timezone2 = __toESM(require("moment-timezone"));
 var import_node_server_utils103 = require("@7365admin1/node-server-utils");
 function useAttendanceRepository() {
   const db = import_node_server_utils103.useAtlas.getDb();
@@ -33269,11 +33269,11 @@ function useAttendanceRepository() {
       cacheOptions.search = search;
     }
     const singaporeTz = "Asia/Singapore";
-    const normalizedStartDate = typeof startDate === "string" ? startDate : (0, import_moment.default)(startDate).tz(singaporeTz).format("YYYY-MM-DD");
-    const normalizedEndDate = typeof endDate === "string" ? endDate : (0, import_moment.default)(endDate).tz(singaporeTz).format("YYYY-MM-DD");
+    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");
     if (startDate && endDate) {
-      const startOfDay = import_moment.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
-      const endOfDay = import_moment.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
+      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();
       query.$expr = {
         $and: [
           { $gte: [{ $toDate: "$checkIn.timestamp" }, startOfDay] },
@@ -33286,7 +33286,7 @@ function useAttendanceRepository() {
       query.$expr = {
         $gte: [
           { $toDate: "$checkIn.timestamp" },
-          import_moment.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+          import_moment_timezone2.default.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
         ]
       };
       cacheOptions.startDate = normalizedStartDate;
@@ -33294,7 +33294,7 @@ function useAttendanceRepository() {
       query.$expr = {
         $lte: [
           { $toDate: "$checkIn.timestamp" },
-          import_moment.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+          import_moment_timezone2.default.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
         ]
       };
       cacheOptions.endDate = normalizedEndDate;
@@ -35702,7 +35702,7 @@ function useVisitorTransactionService() {
         value.unitName = unit?.name;
       }
       const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
-      if (/^(guest|walk-in|contractor|delivery)$/.test(type)) {
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && site) {
         await addUpdateFromVisitor({
           nric,
           name,
@@ -35933,7 +35933,7 @@ function useVisitorTransactionService() {
         value.checkIn = isNaN(parsed.getTime()) ? null : parsed;
       }
       const { nric = "", name = "", contact = "", plateNumber = "", email = "", site = "", type = "guest", company, createdBy } = value;
-      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && !value.checkOut) {
+      if (/^(guest|walk-in|contractor|delivery)$/.test(type) && site) {
         await addUpdateFromVisitor({
           nric,
           name,
@@ -36117,7 +36117,9 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              void 0,
+              true
             );
             item.receivedDate = /* @__PURE__ */ new Date();
             item.status = "Not Returned" /* NOT_RETURNED */;
@@ -36166,7 +36168,9 @@ function useVisitorTransactionService() {
               value.site,
               session,
               void 0,
-              id
+              id,
+              void 0,
+              true
             );
             item.receivedDate = /* @__PURE__ */ new Date();
             item.status = "Not Returned" /* NOT_RETURNED */;
@@ -59142,7 +59146,7 @@ function useNfcPatrolLogController() {
 // src/repositories/new-dashboard.repo.ts
 var import_node_server_utils201 = require("@7365admin1/node-server-utils");
 var import_mongodb122 = require("mongodb");
-var import_moment2 = __toESM(require("moment"));
+var import_moment = __toESM(require("moment"));
 var Period = /* @__PURE__ */ ((Period2) => {
   Period2["TODAY"] = "today";
   Period2["THIS_WEEK"] = "thisWeek";
@@ -59179,7 +59183,7 @@ function useNewDashboardRepo() {
       const dateWithoutTimezone = date.replace(/\s*\+\d{2}:\d{2}$/, "");
       date = new Date(dateWithoutTimezone);
     }
-    const singaporeMoment = import_moment2.default.tz(date, "Asia/Singapore");
+    const singaporeMoment = import_moment.default.tz(date, "Asia/Singapore");
     singaporeMoment.set({
       hour: 23,
       minute: 59,
@@ -59189,7 +59193,7 @@ function useNewDashboardRepo() {
     return singaporeMoment.toDate();
   }
   function getDateRange(p) {
-    const now = (0, import_moment2.default)().tz("Asia/Singapore");
+    const now = (0, import_moment.default)().tz("Asia/Singapore");
     if (p === "thisWeek" /* THIS_WEEK */) {
       return {
         $gte: now.clone().startOf("isoWeek").toDate(),
@@ -59218,7 +59222,7 @@ function useNewDashboardRepo() {
         return getDateRange("today" /* TODAY */);
     }
   }
-  function getSiteDayRange(date = import_moment2.default.tz("Asia/Singapore")) {
+  function getSiteDayRange(date = import_moment.default.tz("Asia/Singapore")) {
     return {
       $gte: date.clone().startOf("day").toDate(),
       $lte: date.clone().endOf("day").toDate()
@@ -59523,8 +59527,8 @@ function useNewDashboardRepo() {
       activePatrolLogs.map(async (log) => {
         const person = await getPatrolLogPerson(log);
         const status = getPatrolLogStatus(log);
-        const logTime = (0, import_moment2.default)(log.createdAt).tz("Asia/Singapore").format("HH:mm");
-        const logDate = (0, import_moment2.default)(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
+        const logTime = (0, import_moment.default)(log.createdAt).tz("Asia/Singapore").format("HH:mm");
+        const logDate = (0, import_moment.default)(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
         return {
           id: log._id.toString(),
           title: log.name,
@@ -59575,11 +59579,11 @@ function useNewDashboardRepo() {
   }
   async function getPropertyManagementDashboard(siteId, period = "today" /* TODAY */, type, facility) {
     const siteIdObj = (0, import_node_server_utils201.toObjectId)(siteId);
-    const startOfToday = import_moment2.default.tz("Asia/Singapore").startOf("day").toDate();
-    const endOfToday = import_moment2.default.tz("Asia/Singapore").endOf("day").toDate();
+    const startOfToday = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
+    const endOfToday = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
     const facilityTodayRange = getSiteDayRange();
     const facilityYesterdayRange = getSiteDayRange(
-      import_moment2.default.tz("Asia/Singapore").subtract(1, "day")
+      import_moment.default.tz("Asia/Singapore").subtract(1, "day")
     );
     const facilityTodayStart = facilityTodayRange.$gte;
     const facilityTodayEnd = facilityTodayRange.$lte;
@@ -59591,13 +59595,13 @@ function useNewDashboardRepo() {
     };
     if (period === "thisWeek" /* THIS_WEEK */) {
       facilityPeriodRange = {
-        $gte: import_moment2.default.tz("Asia/Singapore").startOf("isoWeek").toDate(),
-        $lte: import_moment2.default.tz("Asia/Singapore").endOf("isoWeek").toDate()
+        $gte: import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate(),
+        $lte: import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate()
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
       facilityPeriodRange = {
-        $gte: import_moment2.default.tz("Asia/Singapore").startOf("month").toDate(),
-        $lte: import_moment2.default.tz("Asia/Singapore").endOf("month").toDate()
+        $gte: import_moment.default.tz("Asia/Singapore").startOf("month").toDate(),
+        $lte: import_moment.default.tz("Asia/Singapore").endOf("month").toDate()
       };
     }
     const upcomingEvents = await db.collection(events_namespace_collection).find({
@@ -60229,28 +60233,28 @@ function useNewDashboardRepo() {
     let labels = [];
     let getIntervalIndex;
     if (period === "today" /* TODAY */) {
-      rangeStart = import_moment2.default.tz("Asia/Singapore").startOf("day").toDate();
-      rangeEnd = import_moment2.default.tz("Asia/Singapore").endOf("day").toDate();
+      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("day").toDate();
+      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("day").toDate();
       labels = ["12 AM", "4 AM", "8 AM", "12 PM", "4 PM", "8 PM"];
       getIntervalIndex = (date) => {
-        const hour = (0, import_moment2.default)(date).tz("Asia/Singapore").hour();
+        const hour = (0, import_moment.default)(date).tz("Asia/Singapore").hour();
         return Math.floor(hour / 4);
       };
     } else if (period === "thisWeek" /* THIS_WEEK */) {
-      rangeStart = import_moment2.default.tz("Asia/Singapore").startOf("isoWeek").toDate();
-      rangeEnd = import_moment2.default.tz("Asia/Singapore").endOf("isoWeek").toDate();
+      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("isoWeek").toDate();
+      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("isoWeek").toDate();
       labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
       getIntervalIndex = (date) => {
-        const day = (0, import_moment2.default)(date).tz("Asia/Singapore").isoWeekday();
+        const day = (0, import_moment.default)(date).tz("Asia/Singapore").isoWeekday();
         return day - 1;
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
-      rangeStart = import_moment2.default.tz("Asia/Singapore").startOf("month").toDate();
-      rangeEnd = import_moment2.default.tz("Asia/Singapore").endOf("month").toDate();
-      const daysInMonth = import_moment2.default.tz("Asia/Singapore").daysInMonth();
+      rangeStart = import_moment.default.tz("Asia/Singapore").startOf("month").toDate();
+      rangeEnd = import_moment.default.tz("Asia/Singapore").endOf("month").toDate();
+      const daysInMonth = import_moment.default.tz("Asia/Singapore").daysInMonth();
       labels = Array.from({ length: daysInMonth }, (_, i) => String(i + 1));
       getIntervalIndex = (date) => {
-        return (0, import_moment2.default)(date).tz("Asia/Singapore").date() - 1;
+        return (0, import_moment.default)(date).tz("Asia/Singapore").date() - 1;
       };
     } else {
       throw new import_node_server_utils201.BadRequestError("Invalid period.");
@@ -60888,7 +60892,7 @@ var import_node_server_utils203 = require("@7365admin1/node-server-utils");
 
 // src/utils/hrmlabs-attendance.util.ts
 var import_axios2 = __toESM(require("axios"));
-var import_moment_timezone2 = __toESM(require("moment-timezone"));
+var import_moment_timezone3 = __toESM(require("moment-timezone"));
 var default_early_checkIn = 4;
 async function hrmLabsAuthentication({
   authUrl,
@@ -60960,13 +60964,13 @@ function filterByShiftTime(attendance, shiftData, timezone, format2) {
   return attendance.filter((item) => {
     if (!item.checkIn)
       return false;
-    const checkInLocal = (0, import_moment_timezone2.default)(item.checkIn, format2);
+    const checkInLocal = (0, import_moment_timezone3.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_timezone2.default)(checkInLocal).set({ hour: startHour, minute: startMinute, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-    const shiftEnd = (0, import_moment_timezone2.default)(checkInLocal).set({
+    const shiftStart = (0, import_moment_timezone3.default)(checkInLocal).set({ hour: startHour, minute: startMinute, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+    const shiftEnd = (0, import_moment_timezone3.default)(checkInLocal).set({
       hour: endHour,
       minute: endMinute,
       second: 0,
@@ -61058,18 +61062,18 @@ function totalCountPerShift(attendance, shiftData, timezone, format2) {
     data = uniqueAttendanceData.filter((item) => {
       if (!item.checkIn)
         return false;
-      const checkInLocal = (0, import_moment_timezone2.default)(item.checkIn, format2);
+      const checkInLocal = (0, import_moment_timezone3.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_timezone2.default)(checkInLocal).set({
+      const shiftStart = (0, import_moment_timezone3.default)(checkInLocal).set({
         hour: startHour,
         minute: startMinute,
         second: 0,
         millisecond: 0
       }).subtract(default_early_checkIn, "hour");
-      const shiftEnd = (0, import_moment_timezone2.default)(checkInLocal).set({
+      const shiftEnd = (0, import_moment_timezone3.default)(checkInLocal).set({
         hour: endHour,
         minute: endMinute,
         second: 0,
@@ -61099,11 +61103,11 @@ function filterByStatus(attendance, shiftData, timezone, format2, status) {
   return attendance.filter((item) => {
     if (!item.checkIn)
       return false;
-    const checkInLocal = (0, import_moment_timezone2.default)(item.checkIn, format2);
+    const checkInLocal = (0, import_moment_timezone3.default)(item.checkIn, format2);
     if (!checkInLocal.isValid())
       return false;
     const [lateHour, lateMinute] = shiftData.lateCheckInAlert.split(":").map(Number);
-    const lateLoginTime = (0, import_moment_timezone2.default)(checkInLocal).set({
+    const lateLoginTime = (0, import_moment_timezone3.default)(checkInLocal).set({
       hour: lateHour,
       minute: lateMinute,
       second: 0,
@@ -61175,14 +61179,14 @@ async function totalCountPerStatus(attendance, shiftName, shiftData, timezone, f
       } = item;
       if (!checkInStr || seenGlobal.has(identificationNumber))
         continue;
-      const checkIn = (0, import_moment_timezone2.default)(checkInStr, format2);
-      const checkOut = checkOutStr ? (0, import_moment_timezone2.default)(checkOutStr, format2) : null;
-      const checkOutChecker = checkOut ? (0, import_moment_timezone2.default)(checkOutStr, format2) : checkIn;
+      const checkIn = (0, import_moment_timezone3.default)(checkInStr, format2);
+      const checkOut = checkOutStr ? (0, import_moment_timezone3.default)(checkOutStr, format2) : null;
+      const checkOutChecker = checkOut ? (0, import_moment_timezone3.default)(checkOutStr, format2) : checkIn;
       if (!checkIn.isValid())
         continue;
-      const shiftStart = (0, import_moment_timezone2.default)(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
-      const shiftEnd = (0, import_moment_timezone2.default)(checkOutChecker).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-      const lateCheckIn = (0, import_moment_timezone2.default)(checkIn).set({
+      const shiftStart = (0, import_moment_timezone3.default)(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
+      const shiftEnd = (0, import_moment_timezone3.default)(checkOutChecker).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+      const lateCheckIn = (0, import_moment_timezone3.default)(checkIn).set({
         ...lateTime,
         second: 59,
         millisecond: 59
@@ -61220,8 +61224,8 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
     const [hour, minute] = timeStr.split(":").map(Number);
     return { hour, minute };
   };
-  const startDate = (0, import_moment_timezone2.default)(startDateStr, "DD-MM-YYYY");
-  const endDate = (0, import_moment_timezone2.default)(endDateStr, "DD-MM-YYYY");
+  const startDate = (0, import_moment_timezone3.default)(startDateStr, "DD-MM-YYYY");
+  const endDate = (0, import_moment_timezone3.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"));
@@ -61292,7 +61296,7 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
           } = item;
           if (!checkInStr)
             continue;
-          const checkIn = (0, import_moment_timezone2.default)(checkInStr, format2);
+          const checkIn = (0, import_moment_timezone3.default)(checkInStr, format2);
           if (!checkIn.isValid())
             continue;
           const dayKey = `${identificationNumber}-${checkIn.format(
@@ -61301,10 +61305,10 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
           if (seenPerDay.has(dayKey))
             continue;
           seenPerDay.add(dayKey);
-          const checkOut = checkOutStr ? (0, import_moment_timezone2.default)(checkOutStr, format2) : checkIn;
-          const shiftStart = (0, import_moment_timezone2.default)(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
-          const shiftEnd = (0, import_moment_timezone2.default)(checkOut).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-          const lateCheckIn = (0, import_moment_timezone2.default)(checkIn).set({
+          const checkOut = checkOutStr ? (0, import_moment_timezone3.default)(checkOutStr, format2) : checkIn;
+          const shiftStart = (0, import_moment_timezone3.default)(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
+          const shiftEnd = (0, import_moment_timezone3.default)(checkOut).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+          const lateCheckIn = (0, import_moment_timezone3.default)(checkIn).set({
             ...lateTime,
             second: 59,
             millisecond: 59
@@ -61598,7 +61602,7 @@ var MManpowerRemarks = class {
 
 // src/repositories/manpower-remarks.repo.ts
 var import_mongodb126 = require("mongodb");
-var import_moment_timezone3 = __toESM(require("moment-timezone"));
+var import_moment_timezone4 = __toESM(require("moment-timezone"));
 function useManpowerRemarksRepo() {
   const db = import_node_server_utils204.useAtlas.getDb();
   if (!db) {
@@ -61652,7 +61656,7 @@ function useManpowerRemarksRepo() {
       page = page ? page - 1 : 0;
       limit = limit || 10;
       const searchQuery = {};
-      const nowSGT = (0, import_moment_timezone3.default)().tz("Asia/Singapore");
+      const nowSGT = (0, import_moment_timezone4.default)().tz("Asia/Singapore");
       searchQuery.serviceProviderId = new import_mongodb126.ObjectId(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
@@ -61755,7 +61759,7 @@ function useManpowerRemarksRepo() {
 }
 
 // src/services/manpower-monitoring.service.ts
-var import_moment_timezone4 = __toESM(require("moment-timezone"));
+var import_moment_timezone5 = __toESM(require("moment-timezone"));
 function useManpowerMonitoringSrvc() {
   const {
     createManpowerMonitoringSettings: _createManpowerMonitoringSettings
@@ -61773,10 +61777,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_timezone4.default.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
-    const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone4.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
-    const nightAlertTime = import_moment_timezone4.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
-    const nowSGT = (0, import_moment_timezone4.default)().tz("Asia/Singapore");
+    const morningAlertTime = import_moment_timezone5.default.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
+    const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone5.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
+    const nightAlertTime = import_moment_timezone5.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
+    const nowSGT = (0, import_moment_timezone5.default)().tz("Asia/Singapore");
     try {
       const remarksPayload = {
         siteId: payload.siteId,
@@ -64060,7 +64064,7 @@ function useManpowerSitesCtrl() {
 // src/utils/cron.util.ts
 var import_node_server_utils221 = require("@7365admin1/node-server-utils");
 var import_mongodb131 = require("mongodb");
-var import_moment_timezone5 = __toESM(require("moment-timezone"));
+var import_moment_timezone6 = __toESM(require("moment-timezone"));
 var createManpowerRemarksDaily = async () => {
   const db = import_node_server_utils221.useAtlas.getDb();
   if (!db) {
@@ -64071,9 +64075,9 @@ var createManpowerRemarksDaily = async () => {
   const remarks = db.collection("manpower-remarks");
   const serviceProviders = db.collection("site.service-providers");
   const items = [];
-  const yesterday = (0, import_moment_timezone5.default)().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
+  const yesterday = (0, import_moment_timezone6.default)().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
   try {
-    const nowSGT = (0, import_moment_timezone5.default)().tz("Asia/Singapore");
+    const nowSGT = (0, import_moment_timezone6.default)().tz("Asia/Singapore");
     const servideProvider = await serviceProviders.findOne({
       name: { $regex: process.env.HRMLABS_DOMAIN, $options: "i" }
     });
@@ -64111,9 +64115,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_timezone5.default.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
-        const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone5.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
-        const nightAlertTime = import_moment_timezone5.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
+        const morningAlertTime = import_moment_timezone6.default.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
+        const afternoonAlertTime = afternoonCheckInTime ? import_moment_timezone6.default.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
+        const nightAlertTime = import_moment_timezone6.default.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
         const remark2 = {
           siteId: site.siteId,
           siteName: site.siteName,
@@ -64170,14 +64174,14 @@ var createManpowerRemarksDaily = async () => {
 };
 var updateRemarksisAcknowledged = async () => {
   const { getAttendanceDataCount: _getAttendanceDataCount } = useHrmLabsAttendanceSrvc();
-  const nowSGT = (0, import_moment_timezone5.default)().tz("Asia/Singapore").format("DD-MM-YYYY");
+  const nowSGT = (0, import_moment_timezone6.default)().tz("Asia/Singapore").format("DD-MM-YYYY");
   const db = import_node_server_utils221.useAtlas.getDb();
   if (!db) {
     throw new Error("Unable to connect to server.");
   }
   const namespace_collection = "manpower-remarks";
   const remarks = db.collection(namespace_collection);
-  const timeNow = (0, import_moment_timezone5.default)().tz("Asia/Singapore").format("HH:mm");
+  const timeNow = (0, import_moment_timezone6.default)().tz("Asia/Singapore").format("HH:mm");
   const settings = db.collection("manpower-settings");
   try {
     const matchingDocs = await remarks.find({
@@ -64305,9 +64309,9 @@ var updateRemarksStatusEod = async () => {
   }
   const remarks = db.collection("manpower-remarks");
   const settings = db.collection("manpower-settings");
-  const nowSGT = (0, import_moment_timezone5.default)().tz("Asia/Singapore").format("DD-MM-YYYY");
-  const yesterdaySGT = (0, import_moment_timezone5.default)().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
-  const timeNow = (0, import_moment_timezone5.default)().tz("Asia/Singapore").format("HH:mm");
+  const nowSGT = (0, import_moment_timezone6.default)().tz("Asia/Singapore").format("DD-MM-YYYY");
+  const yesterdaySGT = (0, import_moment_timezone6.default)().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
+  const timeNow = (0, import_moment_timezone6.default)().tz("Asia/Singapore").format("HH:mm");
   const docs = await remarks.find({
     $or: [
       // Morning & Afternoon from today
@@ -64443,7 +64447,7 @@ var isWithinHour = (alertTime, timeNow) => {
 // src/events/manpower.event.ts
 var import_node_server_utils222 = require("@7365admin1/node-server-utils");
 var import_mongodb132 = require("mongodb");
-var import_moment_timezone6 = __toESM(require("moment-timezone"));
+var import_moment_timezone7 = __toESM(require("moment-timezone"));
 async function manpowerEvents(io) {
   let intervalId = null;
   let activeConnections = 0;
@@ -64455,9 +64459,9 @@ async function manpowerEvents(io) {
     }
     const remarks = db.collection("manpower-remarks");
     const settings = db.collection("manpower-settings");
-    const selectedDateMoment = import_moment_timezone6.default.tz(date, "DD-MM-YYYY", "Asia/Singapore");
+    const selectedDateMoment = import_moment_timezone7.default.tz(date, "DD-MM-YYYY", "Asia/Singapore");
     const selectedDateSGT = selectedDateMoment.format("DD-MM-YYYY");
-    const currentSGT = (0, import_moment_timezone6.default)().tz("Asia/Singapore");
+    const currentSGT = (0, import_moment_timezone7.default)().tz("Asia/Singapore");
     const docs = await remarks.find({
       createdAtSGT: selectedDateSGT,
       $or: [
@@ -64479,7 +64483,7 @@ async function manpowerEvents(io) {
       }
       if (currentSGT.isSame(selectedDateMoment, "day")) {
         if (currentSGT.isSameOrAfter(
-          import_moment_timezone6.default.tz("19:55", "HH:mm", "Asia/Singapore")
+          import_moment_timezone7.default.tz("19:55", "HH:mm", "Asia/Singapore")
         )) {
           shiftsToCheck.push({ index: 2, key: "nightShift" });
         }