@7365admin1/core 3.34.4-staging.15 → 3.34.4-staging.16

package/dist/index.d.ts

@@ -6181,7 +6181,14 @@ declare function useNewDashboardRepo(): {
             missed: any;
             percentage: number;
         };
-        activePatrolItems: any[];
+        activePatrolItems: {
+            id: string;
+            title: any;
+            subtitle: string;
+            person: any;
+            status: any;
+            time: string;
+        }[];
     }>;
     getPropertyManagementDashboard: (siteId: string, period?: Period, type?: string, facility?: string) => Promise<{
         openWorkOrder: {

package/dist/index.js

@@ -58990,6 +58990,17 @@ function useNewDashboardRepo() {
       $lte: now.clone().endOf("day").toDate()
     };
   }
+  function getActivePatrolDateRange(period) {
+    switch (period) {
+      case "thisWeek" /* THIS_WEEK */:
+        return getDateRange("thisWeek" /* THIS_WEEK */);
+      case "thisMonth" /* THIS_MONTH */:
+        return getDateRange("thisMonth" /* THIS_MONTH */);
+      case "today" /* TODAY */:
+      default:
+        return getDateRange("today" /* TODAY */);
+    }
+  }
   function getSiteDayRange(date = import_moment2.default.tz("Asia/Singapore")) {
     return {
       $gte: date.clone().startOf("day").toDate(),
@@ -59002,6 +59013,33 @@ function useNewDashboardRepo() {
     }
     return Math.round((currentCount - previousCount) / previousCount * 100 * 100) / 100;
   };
+  async function getPatrolLogPerson(log) {
+    if (!log) {
+      return "Unassigned";
+    }
+    if (log.assignee && log.assignee.length > 0) {
+      const userIds = log.assignee.map((id) => (0, import_node_server_utils201.toObjectId)(id));
+      const userDocs = await db.collection("members").find({ _id: { $in: userIds } }).toArray();
+      if (userDocs && userDocs.length > 0) {
+        return userDocs.map((u) => u.name || u.email || "").filter(Boolean).join(", ");
+      }
+    }
+    if (log.createdBy) {
+      const userDoc = await db.collection("members").findOne({
+        _id: (0, import_node_server_utils201.toObjectId)(log.createdBy)
+      });
+      if (userDoc && userDoc.name) {
+        return userDoc.name;
+      }
+    }
+    return "Unassigned";
+  }
+  function getPatrolLogStatus(log, defaultStatus = "completed") {
+    if (!log?.status) {
+      return defaultStatus;
+    }
+    return Array.isArray(log.status) ? log.status.join(", ") : log.status;
+  }
   async function getSecurityDashboard({
     siteId = "",
     period = "today" /* TODAY */,
@@ -59176,11 +59214,11 @@ function useNewDashboardRepo() {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "cameras.status": "Completed" } },
+              { $match: { status: "complete" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "cameras.status": "Skipped" } },
+              { $match: { status: "incomplete" } },
               { $count: "count" }
             ]
           }
@@ -59200,11 +59238,11 @@ function useNewDashboardRepo() {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "cameras.status": "Completed" } },
+              { $match: { status: "complete" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "cameras.status": "Skipped" } },
+              { $match: { status: "incomplete" } },
               { $count: "count" }
             ]
           }
@@ -59224,11 +59262,11 @@ function useNewDashboardRepo() {
           $facet: {
             total: [{ $count: "count" }],
             completed: [
-              { $match: { "cameras.status": "Completed" } },
+              { $match: { status: "complete" } },
               { $count: "count" }
             ],
             skipped: [
-              { $match: { "cameras.status": "Skipped" } },
+              { $match: { status: "incomplete" } },
               { $count: "count" }
             ]
           }
@@ -59259,127 +59297,27 @@ function useNewDashboardRepo() {
     const tTotal = tPatrolFacet.total[0]?.count ?? 0;
     const tCompleted = tPatrolFacet.completed[0]?.count ?? 0;
     const todayCompliance = tTotal > 0 ? tCompleted / tTotal * 100 : 0;
-    let activePatrolItems = [];
-    if (period === "today" /* TODAY */) {
-      const todayString = import_moment2.default.tz("Asia/Singapore").format("YYYY-MM-DD");
-      const dayIndex = import_moment2.default.tz("Asia/Singapore").day();
-      const repeatDay = dayIndex === 0 ? 7 : dayIndex;
-      const routes = await db.collection("patrol.route").find({
-        site: { $in: [siteIdObj, siteId] },
-        repeat: { $in: [repeatDay, String(repeatDay)] },
-        status: { $ne: "deleted" }
-      }).toArray();
-      const expandedRoutes = [];
-      for (const route of routes) {
-        if (route.start) {
-          expandedRoutes.push({
-            route,
-            startTime: route.start,
-            itemIndex: 0
-          });
-        }
-      }
-      expandedRoutes.sort((a, b) => a.startTime.localeCompare(b.startTime));
-      const limitedRoutes = expandedRoutes.slice(0, 4);
-      limitedRoutes.forEach((item, idx) => {
-        item.itemIndex = idx + 1;
-      });
-      activePatrolItems = await Promise.all(
-        limitedRoutes.map(async ({ route, startTime, itemIndex }) => {
-          const log = await db.collection("patrol.logs").findOne({
-            site: { $in: [siteIdObj, siteId] },
-            route: { $in: [route._id, route._id.toString()] },
-            createdAt: { $gte: today, $lte: todayEnd }
-          });
-          let person = "Unassigned";
-          if (log && log.assignee && log.assignee.length > 0) {
-            const userIds = log.assignee.map((id) => (0, import_node_server_utils201.toObjectId)(id));
-            const userDocs = await db.collection("members").find({ _id: { $in: userIds } }).toArray();
-            if (userDocs && userDocs.length > 0) {
-              person = userDocs.map((u) => u.name || u.email || "").filter(Boolean).join(", ");
-            }
-          } else if (log && log.createdBy) {
-            const userDoc = await db.collection("members").findOne({
-              _id: (0, import_node_server_utils201.toObjectId)(log.createdBy)
-            });
-            if (userDoc && userDoc.name) {
-              person = userDoc.name;
-            }
-          }
-          let status = "pending";
-          if (log) {
-            if (log.status) {
-              status = Array.isArray(log.status) ? log.status.join(", ") : log.status;
-            } else {
-              status = "completed";
-            }
-          } else {
-            const routeTime = import_moment2.default.tz(
-              `${todayString} ${startTime}`,
-              "YYYY-MM-DD HH:mm",
-              "Asia/Singapore"
-            );
-            const nowSg = import_moment2.default.tz("Asia/Singapore");
-            const diffMinutes = nowSg.diff(routeTime, "minutes");
-            if (diffMinutes >= 0) {
-              if (diffMinutes <= 120) {
-                status = "on paused";
-              } else {
-                status = "incomplete";
-              }
-            } else {
-              status = "pending";
-            }
-          }
-          return {
-            id: `${route._id.toString()}_${startTime}`,
-            title: route.name,
-            subtitle: `ID${String(itemIndex).padStart(3, "0")}`,
-            person,
-            status,
-            time: startTime
-          };
-        })
-      );
-    } else {
-      const logs = await db.collection("patrol.logs").find({
-        site: { $in: [siteIdObj, siteId] },
-        createdAt: periodRange
-      }).sort({ createdAt: -1 }).limit(4).toArray();
-      activePatrolItems = await Promise.all(
-        logs.map(async (log) => {
-          let person = "Unassigned";
-          if (log.assignee && log.assignee.length > 0) {
-            const userIds = log.assignee.map((id) => (0, import_node_server_utils201.toObjectId)(id));
-            const userDocs = await db.collection("members").find({ _id: { $in: userIds } }).toArray();
-            if (userDocs && userDocs.length > 0) {
-              person = userDocs.map((u) => u.name || u.email || "").filter(Boolean).join(", ");
-            }
-          } else if (log.createdBy) {
-            const userDoc = await db.collection("members").findOne({
-              _id: (0, import_node_server_utils201.toObjectId)(log.createdBy)
-            });
-            if (userDoc && userDoc.name) {
-              person = userDoc.name;
-            }
-          }
-          let status = "completed";
-          if (log.status) {
-            status = Array.isArray(log.status) ? log.status.join(", ") : log.status;
-          }
-          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");
-          return {
-            id: log._id.toString(),
-            title: log.name,
-            subtitle: logDate,
-            person,
-            status,
-            time: logTime
-          };
-        })
-      );
-    }
+    const activePatrolDateRange = getActivePatrolDateRange(period);
+    const activePatrolLogs = await db.collection("patrol.logs").find({
+      site: { $in: [siteIdObj, siteId] },
+      createdAt: activePatrolDateRange
+    }).sort({ createdAt: -1 }).limit(4).toArray();
+    const activePatrolItems = await Promise.all(
+      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");
+        return {
+          id: log._id.toString(),
+          title: log.name,
+          subtitle: logDate,
+          person,
+          status,
+          time: logTime
+        };
+      })
+    );
     const data = {
       openWorkOrder: {
         count: wFacet.total[0]?.count ?? 0,