@7365admin1/layer-common 3.1.1 → 3.1.2-staging.30

package/composables/useNFCPatrolMonthlyReport.ts

@@ -2,6 +2,8 @@ import type {
   NFCPatrolReportFilters,
   NFCPatrolSummaryReport,
   NFCPatrolReportSummaryRow,
+  NFCPatrolMonthlyReportRow,
+  NFCPatrolMonthlyReport,
 } from "../types/nfc-patrol-report";
 import useNFCPatrolLog from "./useNFCPatrolLog";
 import useSite from "./useSite";
@@ -12,6 +14,55 @@ interface NFCPatrolLogListResponse {
   pageRange?: string;
 }
 
+const MONTHS = [
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+];
+function mapLogsToMonthlyRows(
+  logs: Record<string, any>[],
+): NFCPatrolMonthlyReportRow[] {
+  const rows = MONTHS.map((month) => ({
+    month,
+    checked: 0,
+    checkedPercentage: 0,
+    missed: 0,
+    missedPercentage: 0,
+  }));
+
+  logs.forEach((log) => {
+    const monthIndex = new Date(log.date).getMonth();
+
+    for (const checkpoint of log.checkPoints ?? []) {
+      if (checkpoint.status === "Completed") {
+        rows[monthIndex].checked++;
+      } else if (checkpoint.status === "Skipped") {
+        rows[monthIndex].missed++;
+      }
+    }
+  });
+
+  rows.forEach((row) => {
+    const total = row.checked + row.missed;
+
+    if (total > 0) {
+      row.checkedPercentage = Math.round((row.checked / total) * 100);
+      row.missedPercentage = Math.round((row.missed / total) * 100);
+    }
+  });
+
+  return rows;
+}
+
 function buildAddress(address?: Record<string, string>) {
   if (!address) return undefined;
 
@@ -27,23 +78,7 @@ function buildAddress(address?: Record<string, string>) {
   return parts.length ? parts.join(", ") : undefined;
 }
 
-function mapLogToSummaryRow(
-  log: Record<string, any>,
-  index: number,
-): NFCPatrolReportSummaryRow {
-  const checkpoints: Record<string, any>[] = log.checkPoints ?? [];
-  const checked = checkpoints.filter((cp) => cp.status === "Completed").length;
-  const missed = checkpoints.filter((cp) => cp.status === "Skipped").length;
 
-  return {
-    id: log._id,
-    routeName: `${index + 1}. ${log.route?.name ?? "-"}`,
-    securityCheckSchedule: log.route?.startTime ?? "-",
-    checked,
-    missed,
-    status: missed === 0 ? "Completed" : "Incomplete",
-  };
-}
 
 export function useNFCPatrolMonthlyReport(
   filters: NFCPatrolReportFilters,
@@ -52,12 +87,12 @@ export function useNFCPatrolMonthlyReport(
   const { getAll: getPatrolLogs } = useNFCPatrolLog();
   const { getSiteById } = useSite();
 
-  const report = ref<NFCPatrolSummaryReport | null>(null);
+  const report = ref<NFCPatrolMonthlyReport | null>(null);
   const loading = ref(false);
   const notFound = ref(false);
 
   async function fetchReport() {
-    if (!site || !filters.date || !filters.route) {
+    if (!site || !filters.route) {
       report.value = null;
       notFound.value = false;
       return;
@@ -65,19 +100,16 @@ export function useNFCPatrolMonthlyReport(
 
     loading.value = true;
     notFound.value = false;
-
+    const currentYear = new Date().getFullYear().toString();
     try {
       const [logsRes, siteInfo] = await Promise.all([
-        getPatrolLogs<NFCPatrolLogListResponse>({
-          page: 1,
-          limit: 100,
-          site,
-          date: filters.date,
-          routeId: filters.route,
-          routeStartTime: filters.timeRange
-            ? filters.timeRange.split(" - ")[0]
-            : undefined,
-          type: "month",
+        getPatrolLogs({
+            page: 1,
+            limit: 100,
+            site,
+            routeId: filters.route,
+            date: currentYear,
+            type: "month",
         }),
         getSiteById(site),
       ]);
@@ -93,7 +125,7 @@ export function useNFCPatrolMonthlyReport(
             address: buildAddress(siteInfo.address),
           },
           title: `Patrol Route Summary: ${routeName}`,
-          rows: logs.map(mapLogToSummaryRow),
+          rows: mapLogsToMonthlyRows(logs),
         };
       } else {
         report.value = null;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.1.1",
+  "version": "3.1.2-staging.30",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/types/customer.d.ts

@@ -41,4 +41,5 @@ type TSiteCategory =
   | "shopping_mall"
   | "mix_development"
   | "industrial"
-  | "co_working_co_living";
+  | "co_working"
+  | "co_living";

package/types/equipment.d.ts

@@ -6,6 +6,10 @@ declare type TEquipment = {
   unitOfMeasurement: string;
   createdAt: string;
   updatedAt: string;
+  attachment?: string;
 };
 
-declare type TEquipmentCreate = Pick<TEquipment, "name" | "unitOfMeasurement">;
+declare type TEquipmentCreate = Pick<
+  TEquipment,
+  "name" | "unitOfMeasurement" | "attachment"
+>;

package/types/nfc-patrol-report.ts

@@ -26,7 +26,7 @@ export interface NFCPatrolReportFilterOptions {
 
 export interface NFCPatrolReportLocation {
   name?: string;
-  address?: string; 
+  address?: string;
 }
 
 export interface NFCPatrolRouteSummary {
@@ -77,3 +77,17 @@ export interface NFCPatrolSummaryReport {
   title: string;
   rows: NFCPatrolReportSummaryRow[];
 }
+
+export interface NFCPatrolMonthlyReportRow {
+  month: string;
+  checked: number;
+  checkedPercentage: number;
+  missed: number;
+  missedPercentage: number;
+}
+
+export interface NFCPatrolMonthlyReport {
+  location: NFCPatrolReportLocation;
+  title: string;
+  rows: NFCPatrolMonthlyReportRow[];
+}