@7365admin1/layer-common 4.97.1-staging.596 → 4.97.1-staging.597

package/components/AreaChecklistHistoryLogs.vue

@@ -117,7 +117,7 @@
                         v-if="checklistSet.set !== undefined"
                         class="text-subtitle-2 font-weight-bold px-0"
                       >
-                        Set {{ checklistSet.set }}
+                        {{ visitLabel(checklistSet.set) }}
                         <StatusChip
                           v-if="checklistSet.isScheduleTask"
                           tone="info"
@@ -262,7 +262,7 @@
 </template>
 
 <script setup lang="ts">
-import { dailyStatusLabel, extraCheckLabel, historyUnitLabel } from "../utils/schedule-task";
+import { dailyStatusLabel, extraCheckLabel, historyUnitLabel, visitLabel } from "../utils/schedule-task";
 const props = defineProps({
   orgId: { type: String, required: true, default: "" },
   site: { type: String, required: true, default: "" },

package/components/CleaningScheduleMain.vue

@@ -14,8 +14,10 @@
         <ol class="sg-steps">
           <li>
             Every midnight a new row appears here for the day. It holds every
-            area, with as many visits as the area's "visits per day", plus
-            any <strong>Extra Checks</strong> set for that day.
+            area, with as many visits as the area's "visits per day". An
+            <strong>extra check</strong> from the <strong>Task Calendar</strong>
+            ("My extra checks") adds one more visit to its areas at its set
+            time that day.
           </li>
           <li>
             Staff open the same list in their mobile app and tick each unit
@@ -451,7 +453,7 @@ async function downloadItem(item: any) {
 
   try {
     downloadingId.value = id;
-    await downloadChecklistPdf(id);
+    await downloadChecklistPdf(id, item?.createdAt);
   } catch (err) {
     showMessage(
       (err as any)?.data?.message ||
@@ -468,6 +470,8 @@ const selectedScheduleStatus = useState<string>(
   () => ""
 );
 
+const selectedScheduleDay = useState<string>("selectedScheduleDay", () => "");
+
 const isItemClosed = (item: any): boolean =>
   String(item?.status ?? "").toLowerCase() === "closed";
 
@@ -483,8 +487,9 @@ function onRowClick(data: any) {
       return;
     }
 
-    // Store status so nested pages know whether the schedule is closed
+    // Store status and day so nested pages know whether the list is closed and which day it is
     selectedScheduleStatus.value = String(item?.status ?? "");
+    selectedScheduleDay.value = String(item?.createdAt ?? "");
 
     if (props.type === "toilet") {
       const path = `/${props.orgId}/${props.site}/toilet-checklist/${id}`;

package/components/ManageChecklistMain.vue

@@ -16,6 +16,13 @@
           </StatusChip>
         </v-col>
       </v-row>
+      <p class="checklist-intro" data-test="checklist-intro">
+        Each visit lists this area's units. Staff tick them on their phone; here
+        you can mark a unit <strong>Done</strong> (&#10003;) or send it back with
+        <strong>Needs redo</strong> (&#10007;, with a remark). The last unit of a
+        visit needs a photo. A visit marked "Extra check" was added from the Task
+        Calendar.
+      </p>
       <TableHygiene
         :title="scheduleTitle"
         :headers="headers"
@@ -249,8 +256,8 @@
       <v-card-title>
         {{
           modalData.currentSet !== undefined
-            ? `Set ${modalData.currentSet} Completed`
-            : "All Items Checked"
+            ? `${visitLabel(modalData.currentSet)} done`
+            : "All units ticked"
         }}
       </v-card-title>
 
@@ -285,7 +292,7 @@
               v-if="!modalData.photoIds.length"
               class="text-caption text-medium-emphasis mt-1"
             >
-              At least one photo is required to complete this task. You can take
+              At least one photo is needed to finish this visit. You can take
               or upload more than one.
             </p>
           </v-col>
@@ -382,7 +389,7 @@
   <v-dialog v-model="showAttachmentDialog" max-width="700" scrollable>
     <v-card class="screen-modal">
       <v-card-title class="d-flex align-center">
-        <span>Set {{ attachmentDialogSetNum }} — Attachments</span>
+        <span>{{ visitLabel(attachmentDialogSetNum) }} — photos</span>
         <v-spacer />
         <v-btn
           icon="mdi-close"
@@ -462,6 +469,7 @@
 
 <script setup lang="ts">
 import { readListPage } from "../utils/list-page";
+import { isClosedDay, visitLabel } from "../utils/schedule-task";
 import { isPhotoRefusal, isSetFinished } from "../utils/checklist-set";
 import useCleaningSchedules from "../composables/useCleaningSchedules";
 import useWorkerTerm from "../composables/useWorkerTerm";
@@ -504,8 +512,9 @@ const selectedScheduleStatus = useState<string>(
   "selectedScheduleStatus",
   () => ""
 );
-const isScheduleClosed = computed(
-  () => selectedScheduleStatus.value.toLowerCase() === "closed"
+// Opened from the day list it knows; from a link or a refresh the units tell.
+const isScheduleClosed = computed(() =>
+  isClosedDay(selectedScheduleStatus.value, items.value as any[]),
 );
 
 const page = ref<number>(1);
@@ -1075,13 +1084,13 @@ async function _updateUnitChecklist({
       );
     }
 
-    showMessage(`Set ${setNumber} done`, "success");
+    showMessage(`${visitLabel(setNumber)} done`, "success");
 
     // Refresh data
     await getUnitCleanerChecklistRefresh();
   } catch (error: any) {
     console.error("Error approving set:", error);
-    showMessage(error?.message || "Could not finish this set", "error");
+    showMessage(error?.message || "Could not finish this visit", "error");
   } finally {
     submitting.value = false;
   }
@@ -1089,6 +1098,11 @@ async function _updateUnitChecklist({
 </script>
 
 <style scoped>
+.checklist-intro {
+  margin: 0 0 12px;
+  font-size: var(--fs-cell);
+  color: var(--text2);
+}
 /* The idle checklist circle. `--muted` is the design's de-emphasis token and
    clears the 3:1 bar a non-text indicator needs; Vuetify's `grey-lighten-2`
    read 1.32:1. */

package/components/ScheduleAreaMain.vue

@@ -6,10 +6,10 @@
         :site="site"
         :service-type="serviceType"
         :schedule-route="scheduleRoute"
-        text="These are the areas on this day's checklist. Click an area to see each unit, tick it as done, or send it back to be redone."
+        text="These are the areas on this day's checklist. Click an area to see each unit, tick it as done, or send it back to be redone. Visits today counts the area's normal visits plus any extra checks added today."
       />
       <TableMain
-        :title="pageTitle"
+        :title="dayTitle"
         :headers="headers"
         :items="items"
         :loading="loading"
@@ -143,7 +143,12 @@
 
 <script setup lang="ts">
 import useCleaningSchedules from "../composables/useCleaningSchedules";
-import { dailyChecklistTitle, dailyStatusLabel } from "../utils/schedule-task";
+import {
+  dailyChecklistTitle,
+  dailyStatusLabel,
+  dayLabel,
+  isClosedDay,
+} from "../utils/schedule-task";
 import useUtils from "../composables/useUtils";
 
 const props = defineProps({
@@ -177,7 +182,8 @@ const headers = [
   { title: "Area", value: "name" },
   { title: "Status", value: "status" },
   ...(props.showAreaType ? [{ title: "Type", value: "type" }] : []),
-  { title: "Visits per day", value: "set" },
+  // The highest visit number on today's list: normal visits plus any extra checks added.
+  { title: "Visits today", value: "set" },
 ];
 
 const { formatDate, back } = useUtils();
@@ -190,9 +196,16 @@ const selectedScheduleStatus = useState<string>(
   "selectedScheduleStatus",
   () => ""
 );
-const isScheduleClosed = computed(
-  () => selectedScheduleStatus.value.toLowerCase() === "closed"
+// Opened from the day list it knows; from a link or a refresh the rows tell.
+const isScheduleClosed = computed(() =>
+  isClosedDay(selectedScheduleStatus.value, items.value),
 );
+const selectedScheduleDay = useState<string>("selectedScheduleDay", () => "");
+// "Daily Checklist – Cleaning – Sat, 24 Oct 2026" (the day only when known).
+const dayTitle = computed(() => {
+  const day = dayLabel(selectedScheduleDay.value);
+  return day ? `${pageTitle} – ${day}` : pageTitle;
+});
 
 const items = ref<Array<Record<string, any>>>([]);
 
@@ -202,6 +215,7 @@ const statusOptions = [
   { title: "Not started", value: "open" },
   { title: "In progress", value: "ongoing" },
   { title: "Done", value: "completed" },
+  { title: "Closed", value: "closed" },
 ];
 const areaTypeFilter = ref<TAreaType>("all");
 const typeOptions = [

package/components/ScheduleGuide.vue

@@ -132,8 +132,14 @@ async function check() {
     }
 
     const noUnits: string[] = [];
+    // A newer server lists each area's unit count: no lookups at all. Older
+    // replies (or cached ones) fall back to one capped lookup per area.
+    for (const a of areas) {
+      if (typeof a.unitCount === "number" && a.unitCount === 0) noUnits.push(a.name);
+    }
+    const unknown = areas.filter((a) => typeof a.unitCount !== "number");
     await Promise.all(
-      areas.slice(0, MAX_UNIT_CHECKS).map(async (a) => {
+      unknown.slice(0, MAX_UNIT_CHECKS).map(async (a) => {
         try {
           const full = await getAreaById(a._id);
           if (!(full?.units || []).length) noUnits.push(a.name);

package/components/TableHygiene.vue

@@ -83,7 +83,7 @@
                   <span
                     class="text-caption font-weight-bold text-medium-emphasis text-uppercase"
                   >
-                    Set {{ group.set }}
+                    {{ visitLabel(group.set) }}
                   </span>
                   <StatusChip
                     v-if="group.isScheduleTask"
@@ -206,7 +206,7 @@
 </template>
 
 <script lang="ts" setup>
-import { extraCheckLabel } from "../utils/schedule-task";
+import { extraCheckLabel, visitLabel } from "../utils/schedule-task";
 defineOptions({ inheritAttrs: false });
 
 const props = defineProps({

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/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.97.1-staging.596",
+  "version": "4.97.1-staging.597",
   "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/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`;
+}