@7365admin1/layer-common 4.132.0 → 4.134.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @iservice365/layer-common
 
+## 4.134.0
+
+### Minor Changes
+
+- bd2c26d: Feedback list: optional category filter. `useFeedback().getFeedbacks({ category })` sends `category` (one subject or a comma list) to `/api/feedbacks2`; empty or absent sends nothing, so the list is unchanged. `FeedbackMain` gains a "Filter by category" box (default All).
+- f5ed863: Schedule screens: clearer process for all five trade apps. Extra Visits (Schedule Task) now has a four-step form (What, Where, When, Who is told) with Once / Daily / Weekdays / Weekly / Monthly repeat, start and end date, and a summary before saving; the list shows When, Next run, Last run and Active / Paused / Ended with Edit, Pause/Resume and Delete. Daily Schedule: intro line, "Before you start" banner (Areas, Units, visits per day), "Create today's list now" only when today's list is missing, Closed filter, PDF error message. Wording: Done / Needs redo, In progress, Missed in history, Extra visit chip. Removed the dead Accept column and the unused useScheduleTaskArea composable.
+
+## 4.133.0
+
+### Minor Changes
+
+- 2cfd359: Security roles: new permission boxes - See Blocklist, Block / Unblock Vehicles, Invite Visitor / Contractor, See Offline Data (needs core with the same keys). A security role gets a hidden `catalogue:security-v2` marker the first time it is saved in the editor; roles never saved keep today's access (the new boxes are pre-ticked from the old keys when opened). The marker is not counted in permission totals. `VehicleManagement` / `VehicleAddSelection` take optional `canSeeBlocklist` / `canManageBlocklist` props (default true = unchanged). Helper: `utils/security-catalogue`.
+
 ## 4.132.0
 
 ### Minor Changes
@@ -3346,11 +3359,11 @@ Monthly report: a month that had patrols opens the list of that month's patrol r
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                        GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                        GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                            GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                            GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                        owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                        staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                            owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                            staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/AreaChecklistHistoryLogs.vue

@@ -49,7 +49,7 @@
                       <StatusChip
                         class="text-capitalize"
                         :status="status"
-                        :label="status || 'N/A'"
+                        :label="status === 'N/A' ? status : dailyStatusLabel(status)"
                       />
                     </v-col>
                   </v-row>
@@ -125,7 +125,7 @@
                           pill
                           class="ml-2"
                         >
-                          Schedule Task
+                          Extra visit
                         </StatusChip>
                       </v-list-subheader>
 
@@ -165,8 +165,8 @@
                                  green as on every other screen. -->
                             <StatusChip
                               class="text-capitalize"
-                              :status="unit.status || 'Open'"
-                              :label="unit.status || 'Open'"
+                              :status="historyUnitLabel(unit.status)"
+                              :label="historyUnitLabel(unit.status)"
                             />
                           </v-col>
                         </v-row>
@@ -262,6 +262,7 @@
 </template>
 
 <script setup lang="ts">
+import { dailyStatusLabel, historyUnitLabel } from "../utils/schedule-task";
 const props = defineProps({
   orgId: { type: String, required: true, default: "" },
   site: { type: String, required: true, default: "" },

package/components/CleaningScheduleMain.vue

@@ -1,9 +1,17 @@
 <template>
   <v-row no-gutters align="center" justify="center">
     <v-col cols="12" lg="12">
+      <ScheduleGuide
+        v-if="canViewSchedules"
+        :org-id="orgId"
+        :site="site"
+        :service-type="serviceType"
+        :schedule-route="scheduleRoute"
+        text="A new checklist is created for every area automatically each midnight. Staff tick off each unit on the mobile app."
+      />
       <TableMain
         v-if="canViewSchedules"
-        :title="checklistTitle"
+        :title="pageTitle"
         :items="items"
         :headers="headers"
         :loading="loading"
@@ -11,10 +19,31 @@
         v-model:page="page"
         :pages="pages"
         :pageRange="pageRange"
-        :no-data-text="`No ${checklistTitle} found`"
         @refresh="getCleanerChecklistRefresh"
         @row-click="onRowClick"
       >
+        <template #no-data>
+          <div class="cs-empty">
+            <strong>No daily lists yet.</strong>
+            <span>
+              A list is created automatically every midnight, once your Areas
+              and Units are set up.
+            </span>
+          </div>
+        </template>
+
+        <template #actions>
+          <v-btn
+            v-if="showCreateToday"
+            class="text-none screen-btn-primary"
+            variant="flat"
+            :loading="creatingToday"
+            @click="createTodaysList"
+          >
+            Create today's list now
+          </v-btn>
+        </template>
+
         <template #extension>
           <v-row no-gutters class="w-100 d-flex flex-column">
             <div class="filter-bar">
@@ -71,7 +100,7 @@
           <StatusChip
             class="text-capitalize"
             :status="value"
-            :label="value || 'No Status'"
+            :label="dailyStatusLabel(value)"
           />
         </template>
         <template #item.completedAt="{ value }">
@@ -108,16 +137,22 @@
           </div>
         </AppCard>
       </div>
+      <Snackbar
+        v-model="messageSnackbar"
+        :text="message"
+        :color="messageColor"
+      />
     </v-col>
   </v-row>
 </template>
 
 <script lang="ts" setup>
 import useCleaningSchedules from "../composables/useCleaningSchedules";
-import useWorkerTerm from "../composables/useWorkerTerm";
-import { workerTitle } from "../utils/worker-terms";
-// "Cleaner Checklist" in Hygiene, "Gardener Checklist" in Landscape, ...
-const checklistTitle = workerTitle(`${useWorkerTerm().one} checklist`);
+import {
+  dailyStatusLabel,
+  hasListForToday,
+  scheduleNameFor,
+} from "../utils/schedule-task";
 import useUtils from "../composables/useUtils";
 
 const props = defineProps({
@@ -130,16 +165,24 @@ const props = defineProps({
   canViewScheduleDetails: { type: Boolean, default: false },
   canDownloadSchedule: { type: Boolean, default: false },
   canManageScheduleTasks: { type: Boolean, default: false },
+  canGenerateChecklist: { type: Boolean, default: false },
 });
 
+// "Daily Schedule - Cleaning" / "- Landscape" / "- Pest" / "- Pool" / "- Technician"
+const pageTitle = `Daily Schedule – ${scheduleNameFor(props.serviceType).title.replace(
+  / Schedule$/,
+  "",
+)}`;
+
 const startDate = ref("");
 const endDate = ref("");
 const status = ref<TScheduleAreaStatus>("all");
 const statusOptions = [
   { title: "All", value: "all" },
   { title: "Open", value: "open" },
-  { title: "Ongoing", value: "ongoing" },
+  { title: "In progress", value: "ongoing" },
   { title: "Completed", value: "completed" },
+  { title: "Closed", value: "closed" },
 ] as const;
 
 const items = ref<Array<Record<string, any>>>([]);
@@ -157,8 +200,18 @@ const headers = [
 const remainingTime = ref({} as Record<string, string>);
 const remainingSeconds = ref({} as Record<string, number>);
 const downloadingId = ref<string | null>(null);
+const creatingToday = ref(false);
 
-const { getCleaningSchedules, downloadChecklistPdf } = useCleaningSchedules();
+const message = ref("");
+const messageSnackbar = ref(false);
+const messageColor = ref("error");
+
+const {
+  getCleaningSchedules,
+  downloadChecklistPdf,
+  createTodaysParent,
+  generateChecklist,
+} = useCleaningSchedules();
 const { formatDate } = useUtils();
 
 /**
@@ -233,6 +286,36 @@ const updateRemainingTime = () => {
   });
 };
 
+// Only on the unfiltered first page, where today's row would be if it exists.
+const showCreateToday = computed(
+  () =>
+    props.canGenerateChecklist &&
+    !loading.value &&
+    !!getCleanerChecklistReq.value &&
+    page.value === 1 &&
+    !startDate.value &&
+    !endDate.value &&
+    status.value === "all" &&
+    !hasListForToday(items.value),
+);
+
+async function createTodaysList() {
+  try {
+    creatingToday.value = true;
+    const parent = await createTodaysParent(props.site, props.serviceType);
+    await generateChecklist(props.site, parent.id);
+    showMessage("Today's list is ready.", "success");
+    await getCleanerChecklistRefresh();
+  } catch (error: any) {
+    showMessage(
+      error?.data?.message || error?.message || "Could not create today's list.",
+      "error",
+    );
+  } finally {
+    creatingToday.value = false;
+  }
+}
+
 watchEffect(() => {
   if (getCleanerChecklistReq.value) {
     items.value = getCleanerChecklistReq.value.items;
@@ -286,7 +369,11 @@ async function downloadItem(item: any) {
     downloadingId.value = id;
     await downloadChecklistPdf(id);
   } catch (err) {
-    console.error("Failed to download checklist PDF", err);
+    showMessage(
+      (err as any)?.data?.message ||
+        "Could not download the PDF. Please try again.",
+      "error",
+    );
   } finally {
     downloadingId.value = null;
   }
@@ -328,15 +415,22 @@ function onRowClick(data: any) {
 }
 
 function showMessage(msg: string, color: string = "error") {
-  try {
-    console.warn(msg);
-  } catch (e) {
-    alert(msg);
-  }
+  message.value = msg;
+  messageColor.value = color;
+  messageSnackbar.value = true;
 }
 </script>
 
 <style scoped>
+.cs-empty {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding: 24px 16px;
+  font-family: var(--font-sans);
+  font-size: var(--fs-cell);
+  color: var(--text2);
+}
 .cs-no-permission {
   font-family: var(--font-sans);
   font-size: var(--fs-cell);

package/components/FeedbackMain.vue

@@ -28,6 +28,14 @@
           class="ml-2"
           style="max-width: 250px"
         />
+        <v-autocomplete
+          v-model="filterByCategory"
+          :items="categoryFilterItems"
+          label="Filter by category"
+          hide-details
+          class="ml-2"
+          style="max-width: 250px"
+        />
         <v-text-field
           v-model="startDate"
           :value="standardFormatDate(startDate)"
@@ -684,6 +692,7 @@ const pageRange = ref("-- - -- of --");
 const items = ref<Array<Record<string, any>>>([]);
 
 const filterByStatus = ref("All");
+const filterByCategory = ref("All");
 const getPast30DaysDate = (): Date => {
   const today = new Date();
   const past30Days = new Date(today);
@@ -715,9 +724,10 @@ const {
       dateTo: moment(endDate.value, "DD/MM/YYYY").endOf("day"),
       search: searchText.value,
       status: filterByStatus.value == "All" ? "" : filterByStatus.value,
+      category: filterByCategory.value == "All" ? "" : filterByCategory.value,
     }),
   {
-    watch: [filterByStatus, searchText, page, startDate, endDate],
+    watch: [filterByStatus, filterByCategory, searchText, page, startDate, endDate],
   }
 );
 
@@ -1068,6 +1078,12 @@ const subjectOptions = computed(() => {
     });
 });
 
+// Same categories as the create form, plus "All" (default: nothing hidden).
+const categoryFilterItems = computed(() => [
+  "All",
+  ...subjectOptions.value.map((item) => item.title),
+]);
+
 const isFileUploading = ref<boolean>(false);
 type TFile = {
   name: string;

package/components/ManageChecklistMain.vue

@@ -109,9 +109,9 @@
                 <div class="d-flex align-center ga-2 mb-2">
                   <v-icon color="error" size="18">mdi-close-circle</v-icon>
                   <span class="text-caption font-weight-bold">
-                    Rejection details
+                    Needs redo
                   </span>
-                  <StatusChip status="Rejected" :dot="false" />
+                  <StatusChip status="Needs redo" :dot="false" />
                 </div>
                 <div
                   v-if="item.remarks"
@@ -146,7 +146,7 @@
           </v-row>
         </template>
 
-        <!-- Approve / Reject action buttons -->
+        <!-- Done / Needs redo action buttons (labels only; the API still says approve / reject) -->
         <template #item-append="{ item, group }">
           <v-row
             v-if="!isScheduleClosed && canManageScheduleTasks"
@@ -165,6 +165,8 @@
                 color="error"
                 :loading="!!loadingActions[getKey(item, group.set)]"
                 :disabled="!!loadingActions[getKey(item, group.set)]"
+                aria-label="Needs redo"
+                title="Needs redo"
                 @click.stop="handleItemActionClick(item, group.set, 'reject')"
               />
             </v-col>
@@ -180,6 +182,8 @@
                 color="success"
                 :loading="!!loadingActions[getKey(item, group.set)]"
                 :disabled="!!loadingActions[getKey(item, group.set)]"
+                aria-label="Done"
+                title="Done"
                 @click.stop="handleItemActionClick(item, group.set, 'approve')"
               />
             </v-col>
@@ -190,7 +194,7 @@
           <v-row no-gutters align="center" class="ga-2">
             <v-col v-if="isGroupAnyApproved(group)" cols="auto">
               <StatusChip
-                :status="isGroupComplete(group) ? 'Completed' : 'Ongoing'"
+                :status="isGroupComplete(group) ? 'Completed' : 'In progress'"
                 :tone="isGroupComplete(group) ? 'ok' : 'warn'"
                 :dot="false"
                 class="text-none"
@@ -202,7 +206,7 @@
                       : "mdi-progress-clock"
                   }}
                 </v-icon>
-                {{ isGroupComplete(group) ? "Completed" : "Ongoing" }}
+                {{ isGroupComplete(group) ? "Completed" : "In progress" }}
                 <template v-if="getGroupCompletedByName(group)">
                   · {{ getGroupCompletedByName(group) }}
                 </template>
@@ -316,7 +320,7 @@
   -->
   <v-dialog v-model="showRejectModal" max-width="600" persistent>
     <v-card class="screen-modal">
-      <v-card-title>Reject Checklist Item</v-card-title>
+      <v-card-title>Needs redo</v-card-title>
 
       <v-divider />
 
@@ -901,14 +905,14 @@ async function submitRejectDialog(): Promise<void> {
       rejectModal.remarks.trim(),
       rejectModal.photoIds
     );
-    showMessage(response?.message || "Unit rejected successfully", "success");
+    showMessage(response?.message || "Marked as needs redo", "success");
     showRejectModal.value = false;
     resetRejectModal();
     await getUnitCleanerChecklistRefresh();
   } catch (error: any) {
     console.error("Error rejecting unit checklist:", error);
     showMessage(
-      error?.data?.message || error?.message || "Failed to reject checklist",
+      error?.data?.message || error?.message || "Could not mark this unit as needs redo",
       "error"
     );
   } finally {
@@ -985,7 +989,7 @@ async function _callUpdateUnitChecklist(
     (s) => s.unit === item.unit && s.set === set
   );
   if (isApproved && action === "approve") {
-    showMessage("Unit already approved", "info");
+    showMessage("This unit is already done", "info");
     return;
   }
 
@@ -1000,7 +1004,7 @@ async function _callUpdateUnitChecklist(
     );
     showMessage(
       response?.message ||
-        `Unit ${action === "approve" ? "approved" : "rejected"} successfully`,
+        `Unit marked as ${action === "approve" ? "done" : "needs redo"}`,
       "success"
     );
     await getUnitCleanerChecklistRefresh();
@@ -1071,13 +1075,13 @@ async function _updateUnitChecklist({
       );
     }
 
-    showMessage(`Set ${setNumber} approved successfully`, "success");
+    showMessage(`Set ${setNumber} done`, "success");
 
     // Refresh data
     await getUnitCleanerChecklistRefresh();
   } catch (error: any) {
     console.error("Error approving set:", error);
-    showMessage(error?.message || "Failed to approve set", "error");
+    showMessage(error?.message || "Could not finish this set", "error");
   } finally {
     submitting.value = false;
   }

package/components/RolePermissionFormCreate.vue

@@ -283,6 +283,7 @@ import useRole from "../composables/useRole";
 import useUtils from "../composables/useUtils";
 import useSite from "../composables/useSite";
 import { readApiError } from "../utils/subscription-form";
+import { withSecurityMarker } from "../utils/security-catalogue";
 import { applyRolePreset, ROLE_PRESETS, type TRolePreset } from "../utils/inventory-presets";
 
 /** Shown after "Couldn't save:" when the server gave no reason (network, timeout). */
@@ -533,7 +534,10 @@ async function submit() {
   try {
     await createRole({
       name: name.value,
-      permissions: permState.value.selected,
+      // Security catalogue only (it carries `offline-data`): stamp the v2 marker.
+      permissions: "offline-data" in (props.permissions || {})
+        ? withSecurityMarker(permState.value.selected)
+        : permState.value.selected,
       type: props.type,
       org: props.org,
       site: props.siteId,

package/components/RolePermissionFormPreviewUpdate.vue

@@ -272,6 +272,11 @@ import {
 import useRole from "../composables/useRole";
 import useUtils from "../composables/useUtils";
 import { readApiError } from "../utils/subscription-form";
+import {
+  countRealPermissions,
+  securityV2PreTicks,
+  withSecurityMarker,
+} from "../utils/security-catalogue";
 import {
   holdsPermission,
   withoutPermission,
@@ -348,8 +353,8 @@ const totalLabel = computed(() => {
   const held = definedModel.value ?? [];
   if (holdsWildcard.value) return "All";
   return props.catalogueSize > 0
-    ? `${held.length} / ${props.catalogueSize}`
-    : String(held.length);
+    ? `${countRealPermissions(held)} / ${props.catalogueSize}`
+    : String(countRealPermissions(held));
 });
 
 /**
@@ -638,6 +643,23 @@ const edit = defineModel<boolean>("edit", {
   default: false,
 });
 
+/**
+ * Security catalogue only: the Security tree carries the `offline-data`
+ * module. Other apps' editors never match, so they are untouched.
+ */
+const isSecurityCatalogue = computed(
+  () => "offline-data" in (props.permissions as Record<string, unknown>)
+);
+
+// Opening an UNMARKED security role for edit: pre-tick the new boxes the role
+// already effectively has (legacy fallback), so an unrelated save never strips
+// access. Cancel restores the original list.
+watch(edit, (on) => {
+  if (!on || !isSecurityCatalogue.value) return;
+  const add = securityV2PreTicks(definedModel.value ?? []);
+  if (add.length) definedModel.value = [...definedModel.value, ...add];
+});
+
 /**
  * CANCEL THROWS THE DRAFT AWAY.
  *
@@ -688,7 +710,10 @@ const errorMessages = computed(() => {
     return equalValue;
   }
 
-  const requiredValue = requireListRule(definedModel.value);
+  // The marker is not a permission: a list holding only it is still empty.
+  const requiredValue = requireListRule(
+    (definedModel.value ?? []).filter((p) => countRealPermissions([p]) > 0)
+  );
   if (requiredValue) {
     return requiredValue;
   }
@@ -706,7 +731,12 @@ async function submit() {
   disable.value = true;
   message.value = "";
   try {
-    await updatePermissionById(props.id, definedModel.value);
+    await updatePermissionById(
+      props.id,
+      isSecurityCatalogue.value
+        ? withSecurityMarker(definedModel.value)
+        : definedModel.value
+    );
     emit("success");
   } catch (error: any) {
     // `error.response` is undefined on a network or timeout failure, so the old

package/components/RolePermissionMain.vue

@@ -208,6 +208,7 @@
 // Relative import: this layer's `utils/` is not auto-imported into consumers.
 import { roleLabel, safeReturnTo, showSiteField, sitePickerRoleLabel } from "../utils/role";
 import { holdsPermission } from "../utils/permission-spellings";
+import { countRealPermissions } from "../utils/security-catalogue";
 import {
   catalogueForOrg,
   catalogueForOwnerGrant,
@@ -570,7 +571,8 @@ function getPermissionCount(permissions: unknown): string {
   if (held.includes("*")) return "All";
 
   const offered = permissionCatalogueSize.value;
-  return offered > 0 ? `${held.length} / ${offered}` : String(held.length);
+  const count = countRealPermissions(held);
+  return offered > 0 ? `${count} / ${offered}` : String(count);
 }
 
 function updateRolePermissionsInList(