@7365admin1/layer-common 4.84.0 → 4.84.1-staging.481

package/components/InventoryMain.vue

@@ -149,6 +149,9 @@ const props = defineProps({
 });
 
 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 ?? "") };
 
 const { getStores, createStore: apiCreateStore, getRequests, getReport } = useInventory();
 const { getSites } = useSite();
@@ -227,7 +230,10 @@ async function loadStores() {
   loadError.value = "";
   try {
     stores.value = (await getStores(props.siteId)) ?? [];
-    if (!stores.value.some((s) => s._id === storeId.value)) {
+    const fromLink = stores.value.find((s) => s._id === linked.storeId);
+    linked.storeId = "";
+    if (fromLink) storeId.value = fromLink._id;
+    else if (!stores.value.some((s) => s._id === storeId.value)) {
       // A service provider working at a property store sees it first.
       storeId.value = stores.value[0]?._id ?? "";
     }
@@ -295,7 +301,10 @@ async function createStore() {
 }
 
 watch(storeId, () => {
-  tab.value = "stock";
+  // The linked tab only when this person has it (tabs are hidden, never greyed).
+  const wanted = linked.tab;
+  linked.tab = "";
+  tab.value = wanted && tabs.value.some((t) => t.value === wanted) ? wanted : "stock";
   refreshCounts();
   probeCompanyUsage();
 });

package/components/InvitationClientForm.vue

@@ -388,9 +388,27 @@ watch(
 const roles = ref<any[]>([])
 const { getRoles } = useRole()
 
+/*
+ * `type` is the ROLE type, not the service the client subscribes to, and the
+ * only caller (`ClientMain.vue` "Invite Client") passes no `app` prop -- so
+ * this sent `type: ""` and the endpoint applied no type filter at all. The
+ * dropdown therefore listed every org-less role of every type, which includes
+ * the platform's OWN staff roles (`type: "admin"` -- the two rows the console's
+ * `/super-admin/role-permissions` screen edits). Offering a Seven365 console
+ * staff role on a CLIENT invitation is the defect.
+ *
+ * A client admin's role is `type: "organization"`, which is what the client
+ * roles screen (`org/[organization]/roles-permissions.vue`) already lists. This
+ * narrows to exactly that. It is a narrowing of this one picker only: no role
+ * changes, no permission changes, and the org-less `organization` roles that
+ * were already being picked are all still offered.
+ *
+ * Keying off the selected service instead would empty the dropdown -- no
+ * org-less role carries a service type -- so `props.app` is not the filter.
+ */
 const { data: roleData, refresh: refreshRoles } = await useLazyAsyncData(
   "roles",
-  () => getRoles({ org: org.value?._id, type: props.app, limit: 50 }),
+  () => getRoles({ org: org.value?._id, type: "organization", limit: 50 }),
   { watch: [() => props.app] }
 )
 

package/components/MemberServiceProviders.vue

@@ -22,21 +22,10 @@
       </template>
     </PageHeader>
 
-    <!-- One chip per provider company; a click filters to that company. -->
-    <div v-if="companies.length" class="sp-chips mb-3" data-test="sp-members-companies">
-      <button
-        v-for="c in companies"
-        :key="c.orgId"
-        type="button"
-        class="sp-chip"
-        :class="{ 'sp-chip--active': company === c.orgId }"
-        :aria-pressed="company === c.orgId"
-        @click="company = company === c.orgId ? '' : c.orgId"
-      >
-        <span class="sp-chip__name">{{ companyChipText(c.name, c.people) }}</span>
-        <span class="sp-chip__type">{{ c.typeLabel }}<template v-if="c.invitedVia"> · via {{ c.invitedVia }}</template></span>
-      </button>
-    </div>
+    <!-- Who is on the list at a glance; pick one company with the Company filter. -->
+    <p v-if="companies.length" class="sp-summary mb-3" data-test="sp-members-summary">
+      {{ summaryText }}
+    </p>
 
     <AppCard class="table-card">
       <CardToolbar :count="countText">
@@ -75,6 +64,25 @@
             aria-label="Service"
             data-test="sp-members-type"
           />
+          <v-autocomplete
+            v-model="company"
+            :items="companyItems"
+            item-title="title"
+            item-value="value"
+            density="compact"
+            variant="outlined"
+            hide-details
+            clearable
+            placeholder="All companies"
+            no-data-text="No company for this service"
+            class="sp-company-filter"
+            aria-label="Company"
+            data-test="sp-members-company"
+          >
+            <template #item="{ props: itemProps, item }">
+              <v-list-item v-bind="itemProps" :subtitle="item.raw.subtitle" />
+            </template>
+          </v-autocomplete>
           <AppButton
             variant="icon"
             icon="mdi-refresh"
@@ -151,10 +159,11 @@ import type {
   TSiteProviderMember,
 } from "../composables/useServiceProvider";
 import {
-  companyChipText,
+  companyFilterItems,
   concernMailto,
   filterProviderMembers,
   providerMembersEmptyText,
+  providerSummaryText,
   serviceTypeOptions,
 } from "../utils/site-provider-members";
 import { spDay } from "../utils/sp-inviter-row";
@@ -189,7 +198,7 @@ const loading = ref(false);
 const exporting = ref(false);
 const search = ref("");
 const type = ref("");
-const company = ref("");
+const company = ref<string | null>("");
 const snackbar = ref(false);
 const message = ref("");
 
@@ -209,9 +218,18 @@ const typeItems = computed(() => [
   ...serviceTypeOptions(items.value),
 ]);
 
+const companyItems = computed(() => companyFilterItems(companies.value, type.value));
+const summaryText = computed(() => providerSummaryText(companies.value));
+// A company of another service cannot match; drop it when the service changes.
+watch(type, () => {
+  if (company.value && !companyItems.value.some((c) => c.value === company.value)) {
+    company.value = "";
+  }
+});
+
 const filters = computed(() => ({
   type: type.value,
-  company: company.value,
+  company: company.value || "",
   search: search.value,
 }));
 
@@ -294,41 +312,21 @@ onMounted(async () => {
 </script>
 
 <style scoped>
-.sp-chips {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-}
-
-.sp-chip {
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  padding: 8px 12px;
-  border: 1px solid var(--border);
-  border-radius: var(--r-inner);
-  background: var(--card);
-  color: var(--text);
-  text-align: left;
-  cursor: pointer;
-}
-
-.sp-chip--active {
-  border-color: var(--accent-strong);
-  box-shadow: inset 0 0 0 1px var(--accent-strong);
-}
-
-.sp-chip__name {
-  font-weight: 600;
+.sp-summary {
   font-size: 14px;
+  color: var(--muted);
 }
 
-.sp-chip__type,
 .sp-sub {
   font-size: 12px;
   color: var(--muted);
 }
 
+.sp-company-filter {
+  min-width: 220px;
+  max-width: 300px;
+}
+
 .sp-type-filter {
   min-width: 170px;
   max-width: 220px;

package/components/MyAttendanceMain.vue

@@ -1,5 +1,31 @@
 <template>
   <v-row no-gutters align="center" justify="center">
+    <!-- Site device mode is ON for this site: this shared phone can check other
+         people in and out (owner request 2026-10-01). -->
+    <v-col v-if="siteDeviceMode && canCheckInOut" cols="12" class="mb-4">
+      <v-alert
+        type="info"
+        variant="tonal"
+        icon="mdi-cellphone-check"
+        data-test="site-device-mode-banner"
+      >
+        <div class="font-weight-medium">Site device mode is on</div>
+        <div class="mb-3">
+          This phone can check staff in and out for them: take their photo, type their
+          name and NRIC. Only the last 4 characters of the NRIC are saved.
+        </div>
+        <v-btn
+          class="text-none screen-btn-primary"
+          size="large"
+          variant="flat"
+          prepend-icon="mdi-account-clock"
+          data-test="attendance-proxy-open-btn"
+          @click="dialogShowProxy = true"
+        >
+          Check in / Check out for someone
+        </v-btn>
+      </v-alert>
+    </v-col>
     <v-col cols="12" lg="12">
       <TableMain
         title="Attendance Records"
@@ -71,6 +97,14 @@
     @close="dialogShowMoreActions = false"
   />
 
+  <AttendanceProxyDialog
+    v-if="siteDeviceMode"
+    v-model="dialogShowProxy"
+    :site="props.site"
+    :service-type="props.serviceType"
+    @saved="onProxySaved"
+  />
+
   <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
 </template>
 
@@ -107,7 +141,31 @@ const headers = [
   { title: "Total Hours", value: "totalHours" },
 ];
 
-const { getMyAttendances, checkIn, checkOut } = useAttendance();
+const { getMyAttendances, checkIn, checkOut, getAttendanceSettings } = useAttendance();
+
+// Site device mode: read once per site. A failed read means OFF (today's flow).
+const siteDeviceMode = ref(false);
+const dialogShowProxy = ref(false);
+watch(
+  () => [props.site, props.serviceType],
+  async () => {
+    siteDeviceMode.value = false;
+    if (!props.site) return;
+    try {
+      const res: any = await getAttendanceSettings(props.site, props.serviceType);
+      siteDeviceMode.value = res?.siteDeviceMode === true;
+    } catch {
+      siteDeviceMode.value = false;
+    }
+  },
+  { immediate: true }
+);
+
+function onProxySaved(text: string) {
+  message.value = text;
+  messageColor.value = "success";
+  messageSnackbar.value = true;
+}
 const { formatDate } = useUtils();
 
 const dialogShowMoreActions = ref(false);
@@ -170,7 +228,7 @@ watchEffect(() => {
     const today = new Date().toISOString().split("T")[0];
     todayAttendance.value =
       getMyAttendancesReq.value.items.find((item: any) => {
-        if (!item.checkInTimestamp) return false;
+        if (!item.checkInTimestamp || item.isProxy) return false;
         const itemDate = new Date(item.checkInTimestamp)
           .toISOString()
           .split("T")[0];

package/components/NotificationBell.vue

@@ -127,6 +127,13 @@
         <v-btn variant="text" class="text-none" @click="viewFromToast">View</v-btn>
       </template>
     </v-snackbar>
+
+    <v-snackbar v-model="nowhere.show" location="top right" :timeout="6000" color="surface">
+      <div class="d-flex align-center ga-3">
+        <v-icon icon="mdi-information-outline" color="primary" />
+        <div class="text-body-2">{{ nowhere.text }}</div>
+      </div>
+    </v-snackbar>
   </div>
 </template>
 
@@ -137,7 +144,7 @@ import {
   timeAgo,
   type TInboxItem,
 } from "../utils/notification-inbox";
-import { appUrlsFrom, chooseNavigation, notificationTarget } from "../utils/notification-target";
+import { appUrlsFrom, chooseNavigation, noTargetMessage, notificationTarget } from "../utils/notification-target";
 
 /**
  * The top-bar notification feed for the web, in every signed-in app.
@@ -180,6 +187,8 @@ const markingAll = ref(false);
 const items = ref<Array<Record<string, any>>>([]);
 const unread = ref(0);
 const toast = reactive({ show: false, title: "", body: "" });
+/** Said when a clicked row has no page to open - a click is never a silent nothing. */
+const nowhere = reactive({ show: false, text: "" });
 
 const userId = computed(() => String(currentUser.value?._id ?? ""));
 const badgeLabel = computed(() => badgeText(unread.value));
@@ -341,7 +350,10 @@ async function goToSubject(item: Record<string, any>) {
     hasPage: hasLocalPage,
     appUrls: appUrls(),
   });
-  if (!nav) return;
+  if (!nav) {
+    Object.assign(nowhere, { show: true, text: noTargetMessage(item as any) });
+    return;
+  }
 
   open.value = false;
   if (nav.type === "href") {

package/components/TableMain.vue

@@ -59,17 +59,32 @@
             >
               {{ createLabel }}
             </v-btn>
-            <v-text-field
+            <!--
+              The design's search field. This was a `v-text-field` with only a
+              `max-width`, so inside the actions row it shrank to its minimum
+              and showed "Se" and a magnifier, at a different height and
+              border from the button beside it. Same `search` model; clearing
+              now sets "" instead of Vuetify's null.
+            -->
+            <AppField
               v-if="canSearch"
               v-model="searchInput"
-              density="compact"
+              search
               placeholder="Search"
-              clearable
-              max-width="300"
-              append-inner-icon="mdi-magnify"
-              hide-details
+              aria-label="Search"
               class="table-card__search"
-            />
+            >
+              <template v-if="searchInput" #trailing>
+                <button
+                  type="button"
+                  class="app-field__trailing"
+                  aria-label="Clear search"
+                  @click="searchInput = ''"
+                >
+                  <v-icon icon="mdi-close" size="16" />
+                </button>
+              </template>
+            </AppField>
             <!-- Ghost/secondary, as the design specifies for Scan QR Code. -->
             <v-btn
               v-if="canScanVisitorQRCode"

package/components/VisitorForm.vue

@@ -910,8 +910,20 @@ const hidQrReaderId = computed(() => (
   hidQrConfiguredReaderId.value || String(hidQrReader.value?._id || "")
 ));
 
+/*
+ * Visitor QR passes are hidden at the manager's request (2026-09-23).
+ *
+ * A flag rather than a deletion: issuing, the preview dialog, printing and the
+ * regenerate handler below are all intact and untouched, so bringing the
+ * feature back is this one line. Every surface that offers a Visitor QR reads
+ * `hidQrCodePassAllowed`, which is why the switch belongs here and not in each
+ * of them.
+ */
+const HID_VISITOR_QR_ENABLED = false;
+
 const hidQrCodePassAllowed = computed(() => {
   return (
+    HID_VISITOR_QR_ENABLED &&
     hidQrCodePassEnabled.value &&
     ["guest", "contractor", "walk-in"].includes(prop.type)
   );