@7365admin1/core 3.52.7 → 3.52.8

package/dist/index.mjs

@@ -11606,6 +11606,36 @@ import {
 } from "@7365admin1/node-server-utils";
 import Joi9 from "joi";
 import { ObjectId as ObjectId20 } from "mongodb";
+
+// src/utils/site-timezone.util.ts
+import moment from "moment-timezone";
+var DEFAULT_SITE_TIMEZONE = "Asia/Singapore";
+function isValidTimezone(tz) {
+  return typeof tz === "string" && tz.length > 0 && !!moment.tz.zone(tz);
+}
+function resolveSiteTimezone(site) {
+  const tz = site?.timezone;
+  return isValidTimezone(tz) ? tz : DEFAULT_SITE_TIMEZONE;
+}
+function siteDayBounds(value, timezone) {
+  if (!value)
+    return null;
+  const tz = isValidTimezone(timezone) ? timezone : DEFAULT_SITE_TIMEZONE;
+  const isDateOnly = typeof value === "string" && /^\d{4}-\d{2}-\d{2}$/.test(value);
+  const m = isDateOnly ? moment.tz(value, "YYYY-MM-DD", tz) : typeof value === "string" ? moment.tz(value, moment.ISO_8601, tz) : moment.tz(value, tz);
+  if (!m.isValid())
+    return null;
+  return {
+    start: m.clone().startOf("day").toDate(),
+    end: m.clone().endOf("day").toDate(),
+    date: m.format("YYYY-MM-DD")
+  };
+}
+
+// src/models/site.model.ts
+function siteTimezoneValidator(value, helpers) {
+  return isValidTimezone(value) ? value : helpers.error("any.invalid");
+}
 var addressSchema = Joi9.object({
   line1: Joi9.string().min(3).required(),
   line2: Joi9.string().allow("", null),
@@ -11713,6 +11743,7 @@ var siteSchema = Joi9.object({
   orgId: Joi9.string().hex().required(),
   customerId: Joi9.string().hex().optional().allow("", null),
   address: addressSchema.optional(),
+  timezone: Joi9.string().custom(siteTimezoneValidator, "IANA timezone").optional().default(DEFAULT_SITE_TIMEZONE),
   category: Joi9.string().valid(...Object.values(SiteCategories)).default("commercial" /* COMMERCIAL */),
   deliveryCompanyList: Joi9.array().items(Joi9.string()).optional().allow(null),
   isOpenGate: Joi9.boolean().optional().default(false),
@@ -11723,6 +11754,7 @@ var siteSchema = Joi9.object({
 var updateSiteSchema = Joi9.object({
   _id: Joi9.string().hex().length(24).required(),
   address: updateAddressSchema.optional(),
+  timezone: Joi9.string().custom(siteTimezoneValidator, "IANA timezone").optional(),
   metadata: metadataSchema3.optional(),
   deliveryCompanyList: Joi9.array().items(Joi9.string().trim()).optional().allow(null),
   isOpenGate: Joi9.boolean().optional().allow(null),
@@ -11751,6 +11783,7 @@ function MSite(value) {
     status: "active",
     createdAt: /* @__PURE__ */ new Date(),
     address: value.address,
+    timezone: value.timezone ?? DEFAULT_SITE_TIMEZONE,
     category: value.category,
     deliveryCompanyList: value.deliveryCompanyList ?? [],
     isOpenGate: value.isOpenGate,
@@ -13035,7 +13068,8 @@ function useCustomerSiteRepo() {
     limit = 10,
     sort = {},
     org = "",
-    status = "active"
+    status = "active",
+    siteScope = null
   }, session) {
     page = page > 0 ? page - 1 : 0;
     try {
@@ -13055,6 +13089,11 @@ function useCustomerSiteRepo() {
       page,
       limit
     };
+    if (siteScope) {
+      const scoped = siteScope.filter((id) => ObjectId24.isValid(id));
+      query2.site = { $in: scoped.map((id) => new ObjectId24(id)) };
+      cacheOptions.siteScope = scoped.length ? [...scoped].sort().join(",") : "no-site";
+    }
     if (search) {
       query2.$or = [{ name: { $regex: search, $options: "i" } }];
       cacheOptions.search = search;
@@ -13361,7 +13400,8 @@ var EMPTY = {
   name: "",
   isSuperAdmin: false,
   orgIds: [],
-  propertyManagementOrgIds: []
+  propertyManagementOrgIds: [],
+  memberships: []
 };
 async function resolveInviteActor(userId) {
   const id = userId?.toString() ?? "";
@@ -13388,12 +13428,36 @@ async function resolveInviteActor(userId) {
     )
   );
   const user = await db2.collection("users").findOne({ _id: new ObjectId25(id) }, { projection: { name: 1 } });
+  const memberRoleIds = Array.from(
+    new Set(
+      members.map((m) => m.role?.toString?.() ?? "").filter((r) => r && ObjectId25.isValid(r))
+    )
+  );
+  const orgLevelRoleIds = /* @__PURE__ */ new Set();
+  if (memberRoleIds.length) {
+    const memberRoles = await db2.collection("roles").find(
+      {
+        _id: { $in: memberRoleIds.map((r) => new ObjectId25(r)) },
+        ...LIVE_ROLE
+      },
+      { projection: { site: 1 } }
+    ).toArray();
+    for (const role of memberRoles) {
+      if (!role.site)
+        orgLevelRoleIds.add(role._id.toString());
+    }
+  }
   return {
     id,
     name: user?.name ?? adminMember?.name ?? "",
     isSuperAdmin: isSuperAdmin2,
     orgIds,
-    propertyManagementOrgIds
+    propertyManagementOrgIds,
+    memberships: members.map((m) => ({
+      org: m.org?.toString?.() ?? "",
+      siteId: m.siteId?.toString?.() ?? "",
+      orgLevelRole: orgLevelRoleIds.has(m.role?.toString?.() ?? "")
+    }))
   };
 }
 async function hasOrgInvitation(userId, orgId) {
@@ -19171,6 +19235,11 @@ var schemaVisitorTransaction = Joi21.object({
   ).optional().allow(null),
   unitName: Joi21.string().optional().allow(null, ""),
   expiredAt: Joi21.date().iso().optional().allow(null, ""),
+  // The calendar day this invitation is valid for, in the site's timezone.
+  // Stored as a bare YYYY-MM-DD so no offset conversion can shift the day.
+  arrivalDate: Joi21.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow(null, "").messages({
+    "string.pattern.base": "arrivalDate must be in YYYY-MM-DD format (e.g. 2026-09-02)"
+  }),
   arrivalTime: Joi21.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
     "string.pattern.base": "arrivalTime must be in HH:mm format (e.g. 09:30, 18:45)"
   }),
@@ -19232,6 +19301,11 @@ var schemaSelfServiceVisitor = Joi21.object({
   // value through that schema via MVisitorTransaction(), and Joi.date()
   // would have already coerced it to a Date object by then, failing there.
   expectedCheckIn: Joi21.string().isoDate().required(),
+  // The calendar day this invitation is valid for, in the site's timezone.
+  // Stored as a bare YYYY-MM-DD so no offset conversion can shift the day.
+  arrivalDate: Joi21.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow(null, "").messages({
+    "string.pattern.base": "arrivalDate must be in YYYY-MM-DD format (e.g. 2026-09-02)"
+  }),
   arrivalTime: Joi21.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({ "string.pattern.base": "arrivalTime must be in HH:mm format" }),
   duration: Joi21.number().integer().min(0).optional().allow(null, ""),
   isOvernightParking: Joi21.boolean().optional().default(false),
@@ -19265,6 +19339,13 @@ var schemaSelfServiceVisitor = Joi21.object({
 });
 var schemaUpdateVisTrans = Joi21.object({
   _id: Joi21.string().hex().length(24).required(),
+  // Accepted here so a caller that moves `expectedCheckIn` can move the day
+  // with it. Without this the two drift apart silently and the QR stays valid
+  // on the ORIGINAL day, which is the failure the day-window work exists to
+  // prevent.
+  arrivalDate: Joi21.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow(null, "").messages({
+    "string.pattern.base": "arrivalDate must be in YYYY-MM-DD format (e.g. 2026-09-02)"
+  }),
   name: Joi21.string().optional().allow(null, ""),
   type: Joi21.string().valid(...PERSON_TYPES).optional().allow(null, ""),
   org: Joi21.string().hex().length(24).optional().allow(null, ""),
@@ -19495,6 +19576,7 @@ function MVisitorTransaction(value) {
       remarks: "",
       updatedBy: value.inviterId ?? ""
     } : null,
+    arrivalDate: value.arrivalDate,
     arrivalTime: value.arrivalTime,
     duration: value.duration,
     members: value.members
@@ -19503,7 +19585,7 @@ function MVisitorTransaction(value) {
 
 // src/repositories/visitor-transaction.repo.ts
 import { ObjectId as ObjectId40 } from "mongodb";
-import moment from "moment-timezone";
+import moment2 from "moment-timezone";
 
 // src/utils/compile-handlebars.ts
 var import_handlebars = __toESM(require_lib());
@@ -20334,7 +20416,7 @@ function useVisitorTransactionRepo() {
     const baseUrl = APP_MAIN;
     const qrLink = `${baseUrl}/resident/invite/register/${updatedDocument?._id}`;
     const logo = `${baseUrl}/images/resident/dark/seven-365.svg`;
-    const arrivalDate = updatedDocument?.expectedCheckIn ? moment(updatedDocument.expectedCheckIn).tz("Asia/Singapore").format("DD/MM/YYYY") : "No Arrival Date";
+    const arrivalDate = updatedDocument?.expectedCheckIn ? moment2(updatedDocument.expectedCheckIn).tz("Asia/Singapore").format("DD/MM/YYYY") : "No Arrival Date";
     const isLead = !updatedDocument?.leadId;
     const memberRows = isLead && Array.isArray(updatedDocument?.members) ? updatedDocument.members.map((member, index) => ({
       position: index + 1,
@@ -24161,6 +24243,22 @@ function selectHealthTargets(cameraIds, cap, isValidId) {
     truncated: unique.length > limit
   };
 }
+function orgSiteScope(params) {
+  const org = idOf(params.org);
+  if (!org)
+    return null;
+  const inOrg = params.memberships.filter(
+    (membership) => idOf(membership.org) === org
+  );
+  if (inOrg.some(
+    (membership) => !idOf(membership.siteId) || membership.orgLevelRole === true
+  )) {
+    return null;
+  }
+  return Array.from(
+    new Set(inOrg.map((membership) => idOf(membership.siteId)).filter(Boolean))
+  );
+}
 
 // src/utils/camera-capability.util.ts
 var CAMERA_CAPABILITIES = [
@@ -39635,7 +39733,7 @@ var deleteVehicleRequestSchema = Joi55.object({
 });
 
 // src/utils/vehicle-import.util.ts
-import moment2 from "moment-timezone";
+import moment3 from "moment-timezone";
 var SITE_TIME_ZONE = "Asia/Singapore";
 var DEFAULT_YEARS = 10;
 var CELL_FORMATS = [
@@ -39647,13 +39745,13 @@ var CELL_FORMATS = [
 ];
 function parseExpiryDate(value) {
   if (!value) {
-    return moment2.tz(SITE_TIME_ZONE).add(DEFAULT_YEARS, "years").toISOString();
+    return moment3.tz(SITE_TIME_ZONE).add(DEFAULT_YEARS, "years").toISOString();
   }
-  const wallClock = value instanceof Date ? moment2.utc(value).format("YYYY-MM-DDTHH:mm:ss") : String(value).trim();
+  const wallClock = value instanceof Date ? moment3.utc(value).format("YYYY-MM-DDTHH:mm:ss") : String(value).trim();
   if (!wallClock) {
-    return moment2.tz(SITE_TIME_ZONE).add(DEFAULT_YEARS, "years").toISOString();
+    return moment3.tz(SITE_TIME_ZONE).add(DEFAULT_YEARS, "years").toISOString();
   }
-  const parsed = moment2.tz(wallClock, CELL_FORMATS, SITE_TIME_ZONE);
+  const parsed = moment3.tz(wallClock, CELL_FORMATS, SITE_TIME_ZONE);
   return parsed.isValid() ? parsed.toISOString() : void 0;
 }
 
@@ -41403,13 +41501,16 @@ function useCustomerSiteController() {
     });
     try {
       await requireOrgAccess(req, org);
+      const actor = await resolveInviteActor(callerId(req));
+      const siteScope = actor.isSuperAdmin ? null : orgSiteScope({ memberships: actor.memberships, org });
       const data = await _getAll({
         search,
         page,
         limit,
         sort: sortObj,
         org,
-        status
+        status,
+        siteScope
       });
       res.json(data);
       return;
@@ -41863,7 +41964,7 @@ function MAttendance(value) {
 
 // src/repositories/attendance.repository.ts
 import { ObjectId as ObjectId77 } from "mongodb";
-import moment3 from "moment-timezone";
+import moment4 from "moment-timezone";
 import {
   useAtlas as useAtlas60,
   InternalServerError as InternalServerError38,
@@ -41937,11 +42038,11 @@ function useAttendanceRepository() {
       cacheOptions.search = search;
     }
     const singaporeTz = "Asia/Singapore";
-    const normalizedStartDate = typeof startDate === "string" ? startDate : moment3(startDate).tz(singaporeTz).format("YYYY-MM-DD");
-    const normalizedEndDate = typeof endDate === "string" ? endDate : moment3(endDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedStartDate = typeof startDate === "string" ? startDate : moment4(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : moment4(endDate).tz(singaporeTz).format("YYYY-MM-DD");
     if (startDate && endDate) {
-      const startOfDay = moment3.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
-      const endOfDay = moment3.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
+      const startOfDay = moment4.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = moment4.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
       query2.$expr = {
         $and: [
           { $gte: [{ $toDate: "$checkIn.timestamp" }, startOfDay] },
@@ -41954,7 +42055,7 @@ function useAttendanceRepository() {
       query2.$expr = {
         $gte: [
           { $toDate: "$checkIn.timestamp" },
-          moment3.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+          moment4.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
         ]
       };
       cacheOptions.startDate = normalizedStartDate;
@@ -41962,7 +42063,7 @@ function useAttendanceRepository() {
       query2.$expr = {
         $lte: [
           { $toDate: "$checkIn.timestamp" },
-          moment3.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+          moment4.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
         ]
       };
       cacheOptions.endDate = normalizedEndDate;
@@ -42075,11 +42176,11 @@ function useAttendanceRepository() {
       cacheOptions.search = search;
     }
     const singaporeTz = "Asia/Singapore";
-    const normalizedStartDate = typeof startDate === "string" ? startDate : moment3(startDate).tz(singaporeTz).format("YYYY-MM-DD");
-    const normalizedEndDate = typeof endDate === "string" ? endDate : moment3(endDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedStartDate = typeof startDate === "string" ? startDate : moment4(startDate).tz(singaporeTz).format("YYYY-MM-DD");
+    const normalizedEndDate = typeof endDate === "string" ? endDate : moment4(endDate).tz(singaporeTz).format("YYYY-MM-DD");
     if (startDate && endDate) {
-      const startOfDay = moment3.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
-      const endOfDay = moment3.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
+      const startOfDay = moment4.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate();
+      const endOfDay = moment4.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate();
       query2.$expr = {
         $and: [
           { $gte: [{ $toDate: "$checkIn.timestamp" }, startOfDay] },
@@ -42092,7 +42193,7 @@ function useAttendanceRepository() {
       query2.$expr = {
         $gte: [
           { $toDate: "$checkIn.timestamp" },
-          moment3.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
+          moment4.tz(normalizedStartDate, "YYYY-MM-DD", singaporeTz).startOf("day").toDate()
         ]
       };
       cacheOptions.startDate = normalizedStartDate;
@@ -42100,7 +42201,7 @@ function useAttendanceRepository() {
       query2.$expr = {
         $lte: [
           { $toDate: "$checkIn.timestamp" },
-          moment3.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
+          moment4.tz(normalizedEndDate, "YYYY-MM-DD", singaporeTz).endOf("day").toDate()
         ]
       };
       cacheOptions.endDate = normalizedEndDate;
@@ -51857,6 +51958,16 @@ function useVisitorTransactionService() {
       );
       const isAutoApprovedInvitation = settings?.isAutoApprovedInvitation === true;
       value.checkIn = null;
+      if (!value.arrivalDate && value.expectedCheckIn) {
+        let timezone;
+        try {
+          const site = await _getSiteById(inviter?.site);
+          timezone = resolveSiteTimezone(site);
+        } catch {
+          timezone = resolveSiteTimezone(null);
+        }
+        value.arrivalDate = siteDayBounds(value.expectedCheckIn, timezone)?.date ?? null;
+      }
       const payload = {
         ...value,
         block: inviter?.block?.toString(),
@@ -51917,18 +52028,31 @@ function useVisitorTransactionService() {
     }
     try {
       session.startTransaction();
+      const refId = (value) => {
+        if (!value)
+          return void 0;
+        const id = typeof value === "object" && "_id" in value ? value._id : value;
+        return id ? String(id) : void 0;
+      };
       const memberPayload = {
-        block: lead.block ? String(lead.block) : void 0,
-        level: lead.level ? String(lead.level) : void 0,
-        unit: lead.unit ? String(lead.unit) : void 0,
-        unitName: lead.unitName,
-        org: lead.org ? String(lead.org) : void 0,
-        site: lead.site ? String(lead.site) : void 0,
+        block: refId(lead.block),
+        level: refId(lead.level),
+        unit: refId(lead.unit),
+        // The same $lookup leaves the unit's name on the joined object, which
+        // is the better source when the stored scalar is absent.
+        unitName: lead.unitName ?? lead.unit?.name,
+        org: refId(lead.org),
+        site: refId(lead.site),
         type: lead.type,
         contractorType: lead.contractorType,
         company: lead.company,
         purpose: lead.purpose,
         expectedCheckIn: lead.expectedCheckIn ? new Date(lead.expectedCheckIn).toISOString() : void 0,
+        // Carried so each member's QR is gated on the same calendar day as the
+        // lead's. Without it a member falls back to deriving the day from
+        // `expectedCheckIn`, which is the same answer today but drifts the
+        // moment the lead's day is edited.
+        arrivalDate: lead.arrivalDate,
         arrivalTime: lead.arrivalTime,
         duration: lead.duration,
         isOvernightParking: lead.isOvernightParking,
@@ -52020,7 +52144,7 @@ function useVisitorTransactionService() {
 
 // src/controllers/visitor-transaction.controller.ts
 import Joi67 from "joi";
-import moment4 from "moment-timezone";
+import moment5 from "moment-timezone";
 import { ObjectId as ObjectId88 } from "mongodb";
 import { BadRequestError as BadRequestError123, NotFoundError as NotFoundError36, InternalServerError as InternalServerError44, logger as logger94 } from "@7365admin1/node-server-utils";
 
@@ -52028,6 +52152,15 @@ import { BadRequestError as BadRequestError123, NotFoundError as NotFoundError36
 import Joi66 from "joi";
 var schemaInviteVisitor = Joi66.object({
   expectedCheckIn: Joi66.string().isoDate().required(),
+  // The calendar day the invitation is valid for, as the resident picked it.
+  // A bare YYYY-MM-DD carries no offset, so no conversion between the phone's
+  // zone and the site's can move it onto a neighbouring day - which is exactly
+  // what `expectedCheckIn` alone cannot guarantee. Optional so that already
+  // installed builds, which send only `expectedCheckIn`, keep working; the
+  // server falls back to deriving the day from it in the site's zone.
+  arrivalDate: Joi66.string().pattern(/^\d{4}-\d{2}-\d{2}$/).optional().allow(null, "").messages({
+    "string.pattern.base": "arrivalDate must be in YYYY-MM-DD format (e.g. 2026-09-02)"
+  }),
   arrivalTime: Joi66.string().pattern(/^([01]\d|2[0-3]):([0-5]\d)$/).optional().allow(null, "").messages({
     "string.pattern.base": "arrivalTime must be in HH:mm format (e.g. 09:30, 18:45)"
   }),
@@ -56100,7 +56233,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 ? moment4(record.expectedCheckIn).format("DD/MM/YYYY") : "N/A";
+  const arrivalDate = record.expectedCheckIn ? moment5(record.expectedCheckIn).format("DD/MM/YYYY") : "N/A";
   const html = occasion === "rejected" ? compile_handlebars_default({
     handlebar: "self-service-visitor-rejected",
     context: {
@@ -56648,6 +56781,7 @@ function useVisitorTransactionController() {
     }
     const {
       expectedCheckIn,
+      arrivalDate,
       arrivalTime,
       duration,
       name,
@@ -56665,6 +56799,10 @@ function useVisitorTransactionController() {
     } = value;
     const rest = {
       expectedCheckIn,
+      // Fall back to the day `expectedCheckIn` lands on in the SITE's zone, so
+      // rows written by older builds still carry an explicit day. Resolved in
+      // the invite service, which is where the site id is known.
+      arrivalDate,
       arrivalTime,
       duration,
       name,
@@ -77390,10 +77528,10 @@ import {
   useAtlas as useAtlas116
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId147 } from "mongodb";
-import moment6 from "moment";
+import moment7 from "moment";
 
 // src/utils/dashboard-metrics.util.ts
-import moment5 from "moment-timezone";
+import moment6 from "moment-timezone";
 var DASHBOARD_TIMEZONE = "Asia/Singapore";
 var PERIOD_UNITS = {
   thisWeek: { boundary: "isoWeek", step: "week" },
@@ -77404,7 +77542,7 @@ function unitsOf(period) {
   return PERIOD_UNITS[period] ?? DAY_UNIT;
 }
 function at(now) {
-  return now === void 0 || now === null ? moment5.tz(DASHBOARD_TIMEZONE) : moment5.tz(now, DASHBOARD_TIMEZONE);
+  return now === void 0 || now === null ? moment6.tz(DASHBOARD_TIMEZONE) : moment6.tz(now, DASHBOARD_TIMEZONE);
 }
 function getPeriodRange(period, now) {
   const { boundary } = unitsOf(period);
@@ -77792,8 +77930,8 @@ function useNewDashboardRepo() {
       activePatrolLogs.map(async (log) => {
         const person = await getPatrolLogPerson(log);
         const status = getPatrolLogStatus(log);
-        const logTime = moment6(log.createdAt).tz("Asia/Singapore").format("HH:mm");
-        const logDate = moment6(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
+        const logTime = moment7(log.createdAt).tz("Asia/Singapore").format("HH:mm");
+        const logDate = moment7(log.createdAt).tz("Asia/Singapore").format("DD/MM/YYYY");
         return {
           id: log._id.toString(),
           title: log.name,
@@ -77852,8 +77990,8 @@ function useNewDashboardRepo() {
   }
   async function getPropertyManagementDashboard(siteId, period = "today" /* TODAY */, type, facility) {
     const siteIdObj = toObjectId18(siteId);
-    const startOfToday = moment6.tz("Asia/Singapore").startOf("day").toDate();
-    const endOfToday = moment6.tz("Asia/Singapore").endOf("day").toDate();
+    const startOfToday = moment7.tz("Asia/Singapore").startOf("day").toDate();
+    const endOfToday = moment7.tz("Asia/Singapore").endOf("day").toDate();
     const facilityPeriodRange = getPeriodRange(period);
     const facilityPriorRange = getPreviousPeriodRange(period);
     const facilityCurrentStart = facilityPeriodRange.$gte;
@@ -78479,28 +78617,28 @@ function useNewDashboardRepo() {
     let labels = [];
     let getIntervalIndex;
     if (period === "today" /* TODAY */) {
-      rangeStart = moment6.tz("Asia/Singapore").startOf("day").toDate();
-      rangeEnd = moment6.tz("Asia/Singapore").endOf("day").toDate();
+      rangeStart = moment7.tz("Asia/Singapore").startOf("day").toDate();
+      rangeEnd = moment7.tz("Asia/Singapore").endOf("day").toDate();
       labels = ["12 AM", "4 AM", "8 AM", "12 PM", "4 PM", "8 PM"];
       getIntervalIndex = (date) => {
-        const hour = moment6(date).tz("Asia/Singapore").hour();
+        const hour = moment7(date).tz("Asia/Singapore").hour();
         return Math.floor(hour / 4);
       };
     } else if (period === "thisWeek" /* THIS_WEEK */) {
-      rangeStart = moment6.tz("Asia/Singapore").startOf("isoWeek").toDate();
-      rangeEnd = moment6.tz("Asia/Singapore").endOf("isoWeek").toDate();
+      rangeStart = moment7.tz("Asia/Singapore").startOf("isoWeek").toDate();
+      rangeEnd = moment7.tz("Asia/Singapore").endOf("isoWeek").toDate();
       labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
       getIntervalIndex = (date) => {
-        const day = moment6(date).tz("Asia/Singapore").isoWeekday();
+        const day = moment7(date).tz("Asia/Singapore").isoWeekday();
         return day - 1;
       };
     } else if (period === "thisMonth" /* THIS_MONTH */) {
-      rangeStart = moment6.tz("Asia/Singapore").startOf("month").toDate();
-      rangeEnd = moment6.tz("Asia/Singapore").endOf("month").toDate();
-      const daysInMonth = moment6.tz("Asia/Singapore").daysInMonth();
+      rangeStart = moment7.tz("Asia/Singapore").startOf("month").toDate();
+      rangeEnd = moment7.tz("Asia/Singapore").endOf("month").toDate();
+      const daysInMonth = moment7.tz("Asia/Singapore").daysInMonth();
       labels = Array.from({ length: daysInMonth }, (_, i) => String(i + 1));
       getIntervalIndex = (date) => {
-        return moment6(date).tz("Asia/Singapore").date() - 1;
+        return moment7(date).tz("Asia/Singapore").date() - 1;
       };
     } else {
       throw new BadRequestError208("Invalid period.");
@@ -79144,7 +79282,7 @@ import {
 
 // src/utils/hrmlabs-attendance.util.ts
 import axios3 from "axios";
-import moment7 from "moment-timezone";
+import moment8 from "moment-timezone";
 var default_early_checkIn = 4;
 async function hrmLabsAuthentication({
   authUrl,
@@ -79216,13 +79354,13 @@ function filterByShiftTime(attendance, shiftData, timezone, format2) {
   return attendance.filter((item) => {
     if (!item.checkIn)
       return false;
-    const checkInLocal = moment7(item.checkIn, format2);
+    const checkInLocal = moment8(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 = moment7(checkInLocal).set({ hour: startHour, minute: startMinute, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-    const shiftEnd = moment7(checkInLocal).set({
+    const shiftStart = moment8(checkInLocal).set({ hour: startHour, minute: startMinute, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+    const shiftEnd = moment8(checkInLocal).set({
       hour: endHour,
       minute: endMinute,
       second: 0,
@@ -79314,18 +79452,18 @@ function totalCountPerShift(attendance, shiftData, timezone, format2) {
     data = uniqueAttendanceData.filter((item) => {
       if (!item.checkIn)
         return false;
-      const checkInLocal = moment7(item.checkIn, format2);
+      const checkInLocal = moment8(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 = moment7(checkInLocal).set({
+      const shiftStart = moment8(checkInLocal).set({
         hour: startHour,
         minute: startMinute,
         second: 0,
         millisecond: 0
       }).subtract(default_early_checkIn, "hour");
-      const shiftEnd = moment7(checkInLocal).set({
+      const shiftEnd = moment8(checkInLocal).set({
         hour: endHour,
         minute: endMinute,
         second: 0,
@@ -79355,11 +79493,11 @@ function filterByStatus(attendance, shiftData, timezone, format2, status) {
   return attendance.filter((item) => {
     if (!item.checkIn)
       return false;
-    const checkInLocal = moment7(item.checkIn, format2);
+    const checkInLocal = moment8(item.checkIn, format2);
     if (!checkInLocal.isValid())
       return false;
     const [lateHour, lateMinute] = shiftData.lateCheckInAlert.split(":").map(Number);
-    const lateLoginTime = moment7(checkInLocal).set({
+    const lateLoginTime = moment8(checkInLocal).set({
       hour: lateHour,
       minute: lateMinute,
       second: 0,
@@ -79431,14 +79569,14 @@ async function totalCountPerStatus(attendance, shiftName, shiftData, timezone, f
       } = item;
       if (!checkInStr || seenGlobal.has(identificationNumber))
         continue;
-      const checkIn = moment7(checkInStr, format2);
-      const checkOut = checkOutStr ? moment7(checkOutStr, format2) : null;
-      const checkOutChecker = checkOut ? moment7(checkOutStr, format2) : checkIn;
+      const checkIn = moment8(checkInStr, format2);
+      const checkOut = checkOutStr ? moment8(checkOutStr, format2) : null;
+      const checkOutChecker = checkOut ? moment8(checkOutStr, format2) : checkIn;
       if (!checkIn.isValid())
         continue;
-      const shiftStart = moment7(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
-      const shiftEnd = moment7(checkOutChecker).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-      const lateCheckIn = moment7(checkIn).set({
+      const shiftStart = moment8(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
+      const shiftEnd = moment8(checkOutChecker).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+      const lateCheckIn = moment8(checkIn).set({
         ...lateTime,
         second: 59,
         millisecond: 59
@@ -79476,8 +79614,8 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
     const [hour, minute] = timeStr.split(":").map(Number);
     return { hour, minute };
   };
-  const startDate = moment7(startDateStr, "DD-MM-YYYY");
-  const endDate = moment7(endDateStr, "DD-MM-YYYY");
+  const startDate = moment8(startDateStr, "DD-MM-YYYY");
+  const endDate = moment8(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"));
@@ -79548,7 +79686,7 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
           } = item;
           if (!checkInStr)
             continue;
-          const checkIn = moment7(checkInStr, format2);
+          const checkIn = moment8(checkInStr, format2);
           if (!checkIn.isValid())
             continue;
           const dayKey = `${identificationNumber}-${checkIn.format(
@@ -79557,10 +79695,10 @@ async function chartCountData(attendance, shiftData, timezone, format2, totalShi
           if (seenPerDay.has(dayKey))
             continue;
           seenPerDay.add(dayKey);
-          const checkOut = checkOutStr ? moment7(checkOutStr, format2) : checkIn;
-          const shiftStart = moment7(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
-          const shiftEnd = moment7(checkOut).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
-          const lateCheckIn = moment7(checkIn).set({
+          const checkOut = checkOutStr ? moment8(checkOutStr, format2) : checkIn;
+          const shiftStart = moment8(checkIn).set({ ...shiftStartTime, second: 59, millisecond: 59 }).subtract(default_early_checkIn, "hour");
+          const shiftEnd = moment8(checkOut).set({ ...shiftEndTime, second: 0, millisecond: 0 }).subtract(default_early_checkIn, "hour");
+          const lateCheckIn = moment8(checkIn).set({
             ...lateTime,
             second: 59,
             millisecond: 59
@@ -79873,7 +80011,7 @@ var MManpowerRemarks = class {
 
 // src/repositories/manpower-remarks.repo.ts
 import { ObjectId as ObjectId151 } from "mongodb";
-import moment8 from "moment-timezone";
+import moment9 from "moment-timezone";
 function useManpowerRemarksRepo() {
   const db2 = useAtlas118.getDb();
   if (!db2) {
@@ -79927,7 +80065,7 @@ function useManpowerRemarksRepo() {
       page = page ? page - 1 : 0;
       limit = limit || 10;
       const searchQuery = {};
-      const nowSGT = moment8().tz("Asia/Singapore");
+      const nowSGT = moment9().tz("Asia/Singapore");
       searchQuery.serviceProviderId = new ObjectId151(serviceProviderId);
       if (search != "") {
         searchQuery.siteName = { $regex: search, $options: "i" };
@@ -80039,7 +80177,7 @@ function useManpowerRemarksRepo() {
 }
 
 // src/services/manpower-monitoring.service.ts
-import moment9 from "moment-timezone";
+import moment10 from "moment-timezone";
 function useManpowerMonitoringSrvc() {
   const {
     createManpowerMonitoringSettings: _createManpowerMonitoringSettings
@@ -80057,10 +80195,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 = moment9.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
-    const afternoonAlertTime = afternoonCheckInTime ? moment9.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
-    const nightAlertTime = moment9.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
-    const nowSGT = moment9().tz("Asia/Singapore");
+    const morningAlertTime = moment10.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
+    const afternoonAlertTime = afternoonCheckInTime ? moment10.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
+    const nightAlertTime = moment10.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
+    const nowSGT = moment10().tz("Asia/Singapore");
     try {
       const remarksPayload = {
         siteId: payload.siteId,
@@ -82472,7 +82610,7 @@ import {
   logger as logger192
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId156 } from "mongodb";
-import moment10 from "moment-timezone";
+import moment11 from "moment-timezone";
 var createManpowerRemarksDaily = async () => {
   const db2 = useAtlas126.getDb();
   if (!db2) {
@@ -82483,9 +82621,9 @@ var createManpowerRemarksDaily = async () => {
   const remarks = db2.collection("manpower-remarks");
   const serviceProviders = db2.collection("site.service-providers");
   const items = [];
-  const yesterday = moment10().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
+  const yesterday = moment11().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
   try {
-    const nowSGT = moment10().tz("Asia/Singapore");
+    const nowSGT = moment11().tz("Asia/Singapore");
     const servideProvider = await serviceProviders.findOne({
       name: { $regex: process.env.HRMLABS_DOMAIN, $options: "i" }
     });
@@ -82523,9 +82661,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 = moment10.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
-        const afternoonAlertTime = afternoonCheckInTime ? moment10.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
-        const nightAlertTime = moment10.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
+        const morningAlertTime = moment11.tz(morningCheckInTime, "HH:mm", "Asia/Singapore").add(morningAlertFrequencyMins, "minutes").format("HH:mm");
+        const afternoonAlertTime = afternoonCheckInTime ? moment11.tz(afternoonCheckInTime, "HH:mm", "Asia/Singapore").add(afternoonAlertFrequencyMins, "minutes").format("HH:mm") : "";
+        const nightAlertTime = moment11.tz(nightCheckInTime, "HH:mm", "Asia/Singapore").add(nightAlertFrequencyMins, "minutes").format("HH:mm");
         const remark2 = {
           siteId: site.siteId,
           siteName: site.siteName,
@@ -82582,14 +82720,14 @@ var createManpowerRemarksDaily = async () => {
 };
 var updateRemarksisAcknowledged = async () => {
   const { getAttendanceDataCount: _getAttendanceDataCount } = useHrmLabsAttendanceSrvc();
-  const nowSGT = moment10().tz("Asia/Singapore").format("DD-MM-YYYY");
+  const nowSGT = moment11().tz("Asia/Singapore").format("DD-MM-YYYY");
   const db2 = useAtlas126.getDb();
   if (!db2) {
     throw new Error("Unable to connect to server.");
   }
   const namespace_collection = "manpower-remarks";
   const remarks = db2.collection(namespace_collection);
-  const timeNow = moment10().tz("Asia/Singapore").format("HH:mm");
+  const timeNow = moment11().tz("Asia/Singapore").format("HH:mm");
   const settings = db2.collection("manpower-settings");
   try {
     const matchingDocs = await remarks.find({
@@ -82717,9 +82855,9 @@ var updateRemarksStatusEod = async () => {
   }
   const remarks = db2.collection("manpower-remarks");
   const settings = db2.collection("manpower-settings");
-  const nowSGT = moment10().tz("Asia/Singapore").format("DD-MM-YYYY");
-  const yesterdaySGT = moment10().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
-  const timeNow = moment10().tz("Asia/Singapore").format("HH:mm");
+  const nowSGT = moment11().tz("Asia/Singapore").format("DD-MM-YYYY");
+  const yesterdaySGT = moment11().tz("Asia/Singapore").subtract(1, "days").format("DD-MM-YYYY");
+  const timeNow = moment11().tz("Asia/Singapore").format("HH:mm");
   const docs = await remarks.find({
     $or: [
       // Morning & Afternoon from today
@@ -82855,7 +82993,7 @@ var isWithinHour = (alertTime, timeNow) => {
 // src/events/manpower.event.ts
 import { useAtlas as useAtlas127 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId157 } from "mongodb";
-import moment11 from "moment-timezone";
+import moment12 from "moment-timezone";
 async function manpowerEvents(io) {
   let intervalId = null;
   let activeConnections = 0;
@@ -82867,9 +83005,9 @@ async function manpowerEvents(io) {
     }
     const remarks = db2.collection("manpower-remarks");
     const settings = db2.collection("manpower-settings");
-    const selectedDateMoment = moment11.tz(date, "DD-MM-YYYY", "Asia/Singapore");
+    const selectedDateMoment = moment12.tz(date, "DD-MM-YYYY", "Asia/Singapore");
     const selectedDateSGT = selectedDateMoment.format("DD-MM-YYYY");
-    const currentSGT = moment11().tz("Asia/Singapore");
+    const currentSGT = moment12().tz("Asia/Singapore");
     const docs = await remarks.find({
       createdAtSGT: selectedDateSGT,
       $or: [
@@ -82891,7 +83029,7 @@ async function manpowerEvents(io) {
       }
       if (currentSGT.isSame(selectedDateMoment, "day")) {
         if (currentSGT.isSameOrAfter(
-          moment11.tz("19:55", "HH:mm", "Asia/Singapore")
+          moment12.tz("19:55", "HH:mm", "Asia/Singapore")
         )) {
           shiftsToCheck.push({ index: 2, key: "nightShift" });
         }
@@ -91457,6 +91595,7 @@ export {
   CameraType,
   ConsoleAuditAction,
   ConsoleAuditTarget,
+  DEFAULT_SITE_TIMEZONE,
   DEVICE_STATUS,
   DOBStatus,
   DUPLICATE_TERMS_VERSION_MESSAGE,
@@ -91711,6 +91850,7 @@ export {
   isSafeRelativePath,
   isSuperAdmin,
   isTermsCurrent,
+  isValidTimezone,
   manpowerDesignationsSchema,
   manpowerEvents,
   manpowerMonitoringSchema,
@@ -91730,6 +91870,7 @@ export {
   occurrence_book_namespace_collection,
   online_forms_namespace_collection,
   orgSchema,
+  orgSiteScope,
   overnight_parking_requests_namespace_collection,
   parseCameraChannel,
   parseCameraHost,
@@ -91763,6 +91904,7 @@ export {
   resolveDeviceHttp,
   resolveHidPhysicalCardValue,
   resolveInviteActor,
+  resolveSiteTimezone,
   robotSchema,
   rtspUrl,
   schema,
@@ -91919,6 +92061,7 @@ export {
   sessionSchema,
   setIO,
   shiftSchema,
+  siteDayBounds,
   siteSchema,
   site_people_namespace_collection,
   snapshotEndpoint,