@7365admin1/layer-common 4.143.0 → 4.144.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @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
@@ -3413,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

@@ -111,7 +111,7 @@
               {{
                 form.timed
                   ? "Patrols start at the route's start times, within the tolerance."
-                  : "No time window: this route can be patrolled at any time."
+                  : "No time window: patrol at any time of day, on the selected Days only. Use Select all for every day."
               }}
             </div>
           </v-col>

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/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

@@ -21,6 +21,7 @@ export function useNFCPatrolReportFilters(site: string) {
     route: "",
     timeRange: "",
     date: getTodayDate(),
+    year: String(new Date().getFullYear()),
   });
 
   const options = ref<NFCPatrolReportFilterOptions>({

package/package.json

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

@@ -6,6 +6,8 @@ export interface NFCPatrolReportFilters {
   route: string;
   timeRange: string;
   date: string;
+  /** The Monthly Report's year, "YYYY". Absent = the current year. */
+  year?: string;
 }
 
 export interface NFCPatrolReportExportRequest {

package/utils/nfc-patrol-report.ts

@@ -102,6 +102,21 @@ export function isMissedCheckpoint(
   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();