@7365admin1/layer-common 4.72.0 → 4.73.1-staging.452

package/components/InventoryReportsTab.vue

@@ -6,7 +6,7 @@
         <v-btn value="usage" class="text-none">Usage</v-btn>
         <v-btn v-if="ctl.fullReports" value="technicians" class="text-none">{{ worker.many }}</v-btn>
         <v-btn v-if="ctl.fullReports" value="purchases" class="text-none">Purchases</v-btn>
-        <v-btn value="handovers" class="text-none">Hand-overs</v-btn>
+        <v-btn v-if="ctl.fullReports || ctl.review" value="handovers" class="text-none">Hand-overs</v-btn>
       </v-btn-toggle>
       <v-select
         v-if="report === 'purchases'"
@@ -60,21 +60,36 @@
         hide-details
         style="max-width: 260px"
       />
-      <v-checkbox v-if="report === 'usage'" v-model="uncheckedOnly" label="Not checked yet" density="compact" hide-details class="flex-grow-0" />
+      <v-checkbox v-if="report === 'usage' && canCheck" v-model="uncheckedOnly" label="Not checked yet" density="compact" hide-details class="flex-grow-0" />
       <v-spacer />
-      <v-btn v-if="ctl.fullReports" class="text-none screen-btn-ghost" variant="outlined" prepend-icon="mdi-file-excel-outline" :loading="exporting" @click="exportExcel">
+      <v-btn v-if="ctl.fullReports || report === 'usage'" class="text-none screen-btn-ghost" variant="outlined" prepend-icon="mdi-file-excel-outline" :loading="exporting" @click="exportExcel">
         Export Excel
       </v-btn>
     </div>
 
+    <!-- Usage tracking (owner 2026-09-29): who used what from this store, where, for which work order, with photos. -->
+    <div v-if="report === 'usage'" class="d-flex flex-wrap ga-2 align-center mb-3">
+      <v-select v-model="status" :items="USAGE_STATUS_CHOICES" label="Status" density="compact" hide-details style="max-width: 200px" />
+      <v-select v-model="person" :items="[{ value: '', title: 'Everyone' }, ...personChoices]" label="Person" density="compact" hide-details style="max-width: 280px" />
+      <v-select v-model="itemFilter" :items="[{ value: '', title: 'All items' }, ...itemChoices]" label="Item" density="compact" hide-details style="max-width: 220px" />
+      <v-text-field v-model="locationText" label="Where (unit, tenant or area)" density="compact" hide-details clearable style="max-width: 220px" />
+      <v-text-field v-model="referenceText" label="Work order / ref" density="compact" hide-details clearable style="max-width: 180px" />
+      <v-select v-model="flag" :items="flagChoices" label="Needs a look" density="compact" hide-details style="max-width: 220px" />
+      <v-text-field v-model="search" label="Search" prepend-inner-icon="mdi-magnify" density="compact" hide-details clearable style="max-width: 220px" />
+    </div>
+    <v-alert v-if="report === 'usage' && scope === 'own_company'" type="info" variant="tonal" density="compact" class="mb-2">
+      You see your own company's people only. The store's owner sees everyone's.
+    </v-alert>
+
     <p class="text-caption text-medium-emphasis mb-2">{{ help[report] }}</p>
     <p v-if="report === 'movement' && siteName" class="text-caption text-medium-emphasis mb-2">
       Start, received and end are the whole store's (shared by {{ sites.map((s) => s.name).join(" and ") }}). The last columns show what was issued for {{ siteName }} and used there.
     </p>
 
-    <div v-if="report === 'usage' && rows.length" class="d-flex flex-wrap align-center ga-3 mb-2">
+    <div v-if="report === 'usage' && shownRows.length" class="d-flex flex-wrap align-center ga-3 mb-2">
       <div class="text-body-2 font-weight-medium">
-        {{ rows.length }} record(s) · {{ totals.qty }} item(s) used · Total cost {{ money(totals.cost) }}
+        <template v-if="usageSummary.records">{{ usageSummary.records }} record(s) · {{ usageSummary.qty }} item(s) used · Total cost {{ money(usageSummary.cost) }}</template>
+        <template v-if="usageSummary.drafts">{{ usageSummary.records ? " · " : "" }}{{ usageSummary.drafts }} in progress (drafts — not counted as usage until submitted)</template>
       </div>
       <v-spacer />
       <template v-if="canCheck">
@@ -88,6 +103,19 @@
       </template>
     </div>
 
+    <v-row v-if="report === 'usage' && usageSummary.records" dense class="mb-2">
+      <v-col v-for="box in totalBoxes" :key="box.title" cols="12" md="4">
+        <AppCard class="pa-3">
+          <div class="text-subtitle-2 mb-2">{{ box.title }}</div>
+          <div v-for="t in box.rows.slice(0, 6)" :key="t.label" class="d-flex justify-space-between text-body-2 mb-1 ga-2">
+            <span class="text-truncate">{{ t.label }}</span>
+            <span class="text-no-wrap">{{ t.records }} × · {{ t.qty }}{{ t.unit ? ` ${t.unit}` : "" }} · {{ money(t.totalCost) }}</span>
+          </div>
+          <div v-if="box.rows.length > 6" class="text-caption text-medium-emphasis">and {{ box.rows.length - 6 }} more (all in the Excel file)</div>
+        </AppCard>
+      </v-col>
+    </v-row>
+
     <template v-if="report === 'purchases' && rows.length">
       <div class="text-body-2 font-weight-medium mb-2">Total purchases {{ money(totals.cost) }}</div>
       <v-row dense class="mb-2">
@@ -121,11 +149,12 @@
       :items="shownRows"
       :loading="loading"
       :show-select="report === 'usage' && canCheck"
+      :item-selectable="(r: any) => r.status !== 'draft'"
       item-value="_id"
       density="compact"
       :items-per-page="50"
       class="border rounded"
-      no-data-text="Nothing recorded in this period."
+      :no-data-text="noDataText"
     >
       <template #item.date="{ value }">{{ standardFormatDate(value) }}</template>
       <template #item.createdAt="{ value }">{{ standardFormatDate(value) }}</template>
@@ -142,14 +171,31 @@
       <template #item.receivedCost="{ value }">{{ money(value) }}</template>
       <template #item.usedCost="{ value }">{{ money(value) }}</template>
       <template #item.siteUsedCost="{ value }">{{ money(value) }}</template>
-      <!-- The supervisor checks usage against the technician's before/after photos. -->
+      <!-- The supervisor checks usage against the technician's before/after photos (click to enlarge, with the time taken). -->
       <template #item.photos="{ item }">
-        <div v-if="usagePhotos(item).length" class="d-flex ga-1 py-1">
-          <a v-for="ph in usagePhotos(item)" :key="ph.id" :href="getFileUrl(ph.id)" target="_blank" rel="noopener" :title="ph.label">
-            <v-img :src="getFileUrl(ph.id)" width="36" height="36" cover class="rounded" :alt="ph.label" />
-          </a>
+        <InventoryPhotoThumbs :photos="item.photos" :before-at="item.photosBeforeAt" :after-at="item.photosAfterAt" />
+      </template>
+      <template #item.state="{ item }">
+        <v-chip size="x-small" variant="tonal" :color="item.status === 'draft' ? 'info' : 'success'">{{ item.status === "draft" ? "In progress" : "Submitted" }}</v-chip>
+        <div v-for="f in item.flags ?? []" :key="f" class="mt-1">
+          <v-chip size="x-small" variant="tonal" color="warning">{{ flagWords[f] ?? f }}</v-chip>
         </div>
-        <span v-else class="text-medium-emphasis">—</span>
+      </template>
+      <template #item.technician="{ item }">
+        <a href="#" class="text-primary" @click.prevent="openPerson(item)">{{ item.holderLabel || item.technician }}</a>
+      </template>
+      <template #item.itemName="{ item }">
+        <a v-if="report === 'usage' && scope === 'all'" href="#" class="text-primary" @click.prevent="openItem(item)">{{ item.itemName }}</a>
+        <span v-else>{{ item.itemName }}</span>
+      </template>
+      <template #item.times="{ item }">
+        <div class="text-caption text-no-wrap">
+          <div v-if="item.draftedAt">Draft {{ standardFormatDateTime(item.draftedAt) }}</div>
+          <div v-if="item.submittedAt">Submitted {{ standardFormatDateTime(item.submittedAt) }}</div>
+        </div>
+      </template>
+      <template #item.path="{ item }">
+        <span class="text-caption">{{ usagePathText(item.path, standardFormatDate) || "—" }}</span>
       </template>
       <template #item.checkedByName="{ item }">
         <v-chip v-if="item.checkedByName" size="x-small" color="success" variant="tonal">{{ item.checkedByName }}</v-chip>
@@ -159,6 +205,7 @@
         <span :class="item.reorderLevel && item.closing <= item.reorderLevel ? 'text-error font-weight-bold' : 'font-weight-medium'">{{ item.closing }}</span>
       </template>
     </v-data-table>
+    <InventoryHistoryDialog v-model="drill.show" :store="store" :holder="drill.holder" :item="drill.item" :title="drill.title" />
   </div>
 </template>
 
@@ -166,9 +213,9 @@
 import useInventory, { saveBlob } from "../composables/useInventory";
 import useWorkerTerm, { workerAppKey } from "../composables/useWorkerTerm";
 import useUtils from "../composables/useUtils";
-import useFile from "../composables/useFile";
 import { inventoryControls } from "../utils/inventory-presets";
 import { USED_BY_FILTERS } from "../utils/inventory-used-by";
+import { USAGE_FLAG_WORDS, USAGE_STATUS_CHOICES, usagePathText, usageQuery, usageTotals } from "../utils/inventory-usage";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -177,12 +224,7 @@ const props = defineProps({
 const ctl = computed(() => inventoryControls(props.store.access));
 
 const api = useInventory();
-const { standardFormatDate } = useUtils();
-const { getFileUrl } = useFile();
-const usagePhotos = (row: any) => [
-  ...(row.photos?.before ?? []).map((id: string) => ({ id, label: "Before" })),
-  ...(row.photos?.after ?? []).map((id: string) => ({ id, label: "After" })),
-];
+const { standardFormatDate, standardFormatDateTime } = useUtils();
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 
 const worker = useWorkerTerm({ providers: true });
@@ -197,6 +239,26 @@ const site = ref("");
 const locationType = ref("");
 const uncheckedOnly = ref(false);
 const usedBy = ref("");
+// Usage tracking filters. Status / place / work order / flag / search go to the server; person and item
+// narrow the loaded rows (their choices come from the rows).
+const status = ref("submitted");
+const person = ref("");
+const itemFilter = ref("");
+const locationText = ref("");
+const referenceText = ref("");
+const flag = ref("");
+const search = ref("");
+const scope = ref<"all" | "own_company">("all");
+const staleDays = ref(3);
+const flagWords = computed(() => ({ ...USAGE_FLAG_WORDS, old_draft: `Draft older than ${staleDays.value} days` }) as Record<string, string>);
+const flagChoices = computed(() => [{ value: "", title: "Everything" }, ...Object.entries(flagWords.value).map(([value, title]) => ({ value, title }))]);
+const drill = reactive({ show: false, holder: "", item: "", title: "" });
+function openPerson(r: any) {
+  Object.assign(drill, { show: true, holder: String(r.holder ?? ""), item: "", title: r.holderLabel || r.technician });
+}
+function openItem(r: any) {
+  Object.assign(drill, { show: true, holder: "", item: String(r.item ?? ""), title: `${r.itemName} — where it went` });
+}
 const rows = ref<any[]>([]);
 const selected = ref<string[]>([]);
 const purchases = reactive({ byMonth: [] as { month: string; deliveries: number; totalCost: number }[], bySupplier: [] as { supplier: string; deliveries: number; totalCost: number }[] });
@@ -214,7 +276,7 @@ const barWidth = (v: number) => {
 
 const help: Record<string, string> = {
   movement: "For each item: stock at the start of the month, what came in (deliveries and opening stock), 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.",
+  usage: "Every usage of this store's items, by anyone: who (company and service), where, which work order, before and after photos with their times, and how the stock reached them. Click a person or an item to see its full history. Use it 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, and opening stock entered with new items (Type: Opening stock), with totals by month and by supplier.",
   handovers: "Stock passed from one person to a colleague: who gave it, who received it, and whether they confirmed.",
@@ -228,7 +290,43 @@ const serviceFilter = ref("");
 const serviceChoices = computed(() =>
   [...new Set(rows.value.map(companyOf).filter(Boolean))].sort().map((v) => ({ value: v, title: v })),
 );
-const shownRows = computed(() => (serviceFilter.value ? rows.value.filter((r) => companyOf(r) === serviceFilter.value || [r.toCompany, r.toServiceLabel].filter(Boolean).join(" · ") === serviceFilter.value) : rows.value));
+const shownRows = computed(() =>
+  rows.value.filter(
+    (r) =>
+      (!serviceFilter.value || companyOf(r) === serviceFilter.value || [r.toCompany, r.toServiceLabel].filter(Boolean).join(" · ") === serviceFilter.value) &&
+      (report.value !== "usage" || ((!person.value || String(r.holder) === person.value) && (!itemFilter.value || String(r.item) === itemFilter.value))),
+  ),
+);
+const choices = (key: (r: any) => string, label: (r: any) => string) =>
+  report.value !== "usage"
+    ? []
+    : [...new Map(rows.value.map((r) => [key(r), String(label(r) ?? "")])).entries()].map(([value, title]) => ({ value, title })).sort((a, b) => a.title.localeCompare(b.title));
+const personChoices = computed(() => choices((r) => String(r.holder), (r) => r.holderLabel || r.technician));
+const itemChoices = computed(() => choices((r) => String(r.item), (r) => r.itemName));
+const usageSummary = computed(() => {
+  const done = shownRows.value.filter((r) => r.status !== "draft");
+  return {
+    records: done.length,
+    qty: done.reduce((sum, r) => sum + r.qty, 0),
+    cost: Math.round(done.reduce((sum, r) => sum + (r.totalCost ?? 0), 0) * 100) / 100,
+    drafts: shownRows.value.length - done.length,
+  };
+});
+const totalBoxes = computed(() => {
+  const t = usageTotals(shownRows.value);
+  return [
+    { title: "By item", rows: t.byItem },
+    { title: "By person", rows: t.byPerson },
+    { title: "By company", rows: t.byCompany },
+  ];
+});
+const noDataText = computed(() =>
+  report.value !== "usage"
+    ? "Nothing recorded in this period."
+    : status.value === "draft"
+      ? "No usage in progress. Drafts appear here once someone saves a before photo."
+      : "No usage recorded for these filters in this month.",
+);
 
 const headers: Record<string, any[]> = {
   movement: [
@@ -247,6 +345,7 @@ const headers: Record<string, any[]> = {
   ],
   usage: [
     { title: "Date", key: "date" },
+    { title: "Status", key: "state", sortable: false },
     { title: "Property", key: "siteName" },
     { title: "Where", key: "locationType" },
     { title: "Unit / Area", key: "location" },
@@ -255,12 +354,13 @@ const headers: Record<string, any[]> = {
     { title: "Qty", key: "qty" },
     { title: "Unit price", key: "unitCost" },
     { title: "Total", key: "totalCost" },
-    { title: worker.one, key: "technician" },
-    { title: "Company", key: "holderCompany" },
-    { title: "Service", key: "holderServiceLabel" },
-    { title: "Photos", key: "photos", sortable: false },
-    { title: "Reference", key: "reference" },
+    { title: worker.one, key: "technician", minWidth: "200px" },
+    { title: "Photos", key: "photos", sortable: false, minWidth: "124px" },
+    { title: "Work order / ref", key: "reference", minWidth: "130px" },
+    { title: "Saved / submitted", key: "times", sortable: false },
+    { title: "Came from", key: "path", sortable: false, minWidth: "220px" },
     { title: "Reported by", key: "reportedBy" },
+    { title: "Remarks", key: "remarks" },
     { title: "Checked by", key: "checkedByName" },
   ],
   technicians: [
@@ -326,9 +426,27 @@ function period(): TInventoryPeriod & { unchecked?: boolean } {
     ...(report.value === "usage" && locationType.value ? { locationType: locationType.value } : {}),
     ...(report.value === "usage" && uncheckedOnly.value ? { unchecked: true } : {}),
     ...(usedBy.value ? { usedBy: usedBy.value } : {}),
+    ...(report.value === "usage"
+      ? usageQuery({ status: status.value === "submitted" ? "" : status.value, location: locationText.value, reference: referenceText.value, flag: flag.value, search: search.value })
+      : {}),
   };
 }
 
+/** The export carries the person / item / company picked on screen too. */
+function exportFilters() {
+  if (report.value !== "usage") return {};
+  const pick = rows.value.find((r) => companyOf(r) === serviceFilter.value);
+  const base = String(useRuntimeConfig().public.API_DO_STORAGE_ENDPOINT ?? "");
+  return usageQuery({
+    holder: person.value,
+    item: itemFilter.value,
+    company: serviceFilter.value ? pick?.holderCompany : "",
+    service: serviceFilter.value ? pick?.holderService : "",
+    // Photo links in the file open the photo itself.
+    photoBase: base.startsWith("https://") ? base : "",
+  });
+}
+
 async function load() {
   if (!month.value) return;
   loading.value = true;
@@ -338,6 +456,8 @@ async function load() {
     rows.value = res.rows;
     totals.qty = res.totalQty ?? 0;
     totals.cost = res.totalCost ?? 0;
+    scope.value = res.scope ?? "all";
+    staleDays.value = res.staleAfterDays ?? 3;
     purchases.byMonth = res.byMonth ?? [];
     purchases.bySupplier = res.bySupplier ?? [];
   } catch (error: any) {
@@ -365,7 +485,7 @@ async function setChecked(checked: boolean) {
 async function exportExcel() {
   exporting.value = true;
   try {
-    const blob = await api.exportReport(props.store._id, report.value, { ...period(), appSlug });
+    const blob = await api.exportReport(props.store._id, report.value, { ...period(), ...exportFilters(), appSlug });
     saveBlob(blob, `${props.store.name} - ${report.value === "technicians" ? worker.many : report.value} - ${month.value}.xlsx`);
   } catch {
     notify("Could not export the report.", "error");
@@ -374,7 +494,13 @@ async function exportExcel() {
   }
 }
 
-watch([report, month, span, site, locationType, uncheckedOnly, usedBy, () => props.store._id], load);
+watch([report, month, span, site, locationType, uncheckedOnly, usedBy, status, flag, () => props.store._id], load);
+// Typed filters wait until the typing stops.
+let typing: ReturnType<typeof setTimeout> | undefined;
+watch([locationText, referenceText, search], () => {
+  clearTimeout(typing);
+  typing = setTimeout(load, 400);
+});
 watch(report, () => (serviceFilter.value = ""));
 onMounted(load);
 </script>

package/components/InventoryUsageDialog.vue

@@ -2,24 +2,30 @@
   <v-dialog v-model="show" max-width="620" persistent scrollable>
     <v-card v-if="holding" class="screen-modal">
       <v-card-title class="d-flex align-center">
-        Record Usage
+        {{ draft ? "Finish usage (draft)" : "Record Usage" }}
         <v-spacer />
         <v-btn icon="mdi-close" variant="text" class="screen-modal__close" aria-label="Close" @click="show = false" />
       </v-card-title>
       <v-card-text class="screen-modal__body">
         <div class="font-weight-medium">{{ holding.itemName }}</div>
-        <div class="text-body-2 text-medium-emphasis mb-4">You have {{ holding.qty }} {{ holding.unit }} in hand.</div>
+        <div class="text-body-2 text-medium-emphasis mb-4">
+          You have {{ holding.qty }} {{ holding.unit }} in hand<template v-if="otherDrafts"> · {{ otherDrafts }} already in your other drafts</template>.
+          <template v-if="!draft"> Took the before photo but the job is not done yet? Save a draft now and finish it later.</template>
+        </div>
+        <v-alert v-if="draft" type="info" variant="tonal" density="compact" class="mb-4">
+          Saved as a draft {{ draft.draftedAt ? standardFormatDateTime(draft.draftedAt) : "" }}. Nothing has been taken off your stock yet — add the after photo and submit when the job is done.
+        </v-alert>
         <v-form ref="form">
           <InputLabel title="How many did you use?" required class="mb-1" />
           <v-text-field
             v-model.number="qty"
             type="number"
             min="1"
-            :max="holding.qty"
+            :max="maxQty"
             :suffix="holding.unit"
             density="comfortable"
             style="max-width: 200px"
-            :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 1 && Number(v) <= holding!.qty) || `1 to ${holding!.qty}`]"
+            :rules="[(v: any) => (Number.isInteger(Number(v)) && Number(v) >= 1 && Number(v) <= maxQty) || `1 to ${maxQty}`]"
           />
 
           <InputLabel title="Where?" required class="mb-1" />
@@ -74,15 +80,17 @@
             <v-col cols="12" sm="6">
               <InputLabel title="Photo before" required class="mb-1" />
               <InventoryPhotoInput v-model="photosBefore" :max="3" />
+              <div v-if="draft?.photosBeforeAt" class="text-caption text-medium-emphasis mt-1">Taken {{ standardFormatDateTime(draft.photosBeforeAt) }}</div>
             </v-col>
             <v-col cols="12" sm="6">
               <InputLabel title="Photo after" required class="mb-1" />
               <InventoryPhotoInput v-model="photosAfter" :max="3" />
+              <div v-if="draft?.photosAfterAt" class="text-caption text-medium-emphasis mt-1">Taken {{ standardFormatDateTime(draft.photosAfterAt) }}</div>
             </v-col>
           </v-row>
           <div v-if="photoError" class="text-error text-body-2 mt-1" role="alert">{{ photoError }}</div>
 
-          <InputLabel title="Date used" class="mb-1 mt-3" />
+          <InputLabel :title="draft ? 'Date of the job (used when you submit)' : 'Date used'" class="mb-1 mt-3" />
           <v-text-field v-model="date" type="date" :max="today" density="comfortable" style="max-width: 200px" />
           <InputLabel title="Fault reported by (optional)" class="mb-1" />
           <v-text-field v-model="reportedBy" density="comfortable" placeholder="e.g. tenant, security guard" maxlength="120" />
@@ -91,8 +99,21 @@
         </v-form>
       </v-card-text>
       <div class="screen-modal__footer">
-        <v-btn class="screen-btn-ghost" variant="outlined" :disabled="saving" @click="show = false">Cancel</v-btn>
-        <v-btn class="screen-btn-primary" variant="flat" :loading="saving" @click="save">Save usage</v-btn>
+        <v-btn v-if="draft" class="text-none" variant="text" color="error" :disabled="!!saving" @click="confirmDiscard = true">Discard draft</v-btn>
+        <v-spacer v-if="draft" />
+        <v-btn class="screen-btn-ghost" variant="outlined" :disabled="!!saving" @click="show = false">Cancel</v-btn>
+        <v-btn class="screen-btn-ghost text-none" variant="outlined" prepend-icon="mdi-content-save-outline" :loading="saving === 'draft'" :disabled="!!saving" @click="saveDraft">Save draft</v-btn>
+        <v-btn class="screen-btn-primary" variant="flat" :loading="saving === 'submit'" :disabled="!!saving" @click="save">{{ draft ? "Submit usage" : "Save usage" }}</v-btn>
+      </div>
+    </v-card>
+  </v-dialog>
+  <v-dialog v-model="confirmDiscard" max-width="420">
+    <v-card class="screen-modal">
+      <v-card-title>Discard this draft?</v-card-title>
+      <v-card-text>The draft and its photos are removed. Nothing was taken off your stock, so your stock stays as it is.</v-card-text>
+      <div class="screen-modal__footer">
+        <v-btn class="screen-btn-ghost" variant="outlined" @click="confirmDiscard = false">Keep it</v-btn>
+        <v-btn color="error" variant="flat" :loading="saving === 'discard'" @click="discard">Discard</v-btn>
       </div>
     </v-card>
   </v-dialog>
@@ -107,16 +128,24 @@ const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
   siteId: { type: String, required: true },
   holding: { type: Object as PropType<TInventoryHolding | null>, default: null },
+  /** An existing draft to finish (edit, add the after photo, submit or discard). */
+  draft: { type: Object as PropType<TInventoryUsageDraft | null>, default: null },
   sites: { type: Array as PropType<{ _id: string; name: string }[]>, default: () => [] },
 });
 const emit = defineEmits(["done"]);
 
 const api = useInventory();
-const { requiredRule, debounce } = useUtils();
+const { requiredRule, debounce, standardFormatDateTime } = useUtils();
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 
 const form = ref();
-const saving = ref(false);
+const saving = ref<"" | "draft" | "submit" | "discard">("");
+const confirmDiscard = ref(false);
+// Stock already promised to the person's OTHER drafts; this draft's own qty is free for it.
+const otherDrafts = computed(() => Math.max(0, (props.holding?.inDrafts ?? 0) - (props.draft?.qty ?? 0)));
+const maxQty = computed(() => Math.max(1, (props.holding?.qty ?? 0) - otherDrafts.value));
+const USAGE_DRAFT_NEEDS_BEFORE = "Take the before photo to save a draft.";
+let prefilling = false;
 const today = new Date().toLocaleDateString("en-CA");
 const qty = ref<number | null>(1);
 const where = ref<"tenant_unit" | "common_area">("tenant_unit");
@@ -159,38 +188,81 @@ async function loadAreas() {
   }
 }
 
+function body() {
+  return {
+    item: props.holding!.item,
+    qty: Number(qty.value),
+    locationType: where.value,
+    ...(where.value === "tenant_unit" ? { unit: unit.value } : { area: area.value }),
+    reference: reference.value,
+    photosBefore: photosBefore.value,
+    photosAfter: photosAfter.value,
+    remarks: remarks.value,
+    reportedBy: reportedBy.value,
+  };
+}
+
+function finished(text: string) {
+  notify(text);
+  show.value = false;
+  emit("done");
+}
+
+/** Save draft: before photo required, after photo optional; nothing is deducted. */
+async function saveDraft() {
+  const { valid } = await form.value.validate();
+  photoError.value = photosBefore.value.length ? "" : USAGE_DRAFT_NEEDS_BEFORE;
+  if (!valid || photoError.value || !props.holding) return;
+  saving.value = "draft";
+  try {
+    if (props.draft) await api.updateUsageDraft(props.draft._id, body());
+    else await api.createUsageDraft(props.store._id, { site: site.value, ...body() });
+    finished("Draft saved. Add the after photo and submit it when the job is done — it is under My drafts.");
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not save the draft.", "error");
+  } finally {
+    saving.value = "";
+  }
+}
+
 async function save() {
   const { valid } = await form.value.validate();
   // Owner decision 2026-09-27: a before AND an after photo on every usage record (the API refuses without).
   photoError.value = photosBefore.value.length && photosAfter.value.length ? "" : USAGE_PHOTOS_REQUIRED;
   if (!valid || photoError.value || !props.holding) return;
-  saving.value = true;
+  saving.value = "submit";
   try {
-    await api.recordUsage(props.store._id, {
-      site: site.value,
-      item: props.holding.item,
-      qty: Number(qty.value),
-      locationType: where.value,
-      ...(where.value === "tenant_unit" ? { unit: unit.value } : { area: area.value }),
-      reference: reference.value,
-      date: pickedDate(date.value),
-      photosBefore: photosBefore.value,
-      photosAfter: photosAfter.value,
-      remarks: remarks.value,
-      reportedBy: reportedBy.value,
-    });
-    notify("Usage saved.");
-    show.value = false;
-    emit("done");
+    if (props.draft) {
+      // Keep any edits, then submit: the stock comes off now.
+      await api.updateUsageDraft(props.draft._id, body());
+      await api.submitUsageDraft(props.draft._id, { photosAfter: photosAfter.value, date: pickedDate(date.value) });
+    } else {
+      await api.recordUsage(props.store._id, { site: site.value, ...body(), date: pickedDate(date.value) });
+    }
+    finished("Usage saved.");
   } catch (error: any) {
     notify(error?.data?.message || "Could not save the usage.", "error");
   } finally {
-    saving.value = false;
+    saving.value = "";
+  }
+}
+
+async function discard() {
+  if (!props.draft) return;
+  saving.value = "discard";
+  try {
+    await api.discardUsageDraft(props.draft._id);
+    confirmDiscard.value = false;
+    finished("Draft discarded.");
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not discard the draft.", "error");
+  } finally {
+    saving.value = "";
   }
 }
 
 watch(site, () => {
-  unit.value = "";
+  if (!prefilling) unit.value = "";
   searchUnits("");
   loadAreas();
 });
@@ -212,6 +284,25 @@ watch(show, (open) => {
   reportedBy.value = "";
   date.value = today;
   site.value = props.store.sites.includes(props.siteId) ? props.siteId : props.store.sites[0];
+  const d = props.draft;
+  if (d) {
+    // Finish a draft: everything as saved; the site cannot change.
+    prefilling = true;
+    site.value = String(d.site ?? site.value);
+    qty.value = d.qty;
+    where.value = d.location?.type === "common_area" ? "common_area" : "tenant_unit";
+    area.value = d.location?.area ?? "";
+    unit.value = String(d.location?.unit ?? "");
+    if (unit.value) units.value = [{ _id: unit.value, name: d.location?.unitName ?? "", tenantName: d.location?.tenantName ?? "" }];
+    reference.value = d.reference ?? "";
+    remarks.value = d.remarks ?? "";
+    reportedBy.value = d.reportedBy ?? "";
+    photosBefore.value = [...(d.photos?.before ?? [])];
+    photosAfter.value = [...(d.photos?.after ?? [])];
+    nextTick(() => (prefilling = false));
+    loadAreas();
+    return;
+  }
   searchUnits("");
   loadAreas();
 });

package/components/InvitationClientForm.vue

@@ -388,9 +388,27 @@ watch(
 const roles = ref<any[]>([])
 const { getRoles } = useRole()
 
+/*
+ * `type` is the ROLE type, not the service the client subscribes to, and the
+ * only caller (`ClientMain.vue` "Invite Client") passes no `app` prop -- so
+ * this sent `type: ""` and the endpoint applied no type filter at all. The
+ * dropdown therefore listed every org-less role of every type, which includes
+ * the platform's OWN staff roles (`type: "admin"` -- the two rows the console's
+ * `/super-admin/role-permissions` screen edits). Offering a Seven365 console
+ * staff role on a CLIENT invitation is the defect.
+ *
+ * A client admin's role is `type: "organization"`, which is what the client
+ * roles screen (`org/[organization]/roles-permissions.vue`) already lists. This
+ * narrows to exactly that. It is a narrowing of this one picker only: no role
+ * changes, no permission changes, and the org-less `organization` roles that
+ * were already being picked are all still offered.
+ *
+ * Keying off the selected service instead would empty the dropdown -- no
+ * org-less role carries a service type -- so `props.app` is not the filter.
+ */
 const { data: roleData, refresh: refreshRoles } = await useLazyAsyncData(
   "roles",
-  () => getRoles({ org: org.value?._id, type: props.app, limit: 50 }),
+  () => getRoles({ org: org.value?._id, type: "organization", limit: 50 }),
   { watch: [() => props.app] }
 )
 

package/components/VisitorForm.vue

@@ -910,8 +910,20 @@ const hidQrReaderId = computed(() => (
   hidQrConfiguredReaderId.value || String(hidQrReader.value?._id || "")
 ));
 
+/*
+ * Visitor QR passes are hidden at the manager's request (2026-09-23).
+ *
+ * A flag rather than a deletion: issuing, the preview dialog, printing and the
+ * regenerate handler below are all intact and untouched, so bringing the
+ * feature back is this one line. Every surface that offers a Visitor QR reads
+ * `hidQrCodePassAllowed`, which is why the switch belongs here and not in each
+ * of them.
+ */
+const HID_VISITOR_QR_ENABLED = false;
+
 const hidQrCodePassAllowed = computed(() => {
   return (
+    HID_VISITOR_QR_ENABLED &&
     hidQrCodePassEnabled.value &&
     ["guest", "contractor", "walk-in"].includes(prop.type)
   );