@7365admin1/layer-common 4.97.1-staging.589 → 4.97.1-staging.591

package/components/AreaChecklistHistoryLogs.vue

@@ -125,7 +125,7 @@
                           pill
                           class="ml-2"
                         >
-                          Extra visit
+                          {{ extraCheckLabel(checklistSet) }}
                         </StatusChip>
                       </v-list-subheader>
 
@@ -262,7 +262,7 @@
 </template>
 
 <script setup lang="ts">
-import { dailyStatusLabel, historyUnitLabel } from "../utils/schedule-task";
+import { dailyStatusLabel, extraCheckLabel, historyUnitLabel } from "../utils/schedule-task";
 const props = defineProps({
   orgId: { type: String, required: true, default: "" },
   site: { type: String, required: true, default: "" },

package/components/AreaFormDialog.vue

@@ -37,7 +37,7 @@
       <v-card-text class="screen-modal__body">
         <v-form ref="formRef" v-model="valid">
           <v-row no-gutters class="pa-0">
-            <v-col v-if="prop.showType" cols="12" class="pa-0 mb-2">
+            <v-col v-if="prop.showType && !prop.hideTypeField" cols="12" class="pa-0 mb-2">
               <InputLabel for="type" title="Type" required class="mb-1" />
               <v-select
                 v-model="typeModel"
@@ -169,6 +169,9 @@ const prop = defineProps({
   label: { type: String, default: "Name" },
   entityType: { type: String, default: "Area" }, // values: "Area", "Unit"
   showType: { type: Boolean, default: true },
+  // Keeps the type in the saved payload (as loaded, or "Common") but does not
+  // offer the Common / Toilet choice - for apps where it means nothing.
+  hideTypeField: { type: Boolean, default: false },
   showOptional: { type: Boolean, default: true },
   showUnits: { type: Boolean, default: false },
   site: { type: String, default: "" },

package/components/AreaMain.vue

@@ -17,7 +17,7 @@
         @create="onCreateItem"
         @row-click="handleRowClick"
       >
-        <template #extension>
+        <template v-if="props.showAreaType" #extension>
           <v-row no-gutters class="w-100 d-flex flex-column">
             <!--
               A bare `v-card` here paints Vuetify's own `surface`, a slab a
@@ -138,6 +138,7 @@
     :label="formLabel"
     :entityType="entityTypeLabel"
     :showUnits="true"
+    :hideTypeField="!props.showAreaType"
     :site="props.site"
     :serviceType="props.serviceType"
     @saved="_createArea"
@@ -314,7 +315,9 @@
     title="Import Areas from Excel"
     noun="areas"
     name-label="Area"
-    fill-hint="One area per row: its name, Type (Common or Toilet, from the dropdown), Set and the units to check, separated by commas."
+    :fill-hint="props.showAreaType
+      ? 'One area per row: its name, Type (Common or Toilet, from the dropdown), Set and the units to check, separated by commas.'
+      : 'One area per row: its name, Set and the units to check, separated by commas. Leave Type as Common.'"
     duplicate-note="Areas already on the list (same name and type) are skipped and left unchanged."
     template-file-name="areas-import-template.xlsx"
     :download-template="() => downloadTemplate('areas', importQuery)"
@@ -345,6 +348,10 @@ const props = defineProps({
   canUpdateArea: { type: Boolean, default: false },
   canDeleteArea: { type: Boolean, default: false },
   canImportArea: { type: Boolean, default: false },
+  // Common / Toilet is a cleaning distinction (Toilet areas get the toilet
+  // checklist QR). Apps without it hide the Type filter, column and field;
+  // the saved `type` value is untouched (new areas stay "common").
+  showAreaType: { type: Boolean, default: true },
 });
 
 const isCleanerArea = computed(() => {
@@ -403,7 +410,7 @@ const isDownloading = ref(false);
 
 const headers = [
   { title: "AREA", value: "name" },
-  { title: "TYPE", value: "type" },
+  ...(props.showAreaType ? [{ title: "TYPE", value: "type" }] : []),
   { title: "SETS", value: "set" },
 ];
 

package/components/BuildingForm.vue

@@ -120,7 +120,7 @@
 
 
         <v-col cols="12" class="px-6">
-          <InputLabel class="text-capitalize font-weight-bold" title="Building Floor plan" />
+          <InputLabel class="text-capitalize font-weight-bold" title="Block floor plan" />
           <InputFileV2 v-model="building.buildingFiles" :multiple="true" accept="*" :max-length="10"
             title="Upload Files" />
         </v-col>

package/components/BuildingManagement/buildings.vue

@@ -97,13 +97,13 @@
                 <v-list class="pa-0">
                   <v-list-item v-if="canUpdateBuilding" @click="openEditDialog()">
                     <v-list-item-title class="text-subtitle-2">
-                      Edit Building
+                      Edit Block
                     </v-list-item-title>
                   </v-list-item>
 
                   <v-list-item v-if="canDeleteBuilding" @click="openDeleteDialog()" class="text-red">
                     <v-list-item-title class="text-subtitle-2">
-                      Delete Building
+                      Delete Block
                     </v-list-item-title>
                   </v-list-item>
                 </v-list>
@@ -144,7 +144,7 @@
             <v-col cols="6">
               <v-btn tile block size="48" color="black" variant="flat" class="text-none" @click="handleDeleteBuilding"
                 :loading="deleteLoading">
-                Delete Building
+                Delete Block
               </v-btn>
             </v-col>
           </v-row>

package/components/CleaningScheduleMain.vue

@@ -15,7 +15,7 @@
           <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 Visits</strong> set for that day.
+            any <strong>Extra Checks</strong> set for that day.
           </li>
           <li>
             Staff open the same list in their mobile app and tick each unit
@@ -211,7 +211,7 @@ const props = defineProps({
 // "Daily Checklist – Cleaning" / "– Landscape" / "– Pest" / "– Pool" / "– Technician"
 const pageTitle = dailyChecklistTitle(props.serviceType);
 
-// `?date=YYYY-MM-DD` (from an Extra Visit's "See that day's checklist") opens on that one day.
+// `?date=YYYY-MM-DD` (from an Extra Check's "See that day's checklist") opens on that one day.
 const linkedDay = String(useRoute().query.date ?? "");
 const startDate = ref(/^\d{4}-\d{2}-\d{2}$/.test(linkedDay) ? linkedDay : "");
 const endDate = ref(startDate.value);

package/components/ScheduleAreaMain.vue

@@ -56,6 +56,7 @@
               />
 
               <v-select
+                v-if="props.showAreaType"
                 v-model="areaTypeFilter"
                 :items="typeOptions"
                 density="compact"
@@ -155,6 +156,9 @@ const props = defineProps({
   canGenerateChecklist: { type: Boolean, default: false },
   canViewHistory: { type: Boolean, default: false },
   canManageScheduleTasks: { type: Boolean, default: false },
+  // Common / Toilet is a cleaning distinction; apps without it hide the Type
+  // filter and column (saved `type` values are untouched).
+  showAreaType: { type: Boolean, default: true },
 });
 
 // "Daily Checklist – Cleaning" / "– Landscape" / ... (same title as the day list)
@@ -172,7 +176,7 @@ const pageRange = ref("-- - -- of --");
 const headers = [
   { title: "Area", value: "name" },
   { title: "Status", value: "status" },
-  { title: "Type", value: "type" },
+  ...(props.showAreaType ? [{ title: "Type", value: "type" }] : []),
   { title: "Visits per day", value: "set" },
 ];
 

package/components/ScheduleTaskForm.vue

@@ -1,8 +1,8 @@
 <!--
-  ADD / EDIT AN EXTRA VISIT - four short steps: What, Where, When, Who is told.
+  ADD / EDIT AN EXTRA CHECK - four short steps: What, Where, When, Who is told.
 
   The last step shows one sentence saying exactly what will be created
-  ("Adds 1 extra visit to 3 areas (24 units) at 08:00 every weekday ... next:
+  ("Adds 1 extra check to 3 areas (24 units) at 08:00 every weekday ... next:
   Wed 21 Oct"). The form checks what the server checks (utils/schedule-task.ts)
   so a schedule that would never run is caught before saving; whatever the
   server still refuses is shown in its own words.
@@ -11,7 +11,7 @@
   <v-dialog v-model="show" max-width="760" persistent scrollable>
     <v-card class="screen-modal">
       <v-card-title class="d-flex align-center">
-        {{ props.mode === "edit" ? "Edit Extra Visit" : "Add Extra Visit" }}
+        {{ props.mode === "edit" ? "Edit Extra Check" : "Add Extra Check" }}
         <v-spacer />
         <v-btn
           icon="mdi-close"
@@ -49,7 +49,7 @@
             <v-stepper-window-item :value="1">
               <div class="st-step">
                 <p class="st-step__help">
-                  Give the extra visit a name staff will recognise, and say
+                  Give the extra check a name staff will recognise, and say
                   what they should do.
                 </p>
                 <InputLabel for="title" title="Title" required />
@@ -61,7 +61,7 @@
                   class="filter-field mb-4"
                   placeholder="For example: Lunch toilet check"
                   :error-messages="fieldError('title')"
-                  hint="Staff see this name on their phone, on the extra round."
+                  hint="Staff see this name on their phone and on the Daily Checklist."
                   persistent-hint
                   hide-details="auto"
                 />
@@ -73,7 +73,7 @@
                   density="comfortable"
                   class="filter-field"
                   rows="3"
-                  placeholder="Optional. Anything staff should know for this visit."
+                  placeholder="Optional. Anything staff should know for this check."
                   hint="Optional. For example: refill soap and tissue as well."
                   persistent-hint
                   hide-details="auto"
@@ -85,9 +85,8 @@
             <v-stepper-window-item :value="2">
               <div class="st-step">
                 <p class="st-step__help">
-                  Pick the areas that get the extra visit. Every unit in a
-                  picked area gets one more tick box on the Daily Checklist
-                  for this visit.
+                  Pick the areas to check. Every unit in a picked area gets
+                  one more tick box on the Daily Checklist for this check.
                 </p>
                 <InputLabel for="selected-areas" title="Areas" required />
                 <v-select
@@ -170,7 +169,7 @@
               <div class="st-step">
                 <p class="st-step__help">
                   Choose the time, and whether it happens once or repeats.
-                  Times are Singapore time. The extra round appears on staff's
+                  Times are Singapore time. The check appears on staff's
                   checklist at this time.
                 </p>
                 <v-row dense>
@@ -305,8 +304,8 @@
                   class="mb-4"
                   title="Who is told"
                 >
-                  Staff on this site get a push notification when the extra
-                  visit is added to their checklist.
+                  Staff of this site who use the mobile app get a phone
+                  notification when the check is added to their checklist.
                 </v-alert>
 
                 <div class="st-summary">
@@ -321,7 +320,7 @@
                 <div class="st-preview">
                   <div class="st-preview__head">
                     <v-icon size="18" class="mr-1">mdi-clock-outline</v-icon>
-                    {{ previewTime }} · Extra visit
+                    {{ previewTime }} · Extra check
                   </div>
                   <div class="st-preview__title">
                     {{ subject.trim() || "(your title)" }}
@@ -391,7 +390,7 @@
           :loading="submitting"
           @click="submitTask"
         >
-          {{ props.mode === "edit" ? "Save Changes" : "Add Extra Visit" }}
+          {{ props.mode === "edit" ? "Save Changes" : "Add Extra Check" }}
         </v-btn>
       </v-card-actions>
     </v-card>
@@ -667,7 +666,7 @@ const loadTaskData = async () => {
   } catch (error: any) {
     if ((props.taskData as any)?.title) setFormFromTask(props.taskData);
     showMessage(
-      error?.data?.message || "Could not load this extra visit.",
+      error?.data?.message || "Could not load this extra check.",
       "error",
     );
   } finally {
@@ -719,7 +718,7 @@ const submitTask = async () => {
 
     showMessage(
       response?.message ||
-        `Extra visit ${props.mode === "edit" ? "updated" : "added"}.`,
+        `Extra check ${props.mode === "edit" ? "saved" : "added"}.`,
       "success",
     );
 
@@ -729,7 +728,7 @@ const submitTask = async () => {
   } catch (error: any) {
     // The server's own plain-English message (permission, validation, ...).
     serverError.value =
-      error?.data?.message || "Could not save this extra visit. Please try again.";
+      error?.data?.message || "Could not save this extra check. Please try again.";
     showMessage(serverError.value, "error");
   } finally {
     submitting.value = false;

package/components/ScheduleTaskMain.vue

@@ -5,8 +5,8 @@
         :org-id="orgId"
         :site="site"
         :service-type="serviceType"
-        text="An extra visit adds one more round to the Daily Checklist at a time you choose - once, or on a repeat."
-        how-title="How extra visits work"
+        :text="FEATURE_SUBTITLE"
+        how-title="How extra checks work"
         how-key="extra-visits"
       >
         <ol class="sg-steps">
@@ -16,14 +16,14 @@
             that.
           </li>
           <li>
-            An <strong>extra visit</strong> adds one more round to that
-            checklist, in the areas you pick, at the time you set - once, or
-            repeating (every day, weekdays, chosen days, or monthly).
+            An <strong>extra check</strong> adds one more round of ticks to
+            that checklist, in the areas you pick, at the time you set - once,
+            or repeating (every day, weekdays, chosen days, or monthly).
           </li>
           <li>
-            At that time, staff see the extra round in their mobile app's
-            daily checklist (with a push notification) and tick each unit as
-            they finish it.
+            At that time, staff get a phone notification and see the extra
+            check in their app's Daily Checklist, marked "Extra check" with its
+            name. They tick each unit as they finish it.
           </li>
           <li>
             Here and in the Daily Checklist you see how it went:
@@ -33,9 +33,9 @@
         </ol>
         <div class="sg-example">
           <strong>Example:</strong> the lobby toilets get busy at lunch. Add
-          an extra visit called "Lunch toilet check", pick the area "Lobby
-          Toilets", set 2:00 pm, every weekday. From the next weekday, staff
-          get one more toilet round at 2:00 pm, on top of their normal ones.
+          an extra check called "Lunch toilet check", pick the area "Lobby
+          Toilets", set 2:00 pm, every weekday. Every weekday at 2:00 pm staff
+          get one more toilet check, on top of their normal rounds.
         </div>
         <div class="sg-h">What the words mean</div>
         <dl class="sg-legend">
@@ -45,12 +45,12 @@
           </template>
           <template v-for="h in RESULT_HELP" :key="'r' + h.word">
             <dt><StatusChip :status="h.word" :label="h.word" /></dt>
-            <dd>Last visit: {{ h.meaning }}</dd>
+            <dd>Last check: {{ h.meaning }}</dd>
           </template>
         </dl>
       </ScheduleGuide>
       <TableMain
-        :title="'Extra Visits'"
+        :title="FEATURE_NAME"
         :items="items"
         :headers="headers"
         :loading="loading"
@@ -60,21 +60,21 @@
         :pageRange="pageRange"
         @refresh="getTaskRefresh"
         :canCreate="canCreateScheduleTask"
-        createLabel="Add Extra Visit"
+        createLabel="Add Extra Check"
         @create="openFormDialog"
         @row-click="onRowClick"
       >
         <template #no-data>
           <div class="st-empty">
-            <strong>No extra visits yet.</strong>
+            <strong>No extra checks yet.</strong>
             <span>
               Your Daily Checklist already covers the normal rounds. Add an
-              extra visit when an area needs one more round at a set time -
+              extra check when an area needs one more check at a set time -
               for example "Lunch toilet check, Lobby Toilets, 2:00 pm every
               weekday".
             </span>
             <span v-if="canCreateScheduleTask">
-              Press <strong>Add Extra Visit</strong> above to start. Your
+              Press <strong>Add Extra Check</strong> above to start. Your
               Areas and Units must be set up first.
             </span>
           </div>
@@ -88,7 +88,7 @@
                 variant="flat"
                 @click="openFormDialog"
               >
-                Add Extra Visit
+                Add Extra Check
               </v-btn>
             </v-col>
 
@@ -210,14 +210,14 @@
 
       <v-dialog v-model="dialogShowMoreActions" width="400" persistent>
         <HygieneUpdateMoreAction
-          :title="selectedTask?.title || 'Extra Visit'"
+          :title="selectedTask?.title || 'Extra Check'"
           :canUpdate="canUpdateScheduleTask"
           @close="dialogShowMoreActions = false"
           :canDelete="canDeleteScheduleTask"
-          :deleteButtonLabel="'Delete Extra Visit'"
+          :deleteButtonLabel="'Delete Extra Check'"
           @edit="onEditFromMoreAction"
           @delete="onDeleteFromMoreAction"
-          :editButtonLabel="'Edit Extra Visit'"
+          :editButtonLabel="'Edit Extra Check'"
         >
           <template #content>
             <v-row no-gutters>
@@ -242,7 +242,7 @@
 
                 <v-row no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
-                    Next visit:
+                    Next check:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
                     {{ selectedNext || "-" }}
@@ -251,7 +251,7 @@
 
                 <v-row no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
-                    Last visit:
+                    Last check:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
                     {{ lastRunLabel(selectedTask) }}
@@ -375,7 +375,7 @@
                                 </div>
                                 <span v-else class="text-caption text-disabled"
                                   >No units in this area, so it is skipped when
-                                  this visit is added.</span
+                                  this check is added.</span
                                 >
                               </v-card-text>
                             </div>
@@ -388,7 +388,7 @@
 
                 <v-row v-if="selectedTask.description" no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
-                    Description:
+                    Instructions:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
                     {{ selectedTask.description || "N/A" }}
@@ -441,11 +441,11 @@
       <v-dialog v-model="dialogDeleteTask" max-width="520">
         <v-card class="screen-modal">
           <v-card-title class="text-capitalize">
-            Delete {{ selectedTask?.title || "Extra Visit" }}
+            Delete {{ selectedTask?.title || "Extra Check" }}
           </v-card-title>
 
           <v-card-text class="screen-modal__body">
-            This stops all future extra visits from it. Visits that already
+            This stops all future extra checks from it. Checks that already
             happened stay on their Daily Checklists. Delete it?
           </v-card-text>
 
@@ -487,6 +487,8 @@ import {
   RESULT_HELP,
   STATUS_HELP,
   STATUS_LABELS,
+  FEATURE_NAME,
+  FEATURE_SUBTITLE,
   describeRow,
   describeWhen,
   finishedReason,
@@ -526,7 +528,7 @@ const canViewScheduleTaskDetails = computed(
 
 const checklistRoute = scheduleNameFor(props.serviceType).route;
 
-/** Opens the Daily Checklist filtered to the day this extra visit was last added. */
+/** Opens the Daily Checklist filtered to the day this extra check was last added. */
 function openChecklist(row: Record<string, any>) {
   const day = String(row?.lastRun || "").slice(0, 10);
   navigateTo({
@@ -593,10 +595,10 @@ watch(dialogShowMoreActions, async (isOpen) => {
 const items = ref<any[]>([]);
 
 const headers = [
-  { title: "Extra visit", value: "title" },
-  { title: "What will happen", value: "when", sortable: false },
-  { title: "Next visit", value: "nextRun", sortable: false },
-  { title: "Last visit", value: "lastRun", sortable: false },
+  { title: "Extra check", value: "title" },
+  { title: "When and where", value: "when", sortable: false },
+  { title: "Next check", value: "nextRun", sortable: false },
+  { title: "Last check", value: "lastRun", sortable: false },
   { title: "Status", value: "status", sortable: false },
   { title: "", value: "actions", sortable: false, align: "end" as const },
 ];
@@ -660,7 +662,9 @@ const debounceSearch = debounce(getTaskRefresh, 500);
 watch(
   [searchInput],
   () => {
-    debounceSearch();
+    // A search on page 2 must not land on an empty page: start from page 1.
+    if (page.value !== 1) page.value = 1;
+    else debounceSearch();
   },
   { immediate: false, deep: true }
 );
@@ -679,7 +683,7 @@ function onEditRow(item: Record<string, any>) {
   showForm.value = true;
 }
 
-// A finished extra visit: open its "When" step so a new end date or repeat is one change away.
+// A finished extra check: open its "When" step so a new end date or repeat is one change away.
 function onExtendRow(item: Record<string, any>) {
   selectedTask.value = item;
   formMode.value = "edit";
@@ -699,14 +703,14 @@ async function togglePause(item: Record<string, any>) {
     await setScheduleTaskPaused(item._id, !resuming);
     showMessage(
       resuming
-        ? "Resumed. Extra visits are added again from its next date."
-        : "Paused. No extra visits are added until you resume it.",
+        ? "Resumed. It is added again from its next date."
+        : "Paused. Nothing is added to staff's checklist until you resume it.",
       "success",
     );
     await getTaskRefresh();
   } catch (error: any) {
     showMessage(
-      error?.data?.message || "Could not change this extra visit.",
+      error?.data?.message || "Could not change this extra check.",
       "error",
     );
   } finally {
@@ -756,12 +760,12 @@ async function _deleteScheduleTask() {
 
     const response = await deleteScheduleTask(id);
     dialogDeleteTask.value = false;
-    showMessage("Extra visit deleted. Past visits are kept.", "success");
+    showMessage("Extra check deleted. Past checks are kept.", "success");
 
     await getTaskRefresh();
   } catch (error: any) {
     showMessage(
-      error?.data?.message || "Could not delete this extra visit.",
+      error?.data?.message || "Could not delete this extra check.",
       "error",
     );
   } finally {

package/components/TableHygiene.vue

@@ -92,7 +92,7 @@
                     class="text-none"
                   >
                     <v-icon size="12">mdi-calendar-clock</v-icon>
-                    Extra visit
+                    {{ extraCheckLabel(group) }}
                   </StatusChip>
                   <slot name="group-header-chips" :group="group">
                     <StatusChip
@@ -206,6 +206,7 @@
 </template>
 
 <script lang="ts" setup>
+import { extraCheckLabel } from "../utils/schedule-task";
 defineOptions({ inheritAttrs: false });
 
 const props = defineProps({
@@ -296,6 +297,8 @@ const groupedItems = computed(() => {
     return {
       set: item.set,
       isScheduleTask: item.isScheduleTask ?? false,
+      scheduleTaskTitle: item.scheduleTaskTitle ?? null,
+      scheduleTaskTime: item.scheduleTaskTime ?? null,
       completedByName: item.completedByName ?? null,
       attachments:
         (item.attachment as string[] | undefined) ??

package/components/UnitMain.vue

@@ -187,7 +187,9 @@
     title="Import Units from Excel"
     noun="units"
     name-label="Unit"
-    fill-hint="One unit per row, e.g. Toilet Bowl, Sofa."
+    :fill-hint="/mechanical/i.test(props.serviceType)
+      ? 'One unit per row, e.g. Air-con Unit, Water Pump.'
+      : 'One unit per row, e.g. Toilet Bowl, Sofa.'"
     duplicate-note="Units already on the list are skipped and left unchanged."
     template-file-name="units-import-template.xlsx"
     :download-template="() => downloadTemplate('units', importQuery)"

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.97.1-staging.589",
+  "version": "4.97.1-staging.591",
   "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/breadcrumb.ts

@@ -26,7 +26,8 @@ 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 Visits"],
+  ["Schedule Task", "Extra Checks"],
+  ["Extra Visits", "Extra Checks"],
   ...["Cleaning", "Technician", "Pest", "Pool", "Landscape"].flatMap((t): [string, string][] => [
     [`${t} Schedule Area`, "Area"],
     [`${t} Schedule Unit`, "Unit"],

package/utils/nav-sections.ts

@@ -52,6 +52,7 @@ export const NAV_SECTIONS: Record<string, string> = {
   "Schedule Task": "SERVICE DELIVERY",
   "Daily Checklist": "SERVICE DELIVERY",
   "Extra Visits": "SERVICE DELIVERY",
+  "Extra Checks": "SERVICE DELIVERY",
 
   // EQUIPMENT
   "Equipment Management": "EQUIPMENT",

package/utils/permission-labels.ts

@@ -68,12 +68,13 @@ export const RESOURCE_LABELS: Record<string, string> = {
 export const RESOURCE_LABELS_BY_TYPE: Record<string, Record<string, string>> = {
   property_management_agency: { "virtual-patrol": "CCTV" },
   real_estate_developer: { "virtual-patrol": "CCTV" },
-  // Trade catalogue v2: the trade apps call `event-mgmt` the Task Calendar.
-  cleaning_services: { "event-mgmt": "Task Calendar" },
-  mechanical_electrical_services: { "event-mgmt": "Task Calendar" },
-  pest_control_services: { "event-mgmt": "Task Calendar" },
-  pool_maintenance_services: { "event-mgmt": "Task Calendar" },
-  landscaping_services: { "event-mgmt": "Task Calendar" },
+  // Trade catalogue v2: the trade apps call `event-mgmt` the Task Calendar and
+  // `schedule-task-mgmt` Extra Checks (owner 22 Oct; the key is unchanged).
+  cleaning_services: { "event-mgmt": "Task Calendar", "schedule-task-mgmt": "Extra checks" },
+  mechanical_electrical_services: { "event-mgmt": "Task Calendar", "schedule-task-mgmt": "Extra checks" },
+  pest_control_services: { "event-mgmt": "Task Calendar", "schedule-task-mgmt": "Extra checks" },
+  pool_maintenance_services: { "event-mgmt": "Task Calendar", "schedule-task-mgmt": "Extra checks" },
+  landscaping_services: { "event-mgmt": "Task Calendar", "schedule-task-mgmt": "Extra checks" },
 };
 
 /**
@@ -113,8 +114,18 @@ export function formatResourceLabel(key: string, type?: string): string {
  * `.replace(/-/g, " ")` inline; this keeps them from drifting apart, and keeps
  * an acronym from being lower-cased into nonsense.
  */
+/** Action keys whose words name a screen by its old name. Display only. */
+const ACTION_LABELS: Record<string, string> = {
+  "see-all-schedule-tasks": "see all extra checks",
+  "add-schedule-task": "add extra check",
+  "update-schedule-task": "edit, pause or resume extra check",
+  "delete-schedule-task": "delete extra check",
+  "see-schedule-task-details": "see extra check details",
+};
+
 export function formatActionLabel(action: string): string {
   if (!action) return "";
+  if (ACTION_LABELS[action]) return ACTION_LABELS[action];
   return action
     .split(/[-_\s]+/)
     .filter(Boolean)

package/utils/schedule-task.ts

@@ -1,5 +1,11 @@
 /**
- * EXTRA VISITS (SCHEDULE TASKS) - the rules and the wording, in one place.
+ * EXTRA CHECKS (stored as "schedule tasks") - the rules and the wording, in one place.
+ *
+ * Named "Extra Checks" (owner 22 Oct: "Extra Visits (Scheduled)" was not
+ * understood). It is one more check of an area at a set time, added to staff's
+ * Daily Checklist - "Lunch toilet check", "Pump room check", "Pool water check".
+ * "Check" is the word every trade already uses and it matches "Daily Checklist".
+ * Saved data, API paths and permission keys keep their old names.
  *
  * Mirrors the server (module-hygiene `schedule-task-rules.util.ts`) so the form
  * can say "this will never run" BEFORE the user saves, and the list and the
@@ -9,6 +15,18 @@
  * Pure: no Vue, no imports, so it is unit-tested with `node --test`.
  */
 
+export const FEATURE_NAME = "Extra Checks";
+export const FEATURE_SUBTITLE =
+  "Add a check at a set time - once, or on a repeat. At that time it appears on staff's Daily Checklist on their phone.";
+
+/** The chip on an extra round of the Daily Checklist: "Extra check: Lunch toilet check · 2:00 pm". */
+export function extraCheckLabel(set: { scheduleTaskTitle?: string | null; scheduleTaskTime?: string | null } | null | undefined): string {
+  const title = (set?.scheduleTaskTitle || "").trim();
+  const time = fmtTime(set?.scheduleTaskTime);
+  if (!title) return "Extra check";
+  return `Extra check: ${title}${time ? ` · ${time}` : ""}`;
+}
+
 export type TRepeat = "none" | "daily" | "weekdays" | "weekly" | "monthly";
 
 export const REPEAT_OPTIONS: { title: string; value: TRepeat }[] = [
@@ -119,6 +137,29 @@ function occursOn(r: TRule, date: string): boolean {
   }
 }
 
+/**
+ * Does a STORED extra check fall on `date` (YYYY-MM-DD)? For calendars (the
+ * Property Management Task Calendar overlay). Paused ones do not; fields a stored
+ * row may lack are treated as empty.
+ */
+export function scheduleOccursOn(
+  row: { repeat?: string | null; dates?: string[] | null; daysOfWeek?: number[] | null; startDate?: string | null; endDate?: string | null; paused?: boolean | null },
+  date: string,
+): boolean {
+  if (row.paused) return false;
+  return occursOn(
+    {
+      repeat: (row.repeat || "none") as TRepeat,
+      dates: row.dates ?? [],
+      daysOfWeek: row.daysOfWeek ?? [],
+      startDate: row.startDate ?? "",
+      endDate: row.endDate ?? "",
+      time: "",
+    },
+    date,
+  );
+}
+
 /**
  * The next day this would run if saved right now ("YYYY-MM-DD"), or null when it never would.
  * A day whose time has already passed does not count: a task saved after its time waits for its next day.
@@ -231,36 +272,37 @@ export function buildSummary(
   const units = `${unitCount} unit${unitCount === 1 ? "" : "s"}`;
   const next = nextRunDate(f, now);
   const nextText = next ? `${DAYS[weekdayOf(next)]} ${fmtDate(next, year)}` : "never";
-  return `Adds 1 extra visit to ${areas} (${units}) ${describeWhen(f, year)} — next: ${nextText}.`;
+  return `Adds 1 extra check to ${areas} (${units} to tick) ${describeWhen(f, year)} — next: ${nextText}.`;
 }
 
-/** The state of an extra visit as a whole. "ended" reads "Finished": nothing is left to run. */
+/** The state of an extra check as a whole. "ended" reads "Finished": nothing is left to run. */
 export const STATUS_LABELS: Record<string, string> = { active: "Active", paused: "Paused", ended: "Finished" };
 
 /** What each word means, shown on the page so nobody has to guess. Same words as the mobile apps. */
 export const STATUS_HELP: { word: string; meaning: string }[] = [
-  { word: "Active", meaning: "It will add a visit at its next date and time." },
+  { word: "Active", meaning: "It will be added to staff's checklist at its next date and time." },
   { word: "Paused", meaning: "Stopped for now. Nothing is added until you press Resume." },
   { word: "Finished", meaning: "Its last date has passed, so nothing more is added. Press \"Extend or repeat\" to keep it going." },
 ];
 export const RESULT_HELP: { word: string; meaning: string }[] = [
   { word: "Not started", meaning: "Nothing is ticked yet." },
   { word: "In progress", meaning: "Some units are ticked; the rest can still be done today." },
-  { word: "Done", meaning: "Staff ticked every unit of the visit." },
+  { word: "Done", meaning: "Staff ticked every unit of the check." },
   { word: "Needs redo", meaning: "A supervisor sent a unit back to be done again." },
   { word: "Missed", meaning: "The day ended with units not done." },
 ];
 
-/** "Done 20 Oct" / "Missed 20 Oct" / "No visit yet". */
-export function lastRunLabel(row: { lastRun?: string | null; lastRunStatus?: string | null }): string {
-  if (!row.lastRun) return "No visit yet";
+/** "Done 20 Oct" / "Missed 20 Oct" / "Not done yet". */
+export function lastRunLabel(row: { lastRun?: string | null; lastRunStatus?: string | null; scheduleStatus?: string | null }): string {
+  // Finished rows from before run records existed (20 Oct) may well have run: say we do not know.
+  if (!row.lastRun) return row.scheduleStatus === "ended" ? "No record" : "Not added yet";
   const m = /^(\d{4}-\d{2}-\d{2})/.exec(row.lastRun);
   const day = m ? fmtDate(m[1]) : "";
   const word = { done: "Done", missed: "Missed", pending: "In progress" }[row.lastRunStatus || ""] || "Added";
   return `${word} ${day}`.trim();
 }
 
-/** Why an extra visit says Finished, in one sentence. */
+/** Why an extra check says Finished, in one sentence. */
 export function finishedReason(row: Partial<TRule>, nowYear?: string): string {
   if (row.repeat && row.repeat !== "none" && row.endDate) {
     return `Its end date (${fmtDate(row.endDate, nowYear)}) has passed.`;