@7365admin1/layer-common 4.147.2 → 4.148.1

package/components/VisitorForm.vue

@@ -843,6 +843,8 @@ import usePeople from "../composables/usePeople";
 import useHidAmico from "../composables/useHidAmico";
 import useFile from "../composables/useFile";
 import usePassKey from "../composables/usePassKey";
+import { defaultGateForSite } from "../utils/visitor-camera";
+import { barrierCameraOf, barrierOf, type TBarrierOutcome } from "../utils/visitor-barrier";
 import VisitorPassKeyQRScanner from "./VisitorPassKeyQRScanner.vue";
 import {
   DELETE_PERSON_TITLE,
@@ -978,6 +980,18 @@ const hidQrVisitorId = ref("");
 const hidQrNow = ref(Date.now());
 let hidQrTimer: ReturnType<typeof setInterval> | null = null;
 const hidQrPendingCompletion = ref<"done" | "done:more" | null>(null);
+/**
+ * What this save was and whether it opened the ANPR barrier, sent with
+ * `done` / `done:more` for the list's message (owner, 2026-10-23).
+ */
+const saveResult = ref<{
+  action: "add" | "register" | "edit";
+  barrier?: TBarrierOutcome;
+  /** The camera the barrier is at, "Entry Gate 1". */
+  barrierCamera?: string;
+}>({
+  action: "add",
+});
 const hidQrPreview = reactive({
   imageUrl: "",
   issuedAt: "",
@@ -1098,6 +1112,16 @@ const formMode = computed<"add" | "edit" | "register">(() => {
   return selectedUnregisteredVisitor.value ? "register" : prop.mode;
 });
 
+/*
+ * The user's default ANPR gate at this site (owner, 2026-10-23), picked on the
+ * visitor list: sent with an add or a register (an edit opens nothing) so that
+ * camera is checked for a blocked plate and opens the barrier. None picked:
+ * not sent, and the server uses the site's first camera.
+ */
+const defaultCameraGate = computed(() =>
+  defaultGateForSite((currentUser.value as any)?.defaultCameraGate, prop.site)
+);
+
 // Fields this form actually has for the visitor type - drives both what is
 // shown and what is sent on submit, so nothing outside the form is saved.
 // typeFieldMap also feeds the details dialog, so it can list more than this:
@@ -3138,6 +3162,16 @@ async function submit(options: { skipNonCheckedOutCheck?: boolean } = {}) {
     }
   }
   const payload = buildPayload(isUpdate);
+  // The camera chosen at the bottom of the form (not stored on the visit).
+  if (
+    (formMode.value === "add" || formMode.value === "register") &&
+    defaultCameraGate.value &&
+    payload.plateNumber
+  ) {
+    payload.anprGate = defaultCameraGate.value;
+  }
+  // A new visit replies `{ _id, barrier }`: whether the barrier opened.
+  if (!isUpdate) payload.reportBarrier = true;
 
   try {
     const res = isUpdate
@@ -3158,6 +3192,11 @@ async function submit(options: { skipNonCheckedOutCheck?: boolean } = {}) {
     }
 
     const visitorId = isUpdate ? recordId : getVisitorIdFromResponse(res);
+    saveResult.value = {
+      action: !isUpdate ? "add" : formMode.value === "register" ? "register" : "edit",
+      barrier: barrierOf(res),
+      barrierCamera: barrierCameraOf(res),
+    };
 
     if (passType.value === "HID_QR") {
       const previewReady = await prepareHidQrCodePreview(visitorId);
@@ -3177,8 +3216,8 @@ async function submit(options: { skipNonCheckedOutCheck?: boolean } = {}) {
     }
 
     if (createMore.value) {
-      emit("done:more");
-    } else emit("done");
+      emit("done:more", saveResult.value);
+    } else emit("done", saveResult.value);
   } catch (error: any) {
     const err = error?.data?.message || error?.response?._data?.message;
     errorMessage.value =
@@ -3470,8 +3509,8 @@ function closeHidQrPreview() {
   hidQrPreviewDialog.value = false;
   const completion = hidQrPendingCompletion.value;
   hidQrPendingCompletion.value = null;
-  if (completion === "done:more") emit("done:more");
-  else if (completion === "done") emit("done");
+  if (completion === "done:more") emit("done:more", saveResult.value);
+  else if (completion === "done") emit("done", saveResult.value);
 }
 
 watch(

package/components/VisitorManagement.vue

@@ -57,6 +57,26 @@
       show-header
       @row-click="handleRowClick"
     >
+      <!-- The default ANPR camera (owner, 2026-10-23): only when the site has
+           more than one active Entry / Both / Visitors camera. Add, register
+           and guest check-in use it. -->
+      <template #pagination-prepend>
+        <v-btn
+          v-if="anprCameraCount > 1"
+          icon
+          density="comfortable"
+          variant="text"
+          :color="defaultCameraGate ? 'primary' : undefined"
+          :aria-label="'Default ANPR camera'"
+          data-test="visitor-default-camera"
+          @click="openDefaultCamera"
+        >
+          <v-icon>mdi-cctv</v-icon>
+          <v-tooltip activator="parent" location="top">
+            {{ defaultCameraGateLabel }}
+          </v-tooltip>
+        </v-btn>
+      </template>
       <template #extension>
         <v-row no-gutters class="w-100 d-flex flex-column">
           <v-tabs
@@ -1814,7 +1834,44 @@
       </v-card>
     </v-dialog>
 
-    <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
+    <v-dialog v-model="dialog.defaultCamera" width="450" persistent>
+      <v-card class="screen-modal" width="100%" :loading="savingDefaultCamera">
+        <v-card-title>{{ VISITOR_CAMERA_LABEL }}</v-card-title>
+        <v-card-text>
+          <p class="mb-4 text-body-2">
+            Add, register and guest check-in use this camera: it is checked for a
+            blocked vehicle and opens the barrier. None chosen: the site's first camera.
+          </p>
+          <v-select
+            v-if="anprGateChoices.length"
+            v-model="pickedDefaultGate"
+            :items="anprGateChoices"
+            item-title="title"
+            item-value="value"
+            density="comfortable"
+            clearable
+            placeholder="None (the site's first camera)"
+            data-test="visitor-default-camera-select"
+          />
+          <p v-else class="text-body-2 text-medium-emphasis">
+            No ANPR camera at this site has a gate yet. Set the gates in Settings first.
+          </p>
+          <p v-if="defaultCameraError" class="text-error text-body-2 mt-2">{{ defaultCameraError }}</p>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer />
+          <AppButton variant="ghost" :disabled="savingDefaultCamera" @click="dialog.defaultCamera = false">
+            Cancel
+          </AppButton>
+          <AppButton :disabled="savingDefaultCamera" data-test="visitor-default-camera-submit" @click="submitDefaultCamera">
+            Submit
+          </AppButton>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+
+    <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor"
+      :detail="messageDetail.text" :detail-tone="messageDetail.tone" />
   </v-row>
 </template>
 
@@ -1823,6 +1880,9 @@ import type { PropType } from "vue";
 import moment from "moment-timezone";
 import QRCode from "qrcode";
 import { isVisitorPassSmsOn } from "../composables/useVisitor";
+import { barrierCameraOf, barrierMessage, barrierOf, VISITOR_ACTION_SUCCESS } from "../utils/visitor-barrier";
+import useVisitorCameraChoices from "../composables/useVisitorCameraChoices";
+import { VISITOR_CAMERA_LABEL } from "../utils/visitor-camera";
 import usePassKey from "../composables/usePassKey";
 import {
   VISITOR_SEARCH_DEBOUNCE_MS,
@@ -2236,6 +2296,45 @@ const mode = ref<"add" | "edit" | "register">("add");
 const message = ref("");
 const messageColor = ref("");
 const messageSnackbar = ref(false);
+
+/* The default ANPR camera (gate) for add / register / guest check-in. */
+const {
+  count: anprCameraCount,
+  choices: anprGateChoices,
+  defaultGate: defaultCameraGate,
+  saveDefaultGate,
+} = useVisitorCameraChoices(() => siteId);
+const pickedDefaultGate = ref<number | null>(null);
+const savingDefaultCamera = ref(false);
+const defaultCameraError = ref("");
+const defaultCameraGateLabel = computed(() => {
+  const gate = defaultCameraGate.value;
+  if (!gate) return "Default ANPR camera: the site's first camera";
+  const choice = anprGateChoices.value.find((item) => item.value === gate);
+  return `Default ANPR camera: ${choice?.title ?? `Gate ${gate}`}`;
+});
+
+function openDefaultCamera() {
+  pickedDefaultGate.value = defaultCameraGate.value ?? null;
+  defaultCameraError.value = "";
+  dialog.defaultCamera = true;
+}
+
+async function submitDefaultCamera() {
+  savingDefaultCamera.value = true;
+  defaultCameraError.value = "";
+  try {
+    const res = await saveDefaultGate(pickedDefaultGate.value || null);
+    dialog.defaultCamera = false;
+    showMessage(res?.message || "Saved.", "success");
+  } catch (error) {
+    defaultCameraError.value = errorConverter(error);
+  } finally {
+    savingDefaultCamera.value = false;
+  }
+}
+// The toast's second line: whether the barrier opened.
+const messageDetail = ref<{ text: string; tone: "default" | "error" }>({ text: "", tone: "default" });
 /** Why the list could not be loaded (shown in the empty table). */
 const visitorListError = ref("");
 
@@ -2286,6 +2385,7 @@ const dialog = reactive({
   showSelection: false,
   showForm: false,
   viewVisitor: false,
+  defaultCamera: false,
   snapshotImage: false,
   remarks: false,
   returnPassesKeys: false,
@@ -3182,8 +3282,13 @@ async function handleVisitorDataFromScannedQRCodeCheckInOut(
         ? visitorData.visitorPass
         : [];
 
-      await visitorDataFromScannedQRCodeCheckIn({
+      const checkInReply: any = await visitorDataFromScannedQRCodeCheckIn({
         type,
+        // The user's default ANPR gate at this site: checked for a blocked
+        // plate, opens the barrier. None: the site's first camera.
+        ...(defaultCameraGate.value && String(visitorData.plateNumber ?? "").trim()
+          ? { anprGate: defaultCameraGate.value }
+          : {}),
         filter: {
           _id: visitorId,
           site: visitorData.site ?? siteId,
@@ -3200,7 +3305,13 @@ async function handleVisitorDataFromScannedQRCodeCheckInOut(
         },
         userType: "site",
       });
-      showMessage("Visitor successfully checked-in!", "info");
+      // "Check In Visitor Success." and whether the barrier opened.
+      showMessage(
+        VISITOR_ACTION_SUCCESS.checkIn,
+        "success",
+        barrierOf(checkInReply),
+        barrierCameraOf(checkInReply),
+      );
     } else {
       selectedVisitorId.value = visitorData._id;
       await proceedCheckout();
@@ -3426,23 +3537,49 @@ function handleClickBack() {
 /** iSecure's toast after an add, an update or a register. */
 const VISITOR_SAVED_MESSAGE = "Great! A new visitor has been successfully added.";
 
-function handleVisitorFormDone() {
-  showMessage(VISITOR_SAVED_MESSAGE, "success");
+/*
+ * After a save (owner, 2026-10-23): "Add Visitor Success." / "Register Visitor
+ * Success." and, when the barrier was asked to open, "Opening Barrier
+ * Success." or "Opening Barrier Failed." (red). An edit keeps its message.
+ */
+type TVisitorFormResult = {
+  action?: "add" | "register" | "edit";
+  barrier?: "opened" | "failed";
+  /** The camera the barrier is at, "Entry Gate 1". */
+  barrierCamera?: string;
+};
+
+function visitorSavedMessage(result?: TVisitorFormResult) {
+  if (result?.action === "add") return VISITOR_ACTION_SUCCESS.add;
+  if (result?.action === "register") return VISITOR_ACTION_SUCCESS.register;
+  return VISITOR_SAVED_MESSAGE;
+}
+
+function handleVisitorFormDone(result?: TVisitorFormResult) {
+  showMessage(visitorSavedMessage(result), "success", result?.barrier, result?.barrierCamera);
   getVisitorRefresh();
   dialog.showSelection = false;
   dialog.showForm = false;
 }
 
-function handleVisitorFormCreateMore() {
-  showMessage(VISITOR_SAVED_MESSAGE, "success");
+function handleVisitorFormCreateMore(result?: TVisitorFormResult) {
+  showMessage(visitorSavedMessage(result), "success", result?.barrier, result?.barrierCamera);
   getVisitorRefresh();
   dialog.showSelection = true;
   dialog.showForm = false;
 }
 
-function showMessage(msg: string, color: string) {
+function showMessage(
+  msg: string,
+  color: string,
+  barrier?: "opened" | "failed",
+  barrierCamera?: string,
+) {
   message.value = msg;
   messageColor.value = color;
+  messageDetail.value = barrier
+    ? { text: barrierMessage(barrier, barrierCamera), tone: barrier === "failed" ? "error" : "default" }
+    : { text: "", tone: "default" };
   messageSnackbar.value = true;
 }
 

package/composables/useCleaningSchedules.ts

@@ -1,3 +1,5 @@
+import { checklistPdfName } from "../utils/schedule-task";
+
 export default function useCleaningSchedules() {
   const _cleanerChecklists = ref({
     _id: "",
@@ -199,7 +201,8 @@ export default function useCleaningSchedules() {
     window.URL.revokeObjectURL(downloadUrl);
   }
 
-  async function downloadChecklistPdf(scheduleId: string) {
+  /** `day`: the day the list is for (the row's createdAt), used to name the file. */
+  async function downloadChecklistPdf(scheduleId: string, day?: string | Date) {
     const res = await useNuxtApp().$api<Blob | MediaSource>(
       `/api/hygiene-area-checklist/schedule/${scheduleId}/pdf`,
       {
@@ -210,17 +213,10 @@ export default function useCleaningSchedules() {
 
     if (!res) throw new Error("Error downloading checklist PDF");
 
-    const date = new Date();
-    const formattedDate = `${String(date.getDate()).padStart(2, "0")}_${String(
-      date.getMonth() + 1,
-    ).padStart(2, "0")}_${date.getFullYear()} ${String(
-      date.getHours(),
-    ).padStart(2, "0")}_${String(date.getMinutes()).padStart(2, "0")}`;
-
     const downloadUrl = window.URL.createObjectURL(res);
     const a = document.createElement("a");
     a.href = downloadUrl;
-    a.download = `CHECKLIST_DOWNLOADED_${formattedDate}.pdf`;
+    a.download = checklistPdfName(day);
     a.target = "_blank";
     a.rel = "noopener noreferrer";
     document.body.appendChild(a);

package/composables/useVisitorCameraChoices.ts

@@ -0,0 +1,61 @@
+import { defaultGateForSite, visitorCameras, visitorGateChoices } from "../utils/visitor-camera";
+import useSiteSettings from "./useSiteSettings";
+import useLocalAuth from "./useLocalAuth";
+
+/**
+ * The site's ANPR cameras a visit can be checked at (active Entry, Both Entry
+ * and Exit, Visitors - see `utils/visitor-camera.ts`) and the signed-in user's
+ * default gate there (`defaultCameraGate: [{ site, cameraGateNumber }]` on
+ * their user, picked on the visitor list). The cameras are read in the
+ * background; a failed read shows no camera icon and the server uses the
+ * site's first camera.
+ */
+export default function useVisitorCameraChoices(site: () => string) {
+  const { getAllSiteCameras } = useSiteSettings();
+  const { currentUser } = useLocalAuth();
+  const cameras = ref<unknown[]>([]);
+
+  async function load() {
+    const id = site();
+    if (!id) {
+      cameras.value = [];
+      return;
+    }
+    try {
+      const res = await getAllSiteCameras({ site: id, type: "anpr", limit: 100 });
+      cameras.value = Array.isArray((res as any)?.items) ? (res as any).items : [];
+    } catch {
+      cameras.value = [];
+    }
+  }
+
+  watch(site, load, { immediate: true });
+
+  /** The user's default gate at this site (sent as `anprGate`), or undefined. */
+  const defaultGate = computed(() =>
+    defaultGateForSite((currentUser.value as any)?.defaultCameraGate, site())
+  );
+
+  /** Save (or clear, `null`) the default gate at this site, on the user. */
+  async function saveDefaultGate(gate: number | null) {
+    const res = await useNuxtApp().$api<Record<string, any>>("/api/users/default-camera-gate", {
+      method: "PATCH",
+      body: { site: site(), gate },
+    });
+    if (currentUser.value) {
+      (currentUser.value as any).defaultCameraGate = Array.isArray(res?.defaultCameraGate)
+        ? res.defaultCameraGate
+        : [];
+    }
+    return res;
+  }
+
+  return {
+    /** How many active Entry / Both / Visitors cameras (the icon shows with more than one). */
+    count: computed(() => visitorCameras(cameras.value).length),
+    choices: computed(() => visitorGateChoices(cameras.value)),
+    defaultGate,
+    saveDefaultGate,
+    reload: load,
+  };
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.147.2",
+  "version": "4.148.1",
   "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/camera.d.ts

@@ -28,5 +28,7 @@ declare type TSiteCamera = {
   direction: "entry" | "exit" | "both" | "none";
   name?: string;
   guardPost: number | null;
+  /** ANPR cameras: the gate (1-20) it watches; one camera per gate at a site. */
+  gate?: number | null;
   status: string;
 };

package/utils/anpr-direction.ts

@@ -12,8 +12,11 @@ export const isAllowCameraDirection = (direction: unknown): boolean =>
     String(direction ?? "").trim().toLowerCase(),
   );
 
-/** ANPR camera types that carry blocked plates: every type except Exit. */
-export const BLOCK_CAMERA_DIRECTIONS = ["entry", "both", "residents", "visitors"];
+/**
+ * ANPR camera types that carry blocked plates: every type, Exit included
+ * (owner, 2026-10-23). Mirrors `BLOCK_CAMERA_DIRECTIONS` in iservice365-core.
+ */
+export const BLOCK_CAMERA_DIRECTIONS = ["entry", "both", "residents", "visitors", "exit"];
 
 export const isBlockCameraDirection = (direction: unknown): boolean =>
   BLOCK_CAMERA_DIRECTIONS.includes(
@@ -48,8 +51,8 @@ export const listsFilledByDirectionChange = (
  * Mirrors `listsClearedByDirectionChange` in iservice365-core, which refuses
  * the change unless it is confirmed, so the form asks first.
  *
- * - To Exit: the allowed list and the blocklist.
- * - Entry / Both / Residents to Visitors: the allowed list.
+ * - Entry / Both / Residents to Visitors or Exit: the allowed list. Both
+ *   keep their blocklist (every camera holds the blocked plates).
  * - Anything else: nothing.
  */
 export const listsClearedByDirectionChange = (
@@ -61,8 +64,6 @@ export const listsClearedByDirectionChange = (
 
   if (!after || after === before) return { allow: false, block: false };
 
-  if (after === "exit") return { allow: true, block: true };
-
   return {
     allow: isAllowCameraDirection(before) && !isAllowCameraDirection(after),
     block: false,

package/utils/breadcrumb.ts

@@ -26,8 +26,9 @@ const RENAMED: [string, string][] = [
   ["Building Mgmt", "Occupancy Mgmt"],
   ["Event Mgmt", "Task Calendar"],
   // Schedule screens (owner 21 Oct): the same names the menu and the mobile apps use.
-  ["Schedule Task", "Extra Checks"],
-  ["Extra Visits", "Extra Checks"],
+  // Extra Checks live inside the Task Calendar page since 24 Oct 2026.
+  ["Schedule Task", "Task Calendar"],
+  ["Extra Visits", "Task Calendar"],
   ...["Cleaning", "Technician", "Pest", "Pool", "Landscape"].flatMap((t): [string, string][] => [
     [`${t} Schedule Area`, "Area"],
     [`${t} Schedule Unit`, "Unit"],

package/utils/schedule-task.ts

@@ -405,3 +405,48 @@ export function historyUnitLabel(status: string | null | undefined): "Done" | "N
   if (s === "rejected" || s === "needs redo") return "Needs redo";
   return "Missed";
 }
+
+/** "Visit 2": one round of an area's units ("set" in the data). Same word as "Visits per day". */
+export function visitLabel(set: number | string | null | undefined): string {
+  return set === null || set === undefined || set === "" ? "Visit" : `Visit ${set}`;
+}
+
+/**
+ * Is this day's list closed (view only)? The day list says so when it is
+ * opened from there; opened from a link or after a refresh only the rows can
+ * tell, and at midnight the server closes every area and unit at once.
+ */
+export function isClosedDay(
+  dayStatus: string | null | undefined,
+  rows: { status?: string | null; units?: { status?: string | null }[] | null }[] | null | undefined = [],
+): boolean {
+  const closed = (s: unknown) => String(s ?? "").trim().toLowerCase() === "closed";
+  if (closed(dayStatus)) return true;
+  return (rows ?? []).some((r) => closed(r?.status) || (r?.units ?? []).some((u) => closed(u?.status)));
+}
+
+/** "Fri 24 Oct 2026" (Singapore), the day a list is for; "" when unknown. */
+export function dayLabel(value: string | Date | null | undefined): string {
+  if (!value) return "";
+  const d = new Date(value);
+  if (Number.isNaN(d.getTime())) return "";
+  return d.toLocaleDateString("en-SG", {
+    weekday: "short",
+    day: "numeric",
+    month: "short",
+    year: "numeric",
+    timeZone: "Asia/Singapore",
+  });
+}
+
+/**
+ * The saved PDF's name: the DAY the list is for (Singapore), so three past
+ * days downloaded in a row do not all carry today's time.
+ * "Daily-Checklist-2026-10-24.pdf"; without a day, the old download-time name.
+ */
+export function checklistPdfName(day: string | Date | null | undefined, now: Date = new Date()): string {
+  const d = day ? new Date(day) : null;
+  if (d && !Number.isNaN(d.getTime())) return `Daily-Checklist-${sgtParts(d).date}.pdf`;
+  const p = (n: number) => String(n).padStart(2, "0");
+  return `CHECKLIST_DOWNLOADED_${p(now.getDate())}_${p(now.getMonth() + 1)}_${now.getFullYear()} ${p(now.getHours())}_${p(now.getMinutes())}.pdf`;
+}

package/utils/task-calendar-tabs.ts

@@ -0,0 +1,56 @@
+/**
+ * Trade apps' Task Calendar (owner 24 Oct 2026): which tab to show, and the
+ * words of its one help box. Pure: no Vue, unit-tested with `node --test`.
+ */
+
+export type TTaskCalendarTab = "agent" | "extra";
+
+/**
+ * The tab to open: the address (?tab=) when the viewer may see it, else the
+ * page's own start tab (an old Extra Checks link starts on "extra"), else the
+ * first tab the viewer may see. "" = no tab at all (role has neither).
+ */
+export function pickTaskCalendarTab(
+  query: unknown,
+  initial: unknown,
+  allowed: { agent: boolean; extra: boolean },
+): TTaskCalendarTab | "" {
+  const ok = (t: unknown): t is TTaskCalendarTab =>
+    (t === "agent" && allowed.agent) || (t === "extra" && allowed.extra);
+  const asked = Array.isArray(query) ? query[0] : query;
+  if (ok(asked)) return asked;
+  if (ok(initial)) return initial;
+  if (allowed.agent) return "agent";
+  if (allowed.extra) return "extra";
+  return "";
+}
+
+/** One line per status word, only for the tabs the viewer sees. */
+export function taskCalendarWords(show: { agent: boolean; extra: boolean }): { word: string; meaning: string; tone?: "info" | "err" }[] {
+  const words: { word: string; meaning: string; tone?: "info" | "err" }[] = [];
+  if (show.agent) {
+    words.push(
+      { word: "Upcoming", meaning: "Managing agent job, not due yet.", tone: "info" },
+      { word: "Overdue", meaning: "Managing agent job, due date passed and not marked done.", tone: "err" },
+    );
+  }
+  if (show.extra) {
+    words.push(
+      { word: "Active", meaning: "Extra check: it will be added at its next date and time." },
+      { word: "Paused", meaning: "Extra check: stopped for now. Press Resume to start it again." },
+      { word: "Finished", meaning: "Extra check: its last date has passed. Press \"Extend or repeat\" to keep it going." },
+      { word: "In progress", meaning: "Last check: some units are ticked, the rest can still be done today." },
+      { word: "Missed", meaning: "Last check: the day ended with units not done." },
+      { word: "Needs redo", meaning: "Last check: a supervisor sent a unit back to be done again." },
+    );
+  }
+  const done = [
+    show.agent ? "the managing agent marked the job done" : "",
+    show.extra ? "staff ticked every unit of the extra check" : "",
+  ].filter(Boolean);
+  if (done.length) {
+    const text = done.join("; or ");
+    words.push({ word: "Done", meaning: `${text.charAt(0).toUpperCase()}${text.slice(1)}.` });
+  }
+  return words;
+}

package/utils/vehicle-actions.ts

@@ -27,7 +27,11 @@ export type VehicleActionPermissions = {
   canUpdateVehicle?: boolean;
   canDeleteVehicle?: boolean;
   canApproveVehicle?: boolean;
-  /** Block / Unblock. Omitted = allowed (today's behaviour). */
+  /**
+   * Block / Unblock, and every write on a Block Listed plate (type blocklist):
+   * Edit, Delete and Restore on it alone, Approve together with
+   * `canApproveVehicle`. Omitted = today's rule (Update / Delete / Approve).
+   */
   canManageBlocklist?: boolean;
 };
 
@@ -89,13 +93,27 @@ export function vehiclePlateActions(
     permissions.canManageBlocklist === undefined
       ? canUpdate
       : !!permissions.canManageBlocklist;
+  // A Block Listed plate's Edit and Delete follow Manage Blocklist when the
+  // host passes it (owner, 2026-10-23); other plates keep their own boxes.
+  const blocklistGoverned =
+    type === "blocklist" && permissions.canManageBlocklist !== undefined;
+  const canEdit = blocklistGoverned ? canBlock : canUpdate;
+  const canDelete = blocklistGoverned
+    ? canBlock
+    : !!permissions.canDeleteVehicle;
+  // Approve a pending Block Listed plate: Manage Blocklist AND Approve Vehicle.
+  const canApprove = blocklistGoverned
+    ? canBlock && !!permissions.canApproveVehicle
+    : !!permissions.canApproveVehicle;
+  // Restore (a write, through the approve endpoint): Manage Blocklist alone.
+  const canRestore = blocklistGoverned ? canBlock : !!permissions.canApproveVehicle;
   const actions: VehicleAction[] = [];
 
-  if (canUpdate && (isAllowed || isBlocked)) {
+  if (canEdit && (isAllowed || isBlocked)) {
     actions.push({ key: "edit", title: "Edit Vehicle", icon: "mdi-pencil" });
   }
 
-  if (permissions.canApproveVehicle && isPending) {
+  if (canApprove && isPending) {
     actions.push({
       key: "approve",
       title: "Approve",
@@ -109,7 +127,7 @@ export function vehiclePlateActions(
   // with "You do not have permission to approve vehicles." without it. It
   // used to be offered to everyone, so a role without the right saw Restore,
   // pressed it and was refused - and it could not be hidden on that refusal.
-  if (permissions.canApproveVehicle && isRestorable) {
+  if (canRestore && isRestorable) {
     actions.push({
       key: "restore",
       title: "Restore",
@@ -144,7 +162,7 @@ export function vehiclePlateActions(
     });
   }
 
-  if (permissions.canDeleteVehicle && (isAllowed || isBlocked)) {
+  if (canDelete && (isAllowed || isBlocked)) {
     actions.push({
       key: "delete",
       title: "Delete",