@7365admin1/layer-common 4.64.3 → 4.65.0

package/components/InvitationForm.vue

@@ -59,7 +59,7 @@
                       <v-list-item-title class="text-wrap">
                         {{ noRolesText }}
                       </v-list-item-title>
-                      <NuxtLink v-if="rolesPageLink" :to="rolesPageLink">
+                      <NuxtLink v-if="rolesPageLink && !rolesError" :to="rolesPageLink">
                         Open Roles &amp; Permissions
                       </NuxtLink>
                     </v-list-item>
@@ -474,7 +474,7 @@ const { getInvitableRoles } = useRole();
  * templates are gone from any invitation that names an organisation - the
  * server refuses them there (`core roleInvitable`).
  */
-const { data: RolesData, refresh: refreshRoles } = await useLazyAsyncData(
+const { data: RolesData, refresh: refreshRoles, error: rolesError } = await useLazyAsyncData(
   "get-roles-by-type-" + props.org + "-" + props.app + "-" + fixedSite.value,
   () =>
     getInvitableRoles({
@@ -502,7 +502,9 @@ watchEffect(() => {
 const roleOptions = computed(() => inviteRoleOptions(roles.value));
 
 const noRolesText = computed(() =>
-  fixedSite.value
+  rolesError?.value
+    ? "The roles could not be loaded. You may not have access to this organisation's roles; refresh, or sign in again."
+    : fixedSite.value
     ? "No roles have been created for this site yet. Create one in Roles & Permissions first."
     : "No roles have been created yet. Create one in Roles & Permissions first."
 );

package/components/UnitMain.vue

@@ -37,9 +37,8 @@
                       v-bind="t"
                       class="ma-1 screen-icon-btn"
                       variant="flat"
-                      href="/files/unit-sample-data.xlsx"
-                      target="_blank"
-                      download
+                      :loading="templateDownloading"
+                      @click="downloadLiveTemplate"
                     >
                       <v-icon>mdi-download</v-icon>
                     </v-btn>
@@ -183,16 +182,25 @@
     :color="messageColor"
   />
 
-  <input
-    ref="fileInput"
-    type="file"
-    accept=".csv,.xlsx,.xls"
-    style="display: none"
-    @change="onFileSelected"
+  <ImportExcelDialog
+    v-model="showImport"
+    title="Import Units from Excel"
+    noun="units"
+    name-label="Unit"
+    fill-hint="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)"
+    :check="(file: File) => checkImport('units', file, importQuery)"
+    :commit="(file: File) => commitImport('units', file, importQuery)"
+    @done="getUnitsRefresh()"
+    @error="(text: string) => showMessage(text, 'error')"
   />
 </template>
 
 <script setup lang="ts">
+import useImportTemplates from "../composables/useImportTemplates";
+import { saveBlob } from "../composables/useInventory";
 import useUnits from "../composables/useUnits";
 import useUtils from "../composables/useUtils";
 
@@ -220,7 +228,6 @@ const {
   createUnit,
   updateUnit,
   deleteUnit,
-  uploadUnits,
   downloadUnits,
 } = useUnits();
 
@@ -271,7 +278,6 @@ const selectedUnit = ref<Record<string, any> | null>(null);
 const message = ref("");
 const messageSnackbar = ref(false);
 const messageColor = ref("");
-const fileInput = ref<HTMLInputElement | null>(null);
 
 const dialogShowMoreActions = ref(false);
 const dialogShowForm = ref(false);
@@ -341,30 +347,26 @@ async function handleDownloadExcel() {
 }
 
 function onImportData() {
-  fileInput.value?.click();
+  showImport.value = true;
 }
 
-async function onFileSelected(event: Event) {
-  const target = event.target as HTMLInputElement;
-  const file = target.files?.[0];
-
-  if (!file) return;
-
+// The template is made live from this property's own data (dropdowns, instructions, the property named inside).
+const { downloadTemplate, checkImport, commitImport } = useImportTemplates();
+const importQuery = computed(() => ({ site: String(props.site ?? ""), serviceType: props.serviceType || undefined }));
+const showImport = ref(false);
+const templateDownloading = ref(false);
+async function downloadLiveTemplate() {
+  templateDownloading.value = true;
   try {
-    submitting.value = true;
-
-    const response = await uploadUnits(file, props.site, props.serviceType);
-    showMessage(response?.message, "success");
-
-    await getUnitsRefresh();
-  } catch (err: any) {
-    showMessage(err?.data?.message, "error");
+    saveBlob(await downloadTemplate("units", importQuery.value), "units-import-template.xlsx");
+  } catch (error: any) {
+    showMessage(error?.data?.message || "Could not download the template.", "error");
   } finally {
-    submitting.value = false;
-    target.value = "";
+    templateDownloading.value = false;
   }
 }
 
+
 function onCreateUnit() {
   dialogMode.value = "add";
   editingUnit.value = {};

package/components/VehicleBulkAddForm.vue

@@ -284,6 +284,8 @@
 
 <script setup lang="ts">
 import useVehicle from "../composables/useVehicle";
+import useImportTemplates from "../composables/useImportTemplates";
+import { saveBlob } from "../composables/useInventory";
 import useBuilding from "../composables/useBuilding";
 import { errorConverter } from "../utils/data";
 // @ts-ignore - the country list the one-vehicle form's phone field uses.
@@ -320,6 +322,8 @@ import {
   mapUploadedGrid,
   vehicleBulkTemplateCsv,
   xlsxToGrid,
+  xlsxMeta,
+  templateRefusal,
 } from "../utils/vehicle-bulk-sheet";
 
 /**
@@ -348,6 +352,7 @@ const prop = defineProps({
 const emit = defineEmits(["back", "close", "added"]);
 
 const { addVehiclesBulk } = useVehicle();
+const { downloadTemplate: downloadLiveTemplate } = useImportTemplates();
 const { getBlocksSelection, getLevelsSelection, getUnitSelection } = useBuilding();
 
 type Option = { title: string; value: string };
@@ -1043,18 +1048,19 @@ function statusColour(status: BulkRowStatus) {
 
 /* --------------------------- template and file ---------------------------- */
 
-/** The blank sheet, for filling in somewhere else. Opens in Excel or Sheets. */
-function downloadTemplate() {
-  // A BOM, so Excel opens it as UTF-8 and a name with an accent survives.
-  const blob = new Blob(["", vehicleBulkTemplateCsv()], {
-    type: "text/csv;charset=utf-8;",
-  });
-  const url = URL.createObjectURL(blob);
-  const link = document.createElement("a");
-  link.href = url;
-  link.download = "vehicle-whitelist-template.csv";
-  link.click();
-  URL.revokeObjectURL(url);
+/**
+ * The sheet to fill in somewhere else: an Excel file made live from this
+ * site's own blocks, levels and units, with them as dropdowns, an example row
+ * and an Instructions sheet. If the server cannot make it, the plain CSV
+ * headings are offered instead so the person is never stuck.
+ */
+async function downloadTemplate() {
+  try {
+    saveBlob(await downloadLiveTemplate("vehicles", { site: prop.site }), "vehicle-whitelist-template.xlsx");
+  } catch {
+    // A BOM, so Excel opens it as UTF-8 and a name with an accent survives.
+    saveBlob(new Blob(["", vehicleBulkTemplateCsv()], { type: "text/csv;charset=utf-8;" }), "vehicle-whitelist-template.csv");
+  }
 }
 
 /** The first row that is free to be written into. */
@@ -1083,9 +1089,15 @@ async function onFileChosen(event: Event) {
   uploading.value = true;
 
   try {
-    const grid = isWorkbookName(chosen.name)
-      ? await xlsxToGrid(await chosen.arrayBuffer())
-      : parsePastedGrid(await chosen.text());
+    const workbook = isWorkbookName(chosen.name) ? await chosen.arrayBuffer() : null;
+    if (workbook) {
+      const refusal = templateRefusal(await xlsxMeta(workbook), { kind: "vehicles", site: prop.site });
+      if (refusal) {
+        formError.value = refusal;
+        return;
+      }
+    }
+    const grid = workbook ? await xlsxToGrid(workbook) : parsePastedGrid(await chosen.text());
     const sheet = mapUploadedGrid(grid);
 
     if (!sheet.matchesTemplate) {
@@ -1117,7 +1129,9 @@ async function onFileChosen(event: Event) {
     moveTo(start, 0);
 
     resultNote.value =
-      `${sheet.rows.length} row(s) read from ${chosen.name}. Check anything ` +
+      `${sheet.rows.length} row(s) read from ${chosen.name}` +
+      (sheet.exampleRowIgnored ? " (the example row was left out)" : "") +
+      `. Check anything ` +
       `marked red - a block, level or unit that is not one of this site's own ` +
       `is left blank - then press Submit.`;
   } catch {

package/composables/useAccessManagement.ts

@@ -228,7 +228,11 @@ export default function useAccessManagement() {
     unitId: string;
     page?: number;
     limit?: number;
+    /** Card-number search. Sent only when non-empty; API-core does not read
+     *  it yet, so until it does the list comes back unfiltered. */
+    search?: string;
   }) {
+    const search = params.search?.trim();
     return useNuxtApp().$api<Record<string, any>>(
       `/api/access-management/available-card-contractor/${params.type}`,
       {
@@ -238,6 +242,7 @@ export default function useAccessManagement() {
           unitId: params.unitId,
           page: params.page ?? 1,
           limit: params.limit ?? 100,
+          ...(search ? { search } : {}),
         },
       }
     );

package/composables/useImportTemplates.ts

@@ -0,0 +1,24 @@
+import type { TImportResult } from "../utils/import-result";
+
+/**
+ * Excel templates made live from the property's own data (`/api/import-templates`),
+ * and the check-then-save import behind building units, areas and units.
+ * Vehicles and cameras only download their template here; their files are read
+ * on screen.
+ */
+export type TTemplateKind = "building-units" | "areas" | "units" | "vehicles" | "cameras";
+
+export default function useImportTemplates() {
+  const api = <T = any>(kind: TTemplateKind, path: string, options: Record<string, any> = {}) =>
+    useNuxtApp().$api<T>(`/api/import-templates/${kind}/${path}`, options);
+  const send = (kind: TTemplateKind, path: "check" | "commit", file: File, query: Record<string, string | undefined>) => {
+    const body = new FormData();
+    body.append("file", file);
+    return api<TImportResult>(kind, path, { method: "POST", body, query });
+  };
+  return {
+    downloadTemplate: (kind: TTemplateKind, query: { site: string; serviceType?: string }) => api<Blob>(kind, "template", { query, responseType: "blob" }),
+    checkImport: (kind: TTemplateKind, file: File, query: { site: string; serviceType?: string }) => send(kind, "check", file, query),
+    commitImport: (kind: TTemplateKind, file: File, query: { site: string; serviceType?: string }) => send(kind, "commit", file, query),
+  };
+}

package/composables/useInventory.ts

@@ -1,3 +1,5 @@
+import type { TImportResult } from "../utils/import-result";
+
 /**
  * Inventory API (`/api/inventory`). What a person may do in a store comes back
  * on the store itself (`store.access`), decided by the server — screens show
@@ -67,14 +69,19 @@ export default function useInventory() {
         `/stores/${store}/legacy-equipment/import`,
         { method: "POST", body: { serviceType, commit } },
       ),
-    importTemplate: () => api<Blob>("/import-template", { responseType: "blob" }),
+    /** The store's own item template: live dropdowns (units, packing, categories) and the store named inside. */
+    importTemplate: (store: string) => api<Blob>(`/stores/${store}/import-template`, { responseType: "blob" }),
     importItems: (store: string, file: File, commit: boolean) => {
       const body = new FormData();
       body.append("file", file);
-      return api<{ committed: boolean; ready: number; skipped: number; errors: number; rows: { row: number; name: string; status: string; message: string }[] }>(
-        `/stores/${store}/import`,
-        { method: "POST", body, query: { commit } },
-      );
+      return api<TImportResult>(`/stores/${store}/import`, { method: "POST", body, query: { commit } });
+    },
+    /** Bulk deliveries: the store's items as a dropdown. */
+    receiveTemplate: (store: string) => api<Blob>(`/stores/${store}/receive-template`, { responseType: "blob" }),
+    importReceipts: (store: string, file: File, commit: boolean) => {
+      const body = new FormData();
+      body.append("file", file);
+      return api<TImportResult>(`/stores/${store}/receive-import`, { method: "POST", body, query: { commit } });
     },
   };
 }

package/composables/useSiteEntryPassSettings.ts

@@ -27,9 +27,35 @@ export default function useSiteEntryPassSettings() {
     );
   }
 
+  /**
+   * The encrypted ACM URL the access-card screens hand to API-core, which
+   * decrypts it and sends the ACM commands to that host.
+   *
+   * Resolves the site's own "Enter entrypass URL" setting first, the way
+   * `VisitorForm` does for contractor passes. The access-card forms used to
+   * call `/api/encrypt-acm-url` with no `url`, so every site's door/lift
+   * levels and access groups came from the route's hardcoded default host
+   * whatever the site had configured. A site with no URL set, or whose
+   * settings cannot be read, still gets that default.
+   */
+  async function getEncryptedAcmUrl(siteId: string): Promise<string> {
+    let rawUrl = "";
+    try {
+      const settings: any = await getBySiteId(siteId);
+      rawUrl = String(settings?.data?.settings?.url ?? "").trim();
+    } catch {
+      // No entry pass settings for this site yet - the default host applies.
+    }
+    const { encrypted } = await $fetch<{ encrypted: string }>(
+      `/api/encrypt-acm-url${rawUrl ? `?url=${encodeURIComponent(rawUrl)}` : ""}`,
+    );
+    return encrypted;
+  }
+
   return {
     getBySiteId,
     getById,
     save,
+    getEncryptedAcmUrl,
   };
 }

package/composables/useWebUsb.ts

@@ -345,16 +345,19 @@ export default function useWebUsb() {
       70,
     );
 
-    const qrSmall = 140;
-    const qrCenter = 250;
-    const margin = 20;
-    const qrCanvas = await QRCode.toCanvas(qrUrlImage, { width: qrCenter });
+    // The pass used to print five copies of the same QR - four 140px ones at
+    // the corners around a 250px centre - so a strip could be cut apart. It now
+    // prints a single large QR filling that same band (y 90 to 440, above the
+    // company name at y 470), which scans far more reliably on a thermal print.
+    // Generated at the size it is drawn at: the old corner copies were
+    // downscaled from the 250px canvas, which softened their modules.
+    const qrSize = 350;
+    const qrCanvas = await QRCode.toCanvas(qrUrlImage, {
+      width: qrSize,
+      margin: 1,
+    });
 
-    ctx.drawImage(qrCanvas, margin, 90, qrSmall, qrSmall);
-    ctx.drawImage(qrCanvas, canvas.width - qrSmall - margin, 90, qrSmall, qrSmall);
-    ctx.drawImage(qrCanvas, (canvas.width - qrCenter) / 2, 110, qrCenter, qrCenter);
-    ctx.drawImage(qrCanvas, margin, 300, qrSmall, qrSmall);
-    ctx.drawImage(qrCanvas, canvas.width - qrSmall - margin, 300, qrSmall, qrSmall);
+    ctx.drawImage(qrCanvas, (canvas.width - qrSize) / 2, 90, qrSize, qrSize);
 
     ctx.font = "25px Arial";
     ctx.fillText(companyName || "", canvas.width / 2, 470);
@@ -401,8 +404,8 @@ export default function useWebUsb() {
   /**
    * The self-service onboarding QR: one large QR code, a "SCAN QR CODE"-style
    * subtext, and a dark site-name banner along the bottom - a single-purpose
-   * gate sign, not the multi-copy visitor-pass receipt `createReceiptLayout`
-   * produces (that one prints several QRs to be cut apart and handed out).
+   * gate sign, not the visitor-pass receipt `createReceiptLayout` produces
+   * (that one pairs its QR with company, date, access and instruction lines).
    */
   async function createOnboardingQrLayout(
     qrUrlImage: string,

package/package.json

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

@@ -90,6 +90,8 @@ declare type TInventoryTransaction = {
   photos?: { before: string[]; after: string[]; other: string[] };
   remarks?: string;
   reportedBy?: string;
+  /** Opening stock: who received it, when not the person who entered it. */
+  receivedBy?: string;
   date: string;
   createdByName: string;
 };

package/utils/camera-csv.ts

@@ -103,6 +103,8 @@ function splitLine(line: string): string[] {
 /** A header cell, normalised to the sheet's snake_case spelling. */
 function normaliseColumn(value: string): string {
   return value
+    // "Camera Name *" in the Excel template is camera_name: the * only marks it required.
+    .replace(/\*/g, "")
     .trim()
     .toLowerCase()
     .replace(/^/, "")

package/utils/import-result.ts

@@ -0,0 +1,62 @@
+/**
+ * What an Excel import's check (or save) comes back with, and the plain words
+ * and error report built from it. Shared by every "Import from Excel" dialog.
+ */
+
+export type TImportIssue = { row: number; column: string; message: string };
+
+export type TImportRow = { row: number; name: string; status: "ready" | "added" | "skipped" | "error"; message: string };
+
+export type TImportResult = {
+  committed: boolean;
+  ready: number;
+  skipped: number;
+  errors: number;
+  exampleRowIgnored?: boolean;
+  deliveries?: number;
+  issues?: TImportIssue[];
+  rows: TImportRow[];
+};
+
+/** One sentence for the top of the preview. `noun` is plural, e.g. "items". */
+export function importSummary(result: TImportResult, noun = "rows"): string {
+  const parts: string[] = [];
+  if (result.committed) parts.push(`${result.ready} ${noun} saved.`);
+  else if (result.errors) parts.push(`${result.errors} row(s) need fixing — nothing will be saved until they are fixed.`);
+  else parts.push(`${result.ready} ${noun} ready to save.`);
+  if (!result.committed && result.errors && result.ready) parts.push(`${result.ready} other row(s) are fine.`);
+  if (result.skipped) parts.push(`${result.skipped} already in the system or repeated — they will be left unchanged.`);
+  if (result.exampleRowIgnored) parts.push("The example row was ignored.");
+  return parts.join(" ");
+}
+
+export const IMPORT_STATUS_LABEL: Record<TImportRow["status"], string> = {
+  ready: "Ready",
+  added: "Saved",
+  skipped: "Skipped",
+  error: "Needs fixing",
+};
+
+const csvCell = (v: unknown) => {
+  const s = String(v ?? "");
+  return /[",\r\n]/.test(s) ? `"${s.replace(/"/g, '""')}"` : s;
+};
+
+/**
+ * The error report: one line per problem — the row number in the Excel file,
+ * the column, and what to fix. Rows with an error but no column-level issue
+ * are listed with their message. Opens in Excel.
+ */
+export function importErrorReportCsv(result: TImportResult): string {
+  const lines: string[][] = [["Row in your file", "Column", "What to fix", "Item"]];
+  const nameOf = new Map(result.rows.map((r) => [r.row, r.name]));
+  const covered = new Set<number>();
+  for (const i of result.issues ?? []) {
+    lines.push([String(i.row), i.column, i.message, nameOf.get(i.row) ?? ""]);
+    covered.add(i.row);
+  }
+  for (const r of result.rows) {
+    if (r.status === "error" && !covered.has(r.row)) lines.push([String(r.row), "", r.message, r.name]);
+  }
+  return "" + lines.map((l) => l.map(csvCell).join(",")).join("\r\n") + "\r\n";
+}

package/utils/vehicle-bulk-sheet.ts

@@ -97,6 +97,8 @@ export type UploadedSheet = {
   matchesTemplate: boolean;
   /** The heading line as the file spells it - for telling a person what it has. */
   header: string[];
+  /** A template example row was left in and was not read. */
+  exampleRowIgnored?: boolean;
 };
 
 /**
@@ -138,14 +140,16 @@ export function mapUploadedGrid(grid: string[][]): UploadedSheet {
   // Every line under the header is somebody's car. Nothing is dropped for
   // looking like something else - two people in one household can have the
   // same details but for the plate, and a repeated row is the person's to fix.
-  const rows = lines
-    .slice(1)
+  const body = lines.slice(1);
+  // The example row of a template the server made is marked beside it; it is nobody's car.
+  const rows = body
+    .filter((line) => !isExampleLine(line))
     .map((line) =>
       BULK_SHEET_HEADINGS.map((_, column) => String(line[column] ?? "").trim()),
     )
     .filter((line) => !isEmptyLine(line));
 
-  return { rows, matchesTemplate: true, header };
+  return { rows, matchesTemplate: true, header, exampleRowIgnored: body.some(isExampleLine) };
 }
 
 /**
@@ -385,3 +389,55 @@ export async function xlsxToGrid(data: ArrayBuffer | Uint8Array): Promise<string
 export function isWorkbookName(name: string): boolean {
   return /\.(xlsx|xlsm)$/i.test(String(name ?? ""));
 }
+
+/* ------------------------------ live templates ----------------------------- */
+
+/** Beside the example row of every template the server makes. */
+export const TEMPLATE_EXAMPLE_MARK = "Example – delete this row";
+
+/** Does this line carry the template's example-row mark? */
+export function isExampleLine(cells: string[]): boolean {
+  return (cells ?? []).some((cell) => String(cell ?? "").includes(TEMPLATE_EXAMPLE_MARK));
+}
+
+/**
+ * The hidden "_meta" sheet of a template the server made: which kind of
+ * template it is and the property it was made for (`kind`, `site`,
+ * `siteName`). Empty for any other workbook.
+ */
+export async function xlsxMeta(data: ArrayBuffer | Uint8Array): Promise<Record<string, string>> {
+  const bytes = data instanceof Uint8Array ? data : new Uint8Array(data);
+  const entries = readZipEntries(bytes);
+  const book = entries.get("xl/workbook.xml");
+  const rels = entries.get("xl/_rels/workbook.xml.rels");
+  if (!book || !rels) return {};
+  const sheet = (await readPart(bytes, book)).match(/<sheet\b[^>]*\bname="_meta"[^>]*>/)?.[0];
+  const rid = sheet?.match(/\br:id="([^"]+)"/)?.[1];
+  if (!rid) return {};
+  const relation = ((await readPart(bytes, rels)).match(/<Relationship\b[^>]*>/g) ?? []).find((tag) => tag.includes(` Id="${rid}"`));
+  const target = relation?.match(/\bTarget="([^"]+)"/)?.[1];
+  const part = target ? entries.get(target.startsWith("/") ? target.slice(1) : `xl/${target}`) : undefined;
+  if (!part) return {};
+  const sharedEntry = entries.get("xl/sharedStrings.xml");
+  const strings = sharedEntry ? sharedStringsOf(await readPart(bytes, sharedEntry)) : [];
+  const meta: Record<string, string> = {};
+  for (const line of sheetToGrid(await readPart(bytes, part), strings).slice(1)) {
+    if (line[0]) meta[String(line[0])] = String(line[1] ?? "");
+  }
+  return meta;
+}
+
+/**
+ * Why a template may not be used here, or "" when it may: a template made for
+ * another property, or a different kind of template. A workbook without the
+ * hidden sheet (an older template, a person's own file) is allowed.
+ */
+export function templateRefusal(meta: Record<string, string>, expected: { kind: string; site: string }): string {
+  if (meta.kind && meta.kind !== expected.kind) {
+    return "This is a different kind of template. Download the template on this screen and copy your rows into it.";
+  }
+  if (meta.site && expected.site && meta.site !== expected.site) {
+    return `This file was made for ${meta.siteName ? `"${meta.siteName}"` : "another property"}. Download the template on this screen and copy your rows into it.`;
+  }
+  return "";
+}