@7365admin1/layer-common 4.35.1-staging.448 → 4.35.1-staging.450

package/components/InventoryMain.vue

@@ -119,7 +119,7 @@
         <v-window-item v-if="ctl.tabs.people" value="technicians">
           <InventoryTechniciansTab :store="store" @changed="refreshCounts" />
         </v-window-item>
-        <v-window-item v-if="ctl.tabs.reports" value="reports">
+        <v-window-item v-if="ctl.tabs.reports || companyUsage" value="reports">
           <InventoryReportsTab :store="store" :sites="storeSites" />
         </v-window-item>
         <v-window-item v-if="ctl.tabs.suppliers" value="suppliers">
@@ -150,7 +150,7 @@ const props = defineProps({
 
 const movedFromEquipment = useRoute().query.moved === "equipment";
 
-const { getStores, createStore: apiCreateStore, getRequests } = useInventory();
+const { getStores, createStore: apiCreateStore, getRequests, getReport } = useInventory();
 const { getSites } = useSite();
 const { requiredRule } = useUtils();
 
@@ -216,6 +216,7 @@ const tabs = computed(() => {
     ...(ctl.value.tabs.requests ? [{ value: "requests", label: a.canApprove ? "Requests" : "My Requests", badge: a.canApprove ? pendingCount.value : 0 }] : []),
     ...(ctl.value.tabs.people ? [{ value: "technicians", label: worker.many }] : []),
     ...(ctl.value.tabs.reports ? [{ value: "reports", label: a.canReports ? "Reports" : "Usage check" }] : []),
+    ...(!ctl.value.tabs.reports && companyUsage.value ? [{ value: "reports", label: "Company usage" }] : []),
     ...(ctl.value.tabs.suppliers ? [{ value: "suppliers", label: "Suppliers" }] : []),
     ...(ctl.value.tabs.settings ? [{ value: "settings", label: "Settings" }] : []),
   ];
@@ -239,6 +240,25 @@ async function loadStores() {
   refreshCounts();
 }
 
+/**
+ * Another company's supervisor at the main store may track its OWN people's usage (the API answers the usage
+ * report for them, scoped). The store's access flags do not say so, so ask once per store.
+ * ponytail: one probe request per store switch; add a flag to the store's access if the API grows one.
+ */
+const companyUsage = ref(false);
+async function probeCompanyUsage() {
+  companyUsage.value = false;
+  const s = store.value;
+  if (!s || ctl.value.tabs.reports || !s.main || s.owner !== false) return;
+  const now = new Date().toISOString();
+  try {
+    await getReport(s._id, "usage", { from: now, to: now });
+    companyUsage.value = true;
+  } catch {
+    companyUsage.value = false;
+  }
+}
+
 async function refreshCounts() {
   if (!store.value?.access.canApprove) return (pendingCount.value = 0);
   try {
@@ -277,6 +297,7 @@ async function createStore() {
 watch(storeId, () => {
   tab.value = "stock";
   refreshCounts();
+  probeCompanyUsage();
 });
 watch(() => props.siteId, loadStores);
 

package/components/InventoryMyStockTab.vue

@@ -22,6 +22,25 @@
       <v-btn class="text-none" variant="text" size="small" :loading="acting === h._id + 'c'" @click="cancelHandover(h)">Cancel</v-btn>
     </AppCard>
 
+    <!-- Usage drafts: before photo saved, job not finished yet. Nothing is taken off the stock until submitted. -->
+    <template v-if="drafts.length">
+      <div class="text-subtitle-2 mb-2">My drafts — in progress ({{ drafts.length }})</div>
+      <AppCard
+        v-for="d in drafts"
+        :key="d._id"
+        class="pa-3 mb-2 d-flex flex-wrap align-center ga-3"
+        :style="{ borderLeft: `4px solid rgb(var(--v-theme-${d.stale ? 'error' : 'info'}))` }"
+      >
+        <InventoryPhotoThumbs :photos="{ before: d.photos?.before ?? [] }" :before-at="d.photosBeforeAt" :size="44" />
+        <div class="flex-grow-1" style="min-width: 200px">
+          <div class="font-weight-medium">{{ d.itemName }} × {{ d.qty }} {{ d.unit }}<span v-if="d.reference" class="text-medium-emphasis"> · {{ d.reference }}</span></div>
+          <div class="text-body-2">{{ draftCardText(d, standardFormatDateTime, staleDays).line }}</div>
+          <div v-if="d.stale" class="text-caption text-error">{{ draftCardText(d, standardFormatDateTime, staleDays).warning }}</div>
+        </div>
+        <v-btn class="text-none screen-btn-primary" variant="flat" size="small" @click="continueDraft(d)">{{ d.photos?.after?.length ? "Review and submit" : "Add after photo" }}</v-btn>
+      </AppCard>
+    </template>
+
     <v-progress-linear v-if="loading" indeterminate color="primary" />
     <AppCard v-else-if="!holdings.length" class="pa-6 text-center">
       <div class="text-body-1 mb-1">You are not holding any stock.</div>
@@ -38,16 +57,22 @@
           <div class="flex-grow-1">
             <div class="font-weight-medium">{{ h.itemName }}</div>
             <div class="text-body-2">{{ h.qty }} {{ h.unit }} left · {{ h.usedThisMonth ?? 0 }} used this month</div>
+            <div v-if="h.inDrafts" class="text-caption text-medium-emphasis">{{ h.inDrafts }} in drafts · {{ h.free ?? 0 }} free to use</div>
           </div>
           <div class="d-flex flex-column ga-1">
-            <v-btn v-if="h.qty > 0 && ctl.recordUsage" class="text-none screen-btn-primary" variant="flat" size="small" @click="use(h)">Record usage</v-btn>
+            <v-btn v-if="(h.free ?? h.qty) > 0 && ctl.recordUsage" class="text-none screen-btn-primary" variant="flat" size="small" @click="use(h)">Record usage</v-btn>
             <v-btn v-if="h.qty > 0" class="text-none screen-btn-ghost" variant="outlined" size="small" @click="openGive(h)">Give to colleague</v-btn>
+            <v-btn class="text-none" variant="text" size="small" prepend-icon="mdi-history" @click="openHistory(h)">History</v-btn>
           </div>
         </AppCard>
       </v-col>
     </v-row>
 
-    <div class="text-subtitle-2 mt-6 mb-2">My recent activity</div>
+    <div class="d-flex align-center mt-6 mb-2">
+      <div class="text-subtitle-2">My recent activity</div>
+      <v-spacer />
+      <v-btn class="text-none" variant="text" size="small" prepend-icon="mdi-map-marker-check-outline" @click="openMyUsage">My usage — where I used my stock</v-btn>
+    </div>
     <v-table density="compact">
       <thead>
         <tr>
@@ -76,7 +101,8 @@
       </tbody>
     </v-table>
 
-    <InventoryUsageDialog v-model="usage.show" :store="store" :site-id="siteId" :holding="usage.holding" :sites="sites" @done="changed" />
+    <InventoryUsageDialog v-model="usage.show" :store="store" :site-id="siteId" :holding="usage.holding" :draft="usage.draft" :sites="sites" @done="changed" />
+    <InventoryHistoryDialog v-model="history.show" :store="store" :holder="me" :item="history.item" :title="history.title" :usage-only="history.usageOnly" />
     <v-dialog v-model="give.show" max-width="520" persistent>
       <v-card class="screen-modal">
         <v-card-title class="d-flex align-center">
@@ -135,6 +161,7 @@ import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
 import useLocalAuth from "../composables/useLocalAuth";
 import { inventoryControls } from "../utils/inventory-presets";
+import { draftCardText } from "../utils/inventory-usage";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -147,14 +174,41 @@ const emit = defineEmits(["changed"]);
 const api = useInventory();
 const { typeLabels } = api;
 const { getFileUrl } = useFile();
-const { standardFormatDate } = useUtils();
+const { standardFormatDate, standardFormatDateTime } = useUtils();
 const { currentUser } = useLocalAuth();
 
 const holdings = ref<TInventoryHolding[]>([]);
 const activity = ref<TInventoryTransaction[]>([]);
 const loading = ref(false);
 const showRequest = ref(false);
-const usage = reactive({ show: false, holding: null as TInventoryHolding | null });
+const usage = reactive({ show: false, holding: null as TInventoryHolding | null, draft: null as TInventoryUsageDraft | null });
+const drafts = ref<TInventoryUsageDraft[]>([]);
+const staleDays = ref(3);
+const history = reactive({ show: false, item: "", title: "", usageOnly: false });
+
+function openHistory(h: TInventoryHolding) {
+  Object.assign(history, { show: true, item: String(h.item), title: `History — ${h.itemName}`, usageOnly: false });
+}
+function openMyUsage() {
+  Object.assign(history, { show: true, item: "", title: "My usage", usageOnly: true });
+}
+function continueDraft(d: TInventoryUsageDraft) {
+  // The draft's own item in hand (its qty is reserved there); a stand-in if the list has not loaded it.
+  const holding =
+    holdings.value.find((h) => String(h.item) === String(d.item)) ??
+    ({ _id: d._id, item: d.item, itemName: d.itemName, unit: d.unit, photo: "", holder: "", holderName: "", qty: d.qty, inDrafts: d.qty } as TInventoryHolding);
+  Object.assign(usage, { show: true, holding, draft: d });
+}
+async function loadDrafts() {
+  if (!ctl.value.recordUsage) return;
+  try {
+    const res = await api.getUsageDrafts(props.store._id);
+    drafts.value = res.items;
+    staleDays.value = res.staleAfterDays ?? 3;
+  } catch {
+    drafts.value = [];
+  }
+}
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 
 const handovers = ref<TInventoryHandover[]>([]);
@@ -264,15 +318,16 @@ async function load() {
 }
 
 function use(h: TInventoryHolding) {
-  Object.assign(usage, { show: true, holding: h });
+  Object.assign(usage, { show: true, holding: h, draft: null });
 }
 
 function changed() {
   load();
   loadHandovers();
+  loadDrafts();
   emit("changed");
 }
 
-watch(() => props.store._id, () => (load(), loadHandovers()));
-onMounted(() => (load(), loadHandovers()));
+watch(() => props.store._id, () => (load(), loadHandovers(), loadDrafts()));
+onMounted(() => (load(), loadHandovers(), loadDrafts()));
 </script>

package/components/InventoryPhotoThumbs.vue

@@ -0,0 +1,67 @@
+<template>
+  <div v-if="list.length" class="d-flex flex-wrap ga-1 py-1">
+    <button v-for="ph in list" :key="ph.id + ph.label" type="button" class="inventory-thumb" :title="ph.title" :aria-label="`Open ${ph.title}`" @click="open = ph">
+      <v-img :src="getFileUrl(ph.id)" :width="size" :height="size" cover class="rounded" :alt="ph.title" />
+      <span class="inventory-thumb__tag">{{ ph.label }}</span>
+    </button>
+  </div>
+  <span v-else class="text-medium-emphasis">—</span>
+  <v-dialog :model-value="!!open" max-width="820" @update:model-value="open = null">
+    <v-card v-if="open" class="screen-modal">
+      <v-card-title class="d-flex align-center">
+        {{ open.title }}
+        <v-spacer />
+        <v-btn icon="mdi-close" variant="text" aria-label="Close" @click="open = null" />
+      </v-card-title>
+      <v-card-text>
+        <v-img :src="getFileUrl(open.id)" max-height="70vh" contain />
+        <div class="d-flex mt-2">
+          <a :href="getFileUrl(open.id)" target="_blank" rel="noopener" class="text-body-2">Open full size</a>
+        </div>
+      </v-card-text>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script setup lang="ts">
+import useFile from "../composables/useFile";
+import useUtils from "../composables/useUtils";
+
+/** Before / after (and other) photos of a usage or hand-over: small thumbnails, click to enlarge with the time taken. */
+const props = defineProps({
+  photos: { type: Object as PropType<{ before?: string[]; after?: string[]; other?: string[] } | undefined>, default: undefined },
+  beforeAt: { type: String as PropType<string | null | undefined>, default: null },
+  afterAt: { type: String as PropType<string | null | undefined>, default: null },
+  size: { type: Number, default: 36 },
+});
+const { getFileUrl } = useFile();
+const { standardFormatDateTime } = useUtils();
+const open = ref<{ id: string; label: string; title: string } | null>(null);
+const at = (d?: string | null) => (d ? ` — taken ${standardFormatDateTime(d)}` : "");
+const list = computed(() => [
+  ...(props.photos?.before ?? []).map((id) => ({ id, label: "Before", title: `Before photo${at(props.beforeAt)}` })),
+  ...(props.photos?.after ?? []).map((id) => ({ id, label: "After", title: `After photo${at(props.afterAt)}` })),
+  ...(props.photos?.other ?? []).map((id) => ({ id, label: "Photo", title: "Photo" })),
+]);
+</script>
+
+<style scoped>
+.inventory-thumb {
+  position: relative;
+  border: 0;
+  padding: 0;
+  background: none;
+  cursor: zoom-in;
+}
+.inventory-thumb__tag {
+  position: absolute;
+  left: 2px;
+  bottom: 2px;
+  font-size: 9px;
+  line-height: 1;
+  padding: 1px 3px;
+  border-radius: 3px;
+  background: rgba(0, 0, 0, 0.6);
+  color: #fff;
+}
+</style>

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>