@7365admin1/layer-common 4.149.2 → 4.151.0

package/components/OvernightParkingAvailability.vue

@@ -6,17 +6,67 @@
   >
     <v-row no-gutters>
       <v-col cols="12">
-        <v-row no-gutters class="d-flex align-center ga-2 justify-end">
-          <span class="d-flex ga-2 align-center">
-            <p>Allow Opening Barrier via Plate Number?</p>
+        <!-- Which QR code types a resident's visitor invitation can carry. -->
+        <template v-for="option in visitorQrCodes" :key="option.type">
+          <div class="d-flex align-center justify-space-between py-3">
+            <div>
+              <div class="text-body-2 font-weight-medium">{{ visitorQrLabels[option.type].title }}</div>
+              <p class="text-caption text-medium-emphasis mt-1 mb-0">
+                {{ visitorQrLabels[option.type].description }}
+              </p>
+            </div>
             <v-switch
-              v-model="isAllowPlateNumberOpenBarrier"
-              hide-details
+              v-model="option.isEnabled"
               color="success"
-              size="large"
+              inset
+              density="compact"
+              hide-details
+              class="flex-grow-0 ml-4"
             />
-          </span>
-        </v-row>
+          </div>
+          <!-- How long an HID visitor pass lasts. Only asked once HID is on. -->
+          <v-radio-group
+            v-if="option.type === 'hid' && option.isEnabled"
+            v-model="option.usage"
+            inline
+            hide-details
+            density="compact"
+            color="success"
+            class="pb-3"
+          >
+            <v-radio
+              v-for="usage in hidQrUsageOptions"
+              :key="usage.value"
+              :value="usage.value"
+              class="mr-6"
+            >
+              <template #label>
+                <div>
+                  <div class="text-body-2">{{ usage.title }}</div>
+                  <div class="text-caption text-medium-emphasis">{{ usage.description }}</div>
+                </div>
+              </template>
+            </v-radio>
+          </v-radio-group>
+          <v-divider />
+        </template>
+        <div class="d-flex align-center justify-space-between py-3">
+          <div>
+            <div class="text-body-2 font-weight-medium">Allow Opening Barrier via Plate Number?</div>
+            <p class="text-caption text-medium-emphasis mt-1 mb-0">
+              When enabled, the barrier can be opened for visitors by matching their vehicle plate number.
+            </p>
+          </div>
+          <v-switch
+            v-model="isAllowPlateNumberOpenBarrier"
+            color="success"
+            inset
+            density="compact"
+            hide-details
+            class="flex-grow-0 ml-4"
+          />
+        </div>
+        <v-divider class="mb-4" />
         <v-row
           no-gutters
           class="d-flex align-center ga-2 justify-space-between"
@@ -220,6 +270,41 @@ const isAllowPlateNumberOpenBarrier = ref(false);
 const autoApproveOvernightParking = ref(false);
 const isHydrating = ref(true);
 
+const visitorQrLabels: Record<TVisitorQrCodeType, { title: string; description: string }> = {
+  hid: {
+    title: "HID QR Code Visitor Invitation",
+    description: "When enabled, HID QR codes will be generated for visitor invitations instead of standard entry pass QR codes.",
+  },
+  entryPass: {
+    title: "Entry Pass QR Code Visitor Invitation",
+    description: "When enabled, entry pass QR codes will be generated for visitor invitations.",
+  },
+  security: {
+    title: "Security QR Code Visitor Invitation",
+    description: "When enabled, security QR codes will be generated for visitor invitations.",
+  },
+};
+// Whole day until the end of the visit day, or one entry and then it expires.
+// Sites that saved before this existed have none, and read as whole day.
+const DEFAULT_HID_QR_USAGE: TVisitorQrUsage = "wholeDay";
+const hidQrUsageOptions: { value: TVisitorQrUsage; title: string; description: string }[] = [
+  {
+    value: "wholeDay",
+    title: "Whole day usage",
+    description: "The visitor can use the QR code as many times as needed until the end of the visit day.",
+  },
+  {
+    value: "singleUse",
+    title: "Single usage",
+    description: "The QR code expires after the visitor's first entry.",
+  },
+];
+const visitorQrCodes = ref<TVisitorQrCode[]>([
+  { type: "hid", isEnabled: false, usage: DEFAULT_HID_QR_USAGE },
+  { type: "security", isEnabled: false },
+  { type: "entryPass", isEnabled: false },
+]);
+
 const { requiredRule } = useUtils();
 const { generateTimeSlots, generateTimeSlotsFromStart } = useFacilityUtils();
 const { currentUser } = useLocalAuth();
@@ -290,6 +375,16 @@ watch(
     autoApproveOvernightParking.value =
       data?.autoApproveOvernightParking === true ||
       data?.isAutoApproved === true;
+    // Set in place so the toggle watcher only fires on a real change.
+    visitorQrCodes.value.forEach((option) => {
+      const saved = (data?.visitorQrCodes as TVisitorQrCode[] | undefined)?.find(
+        (q) => q.type === option.type
+      );
+      option.isEnabled = saved?.isEnabled === true;
+      if (option.type === "hid") {
+        option.usage = saved?.usage ?? DEFAULT_HID_QR_USAGE;
+      }
+    });
     setTimeout(() => {
       isHydrating.value = false;
     }, 500);
@@ -374,7 +469,7 @@ watch(
   isAllowPlateNumberOpenBarrier,
   (newValue, oldValue) => {
     if (oldValue === newValue || isHydrating.value) return;
-    handleSave("toggle");
+    handleSave("toggle", "Plate number barrier setting updated successfully.");
   },
   { immediate: false }
 );
@@ -388,7 +483,19 @@ watch(
   { immediate: false }
 );
 
-async function handleSave(action: "toggle" | "save") {
+watch(
+  visitorQrCodes,
+  () => {
+    if (isHydrating.value) return;
+    handleSave("toggle", "Visitor QR settings updated successfully.");
+  },
+  { deep: true }
+);
+
+async function handleSave(
+  action: "toggle" | "save",
+  successMessage = "Overnight parking settings updated successfully."
+) {
   if (!isValid.value && action === "save") {
     message.value = "Please fill in all required fields.";
     messageColor.value = "error";
@@ -403,6 +510,11 @@ async function handleSave(action: "toggle" | "save") {
     isAllowPlateNumberOpenBarrier: isAllowPlateNumberOpenBarrier.value,
     autoApproveOvernightParking: autoApproveOvernightParking.value,
     isAutoApproved: autoApproveOvernightParking.value,
+    visitorQrCodes: visitorQrCodes.value.map(({ type, isEnabled, usage }) => ({
+      type,
+      isEnabled,
+      ...(type === "hid" ? { usage: usage ?? DEFAULT_HID_QR_USAGE } : {}),
+    })),
     updatedBy: updatedByValue.value,
   };
 
@@ -414,7 +526,7 @@ async function handleSave(action: "toggle" | "save") {
       userType.value
     );
     refreshAvailability();
-    message.value = "Overnight parking settings updated successfully.";
+    message.value = successMessage;
     messageColor.value = "success";
     messageSnackbar.value = true;
   } catch (error) {

package/components/Robot/Detail.vue

@@ -255,6 +255,11 @@
         <v-select v-model="jobOpts.levelFlag" :items="CLEAN_POWER_CHOICES" label="Power" density="compact" hide-details class="mb-2" />
         <v-select v-model="jobOpts.cleanTimes" :items="CLEAN_TIMES_CHOICES" label="Times to clean" density="compact" hide-details class="mb-2" />
       </template>
+      <!-- A brand with its own named modes (VIGGO): the robot's list + times. -->
+      <template v-if="offered.modes">
+        <v-select v-model="jobOpts.cleanModeId" :items="robotModeChoices(robotModes)" label="Cleaning mode" density="compact" hide-details class="mb-2" />
+        <v-select v-model="jobOpts.cleanTimes" :items="CLEAN_TIMES_CHOICES" label="Times to clean" density="compact" hide-details class="mb-2" />
+      </template>
       <v-select v-if="offered.rounds" v-model="jobOpts.rounds" :items="PATROL_ROUND_CHOICES" label="Rounds" density="compact" hide-details class="mb-2" />
       <div class="hero-dialog__body">{{ confirming.text.body }}</div>
       <div v-if="optionsLine" class="hero-dialog__body">{{ optionsLine }}</div>
@@ -390,8 +395,10 @@ import {
   PATROL_ROUND_CHOICES,
   jobOptionsLine,
   jobOptionsOffered,
+  robotModeChoices,
   withJobOptions,
   type TJobOptions,
+  type TRobotCleanMode,
 } from "../../utils/robot-display";
 
 const props = withDefaults(
@@ -431,6 +438,7 @@ const {
   resolveRobotAlerts,
   getPatrolHistory,
   getSiteFaults,
+  getRobotRecords,
 } = useRobots();
 
 const record = ref<Record<string, any> | null>(null);
@@ -824,10 +832,21 @@ function pickRoute(id: unknown) {
 }
 /* Job options on a start: reset each time the confirm opens. */
 const jobOpts = ref<TJobOptions>({ ...JOB_OPTION_DEFAULTS });
-const offered = computed(() => jobOptionsOffered(confirming.value?.kind, robotType.value, caps.value));
-const optionsLine = computed(() => jobOptionsLine(offered.value, jobOpts.value));
-watch(confirmOpen, (open) => {
-  if (open) jobOpts.value = { ...JOB_OPTION_DEFAULTS };
+/** The robot's own cleaning modes (VIGGO reports them in its records), read when a start is confirmed. */
+const robotModes = ref<TRobotCleanMode[]>([]);
+const offered = computed(() => jobOptionsOffered(confirming.value?.kind, robotType.value, caps.value, robotModes.value));
+const optionsLine = computed(() => jobOptionsLine(offered.value, jobOpts.value, robotModes.value));
+watch(confirmOpen, async (open) => {
+  if (!open) return;
+  jobOpts.value = { ...JOB_OPTION_DEFAULTS };
+  const kind = confirming.value?.kind;
+  if (record.value?.brand !== "viggo" || (kind !== "full" && kind !== "area")) return;
+  try {
+    const rec = await getRobotRecords(props.robotId);
+    robotModes.value = Array.isArray(rec?.cleanModes) ? rec.cleanModes : [];
+  } catch {
+    robotModes.value = []; // the job still goes, in the robot's default mode
+  }
 });
 function confirmSend(stayHere = false) {
   const c = confirming.value;

package/components/SiteSettings.vue

@@ -186,10 +186,12 @@
         </v-expansion-panel-text>
       </v-expansion-panel>
 
-      <v-expansion-panel>
+      <!-- HID on or off for the site and the HID QR configuration:
+           `hid-mgmt:manage-hid-settings` (`useHidAccessPermission`). -->
+      <v-expansion-panel v-if="canManageHidSettings">
         <v-expansion-panel-title>
           <v-icon class="mr-2">mdi-face-recognition</v-icon>
-          HID Face Reader
+          HID Reader
         </v-expansion-panel-title>
         <v-expansion-panel-text>
           <HidServiceSettingsPanel
@@ -312,6 +314,7 @@ const { canManageSiteInformation,
   canManageVehicleQr,
   canManageSiteSettings: canManageAnySiteSetting,
 } = useSettingsPermission();
+const { canManageHidSettings } = useHidAccessPermission();
 
 const { getSiteById, updateSitebyId, updateSiteInformation } =
   useSiteSettings();

package/components/VisitorForm.vue

@@ -350,6 +350,7 @@
               :hid-qr-printer-configured="hasHidQrPrinterConfig"
               :hid-reader-name="hidQrReader?.name || ''"
               :hid-portal-name="hidQrReader?.portalName || ''"
+              :hid-qr-usage="hidQrUsage"
               @update:available-qr-count="(val) => availableQrCount = val" />
           </v-col>
 
@@ -838,6 +839,7 @@ import useLocalAuth from "../composables/useLocalAuth";
 import useBuilding from "../composables/useBuilding";
 import useVisitor, { getVisitorFieldSwitches, NRIC_LAST4_HINT, VEHICLE_REQUIRED_MESSAGE } from "../composables/useVisitor";
 import useSiteEntryPassSettings from "../composables/useSiteEntryPassSettings";
+import { hidQrUsageFromSettings, minutesUntilEndOfDay } from "../utils/hid-qr-validity";
 import useAccessManagement from "../composables/useAccessManagement";
 import usePeople from "../composables/usePeople";
 import useHidAmico from "../composables/useHidAmico";
@@ -912,7 +914,7 @@ const currentAutofillSource = ref<AutofillSource>(null);
 
 const { requiredRule, debounce, UTCToLocalTIme, maskNRIC, getImage } = useUtils();
 const { addFile } = useFile();
-const { getSiteById, updateSitebyId } = useSiteSettings();
+const { getSiteById, getOvernightParkingAvailabilityV2, updateSitebyId } = useSiteSettings();
 const { currentUser } = useLocalAuth();
 const { getBlocksSelection, getLevelsSelection, getUnitSelection } =
   useBuilding();
@@ -927,7 +929,7 @@ const {
 const { getBySiteId: getEntryPassSettingsBySiteId } =
   useSiteEntryPassSettings();
 const { createVisitorPass, signQr, visitorCheckout } = useAccessManagement();
-const { getReaders, issueVisitorQr } = useHidAmico();
+const { getEnrollmentReaders, issueVisitorQr } = useHidAmico();
 const { testConnection } = useWebUsb();
 const { findVisitorPeopleAnyType, deletePersonRecords } = usePeople();
 const { getPassKeysByPageSearch } = usePassKey();
@@ -1230,11 +1232,6 @@ const hidQrTemplate = computed(() => {
   return hidQrCodePassConfig.value?.template || {};
 });
 
-const hidQrValidityMinutes = computed(() => {
-  const value = Number(hidQrCodePassConfig.value?.validityMinutes);
-  return Number.isFinite(value) && value > 0 ? value : 60;
-});
-
 const hidQrConfiguredReaderId = computed(() => String(hidQrCodePassConfig.value?.readerId || ""));
 type HidQrReaderSummary = {
   _id: string;
@@ -1256,7 +1253,7 @@ const hidQrReaderId = computed(() => (
  * `hidQrCodePassAllowed`, which is why the switch belongs here and not in each
  * of them.
  */
-const HID_VISITOR_QR_ENABLED = false;
+const HID_VISITOR_QR_ENABLED = true;
 
 const hidQrCodePassAllowed = computed(() => {
   return (
@@ -1266,6 +1263,12 @@ const hidQrCodePassAllowed = computed(() => {
   );
 });
 
+// The site's Whole day / Single usage choice for HID visitor passes, shown
+// under the HID QR Code card as the resident app's invite form shows it.
+// Null until read, and when it cannot be read: then no hint, not a guess.
+// Loaded by the watcher below `siteData`.
+const hidQrUsage = ref<"wholeDay" | "singleUse" | null>(null);
+
 // The entry pass is a contractor's, with the site's NFC pass switch on, as
 // the security mobile app (the web-only HID QR pass, switched off above, keeps
 // its own types).
@@ -2298,8 +2301,14 @@ watch(
     hidQrReader.value = null;
     if (!site) return;
     try {
-      const response = await getReaders({ site, page: 1, limit: 100 });
-      const readers: unknown = response?.items ?? response?.data?.items ?? response?.data?.readers ?? [];
+      /* The member's list, not the admin one. `POST /readers/:id/visitor-qr`
+         asks for membership plus `hid-mgmt:use-hid-access` (API-core #1772),
+         while `GET /readers` asks for the HID view right, so a member who may
+         issue a visitor pass but holds no admin right got the pass route and
+         not the reader it needs. `enrollment-readers` is the site's enabled
+         readers with a portal, `{ data: { items } }`, for any member. */
+      const response = await getEnrollmentReaders(site);
+      const readers: unknown = response?.data?.items ?? [];
       const availableReaders = Array.isArray(readers)
         ? readers.filter((reader: unknown): reader is HidQrReaderSummary => (
             typeof reader === "object"
@@ -2326,6 +2335,23 @@ watch(
   { immediate: true },
 );
 
+// Below `siteData` for the same reason as the reader watcher above:
+// `hidQrCodePassAllowed` reads it. Only fetched where HID QR is offered.
+watch(
+  [hidQrCodePassAllowed, () => prop.site],
+  async ([allowed, site]) => {
+    hidQrUsage.value = null;
+    if (!allowed || !site) return;
+    try {
+      const settings = await getOvernightParkingAvailabilityV2(String(site), "site");
+      hidQrUsage.value = hidQrUsageFromSettings(settings);
+    } catch {
+      hidQrUsage.value = null;
+    }
+  },
+  { immediate: true },
+);
+
 const {
   data: blocksListData,
   refresh: refreshBlockListData,
@@ -3388,7 +3414,9 @@ async function prepareHidQrCodePreview(visitorId: string) {
     hidQrVisitorId.value = visitorId;
     const response = await issueVisitorQr(hidQrReaderId.value, {
       visitorId,
-      validityMinutes: hidQrValidityMinutes.value,
+      // The whole visit day, as the resident app issues it. Worked out per
+      // call so a regenerate later in the day still ends at midnight.
+      validityMinutes: minutesUntilEndOfDay(),
     });
     const credential = "data" in response ? response.data : response;
     hidQrPrintPayload.value = credential.qrValue;

package/composables/useCleaningPermission.ts

@@ -84,6 +84,17 @@ export default function useCleaningPermission() {
         description: "Allows the user to manage and update site settings.",
       },
     },
+    // HID access, user side only (decision of 2026-10-16). The service apps
+    // have no HID admin screens yet, so a role here can be prepared with the
+    // one string that lets a member use their own QR code, face, PIN, card and
+    // intercom. Mirrored from core `src/utils/hid-access.util.ts`.
+    "hid-mgmt": {
+      "use-hid-access": {
+        check: true,
+        description:
+          "Allows the user to see HID Access in the app and use their own QR code, face, PIN, card and intercom at this site.",
+      },
+    },
     toilet_locations: {
       "create-toilet-location": {
         check: true,