@7365admin1/layer-common 3.0.29 → 3.0.30-staging.2

package/.github/workflows/publish-staging.yml

@@ -0,0 +1,36 @@
+name: Publish Staging
+on:
+  push:
+    branches:
+      - staging
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: "yarn"
+          cache-dependency-path: yarn.lock
+
+      - run: yarn install --immutable
+
+      - run: yarn build
+
+      - name: Create .npmrc for publishing
+        run: |
+          echo '//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}' > ~/.npmrc
+
+      - name: Set staging prerelease version
+        run: |
+          BASE=$(node -p "const [x,y,z]=require('./package.json').version.split('-')[0].split('.'); [x,y,+z+1].join('.')")
+          npm version "$BASE-staging.${{ github.run_number }}" --no-git-tag-version
+          node -p "'Publishing ' + require('./package.json').version"
+
+      - name: Publish to npm with staging tag
+        run: npm publish --tag staging --registry https://registry.npmjs.org

package/components/Nfc/NFCPatrolReportMain.vue

@@ -35,6 +35,7 @@
         <v-window-item value="daily">
           <DailyReportTab
             :active="activeTab === 'daily'"
+            :site="site"
             :filters="filters"
             :options="options"
             @update:filters="updateFilters"
@@ -45,6 +46,7 @@
         <v-window-item value="monthly">
           <MonthlyReportTab
             :active="activeTab === 'monthly'"
+            :site="site"
             :filters="filters"
             :options="options"
             @update:filters="updateFilters"

package/components/Nfc/PatrolReport/DailyReportTab.vue

@@ -16,10 +16,12 @@
     </template>
 
     <ReportEmptyState
-      v-else-if="!loading"
-      title="No Daily Report Selected"
-      message="Please select a route, time range, and date to view the daily report"
+      v-else-if="!loading && notFound"
+      title="No Daily Report"
+      message="No patrol log for this date"
     />
+
+    <ReportEmptyState v-else-if="!loading" />
   </div>
 </template>
 
@@ -36,6 +38,7 @@ import SummaryReportTable from "./SummaryReportTable.vue";
 
 const props = defineProps<{
   active: boolean;
+  site: string; // ✅ thêm
   filters: NFCPatrolReportFilters;
   options: NFCPatrolReportFilterOptions;
 }>();
@@ -45,7 +48,10 @@ defineEmits<{
   export: [];
 }>();
 
-const { report, loading, fetchReport } = useNFCPatrolDailyReport(props.filters);
+const { report, loading, notFound, fetchReport } = useNFCPatrolDailyReport(
+  props.filters,
+  props.site, // ✅
+);
 
 watch(
   () => [props.filters.route, props.filters.timeRange, props.filters.date, props.active],

package/components/Nfc/PatrolReport/MonthlyReportTab.vue

@@ -36,6 +36,7 @@ import SummaryReportTable from "./SummaryReportTable.vue";
 
 const props = defineProps<{
   active: boolean;
+  site: string;
   filters: NFCPatrolReportFilters;
   options: NFCPatrolReportFilterOptions;
 }>();
@@ -45,7 +46,8 @@ defineEmits<{
   export: [];
 }>();
 
-const { report, loading, fetchReport } = useNFCPatrolMonthlyReport(props.filters);
+const { report, loading, fetchReport } =
+  useNFCPatrolMonthlyReport(props.filters, props.site);
 
 watch(
   () => [props.filters.route, props.filters.timeRange, props.filters.date, props.active],

package/components/Nfc/PatrolReport/PatrolReportTab.vue

@@ -22,6 +22,11 @@
       />
     </template>
 
+    <ReportEmptyState
+      v-else-if="!loading && notFound"
+      title="No Patrol Log"
+      message="No patrol log for this date"
+    />
     <ReportEmptyState v-else-if="!loading" />
 
     <RemarksDialog v-model="dialogRemarks" :remarks="selectedActivityRemarks" />
@@ -56,6 +61,7 @@ defineEmits<{
 const {
   report,
   loading,
+  notFound,
   selectedActivityRemarks,
   dialogRemarks,
   fetchReport,

package/components/VisitorManagement.vue

@@ -1615,6 +1615,7 @@ async function handleVisitorDataFromScannedQRCodeCheckInOut(
         type,
         filter: {
           _id: visitorId,
+          site: visitorData.site ?? siteId,
         },
         update: {
           updatedBy: currentUser.value._id,

package/composables/useNFCPatrolDailyReport.ts

@@ -1,19 +1,98 @@
 import type {
   NFCPatrolReportFilters,
   NFCPatrolSummaryReport,
+  NFCPatrolReportSummaryRow,
 } from "../types/nfc-patrol-report";
-import { useNFCPatrolReportService } from "../services/nfcPatrolReport";
+import useNFCPatrolLog from "./useNFCPatrolLog";
+import useSite from "./useSite";
+
+interface NFCPatrolLogListResponse {
+  items?: Record<string, any>[];
+  pages?: number;
+  pageRange?: string;
+}
+
+function buildAddress(address?: Record<string, string>) {
+  if (!address) return undefined;
+  const parts = [
+    address.line1,
+    address.line2,
+    address.city,
+    address.state,
+    address.postalCode,
+    address.country,
+  ].filter((p) => p && p.trim() !== "");
+  return parts.length ? parts.join(", ") : undefined;
+}
+
+function mapLogToSummaryRow(log: Record<string, any>, index: number): NFCPatrolSummaryRow {
+  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 useNFCPatrolDailyReport(
+  filters: NFCPatrolReportFilters,
+  site: string,
+) {
+  const { getAll: getPatrolLogs } = useNFCPatrolLog();
+  const { getSiteById } = useSite();
 
-export function useNFCPatrolDailyReport(filters: NFCPatrolReportFilters) {
-  const reportService = useNFCPatrolReportService();
   const report = ref<NFCPatrolSummaryReport | null>(null);
   const loading = ref(false);
+  const notFound = ref(false);
 
   async function fetchReport() {
+    if (!site || !filters.date || !filters.route) {
+      report.value = null;
+      notFound.value = false;
+      return;
+    }
+
     loading.value = true;
+    notFound.value = false;
 
     try {
-      report.value = await reportService.getDailyReport(filters);
+      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,
+        }),
+        getSiteById(site),
+      ]);
+
+     const logs = logsRes.items ?? [];
+
+      if (logs.length) {
+        const routeName = logs[0]?.route?.name ?? "-";
+
+        report.value = {
+          location: {
+            name: siteInfo.name,
+            address: buildAddress(siteInfo.address),
+          },
+          title: `Patrol Route Summary: ${routeName}`,
+          rows: logs.map(mapLogToSummaryRow),
+        };
+      } else {
+        report.value = null;
+        notFound.value = true;
+      }
     } finally {
       loading.value = false;
     }
@@ -22,6 +101,7 @@ export function useNFCPatrolDailyReport(filters: NFCPatrolReportFilters) {
   return {
     report,
     loading,
+    notFound,
     fetchReport,
   };
 }

package/composables/useNFCPatrolLog.ts

@@ -3,8 +3,9 @@ interface NFCPatrolLogQuery {
   limit?: number;
   site: string;
   date: string;
+  type?: string;
   routeId: string;
-  routeStartTime: string;
+  routeStartTime?: string;
 }
 
 export default function useNFCPatrolLog() {
@@ -13,6 +14,7 @@ export default function useNFCPatrolLog() {
     limit = 10,
     site,
     date,
+    type,
     routeId,
     routeStartTime,
   }: NFCPatrolLogQuery) {
@@ -23,6 +25,7 @@ export default function useNFCPatrolLog() {
         limit,
         site,
         date,
+        type,
         "route._id": routeId,
         "route.startTime": routeStartTime,
       },

package/composables/useNFCPatrolMonthlyReport.ts

@@ -1,19 +1,104 @@
 import type {
   NFCPatrolReportFilters,
   NFCPatrolSummaryReport,
+  NFCPatrolReportSummaryRow,
 } from "../types/nfc-patrol-report";
-import { useNFCPatrolReportService } from "../services/nfcPatrolReport";
+import useNFCPatrolLog from "./useNFCPatrolLog";
+import useSite from "./useSite";
+
+interface NFCPatrolLogListResponse {
+  items?: Record<string, any>[];
+  pages?: number;
+  pageRange?: string;
+}
+
+function buildAddress(address?: Record<string, string>) {
+  if (!address) return undefined;
+
+  const parts = [
+    address.line1,
+    address.line2,
+    address.city,
+    address.state,
+    address.postalCode,
+    address.country,
+  ].filter((p) => p && p.trim() !== "");
+
+  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,
+  site: string,
+) {
+  const { getAll: getPatrolLogs } = useNFCPatrolLog();
+  const { getSiteById } = useSite();
 
-export function useNFCPatrolMonthlyReport(filters: NFCPatrolReportFilters) {
-  const reportService = useNFCPatrolReportService();
   const report = ref<NFCPatrolSummaryReport | null>(null);
   const loading = ref(false);
+  const notFound = ref(false);
 
   async function fetchReport() {
+    if (!site || !filters.date || !filters.route) {
+      report.value = null;
+      notFound.value = false;
+      return;
+    }
+
     loading.value = true;
+    notFound.value = false;
 
     try {
-      report.value = await reportService.getMonthlyReport(filters);
+      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",
+        }),
+        getSiteById(site),
+      ]);
+
+      const logs = logsRes.items ?? [];
+
+      if (logs.length) {
+        const routeName = logs[0]?.route?.name ?? "-";
+
+        report.value = {
+          location: {
+            name: siteInfo.name,
+            address: buildAddress(siteInfo.address),
+          },
+          title: `Patrol Route Summary: ${routeName}`,
+          rows: logs.map(mapLogToSummaryRow),
+        };
+      } else {
+        report.value = null;
+        notFound.value = true;
+      }
     } finally {
       loading.value = false;
     }
@@ -22,6 +107,7 @@ export function useNFCPatrolMonthlyReport(filters: NFCPatrolReportFilters) {
   return {
     report,
     loading,
+    notFound,
     fetchReport,
   };
 }

package/composables/useNFCPatrolReport.ts

@@ -3,12 +3,80 @@ import type {
   NFCPatrolReport,
   NFCPatrolReportFilters,
 } from "../types/nfc-patrol-report";
+import useNFCPatrolLog from "./useNFCPatrolLog";
+import useSite from "./useSite";
 
-interface NFCPatrolLogResponse {
-  data?: NFCPatrolLogResponse | NFCPatrolReport;
-  item?: NFCPatrolReport;
-  items?: NFCPatrolReport[];
-  nfcPatrolLog?: NFCPatrolReport;
+interface NFCPatrolLogListResponse {
+  items?: Record<string, any>[];
+  pages?: number;
+  pageRange?: string;
+}
+
+function formatTime(iso?: string) {
+  return iso ? iso.slice(11, 16) : "-";
+}
+  function formatDuration(totalMinutes: number) {
+    if (totalMinutes < 60) return `${totalMinutes} mins`;
+
+    const hrs = Math.floor(totalMinutes / 60);
+    const mins = totalMinutes % 60;
+
+    if (mins === 0) return `${hrs} hrs`;
+    return `${hrs} hrs ${mins} mins`;
+  }
+
+  function diffMinutes(startIso?: string, endIso?: string) {
+    if (!startIso || !endIso) return "-";
+    const totalMinutes = Math.max(
+      0,
+      Math.round((new Date(endIso).getTime() - new Date(startIso).getTime()) / 60000),
+    );
+    return formatDuration(totalMinutes);
+  }
+
+
+function mapLogToPatrolReport(
+  log: Record<string, any>,
+  location: NFCPatrolReport["location"],
+): NFCPatrolReport {
+  const checkpoints: Record<string, any>[] = log.checkPoints ?? [];
+  const actualStart = checkpoints[0]?.startDateTime ?? log.startDateTime;
+  const actualEnd = checkpoints[checkpoints.length - 1]?.endDateTime ?? log.endDateTime;
+
+  const totalTravelMinutes = checkpoints.reduce(
+    (sum, cp) => sum + (Number(cp.travelTime) || 0),
+    0,
+  );
+
+  const activities: NFCPatrolActivity[] = checkpoints.map((cp) => ({
+    id: cp.nfcTag_id,
+    checkpoint: cp.nfcTag_name,
+    startTime: formatTime(cp.startDateTime),
+    endTime: formatTime(cp.endDateTime),
+    actualTime: diffMinutes(cp.startDateTime, cp.endDateTime),
+    expectedTime: formatDuration(cp.travelTime),
+    status: cp.status,
+    remarks: cp.skippedRemarks && cp.skippedRemarks !== "N/A" ? cp.skippedRemarks : undefined,
+  }));
+
+  return {
+    location,
+    routeSummary: {
+      routeName: log.route?.name,
+      tolerance: totalTravelMinutes,
+      schedule: {
+        start: log.route?.startTime,
+        end: log.route?.endTime,
+        totalTime: diffMinutes(log.startDateTime, log.endDateTime),
+      },
+      actual: {
+        start: formatTime(actualStart),
+        end: formatTime(actualEnd),
+        totalTime: diffMinutes(actualStart, actualEnd),
+      },
+    },
+    activities,
+  };
 }
 
 export function useNFCPatrolReport(
@@ -16,43 +84,51 @@ export function useNFCPatrolReport(
   site: string,
 ) {
   const { getAll: getPatrolLogs } = useNFCPatrolLog();
+  const { getSiteById } = useSite();
+
   const report = ref<NFCPatrolReport | null>(null);
   const loading = ref(false);
+  const notFound = ref(false);
   const selectedActivityRemarks = ref("");
   const dialogRemarks = ref(false);
 
   async function fetchReport() {
     if (!site || !filters.date || !filters.route || !filters.timeRange) {
       report.value = null;
+      notFound.value = false;
       return;
     }
 
     loading.value = true;
+    notFound.value = false;
 
     try {
-      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;
-    }
-  }
+      const [logsRes, siteInfo] = await Promise.all([
+        getPatrolLogs<NFCPatrolLogListResponse>({
+          page: 1,
+          limit: 10,
+          site,
+          date: filters.date,
+          routeId: filters.route,
+          routeStartTime: filters.timeRange.split(" - ")[0],
+        }),
+        getSiteById(site),
+      ]);
 
-  function extractReport(response: NFCPatrolLogResponse): NFCPatrolReport | null {
-    const payload = response.data ?? response;
+      const log = logsRes.items?.[0];
 
-    if ("location" in payload && "activities" in payload) {
-      return payload;
+      if (log) {
+        report.value = mapLogToPatrolReport(log, {
+          name: siteInfo.name,
+          address: buildAddress(siteInfo.address),
+        });
+      } else {
+        report.value = null;
+        notFound.value = true;
+      }
+    } finally {
+      loading.value = false;
     }
-
-    return payload.nfcPatrolLog ?? payload.item ?? payload.items?.[0] ?? null;
   }
 
   function openRemarksDialog(activity: NFCPatrolActivity) {
@@ -60,9 +136,33 @@ export function useNFCPatrolReport(
     dialogRemarks.value = true;
   }
 
+  function buildAddress(address?: {
+    line1?: string;
+    line2?: string;
+    city?: string;
+    state?: string;
+    country?: string;
+    postalCode?: string;
+  }) {
+    if (!address) return undefined;
+
+    const parts = [
+      address.line1,
+      address.line2,
+      address.city,
+      address.state,
+      address.postalCode,
+      address.country,
+    ].filter((part) => part && part.trim() !== "");
+
+    return parts.length ? parts.join(", ") : undefined;
+  }
+
+
   return {
     report,
     loading,
+    notFound,
     selectedActivityRemarks,
     dialogRemarks,
     fetchReport,

package/composables/useNFCPatrolReportFilters.ts

@@ -2,14 +2,22 @@ import type {
   NFCPatrolReportFilterOptions,
   NFCPatrolReportFilters,
 } from "../types/nfc-patrol-report";
+import useNFCPatrolRoute from "./useNFCPatrolRoute";
 
+function getTodayDate() {
+  const now = new Date();
+  const y = now.getFullYear();
+  const m = String(now.getMonth() + 1).padStart(2, "0");
+  const d = String(now.getDate()).padStart(2, "0");
+  return `${y}-${m}-${d}`;
+}
 export function useNFCPatrolReportFilters(site: string) {
   const { getAll: getPatrolRoutes } = useNFCPatrolRoute();
 
   const filters = reactive<NFCPatrolReportFilters>({
     route: "",
     timeRange: "",
-    date: "2025-11-27",
+    date: getTodayDate(),
   });
 
   const options = ref<NFCPatrolReportFilterOptions>({

package/package.json

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

package/types/nfc-patrol-report.ts

@@ -25,8 +25,8 @@ export interface NFCPatrolReportFilterOptions {
 }
 
 export interface NFCPatrolReportLocation {
-  name: string;
-  address: string;
+  name?: string;
+  address?: string; 
 }
 
 export interface NFCPatrolRouteSummary {