@7365admin1/layer-common 4.90.2-staging.493 → 4.90.2-staging.494

package/components/InventoryMain.vue

@@ -136,7 +136,7 @@
           <InventoryMyStockTab :store="store" :site-id="siteId" :sites="storeSites" @changed="refreshCounts" />
         </v-window-item>
         <v-window-item v-if="ctl.tabs.requests" value="requests">
-          <InventoryRequestsTab :store="store" :site-id="siteId" @changed="refreshCounts" />
+          <InventoryRequestsTab :store="store" :site-id="siteId" :focus-request="focusRequest" @changed="refreshCounts" />
         </v-window-item>
         <v-window-item v-if="ctl.tabs.people" value="technicians">
           <InventoryTechniciansTab :store="store" @changed="refreshCounts" />
@@ -177,6 +177,8 @@ const movedFromEquipment = useRoute().query.moved === "equipment";
 // A notification link (`?storeId=&tab=`, NotificationBell): open that store on that tab, once.
 const linkQuery = useRoute().query;
 const linked = { storeId: String(linkQuery.storeId ?? ""), tab: String(linkQuery.tab ?? "") };
+// `?requestId=` (approved / confirm-received alerts): the Requests tab opens on that request.
+const focusRequest = String(linkQuery.requestId ?? "");
 
 const { getHandovers, getStores, getStore, createStore: apiCreateStore, getRequests, getReport } = useInventory();
 const { getSites } = useSite();

package/components/InventoryMyStockTab.vue

@@ -59,6 +59,19 @@
       </AppCard>
     </template>
 
+    <!-- Colleagues' open drafts (same company): any technician can take one over and finish it from their own stock. -->
+    <template v-if="colleagueDrafts.length">
+      <div class="text-subtitle-2 mb-2">Colleagues' jobs in progress ({{ colleagueDrafts.length }})</div>
+      <AppCard v-for="d in colleagueDrafts" :key="d._id" class="pa-3 mb-2 d-flex flex-wrap align-center ga-3" style="border-left: 4px solid rgb(var(--v-theme-secondary))">
+        <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 }}</div>
+          <div class="text-body-2">{{ colleagueDraftText(d, standardFormatDateTime) }}</div>
+        </div>
+        <v-btn class="text-none screen-btn-primary" variant="flat" size="small" :loading="acting === d._id + 't'" @click="takeOver(d)">Take over</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>
@@ -221,7 +234,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";
+import { colleagueDraftText, draftCardText } from "../utils/inventory-usage";
 import { ackText, inventoryStepsLive } from "../utils/inventory-ack";
 
 const props = defineProps({
@@ -320,6 +333,31 @@ async function loadDrafts() {
     drafts.value = [];
   }
 }
+const colleagueDrafts = ref<TInventoryUsageDraft[]>([]);
+async function loadColleagueDrafts() {
+  // stepsLive = the API knows ?colleagues (an older API ignores it and returns my own, hence the mine/holder filter too).
+  if (!ctl.value.recordUsage || !stepsLive.value) return (colleagueDrafts.value = []);
+  try {
+    const res = await api.getUsageDrafts(props.store._id, "colleagues");
+    colleagueDrafts.value = res.items.filter((d) => !d.mine && String(d.holder) !== me.value);
+  } catch {
+    colleagueDrafts.value = []; // 403/404: not offered, nothing to show
+  }
+}
+async function takeOver(d: TInventoryUsageDraft) {
+  const who = d.holderName || d.startedByName || "your colleague";
+  if (!confirm(`Take over ${who}'s job (${d.qty} ${d.unit ?? ""} ${d.itemName})? You finish it (after photo, submit), and the stock comes from YOUR own stock, not theirs.`)) return;
+  acting.value = d._id + "t";
+  try {
+    await api.takeOverDraft(String(d._id));
+    notify("The job is yours now. Finish it under My drafts.");
+    changed();
+  } catch (error: any) {
+    notify(error?.data?.message || "Could not take over the job.", "error");
+  } finally {
+    acting.value = "";
+  }
+}
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 
 const handovers = ref<TInventoryHandover[]>([]);
@@ -436,11 +474,12 @@ function changed() {
   load();
   loadHandovers();
   loadDrafts();
+  loadColleagueDrafts();
   loadToReceive();
   emit("changed");
 }
 
-watch(() => props.store._id, () => (load(), loadHandovers(), loadDrafts(), loadToReceive()));
-watch(stepsLive, loadToReceive);
-onMounted(() => (load(), loadHandovers(), loadDrafts(), loadToReceive()));
+watch(() => props.store._id, () => (load(), loadHandovers(), loadDrafts(), loadColleagueDrafts(), loadToReceive()));
+watch(stepsLive, () => (loadToReceive(), loadColleagueDrafts()));
+onMounted(() => (load(), loadHandovers(), loadDrafts(), loadColleagueDrafts(), loadToReceive()));
 </script>

package/components/InventoryRequestsTab.vue

@@ -28,7 +28,12 @@
       {{ search ? `No requests match "${search}". Try another word, or pick "All" to look through every status.` : status === "confirm" ? "Nothing is waiting for anyone to tap Received." : status === "pending" ? (store.access.canApprove ? "No requests waiting for approval." : "You have no requests waiting. Use Request Stock to ask the store for items.") : "No requests to show." }}
     </div>
 
-    <AppCard v-for="r in requests" :key="r._id" class="pa-4 mb-3">
+    <AppCard
+      v-for="r in requests"
+      :key="r._id"
+      class="pa-4 mb-3"
+      :style="r._id === focusRequest ? { borderLeft: '4px solid rgb(var(--v-theme-primary))' } : undefined"
+    >
       <div class="d-flex flex-wrap align-center ga-2 mb-2">
         <div class="font-weight-medium">{{ r.requestedByLabel || r.requestedByName || "Someone" }}</div>
         <div class="text-caption text-medium-emphasis">{{ standardFormatDateTime(r.createdAt) }}</div>
@@ -111,6 +116,8 @@ import { ACK_CHIP, ackText, approveCap, inventoryStepsLive } from "../utils/inve
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
   siteId: { type: String, required: true },
+  /** A request to open first (notification link). Shown on top, marked, in the "All" list. */
+  focusRequest: { type: String, default: "" },
 });
 const ctl = computed(() => inventoryControls(props.store.access));
 const emit = defineEmits(["changed"]);
@@ -123,7 +130,7 @@ const notify = inject<(text: string, color?: string) => void>("inventoryNotify",
 const chip = REQUEST_STATUS;
 const stepsLive = computed(() => inventoryStepsLive(props.store));
 
-const status = ref("pending");
+const status = ref(props.focusRequest ? "" : "pending");
 const search = ref("");
 const requests = ref<TInventoryRequest[]>([]);
 const page = ref(1);
@@ -141,7 +148,10 @@ async function load(p = 1) {
     const confirm = status.value === "confirm";
     const res = await api.getRequests(props.store._id, { page: p, limit: confirm ? 100 : 20, status: confirm ? "issued" : status.value || undefined, search: search.value?.trim() || undefined });
     const got = confirm ? res.items.filter((r) => r.ackStatus === "awaiting" || r.ackStatus === "not_received") : res.items;
-    requests.value = p === 1 ? got : [...requests.value, ...got];
+    // ponytail: the linked request is found in the first page of "All" (the newest 20); an older one just shows the list.
+    const focused = p === 1 && props.focusRequest ? got.find((r) => r._id === props.focusRequest) : undefined;
+    const rows = focused ? [focused, ...got.filter((r) => r !== focused)] : got;
+    requests.value = p === 1 ? rows : [...requests.value, ...got];
     page.value = p;
     pages.value = res.pages;
   } catch {

package/composables/useInventory.ts

@@ -51,8 +51,9 @@ export default function useInventory() {
     receiveReturn: (store: string, body: Record<string, any>) => api(`/stores/${store}/returns`, { method: "POST", body }),
     recordUsage: (store: string, body: Record<string, any>) => api(`/stores/${store}/usage`, { method: "POST", body }),
     /** Usage drafts: before photo now, after photo and submit after the job (stock is deducted on submit). */
-    getUsageDrafts: (store: string, everyone = false) =>
-      api<{ items: TInventoryUsageDraft[]; staleAfterDays: number }>(`/stores/${store}/usage-drafts`, { query: everyone ? { everyone: true } : {} }),
+    /** Own drafts; "colleagues" = same-company colleagues' open drafts (anyone who records usage); "everyone" = supervisors. */
+    getUsageDrafts: (store: string, scope: "" | "colleagues" | "everyone" = "") =>
+      api<{ items: TInventoryUsageDraft[]; staleAfterDays: number }>(`/stores/${store}/usage-drafts`, { query: scope ? { [scope]: true } : {} }),
     createUsageDraft: (store: string, body: Record<string, any>) => api<TInventoryUsageDraft>(`/stores/${store}/usage-drafts`, { method: "POST", body }),
     updateUsageDraft: (id: string, body: Record<string, any>) => api<TInventoryUsageDraft>(`/usage-drafts/${id}`, { method: "PATCH", body }),
     discardUsageDraft: (id: string) => api(`/usage-drafts/${id}/discard`, { method: "POST" }),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.90.2-staging.493",
+  "version": "4.90.2-staging.494",
   "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/utils/inventory-usage.ts

@@ -36,6 +36,17 @@ export function draftCardText(d: TDraft, time: (iso: string) => string, staleDay
   };
 }
 
+/** "Kevin started this job at Unit 05-12 at 9:40 - take it over to finish it with your own stock." (a colleague's open draft) */
+export function colleagueDraftText(
+  d: { startedByName?: string; holderName?: string; location?: TLocation; reference?: string; draftedAt?: string; photosBeforeAt?: string | null },
+  time: (iso: string) => string,
+) {
+  const who = d.holderName || d.startedByName || "A colleague";
+  const where = whereText(d.location) || d.reference || "";
+  const at = d.draftedAt || d.photosBeforeAt;
+  return `${who} started this job${where ? ` at ${where}` : ""}${at ? ` at ${time(at)}` : ""} - take it over to finish it with your own stock.`;
+}
+
 /** "Issued to Ali by Keeper (29/09) → Handed to Bala by Ali (29/09)". */
 export function usagePathText(steps: TStep[] | undefined, day: (iso: string) => string) {
   if (!steps?.length) return "";

package/utils/notification-target.ts

@@ -45,7 +45,7 @@ export type TTargetRow = {
    * (core `withNotificationKind`); `site` stands in for `siteId` on rows kept
    * unscoped on purpose. Older rows have neither and are read from `module`.
    */
-  params?: { id?: string; org?: string; kind?: string; site?: string; storeId?: string } | null;
+  params?: { id?: string; org?: string; kind?: string; site?: string; storeId?: string; requestId?: string } | null;
 };
 
 /** What the surrounding app knows that the stored row does not. */
@@ -144,7 +144,7 @@ export function notificationKind(item: TTargetRow | null | undefined): string {
  */
 export function inventoryTabForAlert(title: string): "requests" | "stock" | "mine" | "" {
   if (/stock handed to you|hand-over (confirmed|declined)/i.test(title)) return "mine";
-  if (/request waiting|request (was )?(approved|rejected)/i.test(title)) return "requests";
+  if (/request waiting|request (was )?(approved|rejected)|confirm you received/i.test(title)) return "requests";
   if (/low (on )?stock/i.test(title)) return "stock";
   return "";
 }
@@ -237,7 +237,13 @@ function sitePageTarget(
   // Open the alert's own store on the tab it is about (InventoryMain reads ?storeId=&tab=).
   const storeId = String(item.params?.storeId ?? item.params?.id ?? "").trim();
   const tab = inventoryTabForAlert(String(item.title ?? ""));
-  const query: Record<string, string> = { ...(storeId ? { storeId } : {}), ...(tab ? { tab } : {}) };
+  // Approved / please confirm / reminder alerts name their request (API 2026-10-03): open that request.
+  const requestId = String(item.params?.requestId ?? "").trim();
+  const query: Record<string, string> = {
+    ...(storeId ? { storeId } : {}),
+    ...(tab || requestId ? { tab: tab || "requests" } : {}),
+    ...(requestId ? { requestId } : {}),
+  };
   return Object.keys(query).length ? { candidates, query } : { candidates };
 }