@7365admin1/layer-common 3.0.24 → 3.0.25

package/composables/useNFCPatrolLog.ts

@@ -0,0 +1,35 @@
+interface NFCPatrolLogQuery {
+  page?: number;
+  limit?: number;
+  site: string;
+  date: string;
+  routeId: string;
+  routeStartTime: string;
+}
+
+export default function useNFCPatrolLog() {
+  function getAll<T = Record<string, any>>({
+    page = 1,
+    limit = 10,
+    site,
+    date,
+    routeId,
+    routeStartTime,
+  }: NFCPatrolLogQuery) {
+    return useNuxtApp().$api<T>("/api/nfc-patrol-log", {
+      method: "GET",
+      query: {
+        page,
+        limit,
+        site,
+        date,
+        "route._id": routeId,
+        "route.startTime": routeStartTime,
+      },
+    });
+  }
+
+  return {
+    getAll,
+  };
+}

package/composables/useNFCPatrolReport.ts

@@ -3,25 +3,58 @@ import type {
   NFCPatrolReport,
   NFCPatrolReportFilters,
 } from "../types/nfc-patrol-report";
-import { useNFCPatrolReportService } from "../services/nfcPatrolReport";
 
-export function useNFCPatrolReport(filters: NFCPatrolReportFilters) {
-  const reportService = useNFCPatrolReportService();
+interface NFCPatrolLogResponse {
+  data?: NFCPatrolLogResponse | NFCPatrolReport;
+  item?: NFCPatrolReport;
+  items?: NFCPatrolReport[];
+  nfcPatrolLog?: NFCPatrolReport;
+}
+
+export function useNFCPatrolReport(
+  filters: NFCPatrolReportFilters,
+  site: string,
+) {
+  const { getAll: getPatrolLogs } = useNFCPatrolLog();
   const report = ref<NFCPatrolReport | null>(null);
   const loading = ref(false);
   const selectedActivityRemarks = ref("");
   const dialogRemarks = ref(false);
 
   async function fetchReport() {
+    if (!site || !filters.date || !filters.route || !filters.timeRange) {
+      report.value = null;
+      return;
+    }
+
     loading.value = true;
 
     try {
-      report.value = await reportService.getPatrolReport(filters);
+      const response = await getPatrolLogs<NFCPatrolLogResponse>({
+        page: 1,
+        limit: 10,
+        site,
+        date: filters.date,
+        routeId: filters.route,
+        routeStartTime: filters.timeRange.split(" - ")[0],
+      });
+
+      report.value = extractReport(response);
     } finally {
       loading.value = false;
     }
   }
 
+  function extractReport(response: NFCPatrolLogResponse): NFCPatrolReport | null {
+    const payload = response.data ?? response;
+
+    if ("location" in payload && "activities" in payload) {
+      return payload;
+    }
+
+    return payload.nfcPatrolLog ?? payload.item ?? payload.items?.[0] ?? null;
+  }
+
   function openRemarksDialog(activity: NFCPatrolActivity) {
     selectedActivityRemarks.value = activity.remarks || "No remarks provided";
     dialogRemarks.value = true;

package/composables/useNFCPatrolReportFilters.ts

@@ -2,14 +2,13 @@ import type {
   NFCPatrolReportFilterOptions,
   NFCPatrolReportFilters,
 } from "../types/nfc-patrol-report";
-import { useNFCPatrolReportService } from "../services/nfcPatrolReport";
 
 export function useNFCPatrolReportFilters(site: string) {
-  const reportService = useNFCPatrolReportService();
+  const { getAll: getPatrolRoutes } = useNFCPatrolRoute();
 
   const filters = reactive<NFCPatrolReportFilters>({
-    route: "WH01 Patrol Route",
-    timeRange: "15:00 - 17:00",
+    route: "",
+    timeRange: "",
     date: "2025-11-27",
   });
 
@@ -24,12 +23,36 @@ export function useNFCPatrolReportFilters(site: string) {
     loading.value = true;
 
     try {
-      options.value = await reportService.getFilterOptions(site);
+      const response = await getPatrolRoutes({ site, page: 1, limit: 100 });
+      const routes = (response.items ?? []).map((route: Record<string, any>) => ({
+        title: route.name,
+        value: route._id,
+        startTimes: route.startTimes ?? [],
+      }));
+
+      options.value.routes = routes;
+
+      if (!routes.some((route) => route.value === filters.route)) {
+        filters.route = routes[0]?.value ?? "";
+      }
+
+      updateStartTimes();
     } finally {
       loading.value = false;
     }
   }
 
+  function updateStartTimes() {
+    const route = options.value.routes.find(({ value }) => value === filters.route);
+    options.value.timeRanges = route?.startTimes ?? [];
+
+    if (!options.value.timeRanges.includes(filters.timeRange)) {
+      filters.timeRange = options.value.timeRanges[0] ?? "";
+    }
+  }
+
+  watch(() => filters.route, updateStartTimes);
+
   return {
     filters,
     options,

package/package.json

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

package/services/nfcPatrolReport.ts

@@ -7,7 +7,11 @@ import type {
 } from "../types/nfc-patrol-report";
 
 const filterOptions: NFCPatrolReportFilterOptions = {
-  routes: ["WH01 Patrol Route", "WH02 Patrol Route", "WH03 Patrol Route"],
+  routes: [
+    { title: "WH01 Patrol Route", value: "WH01 Patrol Route", startTimes: [] },
+    { title: "WH02 Patrol Route", value: "WH02 Patrol Route", startTimes: [] },
+    { title: "WH03 Patrol Route", value: "WH03 Patrol Route", startTimes: [] },
+  ],
   timeRanges: ["15:00 - 17:00", "08:00 - 10:00", "13:00 - 15:00", "18:00 - 20:00"],
 };
 

package/types/nfc-patrol-report.ts

@@ -13,8 +13,14 @@ export interface NFCPatrolReportExportRequest {
   filters: NFCPatrolReportFilters;
 }
 
+export interface NFCPatrolReportRouteOption {
+  title: string;
+  value: string;
+  startTimes: string[];
+}
+
 export interface NFCPatrolReportFilterOptions {
-  routes: string[];
+  routes: NFCPatrolReportRouteOption[];
   timeRanges: string[];
 }
 

package/types/visitor.d.ts

@@ -71,6 +71,7 @@ declare type TVisitorPayload = Pick<
   | "createdBy"
 > & {
   members?: TMemberInfo[];
+  updatedBy?: string;
 };
 
 declare type TDefaultOptionObj = {