@7365admin1/layer-common 4.71.2 → 4.73.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.73.0
+
+### Minor Changes
+
+- cd5501e: Inventory: usage drafts (save the before photo first, add the after photo and submit later; edit or discard with a confirm; My drafts cards with an old-draft warning; "in drafts / free" on holdings); History per item and "My usage" with date, item and place filters; Usage report as the store owner's usage tracking (status incl. in-progress drafts, person, item, place, work order, flags, search; totals by item / person / company; photo thumbnails with times; draft and submit times; how the stock reached the person; Excel with the same filters and photo links; click a person or an item for its full history); a provider's supervisor gets "Company usage" for its own people at the main store.
+
+## 4.72.0
+
+### Minor Changes
+
+- eb2e98f: Inventory: "Main store · <company>" with who manages it, a request-first view for other companies, pending-approval banner for the owner; Used by on items (form, chips, column, filter, bulk edit, report filter); Give to colleague (My Stock) with confirm/decline; Hand-overs report; name · company · service on requests, holdings, history, reports; Issue Stock "Give to" grouped by company with a Used-by warning.
+
 ## 4.71.2
 
 ### Patch Changes
@@ -1873,11 +1885,11 @@
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                        GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                        GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                            GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                            GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                        owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                        staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                            owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                            staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/InventoryHistoryDialog.vue

@@ -0,0 +1,205 @@
+<template>
+  <v-dialog v-model="show" max-width="1100" scrollable>
+    <v-card class="screen-modal">
+      <v-card-title class="d-flex align-center">
+        {{ title }}
+        <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">
+        <p class="text-body-2 text-medium-emphasis mb-3">{{ intro }}</p>
+
+        <!-- A supervisor opening a person: what they hold now, then everything that happened to their stock. -->
+        <template v-if="holder && holder !== 'me' && holder !== selfId && (store.access.canApprove || store.access.canHandle)">
+          <div class="text-subtitle-2 mb-1">Holding now</div>
+          <v-table density="compact" class="mb-4 border rounded">
+            <thead>
+              <tr>
+                <th>Item</th>
+                <th class="text-right">In hand</th>
+                <th class="text-right">In drafts</th>
+                <th class="text-right">Used this month</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="h in holdings" :key="h._id">
+                <td>{{ h.itemName }}</td>
+                <td class="text-right">{{ h.qty }} {{ h.unit }}</td>
+                <td class="text-right">{{ h.inDrafts || "—" }}</td>
+                <td class="text-right">{{ h.usedThisMonth ?? 0 }}</td>
+              </tr>
+              <tr v-if="!holdings.length">
+                <td colspan="4" class="text-center text-medium-emphasis py-3">Not holding any stock now.</td>
+              </tr>
+            </tbody>
+          </v-table>
+        </template>
+
+        <div class="d-flex flex-wrap ga-2 mb-2">
+          <v-text-field v-model="from" type="date" label="From" density="compact" hide-details style="max-width: 170px" />
+          <v-text-field v-model="to" type="date" label="To" density="compact" hide-details style="max-width: 170px" />
+          <v-select v-model="type" :items="typeChoices" label="What" density="compact" hide-details style="max-width: 200px" />
+          <v-select v-if="!item" v-model="itemPick" :items="[{ value: '', title: 'All items' }, ...itemChoices]" label="Item" density="compact" hide-details style="max-width: 240px" />
+          <v-text-field v-model="location" label="Where (unit, tenant or area)" density="compact" hide-details clearable style="max-width: 240px" />
+        </div>
+
+        <v-data-table-server
+          :headers="headers"
+          :items="rows"
+          :items-length="total"
+          :loading="loading"
+          :items-per-page="limit"
+          :page="page"
+          density="compact"
+          class="border rounded"
+          :no-data-text="emptyText"
+          @update:page="(p: number) => ((page = p), load())"
+        >
+          <template #item.date="{ value }">{{ standardFormatDateTime(value) }}</template>
+          <template #item.what="{ item }">{{ historyText(item) }}</template>
+          <template #item.person="{ item }">{{ item.holderLabel || item.holderName || "—" }}</template>
+          <template #item.qty="{ item }">{{ item.qty }} {{ item.unit }}</template>
+          <template #item.where="{ item }">{{ whereText(item.location) || (item.type === "handover" ? item.remarks : "") || "—" }}</template>
+          <template #item.reference="{ item }">{{ item.type === "handover" ? "—" : item.reference || "—" }}</template>
+          <template #item.photos="{ item }">
+            <InventoryPhotoThumbs :photos="item.photos" :before-at="item.photosBeforeAt" :after-at="item.photosAfterAt" />
+          </template>
+          <template #item.by="{ item }">{{ item.createdByLabel || item.createdByName }}</template>
+          <template #item.holderBalance="{ value }">{{ value ?? "—" }}</template>
+        </v-data-table-server>
+      </v-card-text>
+    </v-card>
+  </v-dialog>
+</template>
+
+<script setup lang="ts">
+import useInventory from "../composables/useInventory";
+import useUtils from "../composables/useUtils";
+import useLocalAuth from "../composables/useLocalAuth";
+import { historyText, whereText } from "../utils/inventory-usage";
+
+/**
+ * History of stock (owner 2026-09-29, "where they used their stock"): one person's (`holder`, "me" =
+ * the signed-in person), one item's (`item`: its whole chain across people), or both. Received from the
+ * store, hand-overs in and out, usage with where + work order + photos, and returns. Drafts are not history.
+ */
+const show = defineModel<boolean>({ default: false });
+const props = defineProps({
+  store: { type: Object as PropType<TInventoryStore>, required: true },
+  holder: { type: String, default: "" },
+  item: { type: String, default: "" },
+  title: { type: String, default: "History" },
+  /** Open on "Used" only (My usage). */
+  usageOnly: { type: Boolean, default: false },
+});
+
+const api = useInventory();
+const { standardFormatDateTime } = useUtils();
+const { currentUser } = useLocalAuth();
+const selfId = computed(() => String(currentUser.value?._id ?? ""));
+const rows = ref<TInventoryTransaction[]>([]);
+const holdings = ref<TInventoryHolding[]>([]);
+const total = ref(0);
+const page = ref(1);
+const limit = 50;
+const loading = ref(false);
+const from = ref("");
+const to = ref("");
+const type = ref("");
+const location = ref("");
+const itemPick = ref("");
+const itemChoices = ref<{ value: string; title: string }[]>([]);
+
+const typeChoices = [
+  { value: "", title: "Everything" },
+  { value: "use", title: "Used" },
+  { value: "issue", title: "Taken from store" },
+  { value: "handover", title: "Hand-overs" },
+  { value: "return", title: "Given back" },
+];
+
+const intro = computed(() =>
+  props.usageOnly
+    ? "Where the stock was used: date, place, work order and the before / after photos. Filter by date, item or place."
+    : props.item && !props.holder
+    ? "Every movement of this item: into the store, to each person, between colleagues, where it was used and what came back."
+    : "Everything that happened to this stock: taken from the store, hand-overs, where it was used (with the work order and photos) and returns.",
+);
+const emptyText = computed(() => (from.value || to.value || type.value || location.value || itemPick.value ? "Nothing matches these filters." : "Nothing recorded yet."));
+const headers = computed(() => [
+  { title: "Date", key: "date", sortable: false },
+  { title: "What happened", key: "what", sortable: false },
+  ...(props.item ? [] : [{ title: "Item", key: "itemName", sortable: false }]),
+  ...(props.holder ? [] : [{ title: "Person", key: "person", sortable: false }]),
+  { title: "Qty", key: "qty", sortable: false },
+  { title: "Where", key: "where", sortable: false },
+  { title: "Work order / ref", key: "reference", sortable: false },
+  { title: "Photos", key: "photos", sortable: false },
+  { title: "Recorded by", key: "by", sortable: false },
+  ...(props.holder ? [{ title: "In hand after", key: "holderBalance", sortable: false }] : []),
+]);
+
+async function load() {
+  loading.value = true;
+  try {
+    const res = await api.getTransactions(props.store._id, {
+      page: page.value,
+      limit,
+      ...(props.holder ? { holder: props.holder } : {}),
+      ...(props.item || itemPick.value ? { item: props.item || itemPick.value } : {}),
+      ...(type.value ? { type: type.value } : {}),
+      ...(location.value ? { location: location.value } : {}),
+      ...(from.value ? { from: new Date(`${from.value}T00:00:00`).toISOString() } : {}),
+      ...(to.value ? { to: new Date(`${to.value}T23:59:59.999`).toISOString() } : {}),
+    });
+    rows.value = res.items;
+    total.value = res.total;
+  } catch (error: any) {
+    rows.value = [];
+    total.value = 0;
+    notify(error?.data?.message || "Could not load the history.", "error");
+  } finally {
+    loading.value = false;
+  }
+}
+const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
+
+async function loadHoldings() {
+  holdings.value = [];
+  // The API gives another person's holdings to the store's approvers / storekeepers only.
+  if (!props.holder || props.holder === "me" || props.holder === selfId.value || !(props.store.access.canApprove || props.store.access.canHandle)) return;
+  try {
+    holdings.value = await api.getHoldings(props.store._id, props.holder);
+  } catch {
+    holdings.value = [];
+  }
+}
+
+let resetting = false;
+watch([from, to, type, location, itemPick], () => {
+  if (resetting) return;
+  page.value = 1;
+  load();
+});
+watch(show, async (open) => {
+  if (!open) return;
+  resetting = true;
+  page.value = 1;
+  from.value = "";
+  to.value = "";
+  location.value = "";
+  itemPick.value = "";
+  type.value = props.usageOnly ? "use" : "";
+  await nextTick();
+  resetting = false;
+  load();
+  loadHoldings();
+  if (!props.item) {
+    try {
+      itemChoices.value = (await api.getItems(props.store._id, { limit: 200 })).items.map((i) => ({ value: i._id, title: i.name }));
+    } catch {
+      itemChoices.value = [];
+    }
+  }
+});
+</script>

package/components/InventoryItemDetail.vue

@@ -58,7 +58,7 @@
               </td>
               <td class="text-right">{{ t.type === "use" ? "" : t.storeBalance }}</td>
               <td class="text-caption">{{ describe(t) }}</td>
-              <td class="text-caption">{{ t.createdByName }}</td>
+              <td class="text-caption">{{ (t as any).createdByLabel || t.createdByName }}</td>
             </tr>
             <tr v-if="!history.length && !loading">
               <td colspan="6" class="text-center text-medium-emphasis py-4">Nothing recorded yet.</td>
@@ -108,11 +108,14 @@ const formatDate = (d: string) => standardFormatDate(d);
 function describe(t: TInventoryTransaction) {
   const parts: string[] = [];
   if (t.type === "receive") parts.push(t.supplier || "", t.reference ? `PO ${t.reference}` : "");
-  if (t.type === "issue") parts.push(`${t.qty} to ${t.holderName}`, t.reference || "");
-  if (t.type === "return") parts.push(`${t.qty} from ${t.holderName}`);
+  const who = (t as any).holderLabel || t.holderName;
+  if (t.type === "issue") parts.push(`${t.qty} to ${who}`, t.reference || "");
+  if (t.type === "return") parts.push(`${t.qty} from ${who}`);
+  // Give to colleague: one row per holder.
+  if (t.type === "handover") parts.push(who || "", t.remarks || "");
   if (t.type === "use")
     parts.push(
-      `${t.holderName} used ${t.qty}`,
+      `${who} used ${t.qty}`,
       t.location?.type === "tenant_unit" ? `${t.location.unitName} ${t.location.tenantName || ""}` : t.location?.area || "",
       t.reference || "",
     );

package/components/InventoryItemDialog.vue

@@ -36,6 +36,21 @@
               <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-row>
+          <!-- Main store only: which service providers see and may request it (owner 2026-09-29). -->
+          <template v-if="store.ownerType === 'property'">
+            <InputLabel title="Used by" class="mb-1 mt-2" />
+            <v-select
+              :model-value="f.usedBy"
+              :items="usedByItems"
+              multiple
+              chips
+              closable-chips
+              density="comfortable"
+              :hint="USED_BY_HINT"
+              persistent-hint
+              @update:model-value="(v: string[]) => (f.usedBy = nextUsedBy(f.usedBy, v))"
+            />
+          </template>
           <!-- 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>
@@ -93,6 +108,9 @@
 <script setup lang="ts">
 import useInventory, { pickedDate } from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
+import { normaliseUsedBy, nextUsedBy, USED_BY_ALL, USED_BY_ALL_LABEL, USED_BY_HINT, USED_BY_OPTIONS } from "../utils/inventory-used-by";
+
+const usedByItems = [{ value: USED_BY_ALL, title: USED_BY_ALL_LABEL }, ...USED_BY_OPTIONS];
 
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({
@@ -126,6 +144,7 @@ const blank = () => ({
   openingReceivedBy: "",
   openingRemarks: "",
   description: "",
+  usedBy: [USED_BY_ALL] as string[],
 });
 const today = new Date().toLocaleDateString("en-CA");
 const f = reactive(blank());
@@ -135,7 +154,7 @@ const inUse = ref(true);
 watch(show, (open) => {
   if (!open) return;
   const i = props.item;
-  Object.assign(f, blank(), i ? { name: i.name, unit: i.unit, packing: i.packing ?? "", code: i.code, category: i.category, reorderLevel: i.reorderLevel, unitCost: i.unitCost ?? 0, description: i.description } : {});
+  Object.assign(f, blank(), i ? { name: i.name, unit: i.unit, packing: i.packing ?? "", code: i.code, category: i.category, reorderLevel: i.reorderLevel, unitCost: i.unitCost ?? 0, description: i.description, usedBy: normaliseUsedBy(i.usedBy) } : {});
   photo.value = i?.photo ? [i.photo] : [];
   inUse.value = i ? i.status === "active" : true;
 });
@@ -154,6 +173,7 @@ async function save() {
     unitCost: Number(f.unitCost || 0),
     description: f.description,
     photo: photo.value[0] ?? "",
+    ...(props.store.ownerType === "property" ? { usedBy: normaliseUsedBy(f.usedBy) } : {}),
   };
   try {
     if (props.item) {

package/components/InventoryLinesDialog.vue

@@ -16,19 +16,23 @@
               v-if="mode === 'issue'"
               v-model="holder"
               :items="people"
-              item-title="name"
+              :item-title="(p: any) => p.label || p.name"
               item-value="_id"
               :loading="peopleLoading"
               placeholder="Search a name"
               density="comfortable"
               :rules="[requiredRule]"
               no-filter
+              hint="Everyone at this property who can take stock: your staff and the service providers' people."
+              persistent-hint
               @update:search="searchPeople"
             >
               <template #item="{ props: p, item }">
-                <v-list-item v-bind="p" :subtitle="item.raw.orgName" />
+                <v-list-subheader v-if="groupStarts(item.raw)">{{ item.raw.company || "Other" }}</v-list-subheader>
+                <v-list-item v-bind="p" :title="item.raw.name" :subtitle="[item.raw.serviceLabel, item.raw.email].filter(Boolean).join(' · ')" />
               </template>
             </v-autocomplete>
+            <v-alert v-if="usedByWarning" type="warning" variant="tonal" density="compact" class="mt-2">{{ usedByWarning }}</v-alert>
             <v-text-field v-else :model-value="holderName" density="comfortable" readonly />
           </template>
 
@@ -129,6 +133,7 @@
 <script setup lang="ts">
 import useInventory, { pickedDate } from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
+import { normaliseUsedBy, usedByChips, usedByText } from "../utils/inventory-used-by";
 
 type TMode = "receive" | "issue" | "request" | "return";
 type TRow = { item: string; qty: number | null; unitCost?: number | null };
@@ -230,7 +235,24 @@ async function loadItems(search = "") {
 }
 const searchItems = debounce((q: string) => loadItems(q || ""), 300);
 
-const people = ref<{ _id: string; name: string; orgName: string }[]>([]);
+type TPerson = { _id: string; name: string; orgName: string; email?: string; company?: string; service?: string; serviceLabel?: string; label?: string };
+const people = ref<TPerson[]>([]);
+/** A company heading above the first person of each company (the server sorts by company). */
+const groupStarts = (p: TPerson) => {
+  const i = people.value.indexOf(p);
+  return i === 0 || (i > 0 && people.value[i - 1].company !== p.company);
+};
+/** Used by: warn before the server refuses an item meant for another service. */
+const usedByWarning = computed(() => {
+  if (props.mode !== "issue" || !holder.value) return "";
+  const person = people.value.find((p) => p._id === holder.value);
+  if (!person?.service || person.service === "property") return "";
+  const blocked = rows.value
+    .map((r) => itemChoices.value.find((c) => c._id === r.item))
+    .filter((i): i is TInventoryItem => Boolean(i) && usedByChips(i!.usedBy).length > 0 && !normaliseUsedBy(i!.usedBy).includes(person.service!));
+  if (!blocked.length) return "";
+  return `${blocked.map((i) => i.name).join(", ")} ${blocked.length === 1 ? "is" : "are"} for ${usedByText(blocked[0].usedBy)} only — ${person.name} works for ${person.serviceLabel || "another service"}.`;
+});
 const peopleLoading = ref(false);
 const searchPeople = debounce(async (q: string) => {
   peopleLoading.value = true;

package/components/InventoryMain.vue

@@ -82,6 +82,23 @@
     </AppCard>
 
     <template v-else>
+      <!-- Owner rule 2026-09-29: another organisation's store is for requesting only. -->
+      <v-alert v-if="requestOnly" type="info" variant="tonal" density="compact" class="mb-4" icon="mdi-cart-arrow-down">
+        <div class="font-weight-medium">Request items from the main store</div>
+        <div class="text-body-2">Pick the items you need and press Request Stock. You are told when the store keeper approves it.</div>
+      </v-alert>
+      <v-alert
+        v-else-if="store.access.canApprove && pendingCount > 0 && tab !== 'requests'"
+        type="warning"
+        variant="tonal"
+        density="compact"
+        class="mb-4"
+      >
+        <div class="d-flex align-center flex-wrap ga-2">
+          <span>{{ pendingCount === 1 ? "1 request is" : `${pendingCount} requests are` }} waiting for your approval.</span>
+          <v-btn size="small" variant="flat" color="warning" class="text-none" @click="tab = 'requests'">Review requests</v-btn>
+        </div>
+      </v-alert>
       <v-tabs v-model="tab" color="primary" class="mb-4" show-arrows>
         <v-tab v-for="t in tabs" :key="t.value" :value="t.value" class="text-none">
           {{ t.label }}
@@ -102,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">
@@ -123,7 +140,7 @@ import useInventory from "../composables/useInventory";
 import useWorkerTerm from "../composables/useWorkerTerm";
 import useSite from "../composables/useSite";
 import useUtils from "../composables/useUtils";
-import { inventoryStoreLabel, inventorySuppliesText } from "../utils/inventory-store-label";
+import { inventoryManagedBy, inventoryStoreLabel, inventorySuppliesText } from "../utils/inventory-store-label";
 import { inventoryControls } from "../utils/inventory-presets";
 
 const props = defineProps({
@@ -133,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();
 
@@ -167,8 +184,16 @@ const storeSites = computed(() =>
   })),
 );
 
+// Another organisation's (main) store: the person requests from it and manages nothing there.
+const requestOnly = computed(() => Boolean(store.value && store.value.owner === false));
+const managedBy = computed(() => (store.value ? inventoryManagedBy(store.value) : ""));
+
 const subtitle = computed(() => {
   if (!store.value) return "";
+  if (store.value.main && store.value.owner === false) {
+    // "Main store · managed by Management Pte Ltd (Property management)"
+    return managedBy.value ? `Main store · ${managedBy.value.replace(/^Managed/, "managed")}` : "Main store";
+  }
   if (storeSites.value.length > 1) {
     const supplies = inventorySuppliesText(storeSites.value.map((s) => s.name));
     return stores.value.length > 1 ? `${inventoryStoreLabel(store.value, stores.value)} · ${supplies}` : supplies;
@@ -191,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" }] : []),
   ];
@@ -214,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 {
@@ -252,6 +297,7 @@ async function createStore() {
 watch(storeId, () => {
   tab.value = "stock";
   refreshCounts();
+  probeCompanyUsage();
 });
 watch(() => props.siteId, loadStores);