@7365admin1/layer-common 4.35.1-staging.420 → 4.35.1-staging.422

package/components/InventoryMain.vue

@@ -115,7 +115,7 @@ import useInventory from "../composables/useInventory";
 import useWorkerTerm from "../composables/useWorkerTerm";
 import useSite from "../composables/useSite";
 import useUtils from "../composables/useUtils";
-import { inventoryStoreLabel } from "../utils/inventory-store-label";
+import { inventoryStoreLabel, inventorySuppliesText } from "../utils/inventory-store-label";
 
 const props = defineProps({
   orgId: { type: String, required: true },
@@ -152,12 +152,21 @@ const isStaff = computed(() => {
 });
 
 const storeSites = computed(() =>
-  (store.value?.sites ?? []).map((id) => ({ _id: id, name: orgSites.value.find((s) => s._id === id)?.name ?? "This property" })),
+  (store.value?.sites ?? []).map((id) => ({
+    _id: id,
+    name:
+      store.value?.siteNames?.find((s) => s._id === id)?.name ||
+      orgSites.value.find((s) => s._id === id)?.name ||
+      (id === props.siteId ? "This property" : "Another property"),
+  })),
 );
 
 const subtitle = computed(() => {
   if (!store.value) return "";
-  if (storeSites.value.length > 1) return `Supplies ${storeSites.value.map((s) => s.name).join(", ")}`;
+  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;
+  }
   return inventoryStoreLabel(store.value, stores.value);
 });
 

package/components/InventoryReportsTab.vue

@@ -20,7 +20,7 @@
       />
       <v-text-field v-model="month" type="month" :label="report === 'purchases' && span === 'year' ? 'Up to month' : 'Month'" density="compact" hide-details style="max-width: 180px" />
       <v-select
-        v-if="report === 'usage' && sites.length > 1"
+        v-if="(report === 'usage' || report === 'movement') && sites.length > 1"
         v-model="site"
         :items="[{ _id: '', name: 'All properties' }, ...sites]"
         item-title="name"
@@ -49,6 +49,9 @@
     </div>
 
     <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 class="text-body-2 font-weight-medium">
@@ -95,7 +98,7 @@
 
     <v-data-table
       v-model="selected"
-      :headers="headers[report]"
+      :headers="tableHeaders"
       :items="rows"
       :loading="loading"
       :show-select="report === 'usage' && canCheck"
@@ -111,6 +114,7 @@
       <template #item.totalCost="{ value }">{{ money(value) }}</template>
       <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. -->
       <template #item.photos="{ item }">
         <div v-if="usagePhotos(item).length" class="d-flex ga-1 py-1">
@@ -133,7 +137,7 @@
 
 <script setup lang="ts">
 import useInventory, { saveBlob } from "../composables/useInventory";
-import useWorkerTerm from "../composables/useWorkerTerm";
+import useWorkerTerm, { workerAppKey } from "../composables/useWorkerTerm";
 import useUtils from "../composables/useUtils";
 import useFile from "../composables/useFile";
 
@@ -152,7 +156,7 @@ const usagePhotos = (row: any) => [
 const notify = inject<(text: string, color?: string) => void>("inventoryNotify", () => {});
 
 const worker = useWorkerTerm({ providers: true });
-const appSlug = useRuntimeConfig().public?.appSlug as string | undefined;
+const appSlug = workerAppKey();
 
 const now = new Date();
 const month = ref(`${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}`);
@@ -238,6 +242,18 @@ const headers: Record<string, any[]> = {
   ],
 };
 
+const siteName = computed(() => (site.value ? props.sites.find((s) => s._id === site.value)?.name ?? "" : ""));
+const tableHeaders = computed(() =>
+  report.value === "movement" && siteName.value
+    ? [
+        ...headers.movement,
+        { title: `Issued for ${siteName.value}`, key: "siteIssued" },
+        { title: `Used at ${siteName.value}`, key: "siteUsed" },
+        { title: `Usage cost at ${siteName.value}`, key: "siteUsedCost" },
+      ]
+    : headers[report.value],
+);
+
 function period(): TInventoryPeriod & { unchecked?: boolean } {
   const [y, m] = month.value.split("-").map(Number);
   const to = new Date(y, m, 0, 23, 59, 59, 999);
@@ -245,7 +261,7 @@ function period(): TInventoryPeriod & { unchecked?: boolean } {
   return {
     from: from.toISOString(),
     to: to.toISOString(),
-    ...(report.value === "usage" && site.value ? { site: site.value } : {}),
+    ...((report.value === "usage" || report.value === "movement") && site.value ? { site: site.value } : {}),
     ...(report.value === "usage" && locationType.value ? { locationType: locationType.value } : {}),
     ...(report.value === "usage" && uncheckedOnly.value ? { unchecked: true } : {}),
   };

package/components/InventoryRequestsTab.vue

@@ -23,6 +23,8 @@
         <div class="font-weight-medium">{{ r.requestedByName || "Someone" }}</div>
         <div class="text-caption text-medium-emphasis">{{ standardFormatDateTime(r.createdAt) }}</div>
         <v-chip size="small" :color="chip[r.status].color" variant="tonal">{{ chip[r.status].label }}</v-chip>
+        <!-- One store can supply several properties: say which one this request is for. -->
+        <v-chip v-if="store.sites.length > 1 && r.siteName" size="small" variant="outlined" prepend-icon="mdi-office-building-outline">For {{ r.siteName }}</v-chip>
         <v-spacer />
         <template v-if="r.status === 'pending'">
           <v-btn v-if="store.access.canApprove" class="text-none screen-btn-primary" variant="flat" @click="openDecision(r)">Review</v-btn>

package/composables/useWorkerTerm.ts

@@ -3,8 +3,15 @@ import { workerTerm } from "../utils/worker-terms";
 /**
  * The worker noun for the app this page runs in ("Cleaner" in Hygiene,
  * "Security officer" in Security, ...). See utils/worker-terms.ts.
- * Apps without `runtimeConfig.public.appSlug` get the neutral "Staff".
+ * Keyed by `runtimeConfig.public.appSlug`, else the deployment's `APP` code
+ * ("cleaning_services", "security_agency", ...) - hygiene, M&E, pest, pool and
+ * landscape set only `APP`. Neither = the neutral "Staff".
  */
+export function workerAppKey(): string | undefined {
+  const pub = useRuntimeConfig().public ?? {};
+  return (pub.appSlug || pub.APP || undefined) as string | undefined;
+}
+
 export default function useWorkerTerm(opts?: { providers?: boolean }) {
-  return workerTerm(useRuntimeConfig().public?.appSlug as string | undefined, opts);
+  return workerTerm(workerAppKey(), opts);
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.35.1-staging.420",
+  "version": "4.35.1-staging.422",
   "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

@@ -12,6 +12,8 @@ declare type TInventoryStore = {
   ownerType: "property" | "service_provider";
   name: string;
   sites: string[];
+  /** Names of `sites`, from the server (a provider cannot list the owner's sites). */
+  siteNames?: { _id: string; name: string }[];
   showInResidentApp: boolean;
   showCostInResidentApp: boolean;
   access: TInventoryAccess;
@@ -40,6 +42,7 @@ declare type TInventoryRequest = {
   _id: string;
   store: string;
   site: string;
+  siteName?: string;
   requestedBy: string;
   requestedByName: string;
   lines: { item: string; itemName: string; unit: string; qty: number; issuedQty: number }[];

package/utils/inventory-store-label.ts

@@ -6,6 +6,13 @@
  */
 type TStoreLike = { ownerType: string; orgName?: string };
 
+/** "Supplies Winsland House I and Winsland House II" for a store that supplies several sites. */
+export function inventorySuppliesText(names: string[]) {
+  const named = names.map((n) => n || "another property");
+  if (named.length < 2) return "";
+  return `Supplies ${named.slice(0, -1).join(", ")} and ${named[named.length - 1]}`;
+}
+
 export function inventoryStoreLabel(store: TStoreLike, all: TStoreLike[]) {
   const kind = store.ownerType === "property" ? "Property store" : "Our store";
   const sameKind = all.filter((s) => s.ownerType === store.ownerType).length;

package/utils/worker-terms.ts

@@ -4,8 +4,8 @@
  * A cleaning company's workers are cleaners, not technicians. Every screen,
  * export and mobile app takes the noun from here, keyed by the app it runs in
  * (`appSlug`, e.g. "iservice365-web-app-hygiene" or
- * "iservice365-hygiene-mobile-app"); a service-type code ("hygiene",
- * "security_agency", ...) resolves the same way. Only the words change -
+ * "iservice365-hygiene-mobile-app"); a service-type or deployment `APP` code
+ * ("cleaning_services", "security_agency", ...) resolves the same way. Only the words change -
  * field names and API keys (`technician`, `usedByTechnicians`,
  * `/reports/technicians`) stay as they are.
  *