@7365admin1/layer-common 4.133.0 → 4.134.0

package/components/ScheduleTaskMain.vue

@@ -1,8 +1,14 @@
 <template>
   <v-row no-gutters align="center" justify="center">
     <v-col cols="12">
+      <ScheduleGuide
+        :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."
+      />
       <TableMain
-        :title="'Schedule Tasks'"
+        :title="'Extra Visits (Scheduled)'"
         :items="items"
         :headers="headers"
         :loading="loading"
@@ -10,13 +16,23 @@
         v-model:page="page"
         :pages="pages"
         :pageRange="pageRange"
-        :no-data-text="'No schedule tasks found'"
         @refresh="getTaskRefresh"
         :canCreate="canCreateScheduleTask"
-        createLabel="Create Schedule Task"
+        createLabel="Add Extra Visit"
         @create="openFormDialog"
         @row-click="onRowClick"
       >
+        <template #no-data>
+          <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.
+            </span>
+          </div>
+        </template>
+
         <template #actions>
           <v-row no-gutters align="center" class="w-100">
             <v-col cols="auto" v-if="canCreateScheduleTask">
@@ -25,7 +41,7 @@
                 variant="flat"
                 @click="openFormDialog"
               >
-                Create Schedule Task
+                Add Extra Visit
               </v-btn>
             </v-col>
 
@@ -66,13 +82,73 @@
           <span v-else>N/A</span>
         </template>
 
-        <template #item.status="{ value }">
+        <template #item.when="{ item }">
+          <span class="st-when">{{ item.whenText }}</span>
+        </template>
+
+        <template #item.nextRun="{ item }">
+          {{ item.nextRunText || "-" }}
+        </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>
+        </template>
+
+        <template #item.status="{ item }">
           <StatusChip
-            class="text-capitalize"
-            :status="value"
-            :label="value || 'N/A'"
+            :status="item.stateLabel"
+            :label="item.stateLabel"
           />
         </template>
+
+        <template #item.actions="{ item }">
+          <div class="st-actions">
+            <v-btn
+              v-if="canUpdateScheduleTask"
+              size="small"
+              variant="text"
+              class="text-none"
+              prepend-icon="mdi-pencil-outline"
+              @click.stop="onEditRow(item)"
+            >
+              Edit
+            </v-btn>
+            <v-btn
+              v-if="canUpdateScheduleTask && item.stateKey !== 'ended'"
+              size="small"
+              variant="text"
+              class="text-none"
+              :prepend-icon="
+                item.stateKey === 'paused' ? 'mdi-play-outline' : 'mdi-pause'
+              "
+              :loading="pausingId === item._id"
+              @click.stop="togglePause(item)"
+            >
+              {{ item.stateKey === "paused" ? "Resume" : "Pause" }}
+            </v-btn>
+            <v-btn
+              v-if="canDeleteScheduleTask"
+              size="small"
+              variant="text"
+              color="error"
+              class="text-none"
+              prepend-icon="mdi-delete-outline"
+              @click.stop="onDeleteRow(item)"
+            >
+              Delete
+            </v-btn>
+          </div>
+        </template>
       </TableMain>
 
       <ScheduleTaskForm
@@ -86,14 +162,14 @@
 
       <v-dialog v-model="dialogShowMoreActions" width="400" persistent>
         <HygieneUpdateMoreAction
-          :title="selectedTask?.title || 'Schedule Task Actions'"
+          :title="selectedTask?.title || 'Extra Visit'"
           :canUpdate="canUpdateScheduleTask"
           @close="dialogShowMoreActions = false"
           :canDelete="canDeleteScheduleTask"
-          :deleteButtonLabel="'Delete Schedule Task'"
+          :deleteButtonLabel="'Delete Extra Visit'"
           @edit="onEditFromMoreAction"
           @delete="onDeleteFromMoreAction"
-          :editButtonLabel="'Edit Schedule Task'"
+          :editButtonLabel="'Edit Extra Visit'"
         >
           <template #content>
             <v-row no-gutters>
@@ -109,32 +185,28 @@
 
                 <v-row no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
-                    Dates:
+                    When:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
-                    <div
-                      v-if="selectedTask.dates && selectedTask.dates.length > 0"
-                      class="d-flex flex-wrap gap-1"
-                    >
-                      <v-chip
-                        v-for="date in selectedTask.dates"
-                        :key="date"
-                        size="x-small"
-                        class="mr-1 mb-1"
-                      >
-                        {{ formatDateChip(date) }}
-                      </v-chip>
-                    </div>
-                    <div v-else>N/A</div>
+                    {{ selectedWhen }}
+                  </v-col>
+                </v-row>
+
+                <v-row no-gutters class="mb-2">
+                  <v-col cols="5" class="text-subtitle-2 font-weight-bold">
+                    Next run:
+                  </v-col>
+                  <v-col cols="7" class="text-subtitle-2">
+                    {{ selectedNext || "-" }}
                   </v-col>
                 </v-row>
 
-                <v-row v-if="selectedTask.time" no-gutters class="mb-2">
+                <v-row no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
-                    Time:
+                    Last run:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
-                    {{ selectedTask.time || "N/A" }}
+                    {{ lastRunLabel(selectedTask) }}
                   </v-col>
                 </v-row>
 
@@ -192,8 +264,8 @@
                                 v-if="
                                   loadingViewUnits &&
                                   !(
-                                    area.value ||
-                                    area._id in fetchedViewAreaUnits
+                                    (area.value || area._id) in
+                                    fetchedViewAreaUnits
                                   )
                                 "
                                 size="14"
@@ -246,7 +318,8 @@
                                   </v-chip>
                                 </div>
                                 <span v-else class="text-caption text-disabled"
-                                  >No units configured</span
+                                  >No units in this area, so it is skipped when
+                                  this visit runs.</span
                                 >
                               </v-card-text>
                             </div>
@@ -266,15 +339,14 @@
                   </v-col>
                 </v-row>
 
-                <v-row v-if="selectedTask.status" no-gutters class="mb-2">
+                <v-row no-gutters class="mb-2">
                   <v-col cols="5" class="text-subtitle-2 font-weight-bold">
                     Status:
                   </v-col>
                   <v-col cols="7" class="text-subtitle-2">
                     <StatusChip
-                      class="text-capitalize"
-                      :status="selectedTask.status"
-                      :label="selectedTask.status || 'N/A'"
+                      :status="stateOf(selectedTask).label"
+                      :label="stateOf(selectedTask).label"
                     />
                   </v-col>
                 </v-row>
@@ -307,11 +379,12 @@
       <v-dialog v-model="dialogDeleteTask" max-width="520">
         <v-card class="screen-modal">
           <v-card-title class="text-capitalize">
-            Delete {{ selectedTask?.title || "Schedule Task" }}
+            Delete {{ selectedTask?.title || "Extra Visit" }}
           </v-card-title>
 
           <v-card-text class="screen-modal__body">
-            Are you sure you want to delete this schedule task?
+            This stops all future runs of this extra visit. Visits that already
+            happened are kept. Delete it?
           </v-card-text>
 
           <div class="screen-modal__footer">
@@ -348,6 +421,13 @@
 import useScheduleTask from "../composables/useScheduleTask";
 import useUtils from "../composables/useUtils";
 import useAreas from "../composables/useAreas";
+import {
+  STATUS_LABELS,
+  describeWhen,
+  fmtMoment,
+  lastRunLabel,
+  scheduleNameFor,
+} from "../utils/schedule-task";
 
 const props = defineProps({
   orgId: { type: String, required: true },
@@ -362,8 +442,12 @@ const props = defineProps({
 });
 
 const { formatDate, debounce } = useUtils();
-const { getScheduleTasks, getScheduleTaskById, deleteScheduleTask } =
-  useScheduleTask();
+const {
+  getScheduleTasks,
+  getScheduleTaskById,
+  deleteScheduleTask,
+  setScheduleTaskPaused,
+} = useScheduleTask();
 const { getAreaById } = useAreas();
 
 const canViewScheduleTasks = computed(() => props.canViewScheduleTasks);
@@ -374,6 +458,8 @@ const canViewScheduleTaskDetails = computed(
   () => props.canViewScheduleTaskDetails
 );
 
+const scheduleName = scheduleNameFor(props.serviceType).title;
+
 const page = ref(1);
 const pages = ref(0);
 const pageRange = ref("-- - -- of --");
@@ -433,41 +519,28 @@ const items = ref<any[]>([]);
 const headers = [
   { title: "Title", value: "title" },
   { title: "Areas", value: "areas" },
-  { title: "Status", value: "status" },
+  { title: "When", value: "when", sortable: false },
+  { title: "Next run", value: "nextRun", sortable: false },
+  { title: "Last run", value: "lastRun", sortable: false },
+  { title: "Status", value: "status", sortable: false },
+  { title: "", value: "actions", sortable: false, align: "end" as const },
 ];
 
+// Active / Paused / Ended. An older server without `scheduleStatus` shows Active.
+function stateOf(row: Record<string, any>) {
+  const key = row?.scheduleStatus || (row?.paused ? "paused" : "active");
+  return { key: key as string, label: STATUS_LABELS[key] || "Active" };
+}
+const selectedWhen = computed(() => describeWhen(selectedTask.value as any));
+const selectedNext = computed(() => fmtMoment(selectedTask.value?.nextRun));
+const pausingId = ref("");
+
 const showMessage = (text: string, color: string = "success") => {
   message.value = text;
   messageColor.value = color;
   messageSnackbar.value = true;
 };
 
-const formatDateChip = (dateStr: string) => {
-  const parts = dateStr?.split("-");
-  if (parts?.length === 3) return `${parts[2]}-${parts[1]}-${parts[0]}`;
-  return dateStr;
-};
-
-const mapShortToDay = (short: string) => {
-  const mapping: Record<string, string> = {
-    Mon: "Monday",
-    Tue: "Tuesday",
-    Wed: "Wednesday",
-    Thu: "Thursday",
-    Fri: "Friday",
-    Sat: "Saturday",
-    Sun: "Sunday",
-  };
-  return mapping[short] || short;
-};
-
-const formatTaskDays = (dayField: any) => {
-  if (!dayField) return "N/A";
-  if (Array.isArray(dayField))
-    return dayField.map((d) => mapShortToDay(d)).join(", ");
-  return String(dayField);
-};
-
 const {
   data: getTaskReq,
   refresh: getTaskRefresh,
@@ -488,7 +561,18 @@ const {
 
 watchEffect(() => {
   if (getTaskReq.value) {
-    items.value = getTaskReq.value.items || getTaskReq.value || [];
+    const rows: any[] = getTaskReq.value.items || getTaskReq.value || [];
+    items.value = rows.map((row) => {
+      const st = stateOf(row);
+      return {
+        ...row,
+        whenText: describeWhen(row),
+        nextRunText: fmtMoment(row.nextRun),
+        lastRunText: lastRunLabel(row),
+        stateKey: st.key,
+        stateLabel: st.label,
+      };
+    });
     pages.value = getTaskReq.value.pages || 0;
     pageRange.value = getTaskReq.value.pageRange || "-- - -- of --";
   }
@@ -510,7 +594,41 @@ function openFormDialog() {
   showForm.value = true;
 }
 
+function onEditRow(item: Record<string, any>) {
+  selectedTask.value = item;
+  formMode.value = "edit";
+  showForm.value = true;
+}
+
+function onDeleteRow(item: Record<string, any>) {
+  selectedTask.value = item;
+  dialogDeleteTask.value = true;
+}
+
+async function togglePause(item: Record<string, any>) {
+  const resuming = item.stateKey === "paused";
+  try {
+    pausingId.value = item._id;
+    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.",
+      "success",
+    );
+    await getTaskRefresh();
+  } catch (error: any) {
+    showMessage(
+      error?.data?.message || "Could not change this extra visit.",
+      "error",
+    );
+  } finally {
+    pausingId.value = "";
+  }
+}
+
 async function onRowClick(data: any) {
+  if (!canViewScheduleTaskDetails.value) return;
   const taskId = data?.item?._id || data?._id || data?.item?.id || data?.id;
 
   if (taskId) {
@@ -550,13 +668,36 @@ async function _deleteScheduleTask() {
 
     const response = await deleteScheduleTask(id);
     dialogDeleteTask.value = false;
-    showMessage("Scheduled task successfully deleted.", "success");
+    showMessage("Extra visit deleted. Past visits are kept.", "success");
 
     await getTaskRefresh();
   } catch (error: any) {
-    showMessage(error?.data?.message, "error");
+    showMessage(
+      error?.data?.message || "Could not delete this extra visit.",
+      "error",
+    );
   } finally {
     submitting.value = false;
   }
 }
 </script>
+
+<style scoped>
+.st-empty {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding: 24px 16px;
+  font-family: var(--font-sans);
+  font-size: var(--fs-cell);
+  color: var(--text2);
+}
+.st-when {
+  white-space: normal;
+}
+.st-actions {
+  display: flex;
+  justify-content: flex-end;
+  flex-wrap: wrap;
+}
+</style>

package/components/TableHygiene.vue

@@ -92,7 +92,7 @@
                     class="text-none"
                   >
                     <v-icon size="12">mdi-calendar-clock</v-icon>
-                    Schedule Task
+                    Extra visit
                   </StatusChip>
                   <slot name="group-header-chips" :group="group">
                     <StatusChip
@@ -114,7 +114,7 @@
                       class="text-none"
                     >
                       <v-icon size="12">mdi-progress-clock</v-icon>
-                      Ongoing · {{ group.completedByName }}
+                      In progress · {{ group.completedByName }}
                     </StatusChip>
                   </slot>
                 </v-col>

package/composables/useCleaningSchedules.ts

@@ -140,6 +140,14 @@ export default function useCleaningSchedules() {
     );
   }
 
+  /** Today's day-row, created if missing (safe to repeat). Follow with generateChecklist(site, id). */
+  function createTodaysParent(site: string, serviceType: string) {
+    return useNuxtApp().$api<{ id: string }>(`/api/hygiene-parent-checklist`, {
+      method: "POST",
+      body: { site, serviceType },
+    });
+  }
+
   async function getAreaChecklistHistory({
     parentChecklistId = "",
     page = 1,
@@ -231,6 +239,7 @@ export default function useCleaningSchedules() {
     updateAreaChecklistStatus,
     uploadAreaChecklistAttachment,
     generateChecklist,
+    createTodaysParent,
     getAreaChecklistHistory,
     getAreaChecklistHistoryById,
     exportAreas,

package/composables/useFeedback.ts

@@ -73,6 +73,7 @@ export default function useFeedback() {
     provider = "",
     service = "",
     userId = "",
+    category = "",
   }: {
     page?: number;
     limit?: number;
@@ -85,6 +86,8 @@ export default function useFeedback() {
     provider?: string | any;
     service?: string;
     userId?: string;
+    /** Optional: one category (the feedback subject) or a comma list. Empty = all. */
+    category?: string;
   } = {}) {
     try {
       return useNuxtApp().$api<Record<string, any>>("/api/feedbacks2", {
@@ -100,6 +103,7 @@ export default function useFeedback() {
           status,
           provider,
           service,
+          ...(category && { category }),
           ...(currentUser.value?.type != "site" && {
             userId,
           }),

package/composables/useScheduleTask.ts

@@ -1,3 +1,19 @@
+// Repeat fields (all optional: a payload without them behaves as a one-off on `dates`).
+// "" / null clears an optional field on the server.
+type TScheduleRepeatFields = {
+  repeat?: "none" | "daily" | "weekdays" | "weekly" | "monthly";
+  daysOfWeek?: number[] | null;
+  startDate?: string | null;
+  endDate?: string | null;
+};
+
+const repeatBody = (p: TScheduleRepeatFields) => ({
+  repeat: p.repeat,
+  daysOfWeek: p.daysOfWeek,
+  startDate: p.startDate,
+  endDate: p.endDate,
+});
+
 export default function useScheduleTask() {
   async function getScheduleTasks({
     site = "",
@@ -38,7 +54,7 @@ export default function useScheduleTask() {
     areas: { name: string; value: string }[];
     site: string;
     serviceType: string;
-  }) {
+  } & TScheduleRepeatFields) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-schedule-tasks/site/${payload.site}`,
       {
@@ -50,6 +66,7 @@ export default function useScheduleTask() {
           description: payload.description,
           areas: payload.areas,
           serviceType: payload.serviceType,
+          ...repeatBody(payload),
         },
       },
     );
@@ -63,7 +80,7 @@ export default function useScheduleTask() {
       dates: string[];
       description?: string;
       areas: { name: string; value: string }[];
-    },
+    } & TScheduleRepeatFields,
   ) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-schedule-tasks/id/${id}`,
@@ -75,11 +92,23 @@ export default function useScheduleTask() {
           dates: payload.dates,
           description: payload.description,
           areas: payload.areas,
+          ...repeatBody(payload),
         },
       },
     );
   }
 
+  /** Pause / resume. The server stops the next runs while paused; nothing is deleted. */
+  function setScheduleTaskPaused(id: string, paused: boolean) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/hygiene-schedule-tasks/id/${id}`,
+      {
+        method: "PATCH",
+        body: { paused },
+      },
+    );
+  }
+
   function deleteScheduleTask(id: string) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-schedule-tasks/id/${id}`,
@@ -95,5 +124,6 @@ export default function useScheduleTask() {
     updateScheduleTask,
     getScheduleTaskById,
     deleteScheduleTask,
+    setScheduleTaskPaused,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.133.0",
+  "version": "4.134.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/types/cleaner-schedule.d.ts

@@ -53,5 +53,5 @@ declare type TFlattenedUnitItem = TUnitChecklistItem & {
   set: number;
 };
 
-declare type TScheduleAreaStatus = "All" | "Open" | "Ongoing" | "Completed";
+declare type TScheduleAreaStatus = "All" | "Open" | "Ongoing" | "Completed" | "Closed";
 declare type TAreaType = "all" | "common" | "toilet";