@7365admin1/layer-common 4.144.0 → 4.147.0

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/SubscriptionPlanTable.vue

@@ -163,7 +163,11 @@
                   "
                   value="toggle-status"
                   class="text-body-2"
-                  @click="togglePlanStatus(item)"
+                  @click="
+                    item.status === 'active'
+                      ? (planToDeactivate = item)
+                      : togglePlanStatus(item)
+                  "
                 />
               </v-list>
             </v-card>
@@ -197,6 +201,32 @@
       />
     </v-dialog>
 
+    <ConfirmDialog
+      :model-value="!!planToDeactivate"
+      @update:model-value="(v: boolean) => { if (!v) planToDeactivate = null; }"
+    >
+      <template #title>Deactivate plan</template>
+      <template #description>
+        Deactivate {{ planToDeactivate?.name || "this plan" }}? You can activate
+        it again from the Deactivated tab.
+      </template>
+      <template #footer>
+        <v-spacer />
+        <v-btn
+          variant="outlined"
+          :disabled="isDeactivating"
+          @click="planToDeactivate = null"
+          >Cancel</v-btn
+        >
+        <v-btn
+          color="error"
+          variant="flat"
+          :loading="isDeactivating"
+          @click="confirmDeactivate"
+          >Deactivate</v-btn
+        >
+      </template>
+    </ConfirmDialog>
     <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
   </v-container>
 </template>
@@ -417,6 +447,20 @@ async function handleSubmit(payload: PlanFormState) {
   }
 }
 
+// Deactivate asks first; Activate stays one tap.
+const planToDeactivate = ref<SubscriptionPlan | null>(null);
+const isDeactivating = ref(false);
+async function confirmDeactivate() {
+  if (!planToDeactivate.value) return;
+  isDeactivating.value = true;
+  try {
+    await togglePlanStatus(planToDeactivate.value);
+  } finally {
+    isDeactivating.value = false;
+    planToDeactivate.value = null;
+  }
+}
+
 async function togglePlanStatus(plan: SubscriptionPlan) {
   const nextStatus = plan.status === "active" ? "deactive" : "active";
 

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) ??