@7365admin1/layer-common 4.97.1-staging.586 → 4.97.1-staging.588

package/components/VisitorPassKeyQRScanner.vue

@@ -6,7 +6,7 @@
             <v-card class="screen-modal qr-scanner">
                 <div class="qr-scanner__head">
                     <v-card-title>Scan QR Code</v-card-title>
-                    <AppButton variant="icon" icon="mdi-close" @click="closeDialog()" />
+                    <v-btn icon="mdi-close" variant="text" aria-label="Close" @click="closeDialog()" />
                 </div>
 
                 <div class="screen-modal__body qr-scanner__body">

package/components/VisitorSocketPopUp.vue

@@ -41,7 +41,7 @@
       fires, what it links to, or how long it stays; only how it is drawn.
     -->
     <v-snackbar
-      v-if="!isUnregisteredVisitorRoute && enableUnregisteredSnackbar && canViewVisitor"
+      v-if="enableUnregisteredSnackbar && canViewVisitor"
       v-model="snackBarMessage.modal"
       :timeout="-1"
       location="bottom center"
@@ -75,8 +75,10 @@
       </div>
 
       <div class="anpr-toast__actions">
+        <!-- "Register" for a user who can register (Update right), as the
+             security mobile app; otherwise only through to the list. -->
         <AppButton variant="ghost" @click="goToUnregistered">
-          Go to Unregistered
+          {{ canUpdateVisitor ? "Register" : "Go to Unregistered" }}
         </AppButton>
       </div>
     </v-snackbar>
@@ -131,6 +133,11 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  /** The visitor Update right: the notice's button reads "Register". */
+  canUpdateVisitor: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const config = useRuntimeConfig();
@@ -141,8 +148,36 @@ const { tab } = useVisitor();
 const { enableUnregistered, ensureANPRSettings } = useANPRSettings(
   () => props.siteId
 );
-const enableUnregisteredSnackbar = computed(() => enableUnregistered.value);
-const { socketUnregisteredVisitorTrigger, visitorSocketData } =
+// The security mobile app's rule (isecure365 `useUnregisteredTab`): the
+// site's Unregistered switch AND an ANPR camera facing an entrance (entry /
+// both). With the switch alone the notice could appear for a site whose
+// cameras never register anyone arriving.
+const { getAllSiteCameras } = useSiteSettings();
+const hasEntryFacingAnprCamera = ref(false);
+
+async function loadEntryFacingAnprCamera(siteId: string) {
+  hasEntryFacingAnprCamera.value = false;
+  if (!siteId) return;
+  try {
+    const res = await getAllSiteCameras({ site: siteId, type: "anpr", page: 1, limit: 100 });
+    if (siteId !== props.siteId) return;
+    const items = Array.isArray(res?.items)
+      ? res.items
+      : Array.isArray(res?.data?.items)
+        ? res.data.items
+        : [];
+    hasEntryFacingAnprCamera.value = items.some(
+      (camera: any) => camera?.direction === "entry" || camera?.direction === "both"
+    );
+  } catch {
+    hasEntryFacingAnprCamera.value = false;
+  }
+}
+
+const enableUnregisteredSnackbar = computed(
+  () => enableUnregistered.value && hasEntryFacingAnprCamera.value
+);
+const { socketUnregisteredVisitorTrigger, visitorSocketData, registerVisitorFormData } =
   useVisitorSocket();
 
 const APP_NAME = publicConfig.APP || "";
@@ -260,10 +295,10 @@ const showPlate = (plateNumber: string) => {
   }
 
   snackBarMessage.plateNumber = plateNumber;
+  // No timeout (security mobile app, 2026-10): it stays on every screen until
+  // it is closed or its button is used. A newer plate replaces it. (The
+  // window below is no longer started; its cancels are harmless.)
   snackBarMessage.modal = true;
-  // Restart the 20s window from zero. A replacement plate gets a full window
-  // of its own; without this it inherited whatever was left of the one before.
-  plateToastWindow.restart();
 };
 
 const connectSocket = () => {
@@ -284,17 +319,27 @@ const connectSocket = () => {
 
   socket.value.on("anpr-messages", (data: TVisitorSocketData) => {
     const plateNumber = data?.plateNumber?.trim() || "";
-    const isCheckIn = Boolean(plateNumber);
-    const isPlateNumberChanging =
-      Boolean(lastPlateNumber.value) && lastPlateNumber.value !== plateNumber;
+    const recordId = String(data?._id ?? "").trim();
 
-    socketUnregisteredVisitorTrigger.value = false;
+    // Every message still reaches the visitor list (its reload).
     visitorSocketData.value = null;
     visitorSocketData.value = data;
     newVisitor.value = data;
 
-    if (isCheckIn) {
-      showPlate(plateNumber);
+    if (plateNumber) {
+      // An arrival. Only one with both the record id and the plate is kept for
+      // Register, and it drops any outstanding trigger; a read with no record
+      // has nothing to register and raises no notice (security mobile app).
+      // Nothing else on the feed touches the stored arrival.
+      if (recordId) {
+        registerVisitorFormData.value = {
+          _id: recordId,
+          plateNumber,
+          site: data?.site,
+        };
+        socketUnregisteredVisitorTrigger.value = false;
+        showPlate(plateNumber);
+      }
       lastPlateNumber.value = plateNumber;
       return;
     }
@@ -354,24 +399,27 @@ const goToUnregistered = async () => {
   });
 };
 
+// A site switch, or leaving the signed-in layout (logout): the open notice and
+// the stored arrival belong to the old site, so neither survives it.
+const clearPlateNotice = () => {
+  snackBarMessage.modal = false;
+  registerVisitorFormData.value = null;
+  socketUnregisteredVisitorTrigger.value = false;
+};
+
 watch(
   () => props.siteId,
-  () => {
+  (siteId, previous) => {
+    if (previous !== undefined && siteId !== previous) clearPlateNotice();
     disconnectSocket();
     connectSocket();
+    void loadEntryFacingAnprCamera(siteId);
   },
   { immediate: true, deep: true }
 );
 
-watch(
-  () => route.fullPath,
-  () => {
-    if (isUnregisteredVisitorRoute.value) {
-      snackBarMessage.modal = false;
-    }
-  },
-  { immediate: true }
-);
+// The notice now also shows on the Unregistered tab (security mobile app):
+// its button opens Register for the record there.
 
 watch(enableUnregisteredSnackbar, (enabled) => {
   if (!enabled) {
@@ -402,6 +450,7 @@ watch(
 );
 
 onUnmounted(() => {
+  clearPlateNotice();
   plateToastWindow.cancel();
   if (typeof document !== "undefined") {
     document.removeEventListener("keydown", onEscape);

package/composables/useNFCPatrolReportFilters.ts

@@ -3,6 +3,8 @@ import type {
   NFCPatrolReportFilters,
 } from "../types/nfc-patrol-report";
 import useNFCPatrolRoute from "./useNFCPatrolRoute";
+import useNFCPatrolLog from "./useNFCPatrolLog";
+import { collectAllPages } from "../utils/nfc-patrol-report";
 
 function getTodayDate() {
   const now = new Date();
@@ -13,6 +15,7 @@ function getTodayDate() {
 }
 export function useNFCPatrolReportFilters(site: string) {
   const { getAll: getPatrolRoutes } = useNFCPatrolRoute();
+  const { getAll: getPatrolLogs } = useNFCPatrolLog();
 
   const filters = reactive<NFCPatrolReportFilters>({
     route: "",
@@ -34,17 +37,25 @@ export function useNFCPatrolReportFilters(site: string) {
       // Deleted routes too, labelled, so their past patrols can still be
       // reported on. An API from before route deletion refuses the parameter
       // with a 400: ask again without it, and the list is what it was.
-      const response = await getPatrolRoutes({
-        site,
-        page: 1,
-        limit: 100,
-        includeDeleted: true,
-      }).catch((error: any) => {
-        const status = Number(error?.statusCode ?? error?.response?.status ?? 0);
-        if (status !== 400) throw error;
-        return getPatrolRoutes({ site, page: 1, limit: 100 });
-      });
-      const items: Array<Record<string, any>> = response.items ?? [];
+      // Every page: a site may have more than 100 routes (deleted ones count).
+      const allRoutes = (includeDeleted: boolean) =>
+        collectAllPages(
+          (page) =>
+            getPatrolRoutes({
+              site,
+              page,
+              limit: 100,
+              ...(includeDeleted ? { includeDeleted: true } : {}),
+            }) as any,
+          1000,
+        );
+      const items: Array<Record<string, any>> = await allRoutes(true).catch(
+        (error: any) => {
+          const status = Number(error?.statusCode ?? error?.response?.status ?? 0);
+          if (status !== 400) throw error;
+          return allRoutes(false);
+        },
+      );
       const isDeleted = (route: Record<string, any>) => route.status === "Deleted";
       // Routes still in use first, so the report opens on one of them.
       const routes = [
@@ -54,6 +65,7 @@ export function useNFCPatrolReportFilters(site: string) {
         title: isDeleted(route) ? `${route.name} (deleted)` : route.name,
         value: route._id,
         startTimes: route.startTimes ?? [],
+        timed: route.timed !== false,
       }));
 
       options.value.routes = routes;
@@ -62,22 +74,50 @@ export function useNFCPatrolReportFilters(site: string) {
         filters.route = routes[0]?.value ?? "";
       }
 
-      updateStartTimes();
+      await updateStartTimes();
     } finally {
       loading.value = false;
     }
   }
 
-  function updateStartTimes() {
+  let startTimesRequest = 0;
+  async function updateStartTimes() {
     const route = options.value.routes.find(({ value }) => value === filters.route);
-    options.value.timeRanges = route?.startTimes ?? [];
+    const request = ++startTimesRequest;
+
+    // An untimed route has no start times: its rounds start whenever the guard
+    // starts them, so offer the start times of that day's rounds instead.
+    let times: string[] = route?.startTimes ?? [];
+    if (route && route.timed === false && filters.date) {
+      try {
+        const logs = await collectAllPages(
+          (page) =>
+            getPatrolLogs({
+              page,
+              limit: 100,
+              site,
+              date: filters.date,
+              routeId: route.value,
+            }) as any,
+          1000,
+        );
+        times = [...new Set(logs.map((log) => String(log.route?.startTime ?? "")))]
+          .filter(Boolean)
+          .sort();
+      } catch {
+        times = [];
+      }
+      if (request !== startTimesRequest) return;
+    }
+
+    options.value.timeRanges = times;
 
     if (!options.value.timeRanges.includes(filters.timeRange)) {
       filters.timeRange = options.value.timeRanges[0] ?? "";
     }
   }
 
-  watch(() => filters.route, updateStartTimes);
+  watch(() => [filters.route, filters.date], () => void updateStartTimes());
 
   return {
     filters,

package/composables/useNFCPatrolRoute.ts

@@ -32,11 +32,12 @@ export default function useNFCPatrolRoute() {
   function add(value: {
     name: string;
     checkPointNumber: number;
-    tolerance: string;
+    tolerance: string | number;
     days: number[];
     startTimes: string[];
     checkPoints: Array<{ nfcTag_id: string }>;
     site: string;
+    timed?: boolean;
   }) {
     return useNuxtApp().$api<Record<string, any>>("/api/nfc-patrol-route", {
       method: "POST",
@@ -61,11 +62,12 @@ export default function useNFCPatrolRoute() {
     value: {
       name: string;
       checkPointNumber: number;
-      tolerance: string;
+      tolerance: string | number;
       days: number[];
       startTimes: string[];
       checkPoints: Array<{ nfcTag_id: string }>;
       site: string;
+      timed?: boolean;
     }
   ) {
     return useNuxtApp().$api(`/api/nfc-patrol-route/id/${id}`, {

package/composables/usePeople.ts

@@ -1,3 +1,10 @@
+import {
+  VISITOR_PERSON_TYPES,
+  recordIdsOf,
+  visitorPeopleResults,
+  type VisitorPerson,
+} from "../utils/visitor-people";
+
 export default function () {
   async function getAll({
     page = 1,
@@ -66,6 +73,51 @@ export default function () {
     });
   }
 
+  /**
+   * The visitor form's autofill lookup across EVERY visitor type, as the
+   * security mobile app (isecure365 `findAnyVisitorType`): one request with
+   * `type[]=guest&type[]=contractor&type[]=delivery`, the type being registered
+   * listed first, and one person on file under several types merged into one
+   * result. `walk-in` is looked up as `guest`.
+   */
+  async function findVisitorPeopleAnyType(
+    by: "nric" | "contact" | "plateNumber",
+    term: string,
+    site?: string,
+    preferType?: string
+  ): Promise<VisitorPerson[]> {
+    const res = await $fetch<any>(`/api/people`, {
+      method: "GET",
+      query: {
+        [by]: term,
+        ...(site ? { site } : {}),
+        "type[]": [...VISITOR_PERSON_TYPES],
+      },
+    });
+    const items: VisitorPerson[] = Array.isArray(res)
+      ? res
+      : Array.isArray(res?.items)
+        ? res.items
+        : Array.isArray(res?.data?.items)
+          ? res.data.items
+          : Array.isArray(res?.data)
+            ? res.data
+            : [];
+    const type = preferType === "walk-in" ? "guest" : preferType;
+    return visitorPeopleResults(items, type);
+  }
+
+  /**
+   * Deletes the People records behind one autofill result (a merged result is
+   * several): `PUT /api/people/:id`, a soft delete. For a person saved with a
+   * wrong NRIC; past visits are not touched.
+   */
+  async function deletePersonRecords(person: VisitorPerson) {
+    for (const id of recordIdsOf(person)) {
+      await deleteById(id);
+    }
+  }
+
   async function findPersonByContact(
     contact: string
   ): Promise<null | Partial<TPeople>> {
@@ -164,6 +216,8 @@ export default function () {
     findPersonByNRICMultipleResult,
     findPersonByPhoneNumberMultipleResult,
     findPersonByPlateNumberMultipleResult,
+    findVisitorPeopleAnyType,
+    deletePersonRecords,
     findPersonByContact,
     getPeopleByUnit,
     getOccupiedStructure,

package/composables/useVisitor.ts

@@ -4,11 +4,13 @@ export default function () {
     value: TVisitorType;
   };
 
+  // The Add type picker, in iSecure's order and words (`VISITOR_FORM_TYPES` /
+  // `VISITOR_FORM_TITLES`). The values are the stored types - never rename.
   const visitorSelection: TVisitorSelection[] = [
-    { label: "Drive-in", value: "guest" },
+    { label: "Guest", value: "guest" },
     { label: "Contractor", value: "contractor" },
-    { label: "Walk-In", value: "walk-in" },
     { label: "Delivery", value: "delivery" },
+    { label: "Walk-In", value: "walk-in" },
     { label: "Pick-Up", value: "pick-up" },
     { label: "Drop-Off", value: "drop-off" },
   ];

package/composables/useVisitorSocket.ts

@@ -64,7 +64,25 @@ export const plateToast = (
   };
 };
 
+/**
+ * The last vehicle ARRIVAL the ANPR camera read, kept so the plate notice's
+ * Register / "Go to Unregistered" opens the Register flow for THAT record.
+ * As the security mobile app (isecure365 `anpr-unregistered.ts`): only a read
+ * with both the record id and the plate is kept, and nothing else on the feed
+ * (a camera alert, a reload) replaces it.
+ */
+export type TRegisterVisitorFormData = {
+  /** The unregistered record the camera created - the one the form updates. */
+  _id: string;
+  plateNumber: string;
+  site?: string;
+};
+
 export const useVisitorSocket = () => {
+  const registerVisitorFormData = useState(
+    "registerVisitorFormData",
+    (): TRegisterVisitorFormData | null => null,
+  );
   const socketUnregisteredVisitorTrigger = useState(
     "socketUnregisteredVisitorTrigger",
     () => false,
@@ -76,6 +94,7 @@ export const useVisitorSocket = () => {
   
 
   return {
+    registerVisitorFormData,
     socketUnregisteredVisitorTrigger,
     visitorSocketData,
   };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.97.1-staging.586",
+  "version": "4.97.1-staging.588",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",
@@ -69,6 +69,7 @@
     "sass": "^1.80.6",
     "sip.js": "0.21.2",
     "socket.io-client": "^4.8.3",
+    "tesseract.js": "^5.1.1",
     "vue-draggable-next": "^2.3.0",
     "vue3-signature": "^0.2.4",
     "vuetify-pro-tiptap": "^2.8.2",

package/types/nfc-patrol-report.ts

@@ -1,6 +1,6 @@
 export type NFCPatrolReportTab = "patrol" | "daily" | "monthly";
 
-export type NFCPatrolActivityStatus = "Completed" | "Skipped";
+export type NFCPatrolActivityStatus = "Completed" | "Skipped" | "Pending";
 
 export interface NFCPatrolReportFilters {
   route: string;
@@ -17,6 +17,8 @@ export interface NFCPatrolReportRouteOption {
   title: string;
   value: string;
   startTimes: string[];
+  /** false = route timing switched off (rounds start any time). */
+  timed?: boolean;
 }
 
 export interface NFCPatrolReportFilterOptions {
@@ -69,7 +71,7 @@ export interface NFCPatrolReport {
   activities: NFCPatrolActivity[];
 }
 
-export type NFCPatrolReportSummaryStatus = "Completed" | "Incomplete";
+export type NFCPatrolReportSummaryStatus = "Completed" | "Incomplete" | "In progress";
 
 export interface NFCPatrolReportSummaryRow {
   id: string;

package/utils/nfc-patrol-report.ts

@@ -78,6 +78,30 @@ export async function collectAllPages(
   return items;
 }
 
+/** A round of a route whose timing is switched off: no window, never late. */
+export function isUntimedLog(log: Record<string, any>) {
+  return log?.route?.timed === false;
+}
+
+/**
+ * Was this checkpoint missed? A skip always is. A checkpoint still Pending
+ * once its timed round's window has closed is too: nothing on the server ever
+ * moves it off Pending, so a round the guard walked away from used to read
+ * "Completed, 0 missed". A round of an untimed route has no window and is
+ * never missed for time.
+ */
+export function isMissedCheckpoint(
+  log: Record<string, any>,
+  checkpoint: Record<string, any>,
+  now: Date = new Date(),
+) {
+  if (checkpoint?.status === "Skipped") return true;
+  if (checkpoint?.status === "Completed") return false;
+  if (isUntimedLog(log)) return false;
+  const end = new Date(log?.endDateTime).getTime();
+  return Number.isFinite(end) && now.getTime() > end;
+}
+
 /** The month (0-11) a patrol log counts under; NaN for a date that is not one. */
 export function monthIndexOf(log: Record<string, any>) {
   return new Date(log?.date).getMonth();
@@ -91,6 +115,7 @@ export function monthIndexOf(log: Record<string, any>) {
  */
 export function mapLogsToMonthlyRows(
   logs: Record<string, any>[],
+  now: Date = new Date(),
 ): TPatrolMonthRow[] {
   const rows: TPatrolMonthRow[] = MONTHS.map((month) => ({
     month,
@@ -106,7 +131,7 @@ export function mapLogsToMonthlyRows(
 
     for (const checkpoint of log?.checkPoints ?? []) {
       if (checkpoint?.status === "Completed") rows[monthIndex].checked++;
-      else if (checkpoint?.status === "Skipped") rows[monthIndex].missed++;
+      else if (isMissedCheckpoint(log, checkpoint, now)) rows[monthIndex].missed++;
     }
   }
 
@@ -168,15 +193,20 @@ export function mapLogToPatrolRun(
     };
   });
 
+  const untimed = isUntimedLog(log);
+
   return {
     routeSummary: {
       routeName: log.route?.name,
-      tolerance: Number(log.route?.tolerance) || 0,
-      schedule: {
-        start: log.route?.startTime,
-        end: log.route?.endTime,
-        totalTime: diffMinutes(log.startDateTime, log.endDateTime),
-      },
+      tolerance: untimed ? 0 : Number(log.route?.tolerance) || 0,
+      // An untimed round has no schedule to compare against.
+      schedule: untimed
+        ? { start: "Anytime", end: "-", totalTime: "-" }
+        : {
+            start: log.route?.startTime,
+            end: log.route?.endTime,
+            totalTime: diffMinutes(log.startDateTime, log.endDateTime),
+          },
       actual: {
         start: clockTime(actual.start, timezone),
         end: clockTime(actual.end, timezone),
@@ -196,21 +226,28 @@ export function mapLogToSummaryRow(
   log: Record<string, any>,
   index: number,
   siteTimezone?: string,
+  now: Date = new Date(),
 ): 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;
+  const missed = checkpoints.filter((cp) => isMissedCheckpoint(log, cp, now)).length;
+  const allDone =
+    checkpoints.length > 0 &&
+    checkpoints.every((cp) => cp.status === "Completed" || cp.status === "Skipped");
+  const status = missed > 0 ? "Incomplete" : allDone ? "Completed" : "In progress";
 
   return {
     id: log._id,
     date: log.date,
     routeName: `${index + 1}. ${log.route?.name ?? "-"}`,
-    securityCheckSchedule: log.route?.startTime ?? "-",
+    securityCheckSchedule: isUntimedLog(log)
+      ? `Anytime (started ${log.route?.startTime ?? "-"})`
+      : log.route?.startTime ?? "-",
     guardName: log.sign?.guardName,
     guardSignatureFileId: log.sign?.guardSignatureFileId,
     checked,
     missed,
-    status: missed === 0 ? "Completed" : "Incomplete",
+    status,
     detail: mapLogToPatrolRun(log, siteTimezone),
   };
 }

package/utils/nfc-patrol-schedule.ts

@@ -71,3 +71,23 @@ export function formatRouteDays(days: number[] = []) {
   }
   return parts.join(", ");
 }
+
+/**
+ * The route form's "Select all" for days: every day when not all are
+ * selected yet, none when they all are.
+ */
+export function allDaysToggled(selected: number[], allDays: number[]): number[] {
+  const everyDay = allDays.every((day) => selected.includes(day));
+  return everyDay ? [] : [...allDays];
+}
+
+/**
+ * Why a checkpoint count is not usable, or null when it is. Any whole number
+ * from 1 up: a route takes as many NFC tags as the site has (no cap).
+ */
+export function checkpointCountError(value: unknown): string | null {
+  const count = Number(value);
+  if (value === "" || value === null || value === undefined) return "This field is required";
+  if (!Number.isInteger(count) || count < 1) return "Enter a whole number of 1 or more";
+  return null;
+}