@7365admin1/layer-common 4.142.0 → 4.144.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @iservice365/layer-common
 
+## 4.144.0
+
+### Minor Changes
+
+- b64093c: NFC patrol reports: the Monthly Report has a Year picker (this year and the five before it), so past years can be reported; each month's row still opens that month's patrols, and the export heading and file name use the picked year. Route form: the Route timing Off hint now says the route still runs only on its selected Days (use Select all for every day).
+- a5acba6: Visitor list shows NFC card numbers (not database ids) for a visitor's extra cards; AreaMain / ScheduleAreaMain take `showAreaType` (default true) to hide the cleaning-only Common/Toilet type; AreaFormDialog `hideTypeField`; M&E unit import example; Blocks screen action labels say Block.
+
+## 4.143.0
+
+### Minor Changes
+
+- 87617ca: NFC patrol: route timing On/Off switch on the route form (Off = no start times or tolerance, patrol at any time; routes list and preview show "Anytime (timing off)"); "Select all / Unselect all" for the route's days; any number of checkpoints (was a 1-10 list) and every tag of the site offered (was the first 100); tolerance sent as a number. Reports: a checkpoint still Pending after its timed round's window closed counts as missed and the round reads "Incomplete" (was "Completed, 0 missed"), a round still open reads "In progress", untimed rounds are never missed for time and show "Anytime"; the Patrol tab offers an untimed route's rounds of the day; the report's route picker reads every page. Routes search returns to page 1.
+
 ## 4.142.0
 
 ### Minor Changes
@@ -3407,11 +3420,11 @@ Monthly report: a month that had patrols opens the list of that month's patrol r
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/AreaFormDialog.vue

@@ -37,7 +37,7 @@
       <v-card-text class="screen-modal__body">
         <v-form ref="formRef" v-model="valid">
           <v-row no-gutters class="pa-0">
-            <v-col v-if="prop.showType" cols="12" class="pa-0 mb-2">
+            <v-col v-if="prop.showType && !prop.hideTypeField" cols="12" class="pa-0 mb-2">
               <InputLabel for="type" title="Type" required class="mb-1" />
               <v-select
                 v-model="typeModel"
@@ -169,6 +169,9 @@ const prop = defineProps({
   label: { type: String, default: "Name" },
   entityType: { type: String, default: "Area" }, // values: "Area", "Unit"
   showType: { type: Boolean, default: true },
+  // Keeps the type in the saved payload (as loaded, or "Common") but does not
+  // offer the Common / Toilet choice - for apps where it means nothing.
+  hideTypeField: { type: Boolean, default: false },
   showOptional: { type: Boolean, default: true },
   showUnits: { type: Boolean, default: false },
   site: { type: String, default: "" },

package/components/AreaMain.vue

@@ -17,7 +17,7 @@
         @create="onCreateItem"
         @row-click="handleRowClick"
       >
-        <template #extension>
+        <template v-if="props.showAreaType" #extension>
           <v-row no-gutters class="w-100 d-flex flex-column">
             <!--
               A bare `v-card` here paints Vuetify's own `surface`, a slab a
@@ -138,6 +138,7 @@
     :label="formLabel"
     :entityType="entityTypeLabel"
     :showUnits="true"
+    :hideTypeField="!props.showAreaType"
     :site="props.site"
     :serviceType="props.serviceType"
     @saved="_createArea"
@@ -314,7 +315,9 @@
     title="Import Areas from Excel"
     noun="areas"
     name-label="Area"
-    fill-hint="One area per row: its name, Type (Common or Toilet, from the dropdown), Set and the units to check, separated by commas."
+    :fill-hint="props.showAreaType
+      ? 'One area per row: its name, Type (Common or Toilet, from the dropdown), Set and the units to check, separated by commas.'
+      : 'One area per row: its name, Set and the units to check, separated by commas. Leave Type as Common.'"
     duplicate-note="Areas already on the list (same name and type) are skipped and left unchanged."
     template-file-name="areas-import-template.xlsx"
     :download-template="() => downloadTemplate('areas', importQuery)"
@@ -345,6 +348,10 @@ const props = defineProps({
   canUpdateArea: { type: Boolean, default: false },
   canDeleteArea: { type: Boolean, default: false },
   canImportArea: { type: Boolean, default: false },
+  // Common / Toilet is a cleaning distinction (Toilet areas get the toilet
+  // checklist QR). Apps without it hide the Type filter, column and field;
+  // the saved `type` value is untouched (new areas stay "common").
+  showAreaType: { type: Boolean, default: true },
 });
 
 const isCleanerArea = computed(() => {
@@ -403,7 +410,7 @@ const isDownloading = ref(false);
 
 const headers = [
   { title: "AREA", value: "name" },
-  { title: "TYPE", value: "type" },
+  ...(props.showAreaType ? [{ title: "TYPE", value: "type" }] : []),
   { title: "SETS", value: "set" },
 ];
 

package/components/BuildingForm.vue

@@ -120,7 +120,7 @@
 
 
         <v-col cols="12" class="px-6">
-          <InputLabel class="text-capitalize font-weight-bold" title="Building Floor plan" />
+          <InputLabel class="text-capitalize font-weight-bold" title="Block floor plan" />
           <InputFileV2 v-model="building.buildingFiles" :multiple="true" accept="*" :max-length="10"
             title="Upload Files" />
         </v-col>

package/components/BuildingManagement/buildings.vue

@@ -97,13 +97,13 @@
                 <v-list class="pa-0">
                   <v-list-item v-if="canUpdateBuilding" @click="openEditDialog()">
                     <v-list-item-title class="text-subtitle-2">
-                      Edit Building
+                      Edit Block
                     </v-list-item-title>
                   </v-list-item>
 
                   <v-list-item v-if="canDeleteBuilding" @click="openDeleteDialog()" class="text-red">
                     <v-list-item-title class="text-subtitle-2">
-                      Delete Building
+                      Delete Block
                     </v-list-item-title>
                   </v-list-item>
                 </v-list>
@@ -144,7 +144,7 @@
             <v-col cols="6">
               <v-btn tile block size="48" color="black" variant="flat" class="text-none" @click="handleDeleteBuilding"
                 :loading="deleteLoading">
-                Delete Building
+                Delete Block
               </v-btn>
             </v-col>
           </v-row>

package/components/Nfc/NFCPatrolReportMain.vue

@@ -100,6 +100,7 @@ import {
   reportFileName,
   type CsvSection,
 } from "../../utils/report-export";
+import { reportYear } from "../../utils/nfc-patrol-report";
 
 import PatrolReportTab from "./PatrolReport/PatrolReportTab.vue";
 import DailyReportTab from "./PatrolReport/DailyReportTab.vue";
@@ -137,6 +138,7 @@ function updateFilters(value: NFCPatrolReportFilters) {
   filters.route = value.route;
   filters.timeRange = value.timeRange;
   filters.date = value.date;
+  filters.year = value.year;
 }
 
 const { exportReportPdf } = useReportPdf();
@@ -147,10 +149,10 @@ function reportMeta(report: HTMLElement, extension: "pdf" | "csv"): ReportPdfMet
   const route = options.value.routes.find(({ value }) => value === filters.route)?.title;
   const text = (selector: string) => report.querySelector(selector)?.textContent?.trim() || undefined;
 
-  // The yearly table always covers the current year (useNFCPatrolMonthlyReport).
+  // The yearly table covers the year picked on the Monthly Report.
   const period =
     activeTab.value === "monthly"
-      ? { label: "Year", value: String(new Date().getFullYear()) }
+      ? { label: "Year", value: reportYear(filters.year) }
       : { label: "Date", value: formatReportDate(filters.date) };
   const details = [{ label: "Route", value: route ?? "-" }, period];
   if (activeTab.value === "patrol" && filters.timeRange) {

package/components/Nfc/NFCPatrolRouteForm.vue

@@ -33,17 +33,21 @@
             <label class="text-caption screen-hint mb-1 d-block">
               Checkpoints <span class="text-error">*</span>
             </label>
-            <v-select
-              v-model="form.checkPointNumber"
-              :items="checkpointOptions"
+            <!-- Any number of checkpoints (it was a 1-10 list). -->
+            <v-text-field
+              :model-value="form.checkPointNumber"
+              type="number"
+              min="1"
+              inputmode="numeric"
               variant="outlined"
               density="comfortable"
-              hide-details
-              @update:model-value="updateCheckpointsCount"
+              :rules="[rules.checkpointCount]"
+              hide-details="auto"
+              @update:model-value="onCheckpointCountInput"
             />
           </v-col>
 
-          <v-col cols="12" md="4" class="mb-4 px-md-1">
+          <v-col v-if="form.timed" cols="12" md="4" class="mb-4 px-md-1">
             <label class="text-caption screen-hint mb-1 d-block">
               Tolerance (mins) <span class="text-error">*</span>
             </label>
@@ -74,11 +78,46 @@
               density="comfortable"
               hide-details
               chips
+            >
+              <template #prepend-item>
+                <v-list-item
+                  :title="allDaysSelected ? 'Unselect all' : 'Select all'"
+                  @click="toggleAllDays"
+                >
+                  <template #prepend>
+                    <v-checkbox-btn
+                      :model-value="allDaysSelected"
+                      :indeterminate="someDaysSelected"
+                      @click.stop="toggleAllDays"
+                    />
+                  </template>
+                </v-list-item>
+                <v-divider class="mt-1" />
+              </template>
+            </v-select>
+          </v-col>
+
+          <!-- Route timing. Off: no start times or tolerance, and the route can be
+               patrolled at any time of the day. -->
+          <v-col cols="12" class="mb-4">
+            <v-switch
+              v-model="form.timed"
+              color="primary"
+              inset
+              hide-details
+              :label="form.timed ? 'Route timing: On' : 'Route timing: Off'"
             />
+            <div class="text-caption screen-hint">
+              {{
+                form.timed
+                  ? "Patrols start at the route's start times, within the tolerance."
+                  : "No time window: patrol at any time of day, on the selected Days only. Use Select all for every day."
+              }}
+            </div>
           </v-col>
 
           <!-- Start Times -->
-          <v-col cols="12" class="mb-4">
+          <v-col v-if="form.timed" cols="12" class="mb-4">
             <v-card variant="outlined" class="pa-4" rounded="lg">
               <div class="d-flex align-center justify-space-between mb-3">
                 <span class="text-h6 font-weight-medium">Start Times</span>
@@ -264,6 +303,8 @@
 <script setup lang="ts">
 import useNFCPatrolRoute from "../../composables/useNFCPatrolRoute";
 import useNFCPatrolTag from "../../composables/useNFCPatrolTag";
+import { collectAllPages } from "../../utils/nfc-patrol-report";
+import { allDaysToggled, checkpointCountError } from "../../utils/nfc-patrol-schedule";
 
 const props = defineProps({
   title: {
@@ -329,11 +370,12 @@ const form = ref({
   startTimes: ["08:00"] as string[],
   endTimes: ["09:00"] as string[],
   checkPoints: [] as Checkpoint[],
+  // Route timing; false = no time window (patrol at any time).
+  timed: true,
 });
 
 const startTimeKeys = ref<number[]>([Date.now()]);
 
-const checkpointOptions = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 const dayOptions = [
   { title: "Monday", value: 1 },
   { title: "Tuesday", value: 2 },
@@ -344,10 +386,29 @@ const dayOptions = [
   { title: "Sunday", value: 0 },
 ];
 
+const allDaysSelected = computed(() => form.value.days.length === dayOptions.length);
+const someDaysSelected = computed(
+  () => form.value.days.length > 0 && !allDaysSelected.value,
+);
+
+function toggleAllDays() {
+  form.value.days = allDaysToggled(
+    form.value.days,
+    dayOptions.map((day) => day.value),
+  );
+}
+
+function onCheckpointCountInput(value: string | number) {
+  const count = Number(value);
+  form.value.checkPointNumber = count;
+  if (Number.isInteger(count) && count >= 1) updateCheckpointsCount(count);
+}
+
 const MAX_TOLERANCE_MINUTES = 60;
 
 const rules = {
   required: (v: any) => !!v || "This field is required",
+  checkpointCount: (v: any) => checkpointCountError(v) ?? true,
   tolerance: (v: any) => {
     if (!/^\d+$/.test(String(v ?? ""))) return "Numbers only";
     if (Number(v) > MAX_TOLERANCE_MINUTES)
@@ -374,8 +435,11 @@ const { getAll: getAllNFCTags } = useNFCPatrolTag();
 
 async function fetchNFCTags() {
   try {
-    const response = await getAllNFCTags({ site: props.site, limit: 100 });
-    nfcTags.value = response.items || [];
+    // Every page: a site can have any number of tags (it read the first 100).
+    nfcTags.value = await collectAllPages(
+      (page) => getAllNFCTags({ site: props.site, page, limit: 100 }) as any,
+      1000,
+    );
   } catch (error) {
     console.error("Error fetching NFC tags:", error);
   }
@@ -554,6 +618,7 @@ async function initializeEditForm(newRoute: any) {
   form.value.startTimes = startTimes;
   form.value.endTimes = endTimes;
   form.value.checkPoints = existingCheckPoints;
+  form.value.timed = newRoute.timed !== false;
 
   // Reinitialize keys for each start time
   startTimeKeys.value = startTimes.map(() => Date.now() + Math.random());
@@ -598,14 +663,17 @@ async function submit() {
       ),
     ];
 
+    // Timing off keeps the tolerance as it was (the server requires one) but
+    // sends no start times: the route has no schedule.
     const payload = {
       name: form.value.name,
-      checkPointNumber: form.value.checkPointNumber,
-      tolerance: form.value.tolerance,
+      checkPointNumber: Number(form.value.checkPointNumber),
+      tolerance: Number(form.value.tolerance) || 0,
       days: form.value.days,
-      startTimes: uniqueStartTimes,
+      startTimes: form.value.timed ? uniqueStartTimes : [],
       checkPoints: form.value.checkPoints,
       site: props.site,
+      timed: form.value.timed,
     };
 
     if (props.mode === "create") {

package/components/Nfc/NFCPatrolRouteMain.vue

@@ -50,14 +50,15 @@
 
         <template #item.tolerance="{ item }">
           <div class="text-center">
-            {{ item.tolerance ? `${item.tolerance} mins` : "--" }}
+            {{ item.timed && item.tolerance ? `${item.tolerance} mins` : "--" }}
           </div>
         </template>
 
         <!-- Earliest first, one unbreakable pill per window; past three the
              rest fold into "+N more" so a busy route keeps a normal row. -->
-        <template #item.schedules="{ value }">
-          <NFCRouteScheduleTimes :windows="value || []" :limit="3" />
+        <template #item.schedules="{ item, value }">
+          <span v-if="!item.timed">Anytime (timing off)</span>
+          <NFCRouteScheduleTimes v-else :windows="value || []" :limit="3" />
         </template>
 
         <template #item.repeatDays="{ value }">
@@ -132,7 +133,12 @@
               </span>
             </v-col>
 
-            <v-col cols="12" class="mb-2" v-if="selectedRoute.tolerance">
+            <v-col cols="12" class="mb-2" v-if="selectedRoute.timed === false">
+              Security Check Schedule:
+              <span class="font-weight-bold">Anytime (timing off)</span>
+            </v-col>
+
+            <v-col cols="12" class="mb-2" v-if="selectedRoute.timed !== false && selectedRoute.tolerance">
               Tolerance:
               <span class="font-weight-bold">
                 {{ selectedRoute.tolerance }} mins
@@ -149,7 +155,7 @@
             <v-col
               cols="12"
               class="mb-2"
-              v-if="selectedRoute.schedules && selectedRoute.schedules.length"
+              v-if="selectedRoute.timed !== false && selectedRoute.schedules && selectedRoute.schedules.length"
             >
               <div class="mb-2">
                 Security Check Schedule
@@ -376,6 +382,7 @@ watchEffect(() => {
       days: item.days,
       startTimes: item.startTimes || [],
       checkPoints: item.checkPoints || [],
+      timed: item.timed !== false,
       // Display fields for the table
       routeName: item.name,
       numberOfCheckpoints: item.checkPointNumber,
@@ -392,6 +399,11 @@ watchEffect(() => {
   }
 });
 
+// A new search starts on page 1 (from page 2 or later it could show nothing).
+watch(searchInput, () => {
+  page.value = 1;
+});
+
 const dialogAdd = ref(false);
 const dialogEdit = ref(false);
 const dialogPreview = ref(false);

package/components/Nfc/PatrolReport/MonthlyReportTab.vue

@@ -5,6 +5,7 @@
       :options="options"
       :show-time-filter="false"
       :show-date-filter="false"
+      show-year-filter
       @update:model-value="$emit('update:filters', $event)"
       @export="(type) => $emit('export', type, csvSections())"
     />
@@ -53,7 +54,7 @@ import type {
 } from "../../../types/nfc-patrol-report";
 
 import { useNFCPatrolMonthlyReport } from "../../../composables/useNFCPatrolMonthlyReport";
-import { monthlyReportCsv } from "../../../utils/nfc-patrol-report";
+import { monthlyReportCsv, reportYear } from "../../../utils/nfc-patrol-report";
 import PatrolMonthDialog from "./PatrolMonthDialog.vue";
 import type { CsvSection } from "../../../utils/report-export";
 
@@ -84,8 +85,7 @@ const monthTitle = ref("");
 const monthRows = shallowRef<NFCPatrolReportSummaryRow[]>([]);
 
 function openMonth(monthIndex: number) {
-  // The yearly report always covers the current year (useNFCPatrolMonthlyReport).
-  monthTitle.value = `${report.value?.rows[monthIndex]?.month ?? ""} ${new Date().getFullYear()}`;
+  monthTitle.value = `${report.value?.rows[monthIndex]?.month ?? ""} ${reportYear(props.filters.year)}`;
   monthRows.value = monthRuns(monthIndex);
   monthOpen.value = true;
 }
@@ -95,7 +95,7 @@ function csvSections() {
 }
 
 watch(
-  () => [props.filters.route, props.active],
+  () => [props.filters.route, props.filters.year, props.active],
   () => {
     if (props.active) {
       void fetchReport();

package/components/Nfc/PatrolReport/ReportFilters.vue

@@ -63,6 +63,25 @@
       />
     </v-col>
 
+    <!-- Monthly Report: which year. Each month's row then opens that month. -->
+    <v-col
+      v-if="showYearFilter"
+      cols="12"
+      md="2"
+      class="px-md-2 mb-2 mb-md-0"
+    >
+      <v-select
+        :model-value="reportYear(modelValue.year)"
+        :items="reportYears()"
+        label="Year"
+        class="filter-field"
+        variant="outlined"
+        density="comfortable"
+        hide-details
+        @update:model-value="updateFilter('year', $event)"
+      />
+    </v-col>
+
     <v-spacer />
 
     <v-col cols="12" md="2" class="pl-md-2">
@@ -99,6 +118,7 @@ import type {
   NFCPatrolReportFilters,
 } from "../../../types/nfc-patrol-report";
 import ReportDatePicker from "./ReportDatePicker.vue";
+import { reportYear, reportYears } from "../../../utils/nfc-patrol-report";
 
 const props = withDefaults(
   defineProps<{
@@ -106,12 +126,14 @@ const props = withDefaults(
     options: NFCPatrolReportFilterOptions;
     showTimeFilter?: boolean;
     showDateFilter?: boolean;
+    showYearFilter?: boolean;
   }>(),
   {
     showTimeFilter: true,
     showDateFilter: true,
+    showYearFilter: false,
   },
-);;
+);
 
 const emit = defineEmits<{
   "update:modelValue": [value: NFCPatrolReportFilters];

package/components/Nfc/PatrolReport/SummaryReportTable.vue

@@ -108,6 +108,7 @@ function skipped(row: NFCPatrolReportSummaryRow) {
 }
 
 function statusClass(status: NFCPatrolReportSummaryStatus) {
+  if (status === "In progress") return "text-warning";
   return status === "Completed" ? "text-success" : "text-error";
 }
 </script>

package/components/ScheduleAreaMain.vue

@@ -56,6 +56,7 @@
               />
 
               <v-select
+                v-if="props.showAreaType"
                 v-model="areaTypeFilter"
                 :items="typeOptions"
                 density="compact"
@@ -155,6 +156,9 @@ const props = defineProps({
   canGenerateChecklist: { type: Boolean, default: false },
   canViewHistory: { type: Boolean, default: false },
   canManageScheduleTasks: { type: Boolean, default: false },
+  // Common / Toilet is a cleaning distinction; apps without it hide the Type
+  // filter and column (saved `type` values are untouched).
+  showAreaType: { type: Boolean, default: true },
 });
 
 // "Daily Checklist – Cleaning" / "– Landscape" / ... (same title as the day list)
@@ -172,7 +176,7 @@ const pageRange = ref("-- - -- of --");
 const headers = [
   { title: "Area", value: "name" },
   { title: "Status", value: "status" },
-  { title: "Type", value: "type" },
+  ...(props.showAreaType ? [{ title: "Type", value: "type" }] : []),
   { title: "Visits per day", value: "set" },
 ];
 

package/components/UnitMain.vue

@@ -187,7 +187,9 @@
     title="Import Units from Excel"
     noun="units"
     name-label="Unit"
-    fill-hint="One unit per row, e.g. Toilet Bowl, Sofa."
+    :fill-hint="/mechanical/i.test(props.serviceType)
+      ? 'One unit per row, e.g. Air-con Unit, Water Pump.'
+      : 'One unit per row, e.g. Toilet Bowl, Sofa.'"
     duplicate-note="Units already on the list are skipped and left unchanged."
     template-file-name="units-import-template.xlsx"
     :download-template="() => downloadTemplate('units', importQuery)"

package/components/VisitorManagement.vue

@@ -368,6 +368,7 @@
           <v-menu
             v-if="item.accessCards?.type === 'NFC' && item.accessCards?.cardNo"
             :close-on-content-click="false"
+            @update:model-value="(open: boolean) => open && loadNfcCardNos(item)"
           >
             <template #activator="{ props: nfcMenuProps }">
               <div
@@ -400,7 +401,7 @@
                   v-for="card in cardGroup.filter((c: any) => c._id !== item.accessCards._id)"
                   :key="card._id"
                   prepend-icon="mdi-credit-card-outline"
-                  :title="card._id"
+                  :title="nfcCardLabel(card, item)"
                 />
               </template>
             </v-list>
@@ -1272,7 +1273,7 @@
             <div class="d-flex align-center ga-2 mb-2">
               <v-icon size="18" icon="mdi-credit-card-outline" color="purple" />
               <v-chip size="small" variant="tonal" color="purple">{{
-                card.cardNo
+                nfcCardNos[card.cardId] || card.cardNo
               }}</v-chip>
             </div>
             <v-select
@@ -1687,7 +1688,35 @@ const {
   visitorDataFromScannedQRCodeCheckIn,
   sendPassSms,
 } = useVisitor();
-const { visitorCheckout } = useAccessManagement();
+const { visitorCheckout, getCardDetails } = useAccessManagement();
+
+// A visitor's extra NFC cards are stored as ids only, so their card numbers
+// are read when the card list (or the return dialog) opens. Until then, or if
+// the card can't be read, a plain placeholder shows - never the database id.
+const nfcCardNos = reactive<Record<string, string>>({});
+function nfcCardLabel(card: any, visitor: any): string {
+  const id = String(card?._id ?? "");
+  if (card?.cardNo) return card.cardNo;
+  if (id && id === String(visitor?.accessCards?._id ?? ""))
+    return visitor.accessCards.cardNo;
+  return nfcCardNos[id] || "Card number not available";
+}
+async function loadNfcCardNos(visitor: any) {
+  const ids = ((visitor?.cards?.flat?.() ?? []) as any[])
+    .filter((c) => c?._id && !c.cardNo && !nfcCardNos[String(c._id)])
+    .map((c) => String(c._id))
+    .filter((id) => id !== String(visitor?.accessCards?._id ?? ""));
+  await Promise.all(
+    ids.map(async (cardId) => {
+      try {
+        const res = await getCardDetails({ siteId, cardId });
+        if (res?.data?.cardNo) nfcCardNos[cardId] = String(res.data.cardNo);
+      } catch {
+        // left as the placeholder
+      }
+    })
+  );
+}
 const {
   debounce,
   formatCamelCaseToWords,
@@ -2903,10 +2932,7 @@ function handleCheckout(userId: string) {
     const allCards: any[] = visitor.cards?.flat() ?? [];
     nfcCardReturnStatuses.value = allCards.map((card: any) => ({
       cardId: card._id,
-      cardNo:
-        card._id === visitor.accessCards._id
-          ? visitor.accessCards.cardNo
-          : card._id,
+      cardNo: nfcCardLabel(card, visitor),
       status: "In Use",
       remarks: "",
     }));
@@ -2920,6 +2946,7 @@ function handleCheckout(userId: string) {
         },
       ];
     }
+    loadNfcCardNos(visitor);
     dialog.returnNfcCard = true;
     return;
   }

package/composables/useNFCPatrolMonthlyReport.ts

@@ -11,6 +11,7 @@ import {
   mapLogsToMonthlyRows,
   mapLogsToMonthRuns,
   monthIndexOf,
+  reportYear,
 } from "../utils/nfc-patrol-report";
 
 interface NFCPatrolLogListResponse {
@@ -53,7 +54,7 @@ export function useNFCPatrolMonthlyReport(
    */
   const failed = ref(false);
 
-  // The year's patrol logs, kept so a month's row can open its list without
+  // The picked year's patrol logs, kept so a month's row can open its list without
   // asking the server again. Not deep-reactive: nothing edits them.
   const logs = shallowRef<Record<string, any>[]>([]);
   let siteTimezone: string | undefined;
@@ -70,7 +71,7 @@ export function useNFCPatrolMonthlyReport(
     loading.value = true;
     notFound.value = false;
     failed.value = false;
-    const currentYear = new Date().getFullYear().toString();
+    const year = reportYear(filters.year);
     try {
       // The whole year, not page one of it. `collectAllPages` reads the page
       // count out of the first reply and walks the rest.
@@ -81,7 +82,8 @@ export function useNFCPatrolMonthlyReport(
             limit: 100,
             site,
             routeId: filters.route,
-            date: currentYear,
+            // "YYYY" + type "month": the server returns that whole year.
+            date: year,
             type: "month",
           }),
         ),

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,11 +15,13 @@ function getTodayDate() {
 }
 export function useNFCPatrolReportFilters(site: string) {
   const { getAll: getPatrolRoutes } = useNFCPatrolRoute();
+  const { getAll: getPatrolLogs } = useNFCPatrolLog();
 
   const filters = reactive<NFCPatrolReportFilters>({
     route: "",
     timeRange: "",
     date: getTodayDate(),
+    year: String(new Date().getFullYear()),
   });
 
   const options = ref<NFCPatrolReportFilterOptions>({
@@ -34,17 +38,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 +66,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 +75,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/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.142.0",
+  "version": "4.144.0",
   "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.",

package/types/nfc-patrol-report.ts

@@ -1,11 +1,13 @@
 export type NFCPatrolReportTab = "patrol" | "daily" | "monthly";
 
-export type NFCPatrolActivityStatus = "Completed" | "Skipped";
+export type NFCPatrolActivityStatus = "Completed" | "Skipped" | "Pending";
 
 export interface NFCPatrolReportFilters {
   route: string;
   timeRange: string;
   date: string;
+  /** The Monthly Report's year, "YYYY". Absent = the current year. */
+  year?: string;
 }
 
 export interface NFCPatrolReportExportRequest {
@@ -17,6 +19,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 +73,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,45 @@ 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 Monthly Report's year: the one picked, or the current year. */
+export function reportYear(year?: string, now = new Date()) {
+  return /^\d{4}$/.test(year ?? "") ? (year as string) : String(now.getFullYear());
+}
+
+/**
+ * The years the Monthly Report offers, newest first: this year and the five
+ * before it.
+ */
+// ponytail: fixed 6-year window; derive from the oldest log if sites need more.
+export function reportYears(now = new Date(), count = 6) {
+  const current = now.getFullYear();
+  return Array.from({ length: count }, (_, i) => String(current - i));
+}
+
 /** 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 +130,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 +146,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 +208,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 +241,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;
+}