@7365admin1/layer-common 4.135.0 → 4.137.0

package/components/ScheduleTaskMain.vue

@@ -5,10 +5,52 @@
         :org-id="orgId"
         :site="site"
         :service-type="serviceType"
-        text="An extra visit adds one more round to your daily schedule at the time you choose, once or on a repeat. Staff on this site get a push notification when it is added."
-      />
+        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"
+        how-key="extra-visits"
+      >
+        <ol class="sg-steps">
+          <li>
+            Every night the app makes the <strong>Daily Checklist</strong>
+            for every area on this site. You do not need to do anything for
+            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).
+          </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.
+          </li>
+          <li>
+            Here and in the Daily Checklist you see how it went:
+            <strong>Done</strong>, <strong>In progress</strong>,
+            <strong>Needs redo</strong> or <strong>Missed</strong>.
+          </li>
+        </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.
+        </div>
+        <div class="sg-h">What the words mean</div>
+        <dl class="sg-legend">
+          <template v-for="h in STATUS_HELP" :key="h.word">
+            <dt><StatusChip :status="h.word" :label="h.word" /></dt>
+            <dd>{{ h.meaning }}</dd>
+          </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>
+          </template>
+        </dl>
+      </ScheduleGuide>
       <TableMain
-        :title="'Extra Visits (Scheduled)'"
+        :title="'Extra Visits'"
         :items="items"
         :headers="headers"
         :loading="loading"
@@ -26,9 +68,14 @@
           <div class="st-empty">
             <strong>No extra visits yet.</strong>
             <span>
-              An extra visit adds one more round to your daily
-              {{ scheduleName }} at a time you choose. Set up your Areas and
-              Units first, then add one.
+              Your Daily Checklist already covers the normal rounds. Add an
+              extra visit when an area needs one more round 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
+              Areas and Units must be set up first.
             </span>
           </div>
         </template>
@@ -61,27 +108,6 @@
           </v-row>
         </template>
 
-        <template #item.areas="{ value }">
-          <div v-if="value && value.length > 0">
-            <StatusChip
-              v-for="(area, idx) in value.slice(0, 2)"
-              :key="idx"
-              class="mr-1 mb-1"
-              :dot="false"
-              tone="neutral"
-              :label="area.name"
-            />
-            <StatusChip
-              v-if="value.length > 2"
-              class="mb-1"
-              :dot="false"
-              tone="neutral"
-              :label="`+${value.length - 2} more`"
-            />
-          </div>
-          <span v-else>N/A</span>
-        </template>
-
         <template #item.when="{ item }">
           <span class="st-when">{{ item.whenText }}</span>
         </template>
@@ -91,24 +117,34 @@
         </template>
 
         <template #item.lastRun="{ item }">
-          <StatusChip
-            v-if="item.lastRun && item.lastRunStatus === 'done'"
-            status="Done"
-            :label="item.lastRunText"
-          />
-          <StatusChip
-            v-else-if="item.lastRun && item.lastRunStatus === 'missed'"
-            status="Missed"
-            :label="item.lastRunText"
-          />
-          <span v-else>{{ item.lastRunText }}</span>
+          <div class="st-cell">
+            <StatusChip
+              v-if="item.lastRun && item.lastRunWord"
+              :status="item.lastRunWord"
+              :label="item.lastRunText"
+            />
+            <span v-else>{{ item.lastRunText }}</span>
+            <a
+              v-if="item.lastRun"
+              href="#"
+              class="st-link"
+              @click.prevent.stop="openChecklist(item)"
+            >
+              See that day's checklist
+            </a>
+          </div>
         </template>
 
         <template #item.status="{ item }">
-          <StatusChip
-            :status="item.stateLabel"
-            :label="item.stateLabel"
-          />
+          <div class="st-cell">
+            <StatusChip
+              :status="item.stateLabel"
+              :label="item.stateLabel"
+            />
+            <span v-if="item.stateKey === 'ended'" class="st-note">
+              {{ item.finishedText }}
+            </span>
+          </div>
         </template>
 
         <template #item.actions="{ item }">
@@ -123,6 +159,17 @@
             >
               Edit
             </v-btn>
+            <v-btn
+              v-if="canUpdateScheduleTask && item.stateKey === 'ended'"
+              size="small"
+              variant="tonal"
+              color="primary"
+              class="text-none"
+              prepend-icon="mdi-calendar-refresh"
+              @click.stop="onExtendRow(item)"
+            >
+              Extend or repeat
+            </v-btn>
             <v-btn
               v-if="canUpdateScheduleTask && item.stateKey !== 'ended'"
               size="small"
@@ -155,6 +202,7 @@
         v-model:show="showForm"
         :mode="formMode"
         :taskData="selectedTask"
+        :start-step="formStartStep"
         :site="props.site"
         :serviceType="props.serviceType"
         @refresh="getTaskRefresh"
@@ -194,7 +242,7 @@
 
                 <v-row no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
-                    Next run:
+                    Next visit:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
                     {{ selectedNext || "-" }}
@@ -203,10 +251,18 @@
 
                 <v-row no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
-                    Last run:
+                    Last visit:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
                     {{ lastRunLabel(selectedTask) }}
+                    <a
+                      v-if="selectedTask.lastRun"
+                      href="#"
+                      class="st-link d-block"
+                      @click.prevent="openChecklist(selectedTask)"
+                    >
+                      See that day's checklist
+                    </a>
                   </v-col>
                 </v-row>
 
@@ -319,7 +375,7 @@
                                 </div>
                                 <span v-else class="text-caption text-disabled"
                                   >No units in this area, so it is skipped when
-                                  this visit runs.</span
+                                  this visit is added.</span
                                 >
                               </v-card-text>
                             </div>
@@ -348,6 +404,12 @@
                       :status="stateOf(selectedTask).label"
                       :label="stateOf(selectedTask).label"
                     />
+                    <div
+                      v-if="stateOf(selectedTask).key === 'ended'"
+                      class="st-note mt-1"
+                    >
+                      {{ finishedReason(selectedTask as any) }}
+                    </div>
                   </v-col>
                 </v-row>
 
@@ -383,8 +445,8 @@
           </v-card-title>
 
           <v-card-text class="screen-modal__body">
-            This stops all future runs of this extra visit. Visits that already
-            happened are kept. Delete it?
+            This stops all future extra visits from it. Visits that already
+            happened stay on their Daily Checklists. Delete it?
           </v-card-text>
 
           <div class="screen-modal__footer">
@@ -422,8 +484,12 @@ import useScheduleTask from "../composables/useScheduleTask";
 import useUtils from "../composables/useUtils";
 import useAreas from "../composables/useAreas";
 import {
+  RESULT_HELP,
+  STATUS_HELP,
   STATUS_LABELS,
+  describeRow,
   describeWhen,
+  finishedReason,
   fmtMoment,
   lastRunLabel,
   scheduleNameFor,
@@ -458,7 +524,16 @@ const canViewScheduleTaskDetails = computed(
   () => props.canViewScheduleTaskDetails
 );
 
-const scheduleName = scheduleNameFor(props.serviceType).title;
+const checklistRoute = scheduleNameFor(props.serviceType).route;
+
+/** Opens the Daily Checklist filtered to the day this extra visit was last added. */
+function openChecklist(row: Record<string, any>) {
+  const day = String(row?.lastRun || "").slice(0, 10);
+  navigateTo({
+    path: `/${props.orgId}/${props.site}/${checklistRoute}`,
+    query: /^\d{4}-\d{2}-\d{2}$/.test(day) ? { date: day } : {},
+  });
+}
 
 const page = ref(1);
 const pages = ref(0);
@@ -468,6 +543,7 @@ const searchInput = ref("");
 const showForm = ref(false);
 const selectedTask = ref<Record<string, any>>({});
 const formMode = ref<"add" | "edit">("add");
+const formStartStep = ref(1);
 const submitting = ref(false);
 const dialogShowMoreActions = ref(false);
 const dialogDeleteTask = ref(false);
@@ -517,11 +593,10 @@ watch(dialogShowMoreActions, async (isOpen) => {
 const items = ref<any[]>([]);
 
 const headers = [
-  { title: "Title", value: "title" },
-  { title: "Areas", value: "areas" },
-  { title: "When", value: "when", sortable: false },
-  { title: "Next run", value: "nextRun", sortable: false },
-  { title: "Last run", value: "lastRun", sortable: false },
+  { 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: "Status", value: "status", sortable: false },
   { title: "", value: "actions", sortable: false, align: "end" as const },
 ];
@@ -566,7 +641,9 @@ watchEffect(() => {
       const st = stateOf(row);
       return {
         ...row,
-        whenText: describeWhen(row),
+        whenText: describeRow(row),
+        finishedText: finishedReason(row),
+        lastRunWord: ({ done: "Done", missed: "Missed", pending: "In progress" } as Record<string, string>)[row.lastRunStatus] || "",
         nextRunText: fmtMoment(row.nextRun),
         lastRunText: lastRunLabel(row),
         stateKey: st.key,
@@ -590,6 +667,7 @@ watch(
 
 function openFormDialog() {
   formMode.value = "add";
+  formStartStep.value = 1;
   selectedTask.value = {};
   showForm.value = true;
 }
@@ -597,6 +675,15 @@ function openFormDialog() {
 function onEditRow(item: Record<string, any>) {
   selectedTask.value = item;
   formMode.value = "edit";
+  formStartStep.value = 1;
+  showForm.value = true;
+}
+
+// A finished extra visit: 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";
+  formStartStep.value = 3;
   showForm.value = true;
 }
 
@@ -612,8 +699,8 @@ async function togglePause(item: Record<string, any>) {
     await setScheduleTaskPaused(item._id, !resuming);
     showMessage(
       resuming
-        ? "Resumed. It will run again from its next date."
-        : "Paused. It will not run until you resume it.",
+        ? "Resumed. Extra visits are added again from its next date."
+        : "Paused. No extra visits are added until you resume it.",
       "success",
     );
     await getTaskRefresh();
@@ -649,6 +736,7 @@ async function onRowClick(data: any) {
 const onEditFromMoreAction = async () => {
   dialogShowMoreActions.value = false;
   formMode.value = "edit";
+  formStartStep.value = stateOf(selectedTask.value).key === "ended" ? 3 : 1;
   showForm.value = true;
 };
 
@@ -693,8 +781,27 @@ async function _deleteScheduleTask() {
   color: var(--text2);
 }
 .st-when {
+  display: inline-block;
+  min-width: 220px;
   white-space: normal;
 }
+.st-cell {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 4px;
+}
+.st-note {
+  font-size: var(--fs-chip-lg);
+  color: var(--text2);
+  white-space: normal;
+}
+.st-link {
+  font-size: var(--fs-chip-lg);
+  font-weight: 600;
+  color: rgb(var(--v-theme-primary));
+  text-decoration: underline;
+}
 .st-actions {
   display: flex;
   justify-content: flex-end;

package/components/StatusChip.vue

@@ -104,7 +104,7 @@ const toneClass = computed(() =>
   font-size: var(--fs-chip);
 }
 
-/* The role tag: `padding:3px 10px;border-radius:999px;font-size:11.5px`. */
+/* The role tag: `padding:3px 10px;border-radius:999px;font-size:12.5px`. */
 .status-chip--pill {
   padding: 3px 10px;
   font-size: var(--fs-chip);

package/components/VisitorsReportPreview.vue

@@ -397,12 +397,12 @@ onMounted(() => {
 
     :deep(.v-data-table thead tr th) {
         padding: 6px !important;
-        font-size: 11px !important;
+        font-size: 12px !important;
     }
 
     :deep(.v-data-table tbody tr td) {
         padding: 4px !important;
-        font-size: 10px !important;
+        font-size: 12px !important;
     }
 
     :deep(.v-img) {

package/composables/useCleaningPermission.ts

@@ -13,6 +13,7 @@ export default function useCleaningPermission() {
     bulletinBoardPermissions,
  
     inventoryPermissions,
+    taskCalendarPermissions,
     robotPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
@@ -298,6 +299,8 @@ export default function useCleaningPermission() {
       },
     },
     "robot-mgmt": robotPermissions,
+    // Task Calendar -> See calendar (trade catalogue v2, 2026-10-21).
+    "event-mgmt": taskCalendarPermissions,
   };
 
   return {

package/composables/useCommonPermission.ts

@@ -391,7 +391,19 @@ export function useCommonPermissions() {
     },
   };
 
+  // Trade catalogue v2 (owner 2026-10-21): Task Calendar per role. Grants
+  // nothing alone; a role without `catalogue:trade-v2` keeps the calendar
+  // (utils/trade-catalogue.ts).
+  const taskCalendarPermissions: Record<string, TPermission> = {
+    "see-task-calendar": {
+      check: true,
+      label: "See calendar",
+      description: "Allows the user to open the Task Calendar.",
+    },
+  };
+
   return {
+    taskCalendarPermissions,
     robotPermissions,
     inventoryPermissions,
     invitationPermissions,

package/composables/useLandscapingPermission.ts

@@ -31,9 +31,11 @@ export default function useLandscapingPermission() {
     serviceProviderPermissions,
   
     inventoryPermissions,
+    taskCalendarPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
     inventory: inventoryPermissions,
+    "event-mgmt": taskCalendarPermissions,
     members: memberPermissions,
     roles: rolePermissions,
     invitations: invitationPermissions,

package/composables/useMechanicalElectricalPermission.ts

@@ -31,6 +31,7 @@ export default function useMechanicalElectricalPermission() {
     bulletinBoardPermissions,
 
     inventoryPermissions,
+    taskCalendarPermissions,
   } = useCommonPermissions();
   const { permissions: schedulePermissions } = useCleaningPermission();
 
@@ -61,6 +62,8 @@ export default function useMechanicalElectricalPermission() {
     // same seven actions Cleaning offers (decision 3A) -- taken from it, like
     // the keys above, so the two cannot drift. Catalogue-only: grants nothing.
     "emergency-contact": schedulePermissions["emergency-contact"],
+    // Task Calendar -> See calendar (trade catalogue v2, 2026-10-21).
+    "event-mgmt": taskCalendarPermissions,
 
   };
 

package/composables/usePestControlPermission.ts

@@ -31,9 +31,11 @@ export default function usePestControlPermission() {
     serviceProviderPermissions,
 
     inventoryPermissions,
+    taskCalendarPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
     inventory: inventoryPermissions,
+    "event-mgmt": taskCalendarPermissions,
     members: memberPermissions,
     roles: rolePermissions,
     invitations: invitationPermissions,

package/composables/usePoolMaintenancePermission.ts

@@ -31,9 +31,11 @@ export default function usePoolMaintenancePermission() {
     serviceProviderPermissions,
 
     inventoryPermissions,
+    taskCalendarPermissions,
   } = useCommonPermissions();
   const permissions: TPermissions = {
     inventory: inventoryPermissions,
+    "event-mgmt": taskCalendarPermissions,
     members: memberPermissions,
     roles: rolePermissions,
     invitations: invitationPermissions,

package/constants/permissions.ts

@@ -304,6 +304,8 @@ export const PERMISSIONS = {
     "delete-emergency-contact-category",
   ],
   "event-mgmt": [
+    // Trade catalogue v2 (2026-10-21): Task Calendar -> See calendar.
+    "see-task-calendar",
     "see-all-event",
     "add-event",
     "update-event",
@@ -394,7 +396,7 @@ export const PERMISSIONS = {
   // Security catalogue v2 (2026-10-20). `catalogue:security-v2` is the marker the
   // role editor stamps on save; it grants nothing (see utils/security-catalogue.ts).
   "offline-data": ["see-offline-data"],
-  catalogue: ["security-v2"],
+  catalogue: ["security-v2", "trade-v2"],
   "visitor-mgmt": [
     "invite-visitor",
     "see-all-visitor",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.135.0",
+  "version": "4.137.0",
   "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

@@ -25,6 +25,13 @@ const ACRONYMS: Record<string, string> = {
 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"],
+  ...["Cleaning", "Technician", "Pest", "Pool", "Landscape"].flatMap((t): [string, string][] => [
+    [`${t} Schedule Area`, "Area"],
+    [`${t} Schedule Unit`, "Unit"],
+    [`${t} Schedule`, "Daily Checklist"],
+  ]),
 ];
 
 export function moduleNameFromRoute(route: {

package/utils/nav-sections.ts

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

package/utils/org-modules.ts

@@ -259,7 +259,10 @@ const GRANT_COVERS: Readonly<Record<string, readonly string[]>> = {
   "visitor:create": ["visitor-mgmt:invite-visitor"],
 };
 
+// Trade v2 See calendar: open to every trade role before the box, so no owner
+// grant names it (core `boundToOwnerGrant` never refuses it either).
 const grantHolds = (grant: readonly string[], key: string) =>
+  key === "event-mgmt:see-task-calendar" ||
   grant.includes(key) || grant.some((g) => GRANT_COVERS[g]?.includes(key));
 
 /**

package/utils/permission-labels.ts

@@ -68,6 +68,12 @@ 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" },
 };
 
 /**