@7365admin1/layer-common 4.35.1-staging.426 → 4.35.1-staging.428

package/components/InventoryItemDetail.vue

@@ -12,7 +12,7 @@
           <div class="flex-grow-1">
             <div class="text-h5 mb-1" :class="item.lowStock ? 'text-error' : ''">{{ item.onHand }} {{ item.unit }} in store</div>
             <div class="text-body-2 text-medium-emphasis">
-              {{ [item.code && `Code ${item.code}`, item.category, item.packing, item.reorderLevel ? `Alert at ${item.reorderLevel}` : "", item.unitCost !== undefined ? `$${Number(item.unitCost).toFixed(2)} each` : ""].filter(Boolean).join(" · ") }}
+              {{ [inventoryItemMeta(item), item.reorderLevel ? `Alert at ${item.reorderLevel}` : "", item.unitCost !== undefined ? `$${Number(item.unitCost).toFixed(2)} each` : ""].filter(Boolean).join(" · ") }}
             </div>
             <div v-if="item.description" class="text-body-2 mt-2">{{ item.description }}</div>
           </div>
@@ -77,6 +77,7 @@
 import useInventory from "../composables/useInventory";
 import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
+import { inventoryItemMeta } from "../utils/inventory-store-label";
 
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({
@@ -114,7 +115,7 @@ function describe(t: TInventoryTransaction) {
       t.reference || "",
     );
   if (t.type === "adjust") parts.push(t.remarks || "");
-  if (t.type === "opening") parts.push(t.remarks || "");
+  if (t.type === "opening") parts.push(t.supplier || "", t.reference ? `PO ${t.reference}` : "", t.receivedBy ? `received by ${t.receivedBy}` : "", t.remarks || "");
   return parts.filter(Boolean).join(" · ");
 }
 

package/components/InventoryItemDialog.vue

@@ -35,11 +35,39 @@
               <InputLabel title="Unit price" class="mb-1" />
               <v-text-field v-model.number="f.unitCost" type="number" min="0" step="0.01" prefix="$" density="comfortable" :rules="[moneyRule]" hint="Price of one unit" persistent-hint />
             </v-col>
-            <v-col v-if="!item" cols="12" sm="4">
-              <InputLabel title="Current stock" class="mb-1" />
-              <v-text-field v-model.number="f.openingQty" type="number" min="0" density="comfortable" :rules="[wholeRule]" hint="Quantity in the store today" persistent-hint />
-            </v-col>
           </v-row>
+          <!-- Stock already on the shelf, recorded like a delivery (one "Opening stock" entry in the item's history). -->
+          <template v-if="!item">
+            <div class="text-subtitle-2 mt-4">Opening stock</div>
+            <div class="text-caption text-medium-emphasis mb-2">
+              Stock you already have. It is recorded like a delivery and shows in the item's history and the Purchases report as "Opening stock".
+              Supplier and PO no. are optional — old stock may have none. Leave the quantity at 0 if you have none yet.
+            </div>
+            <v-row dense>
+              <v-col cols="12" sm="4">
+                <InputLabel title="Quantity" class="mb-1" />
+                <v-text-field v-model.number="f.openingQty" type="number" min="0" density="comfortable" :rules="[wholeRule]" :suffix="f.unit || ''" hint="How many are in the store now" persistent-hint />
+              </v-col>
+              <v-col cols="12" sm="4">
+                <InputLabel title="Date received (as at)" class="mb-1" />
+                <v-text-field v-model="f.openingDate" type="date" :max="today" density="comfortable" :disabled="!f.openingQty" hint="Blank = today" persistent-hint />
+              </v-col>
+              <v-col cols="12" sm="4">
+                <InputLabel title="Received by" class="mb-1" />
+                <v-text-field v-model="f.openingReceivedBy" density="comfortable" maxlength="120" :disabled="!f.openingQty" placeholder="You" hint="Blank = you" persistent-hint />
+              </v-col>
+              <v-col cols="12" sm="6">
+                <InputLabel title="Supplier" class="mb-1" />
+                <v-text-field v-model="f.openingSupplier" density="comfortable" maxlength="200" :disabled="!f.openingQty" hint="Optional" persistent-hint />
+              </v-col>
+              <v-col cols="12" sm="6">
+                <InputLabel title="PO no." class="mb-1" />
+                <v-text-field v-model="f.openingReference" density="comfortable" maxlength="100" :disabled="!f.openingQty" hint="Optional" persistent-hint />
+              </v-col>
+            </v-row>
+            <InputLabel title="Remarks" class="mb-1 mt-2" />
+            <v-text-field v-model="f.openingRemarks" density="comfortable" maxlength="1000" :disabled="!f.openingQty" placeholder="e.g. counted during stock-take" />
+          </template>
           <InputLabel title="Description" class="mb-1 mt-2" />
           <v-textarea v-model="f.description" rows="2" auto-grow density="comfortable" placeholder="Size, model, where it is used" />
           <InputLabel title="Photo" class="mb-1" />
@@ -63,7 +91,7 @@
 </template>
 
 <script setup lang="ts">
-import useInventory from "../composables/useInventory";
+import useInventory, { pickedDate } from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
 
 const show = defineModel<boolean>({ default: false });
@@ -83,7 +111,23 @@ const moneyRule = (v: any) => v === "" || v === null || Number(v) >= 0 || "Enter
 
 const form = ref();
 const saving = ref(false);
-const blank = () => ({ name: "", unit: "pcs", packing: "", code: "", category: "", reorderLevel: 0, unitCost: 0, openingQty: 0, description: "" });
+const blank = () => ({
+  name: "",
+  unit: "pcs",
+  packing: "",
+  code: "",
+  category: "",
+  reorderLevel: 0,
+  unitCost: 0,
+  openingQty: 0,
+  openingDate: "",
+  openingSupplier: "",
+  openingReference: "",
+  openingReceivedBy: "",
+  openingRemarks: "",
+  description: "",
+});
+const today = new Date().toLocaleDateString("en-CA");
 const f = reactive(blank());
 const photo = ref<string[]>([]);
 const inUse = ref(true);
@@ -116,7 +160,18 @@ async function save() {
       await updateItem(props.item._id, { ...body, status: inUse.value ? "active" : "inactive" });
       notify("Item saved.");
     } else {
-      await createItem(props.store._id, { ...body, openingQty: Number(f.openingQty || 0) });
+      const qty = Number(f.openingQty || 0);
+      const opening = qty
+        ? {
+            openingQty: qty,
+            openingDate: pickedDate(f.openingDate),
+            openingSupplier: f.openingSupplier,
+            openingReference: f.openingReference,
+            openingReceivedBy: f.openingReceivedBy,
+            openingRemarks: f.openingRemarks,
+          }
+        : { openingQty: 0 };
+      await createItem(props.store._id, { ...body, ...opening });
       notify("Item added.");
     }
     show.value = false;

package/components/InventoryReportsTab.vue

@@ -184,7 +184,7 @@ const help: Record<string, string> = {
   movement: "For each item: stock at the start of the month, what came in, what was issued and returned, count differences, and stock at the end.",
   usage: "Every recorded usage: where it was used, for which tenant, by whom, and the cost. Use this for tenant billing. Tick records and mark them checked once verified.",
   technicians: "For each person: stock they held at the start, took, used, returned, and hold at the end of the month.",
-  purchases: "Every delivery received, with totals by month and by supplier, to see how purchasing changes over time.",
+  purchases: "Every delivery received, and opening stock entered with new items (Type: Opening stock), with totals by month and by supplier.",
 };
 
 const headers: Record<string, any[]> = {
@@ -231,6 +231,7 @@ const headers: Record<string, any[]> = {
   ],
   purchases: [
     { title: "Date", key: "date" },
+    { title: "Type", key: "kind" },
     { title: "Supplier", key: "supplier" },
     { title: "PO No.", key: "reference" },
     { title: "Item", key: "itemName" },

package/components/InventorySettingsTab.vue

@@ -39,6 +39,7 @@
 <script setup lang="ts">
 import useInventory from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
+import { inventorySiteOptions } from "../utils/inventory-store-label";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -57,11 +58,7 @@ const sites = ref<string[]>([]);
 const showInResidentApp = ref(false);
 const showCostInResidentApp = ref(false);
 
-const siteItems = computed(() => {
-  const known = new Map(props.orgSites.map((s) => [s._id, s.name]));
-  for (const id of props.store.sites) if (!known.has(id)) known.set(id, "Current property");
-  return [...known].map(([_id, name]) => ({ _id, name }));
-});
+const siteItems = computed(() => inventorySiteOptions(props.orgSites, props.store));
 
 function reset() {
   name.value = props.store.name;

package/components/InventoryStockTab.vue

@@ -10,9 +10,15 @@
     </v-row>
 
     <div class="d-flex flex-wrap ga-2 align-center mb-3">
-      <v-btn v-if="store.access.canManage && !storeEmpty" class="text-none screen-btn-primary" variant="flat" prepend-icon="mdi-truck-delivery-outline" @click="open('receive')">
-        Receive Stock
-      </v-btn>
+      <v-menu v-if="store.access.canManage && !storeEmpty">
+        <template #activator="{ props: menu }">
+          <v-btn v-bind="menu" class="text-none screen-btn-primary" variant="flat" prepend-icon="mdi-truck-delivery-outline" append-icon="mdi-chevron-down">Receive Stock</v-btn>
+        </template>
+        <v-list density="compact">
+          <v-list-item prepend-icon="mdi-truck-delivery-outline" title="Record a delivery" @click="open('receive')" />
+          <v-list-item prepend-icon="mdi-file-excel-outline" title="Import deliveries from Excel" @click="showReceiveImport = true" />
+        </v-list>
+      </v-menu>
       <v-btn v-if="store.access.canApprove && !storeEmpty" class="text-none screen-btn-primary" variant="flat" prepend-icon="mdi-hand-extended-outline" @click="open('issue')">
         Issue Stock
       </v-btn>
@@ -61,7 +67,7 @@
           </v-avatar>
           <div>
             <div class="font-weight-medium">{{ item.name }}</div>
-            <div class="text-caption text-medium-emphasis">{{ [item.code, item.category, item.packing].filter(Boolean).join(" · ") }}</div>
+            <div class="text-caption text-medium-emphasis">{{ inventoryItemMeta(item) }}</div>
           </div>
         </div>
       </template>
@@ -86,6 +92,7 @@
     <InventoryLinesDialog v-model="lines.show" :mode="lines.mode" :store="store" :site-id="siteId" :sites="sites" @done="done" />
     <InventoryItemDialog v-model="itemDialog.show" :store="store" :item="itemDialog.item" @done="done" />
     <InventoryImportDialog v-model="showImport" :store="store" @done="done" />
+    <InventoryImportDialog v-model="showReceiveImport" :store="store" kind="receipts" @done="done" />
     <InventoryLegacyImportDialog v-model="showLegacy" :store="store" @done="done" />
     <InventoryItemDetail v-model="detail.show" :store="store" :item="detail.item" @edit="editItem" @done="done" />
   </div>
@@ -95,6 +102,7 @@
 import useInventory from "../composables/useInventory";
 import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
+import { inventoryItemMeta } from "../utils/inventory-store-label";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -167,6 +175,7 @@ function openItem(item: TInventoryItem) {
 }
 
 const showImport = ref(false);
+const showReceiveImport = ref(false);
 const showLegacy = ref(false);
 
 function done() {

package/components/NotificationBell.vue

@@ -30,7 +30,7 @@
 
       <v-card :width="440" elevation="0" class="notif-panel">
         <div class="notif-panel__head">
-          <span>Notification</span>
+          <span>Notifications</span>
           <v-btn
             v-if="unread > 0"
             variant="text"

package/components/NotificationSettings.vue

@@ -8,7 +8,7 @@
 
         <v-col cols="12" md="8" class="screen-hint intro-copy">
           Choose what you want to hear about, and how. These settings are yours
-          alone and apply everywhere you use iService — on this site and on your
+          alone and apply everywhere you use iService365 — on this site and on your
           phone.
         </v-col>
 

package/components/Robot/MiniMap.vue

@@ -49,7 +49,7 @@
     </RobotFloorPlan>
 
     <div class="hero-mini__foot">
-      <span>{{ shownMap ? `Robot map · ${shownMap.label}` : "Floor plan from robot (placeholder)" }}</span>
+      <span>{{ shownMap ? `Robot map · ${shownMap.label}` : "Sample layout, not this building's map" }}</span>
       <span v-if="type === 'security'"><span class="hero-mini__legend" aria-hidden="true" />Patrol routes</span>
       <span v-if="showRoutes && hasRoutes"><span class="hero-mini__legend hero-mini__legend--lane" aria-hidden="true" />Robot lanes</span>
       <span v-if="floor !== null" class="hero-mini__count">{{ robots.length }} on {{ floorName(floor) }}</span>

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/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/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.35.1-staging.426",
+  "version": "4.35.1-staging.428",
   "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/dashboard.ts

@@ -51,3 +51,14 @@ export function buildWorkOrderStatus(
     { label: "Pending", value: pending, percent: (pending / max) * 100, tone: "warn" },
   ];
 }
+
+/**
+ * The activity chart's top value. The six y-axis labels are max x 0, .2 ... 1
+ * rounded, so a raw max of 1 printed "0 0 0 1 1 1" - the same number on four
+ * lines. Rounding the top up to a multiple of 5 makes every label a distinct
+ * whole number (0 1 2 3 4 5, 0 2 4 6 8 10, ...).
+ */
+export function chartTopValue(values: number[]) {
+  const max = Math.max(0, ...values.filter((v) => Number.isFinite(v)));
+  return Math.max(5, Math.ceil(max / 5) * 5);
+}

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/inventory-store-label.ts

@@ -18,3 +18,30 @@ export function inventoryStoreLabel(store: TStoreLike, all: TStoreLike[]) {
   const sameKind = all.filter((s) => s.ownerType === store.ownerType).length;
   return sameKind > 1 && store.orgName ? `${kind} · ${store.orgName}` : kind;
 }
+
+/**
+ * The properties a store can be set to supply, by name. The organisation's own
+ * site list does not always contain the store's current property (a manager
+ * can run a store at a site another organisation owns), so the store's own
+ * resolved names fill the gap - a chip must never read "Current property"
+ * when the store already knows it is Seventh Condominium.
+ */
+export function inventorySiteOptions(
+  orgSites: { _id: string; name: string }[],
+  store: { sites: string[]; siteNames?: { _id: string; name?: string }[] },
+) {
+  const known = new Map(orgSites.map((s) => [s._id, s.name]));
+  for (const id of store.sites) {
+    if (!known.has(id)) known.set(id, store.siteNames?.find((s) => s._id === id)?.name || "Another property");
+  }
+  return [...known].map(([_id, name]) => ({ _id, name }));
+}
+
+type TItemLike = { code?: string; category?: string; packing?: string };
+
+/** "Code 001 · Bulb · Packing: 25" - each figure says what it is, never a bare number. */
+export function inventoryItemMeta(item: TItemLike) {
+  return [item.code && `Code ${item.code}`, item.category, item.packing && `Packing: ${item.packing}`]
+    .filter(Boolean)
+    .join(" · ");
+}