@7365admin1/layer-common 4.65.0 → 4.65.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @iservice365/layer-common
 
+## 4.65.2
+
+### Patch Changes
+
+- dbd4245: Inventory Stock Movement: the Received column labels opening stock received in the month ("incl. N opening stock").
+
+## 4.65.1
+
+### Patch Changes
+
+- 5df1751: Signed-in QA sweep fixes (plain words and readable controls):
+  - Inventory Settings names every property it supplies (was "Current property" when the organisation's site list did not include it).
+  - Inventory item lines label the packing ("Code 001 · Bulb · Packing: 25") instead of a bare number.
+  - Dashboard Low Stock tile shows 0 and "Every item is above its alert level" instead of "No data to display".
+  - Dashboard activity chart y-axis shows distinct whole numbers (was "0 0 0 1 1 1"); the Customize entry is called "Activity chart" and describes what it draws.
+  - A plain on/off switch now has a visible off track in light mode.
+  - Bell panel title "Notifications"; notification settings say "iService365"; the robot mini-map no longer shows "(placeholder)".
+
 ## 4.65.0
 
 ### Minor Changes
@@ -1755,11 +1773,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/assets/css/primitives.css

@@ -939,6 +939,19 @@ select option {
   background: var(--accent);
 }
 
+/*
+ * A plain `v-switch` (no `.app-switch`). Vuetify paints its OFF track with the
+ * theme's surface-variant, which this theme sets to near-white (251,251,248),
+ * so on a white card an off switch showed only its thumb and did not read as
+ * a switch at all (Inventory > Settings, Site Settings, Online Forms...). Give
+ * the off track a visible tint in both themes; when ON, Vuetify's `bg-*`
+ * colour class (`!important`) still wins, so the checked colour is unchanged.
+ */
+.v-switch:not(.app-switch) .v-switch__track {
+  background-color: rgba(var(--v-theme-on-surface), 0.26);
+  opacity: 1;
+}
+
 .app-switch .v-selection-control__input {
   position: absolute;
   inset: 0;

package/components/DashboardMain.vue

@@ -31,7 +31,9 @@
               <span class="text-blue-grey">Balance: {{ item.qty }}</span>
             </div>
           </div>
-          <div v-else class="print-kpi-meta mt-2">No supplies recorded</div>
+          <div v-else class="print-kpi-meta mt-2">
+            {{ card.raw?.basis === "below-alert-level" ? "0 · every item is above its alert level" : "No supplies recorded" }}
+          </div>
         </template>
         <template v-else>
           <div class="print-kpi-value">{{ card.value }}</div>
@@ -401,6 +403,11 @@
                 <span class="text-medium-emphasis">Balance: {{ item.qty }}</span>
               </div>
             </div>
+            <!-- Nothing low: say so with the number, not "No data" - that reads as "not set up". -->
+            <div v-else-if="card.raw?.basis === 'below-alert-level'" class="d-flex flex-column">
+              <span class="text-h5 font-weight-bold text-high-emphasis">0</span>
+              <span class="text-body-2 text-medium-emphasis">Every item is above its alert level</span>
+            </div>
             <DashboardEmptyState v-else compact />
           </template>
         </AppKpiTile>
@@ -1230,7 +1237,7 @@ import type { CookieOptions } from "#app";
 // Explicitly, not by auto-import: every other component in this layer reaches
 // its utils by relative path (`StatusChip.vue`, `CameraWall.vue`,
 // `plugins/vuetify.ts`), and a bare call resolved to nothing when driven.
-import { buildWorkOrderStatus } from "../utils/dashboard";
+import { buildWorkOrderStatus, chartTopValue } from "../utils/dashboard";
 import { permissionsDenied } from "../utils/module-routes";
 import { grantsPermission } from "../utils/permission-spellings";
 import { workerTerm, workerTitle } from "../utils/worker-terms";
@@ -2155,8 +2162,8 @@ const customizeWidgets = computed(() => {
       },
       {
         key: "activity",
-        title: "This Week Activity (Line Chart)",
-        description: "Compare incidents and work orders over time.",
+        title: "Activity chart",
+        description: "Work orders opened and closed over the chosen period.",
       },
       {
         key: "upcomingEvents",
@@ -2217,8 +2224,8 @@ const customizeWidgets = computed(() => {
       },
       {
         key: "activity",
-        title: "This Week Activity (Line Chart)",
-        description: "Compare incidents and work orders over time.",
+        title: "Activity chart",
+        description: "Work orders opened and closed over the chosen period.",
       },
       {
         key: "activePatrol",
@@ -2714,7 +2721,7 @@ const secondarySeries = computed(() =>
 const primaryLegendLabel = computed(() => activityChart.value.primaryLabel);
 const secondaryLegendLabel = computed(() => activityChart.value.secondaryLabel);
 const chartMax = computed(() =>
-  Math.max(1, ...primarySeries.value, ...secondarySeries.value)
+  chartTopValue([...primarySeries.value, ...secondarySeries.value])
 );
 const hasChartData = computed(
   () => primarySeries.value.some(Boolean) || secondarySeries.value.some(Boolean)

package/components/InventoryItemDetail.vue

@@ -12,7 +12,7 @@
           <div class="flex-grow-1">
             <div class="text-h5 mb-1" :class="item.lowStock ? 'text-error' : ''">{{ item.onHand }} {{ item.unit }} in store</div>
             <div class="text-body-2 text-medium-emphasis">
-              {{ [item.code && `Code ${item.code}`, item.category, item.packing, item.reorderLevel ? `Alert at ${item.reorderLevel}` : "", item.unitCost !== undefined ? `$${Number(item.unitCost).toFixed(2)} each` : ""].filter(Boolean).join(" · ") }}
+              {{ [inventoryItemMeta(item), item.reorderLevel ? `Alert at ${item.reorderLevel}` : "", item.unitCost !== undefined ? `$${Number(item.unitCost).toFixed(2)} each` : ""].filter(Boolean).join(" · ") }}
             </div>
             <div v-if="item.description" class="text-body-2 mt-2">{{ item.description }}</div>
           </div>
@@ -77,6 +77,7 @@
 import useInventory from "../composables/useInventory";
 import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
+import { inventoryItemMeta } from "../utils/inventory-store-label";
 
 const show = defineModel<boolean>({ default: false });
 const props = defineProps({

package/components/InventoryReportsTab.vue

@@ -112,6 +112,9 @@
       <template #item.locationType="{ value }">{{ value === "tenant_unit" ? "Tenant unit" : "Common area" }}</template>
       <template #item.unitCost="{ value }">{{ money(value) }}</template>
       <template #item.totalCost="{ value }">{{ money(value) }}</template>
+      <template #item.received="{ item }">
+        {{ item.received }}<span v-if="item.receivedOpening" class="d-block text-caption text-medium-emphasis">incl. {{ item.receivedOpening }} opening stock</span>
+      </template>
       <template #item.receivedCost="{ value }">{{ money(value) }}</template>
       <template #item.usedCost="{ value }">{{ money(value) }}</template>
       <template #item.siteUsedCost="{ value }">{{ money(value) }}</template>
@@ -181,7 +184,7 @@ const barWidth = (v: number) => {
 };
 
 const help: Record<string, string> = {
-  movement: "For each item: stock at the start of the month, what came in, what was issued and returned, count differences, and stock at the end.",
+  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.",
   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.",

package/components/InventorySettingsTab.vue

@@ -39,6 +39,7 @@
 <script setup lang="ts">
 import useInventory from "../composables/useInventory";
 import useUtils from "../composables/useUtils";
+import { inventorySiteOptions } from "../utils/inventory-store-label";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },
@@ -57,11 +58,7 @@ const sites = ref<string[]>([]);
 const showInResidentApp = ref(false);
 const showCostInResidentApp = ref(false);
 
-const siteItems = computed(() => {
-  const known = new Map(props.orgSites.map((s) => [s._id, s.name]));
-  for (const id of props.store.sites) if (!known.has(id)) known.set(id, "Current property");
-  return [...known].map(([_id, name]) => ({ _id, name }));
-});
+const siteItems = computed(() => inventorySiteOptions(props.orgSites, props.store));
 
 function reset() {
   name.value = props.store.name;

package/components/InventoryStockTab.vue

@@ -67,7 +67,7 @@
           </v-avatar>
           <div>
             <div class="font-weight-medium">{{ item.name }}</div>
-            <div class="text-caption text-medium-emphasis">{{ [item.code, item.category, item.packing].filter(Boolean).join(" · ") }}</div>
+            <div class="text-caption text-medium-emphasis">{{ inventoryItemMeta(item) }}</div>
           </div>
         </div>
       </template>
@@ -102,6 +102,7 @@
 import useInventory from "../composables/useInventory";
 import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
+import { inventoryItemMeta } from "../utils/inventory-store-label";
 
 const props = defineProps({
   store: { type: Object as PropType<TInventoryStore>, required: true },

package/components/NotificationBell.vue

@@ -30,7 +30,7 @@
 
       <v-card :width="440" elevation="0" class="notif-panel">
         <div class="notif-panel__head">
-          <span>Notification</span>
+          <span>Notifications</span>
           <v-btn
             v-if="unread > 0"
             variant="text"

package/components/NotificationSettings.vue

@@ -8,7 +8,7 @@
 
         <v-col cols="12" md="8" class="screen-hint intro-copy">
           Choose what you want to hear about, and how. These settings are yours
-          alone and apply everywhere you use iService — on this site and on your
+          alone and apply everywhere you use iService365 — on this site and on your
           phone.
         </v-col>
 

package/components/Robot/MiniMap.vue

@@ -49,7 +49,7 @@
     </RobotFloorPlan>
 
     <div class="hero-mini__foot">
-      <span>{{ shownMap ? `Robot map · ${shownMap.label}` : "Floor plan from robot (placeholder)" }}</span>
+      <span>{{ shownMap ? `Robot map · ${shownMap.label}` : "Sample layout, not this building's map" }}</span>
       <span v-if="type === 'security'"><span class="hero-mini__legend" aria-hidden="true" />Patrol routes</span>
       <span v-if="showRoutes && hasRoutes"><span class="hero-mini__legend hero-mini__legend--lane" aria-hidden="true" />Robot lanes</span>
       <span v-if="floor !== null" class="hero-mini__count">{{ robots.length }} on {{ floorName(floor) }}</span>

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.65.0",
+  "version": "4.65.2",
   "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/dashboard.ts

@@ -51,3 +51,14 @@ export function buildWorkOrderStatus(
     { label: "Pending", value: pending, percent: (pending / max) * 100, tone: "warn" },
   ];
 }
+
+/**
+ * The activity chart's top value. The six y-axis labels are max x 0, .2 ... 1
+ * rounded, so a raw max of 1 printed "0 0 0 1 1 1" - the same number on four
+ * lines. Rounding the top up to a multiple of 5 makes every label a distinct
+ * whole number (0 1 2 3 4 5, 0 2 4 6 8 10, ...).
+ */
+export function chartTopValue(values: number[]) {
+  const max = Math.max(0, ...values.filter((v) => Number.isFinite(v)));
+  return Math.max(5, Math.ceil(max / 5) * 5);
+}

package/utils/inventory-store-label.ts

@@ -18,3 +18,30 @@ export function inventoryStoreLabel(store: TStoreLike, all: TStoreLike[]) {
   const sameKind = all.filter((s) => s.ownerType === store.ownerType).length;
   return sameKind > 1 && store.orgName ? `${kind} · ${store.orgName}` : kind;
 }
+
+/**
+ * The properties a store can be set to supply, by name. The organisation's own
+ * site list does not always contain the store's current property (a manager
+ * can run a store at a site another organisation owns), so the store's own
+ * resolved names fill the gap - a chip must never read "Current property"
+ * when the store already knows it is Seventh Condominium.
+ */
+export function inventorySiteOptions(
+  orgSites: { _id: string; name: string }[],
+  store: { sites: string[]; siteNames?: { _id: string; name?: string }[] },
+) {
+  const known = new Map(orgSites.map((s) => [s._id, s.name]));
+  for (const id of store.sites) {
+    if (!known.has(id)) known.set(id, store.siteNames?.find((s) => s._id === id)?.name || "Another property");
+  }
+  return [...known].map(([_id, name]) => ({ _id, name }));
+}
+
+type TItemLike = { code?: string; category?: string; packing?: string };
+
+/** "Code 001 · Bulb · Packing: 25" - each figure says what it is, never a bare number. */
+export function inventoryItemMeta(item: TItemLike) {
+  return [item.code && `Code ${item.code}`, item.category, item.packing && `Packing: ${item.packing}`]
+    .filter(Boolean)
+    .join(" · ");
+}