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

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/composables/useInventory.ts

@@ -15,6 +15,7 @@ export default function useInventory() {
     receive: "Received",
     issue: "Issued",
     use: "Used",
+    use_draft: "Draft",
     return: "Returned",
     adjust: "Stock count",
     handover: "Hand-over",
@@ -44,6 +45,13 @@ export default function useInventory() {
     issue: (store: string, body: Record<string, any>) => api(`/stores/${store}/issue`, { method: "POST", body }),
     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 } : {} }),
+    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" }),
+    submitUsageDraft: (id: string, body: { photosAfter?: string[]; date?: string }) => api<TInventoryTransaction>(`/usage-drafts/${id}/submit`, { method: "POST", body }),
 
     getRequests: (store: string, query: { page?: number; limit?: number; status?: string; mine?: boolean }) =>
       api<{ items: TInventoryRequest[]; total: number; pendingCount: number; page: number; pages: number }>(`/stores/${store}/requests`, { query }),
@@ -74,9 +82,9 @@ export default function useInventory() {
     getPeople: (store: string, search = "") =>
       api<{ _id: string; name: string; orgName: string; email?: string; company?: string; service?: string; serviceLabel?: string; label?: string }[]>(`/stores/${store}/people`, { query: { search } }),
 
-    getReport: (store: string, report: "movement" | "usage" | "technicians" | "purchases" | "handovers", query: TInventoryPeriod & { unchecked?: boolean }) =>
-      api<{ rows: any[]; totalQty?: number; totalCost?: number }>(`/stores/${store}/reports/${report}`, { query }),
-    exportReport: (store: string, report: string, query: TInventoryPeriod & { appSlug?: string }) =>
+    getReport: (store: string, report: "movement" | "usage" | "technicians" | "purchases" | "handovers", query: TInventoryPeriod & Record<string, any>) =>
+      api<{ rows: any[]; totalQty?: number; totalCost?: number; scope?: "all" | "own_company"; staleAfterDays?: number }>(`/stores/${store}/reports/${report}`, { query }),
+    exportReport: (store: string, report: string, query: TInventoryPeriod & Record<string, any>) =>
       api<Blob>(`/stores/${store}/reports/${report}/export`, { query, responseType: "blob" }),
     checkUsage: (store: string, ids: string[], checked: boolean) =>
       api<{ updated: number }>(`/stores/${store}/usage/check`, { method: "POST", body: { ids, checked } }),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.35.1-staging.448",
+  "version": "4.35.1-staging.450",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",

package/types/inventory.d.ts

@@ -82,6 +82,11 @@ declare type TInventoryHolding = {
   packing?: string;
   /** Used by this holder since the start of the month (Singapore time). */
   usedThisMonth?: number;
+  holderLabel?: string;
+  /** How many sit in the holder's own usage drafts (not deducted until submitted), and what is still free. */
+  inDrafts?: number;
+  draftCount?: number;
+  free?: number;
 };
 
 declare type TInventoryTransaction = {
@@ -89,7 +94,7 @@ declare type TInventoryTransaction = {
   item: string;
   itemName: string;
   unit: string;
-  type: "opening" | "receive" | "issue" | "use" | "return" | "adjust" | "handover";
+  type: "opening" | "receive" | "issue" | "use" | "return" | "adjust" | "handover" | "use_draft";
   qty: number;
   storeChange: number;
   storeBalance: number;
@@ -97,7 +102,7 @@ declare type TInventoryTransaction = {
   holderChange?: number;
   holderBalance?: number;
   site?: string;
-  location?: { type: "common_area" | "tenant_unit"; area?: string; unitName?: string; tenantName?: string };
+  location?: { type: "common_area" | "tenant_unit"; area?: string; unit?: string; unitName?: string; tenantName?: string };
   reference?: string;
   supplier?: string;
   unitCost: number;
@@ -109,8 +114,19 @@ declare type TInventoryTransaction = {
   receivedBy?: string;
   date: string;
   createdByName: string;
+  holder?: string;
+  holderLabel?: string;
+  createdByLabel?: string;
+  /** Usage saved as a draft first. */
+  draftedAt?: string;
+  photosBeforeAt?: string | null;
+  photosAfterAt?: string | null;
+  submittedAt?: string;
 };
 
+/** A usage record saved with its before photo, waiting for the after photo (no stock deducted yet). */
+declare type TInventoryUsageDraft = TInventoryTransaction & { type: "use_draft"; stale: boolean; mine: boolean; clientRef?: string };
+
 declare type TInventoryPeriod = { from: string; to: string; site?: string; locationType?: string; usedBy?: string };
 
 /** An organisation's supplier (shared by its stores). Only the name is required. */

package/utils/inventory-usage.ts

@@ -0,0 +1,94 @@
+/**
+ * Plain words for usage drafts, usage history and the store owner's usage
+ * tracking (owner 2026-09-29). Used by the Record Usage dialog, My Stock and
+ * the Usage report. Pure, so it is tested without a browser.
+ */
+type TLocation = { type?: string; area?: string; unitName?: string; tenantName?: string } | undefined;
+type TDraft = { location?: TLocation; photos?: { before?: string[]; after?: string[] }; photosBeforeAt?: string | null; stale?: boolean };
+type TStep = { type: "issued" | "handed_over"; to: string; by: string; date: string };
+
+export const USAGE_FLAG_WORDS: Record<string, string> = {
+  no_work_order: "No work order",
+  old_draft: "Draft waiting too long",
+  above_typical: "More than usual",
+};
+
+export const USAGE_STATUS_CHOICES = [
+  { value: "submitted", title: "Submitted" },
+  { value: "draft", title: "In progress (drafts)" },
+  { value: "all", title: "All" },
+];
+
+/** "Unit Tower A 05-12 (Tenant Co)" or the common area as typed. */
+export function whereText(location: TLocation) {
+  if (!location) return "";
+  if (location.type === "tenant_unit") return `Unit ${location.unitName ?? ""}${location.tenantName ? ` (${location.tenantName})` : ""}`.trim();
+  return location.area ?? "";
+}
+
+/** "Before photo taken 10:32 · Unit 05-12 · Add the after photo to finish" — the draft card. */
+export function draftCardText(d: TDraft, time: (iso: string) => string, staleDays = 3) {
+  const taken = d.photosBeforeAt ? `Before photo taken ${time(d.photosBeforeAt)}` : "Before photo taken";
+  const next = d.photos?.after?.length ? "Ready to submit" : "Add the after photo to finish";
+  return {
+    line: [taken, whereText(d.location), next].filter(Boolean).join(" · "),
+    warning: d.stale ? `Waiting more than ${staleDays} days — finish or discard it` : "",
+  };
+}
+
+/** "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 "";
+  return steps.map((s) => `${s.type === "issued" ? "Issued to" : "Handed to"} ${s.to} by ${s.by} (${day(s.date)})`).join(" → ");
+}
+
+/** Query for the report/export: empty filters are left out, so the server applies no filter. */
+export function usageQuery(filters: Record<string, string | boolean | undefined | null>) {
+  return Object.fromEntries(Object.entries(filters).filter(([, v]) => v !== "" && v !== undefined && v !== null && v !== false));
+}
+
+/** Totals per item / person / company, of submitted records only (drafts are not usage yet). */
+export function usageTotals(rows: { status?: string; qty: number; totalCost?: number; unit?: string; itemName?: string; holderLabel?: string; technician?: string; holderCompany?: string }[]) {
+  const group = (label: (r: (typeof rows)[number]) => string) => {
+    const map = new Map<string, { label: string; records: number; qty: number; totalCost: number; unit: string }>();
+    for (const r of rows) {
+      if (r.status === "draft") continue;
+      const k = label(r);
+      const t = map.get(k) ?? { label: k, records: 0, qty: 0, totalCost: 0, unit: r.unit ?? "" };
+      t.records++;
+      t.qty += r.qty;
+      t.totalCost = Math.round((t.totalCost + (r.totalCost ?? 0)) * 100) / 100;
+      // Different units are not added up in words.
+      if (t.unit !== (r.unit ?? "")) t.unit = "";
+      map.set(k, t);
+    }
+    return [...map.values()].sort((a, b) => b.records - a.records || a.label.localeCompare(b.label));
+  };
+  return {
+    byItem: group((r) => r.itemName ?? ""),
+    byPerson: group((r) => r.holderLabel || r.technician || ""),
+    byCompany: group((r) => r.holderCompany || "(company not known)"),
+  };
+}
+
+/** What a history row says happened, from the person's side. */
+export function historyText(t: { type: string; holderChange?: number }) {
+  switch (t.type) {
+    case "issue":
+      return "Taken from store";
+    case "return":
+      return "Given back to store";
+    case "handover":
+      return (t.holderChange ?? 0) < 0 ? "Given to colleague" : "Received from colleague";
+    case "use":
+      return "Used";
+    case "opening":
+      return "Opening stock";
+    case "receive":
+      return "Received into store";
+    case "adjust":
+      return "Stock count";
+    default:
+      return t.type;
+  }
+}

package/utils/service-type.ts

@@ -0,0 +1,30 @@
+/**
+ * A SERVICE PROVIDER'S LINE OF BUSINESS, AS PEOPLE NAME IT.
+ *
+ * `/api/service-providers` returns the service CODE (`mechanical_electrical_services`),
+ * which is a database value, not something to show an operator. This is the same
+ * mapping `API-core src/utils/converter.ts spmServiceNewToOld` applies — copied
+ * rather than imported, because that is a server package this layer does not
+ * depend on.
+ *
+ * NOT the same labels as `utils/module-applications.ts APPLICATIONS`. Those name
+ * the seven role-permission applications ("Mechanical & electrical", "Pest
+ * control") and are keyed `mechanical-electrical`, not `*_services`. These are
+ * the shorter names the service-provider screens use ("M&E", "Pest Control").
+ *
+ * An unknown code is returned untouched: a new service type shows as its raw
+ * code, which is visibly odd, rather than vanishing from the row.
+ */
+const SERVICE_TYPE_LABELS: Readonly<Record<string, string>> = Object.freeze({
+  security_agency: "Security",
+  cleaning_services: "Cleaning",
+  pool_maintenance_services: "Pool Maintenance",
+  pest_control_services: "Pest Control",
+  landscaping_services: "Landscape",
+  mechanical_electrical_services: "Mechanical & Electrical",
+});
+
+export function serviceTypeLabel(service: string | null | undefined): string {
+  const code = String(service ?? "");
+  return SERVICE_TYPE_LABELS[code] ?? code;
+}