@7365admin1/layer-common 4.97.0 → 4.97.1-staging.501

package/components/InvitationClientForm.vue

@@ -388,9 +388,27 @@ watch(
 const roles = ref<any[]>([])
 const { getRoles } = useRole()
 
+/*
+ * `type` is the ROLE type, not the service the client subscribes to, and the
+ * only caller (`ClientMain.vue` "Invite Client") passes no `app` prop -- so
+ * this sent `type: ""` and the endpoint applied no type filter at all. The
+ * dropdown therefore listed every org-less role of every type, which includes
+ * the platform's OWN staff roles (`type: "admin"` -- the two rows the console's
+ * `/super-admin/role-permissions` screen edits). Offering a Seven365 console
+ * staff role on a CLIENT invitation is the defect.
+ *
+ * A client admin's role is `type: "organization"`, which is what the client
+ * roles screen (`org/[organization]/roles-permissions.vue`) already lists. This
+ * narrows to exactly that. It is a narrowing of this one picker only: no role
+ * changes, no permission changes, and the org-less `organization` roles that
+ * were already being picked are all still offered.
+ *
+ * Keying off the selected service instead would empty the dropdown -- no
+ * org-less role carries a service type -- so `props.app` is not the filter.
+ */
 const { data: roleData, refresh: refreshRoles } = await useLazyAsyncData(
   "roles",
-  () => getRoles({ org: org.value?._id, type: props.app, limit: 50 }),
+  () => getRoles({ org: org.value?._id, type: "organization", limit: 50 }),
   { watch: [() => props.app] }
 )
 

package/components/Nfc/NFCPatrolRouteForm.vue

@@ -49,10 +49,16 @@
             </label>
             <v-text-field
               v-model="form.tolerance"
-              placeholder="60 mins"
+              placeholder="60"
+              suffix="mins"
+              inputmode="numeric"
+              maxlength="2"
               variant="outlined"
               density="comfortable"
-              hide-details
+              :rules="[rules.required, rules.tolerance]"
+              hide-details="auto"
+              @keydown="allowDigitsOnly"
+              @paste="pasteDigitsOnly"
             />
           </v-col>
 
@@ -163,17 +169,11 @@
                 Checkpoints
               </v-col>
               <v-col
-                cols="6"
+                cols="10"
                 class="text-caption screen-hint font-weight-medium pl-4"
               >
                 NFC Tag
               </v-col>
-              <v-col
-                cols="4"
-                class="text-caption screen-hint font-weight-medium text-right"
-              >
-                Travel time
-              </v-col>
             </v-row>
           </v-col>
 
@@ -182,12 +182,27 @@
               v-for="(checkpoint, index) in form.checkPoints"
               :key="index"
               no-gutters
-              class="mb-3 align-center"
+              class="mb-3 align-center checkpoint-row"
+              :class="{
+                'checkpoint-row--dragging': dragIndex === index,
+                'checkpoint-row--over':
+                  dragOverIndex === index && dragIndex !== index,
+              }"
+              @dragover="onCheckpointDragOver($event, index)"
+              @drop="dropCheckpoint($event, index)"
             >
-              <v-col cols="1" class="text-body-2">
+              <v-col cols="1" class="text-body-2 d-flex align-center">
+                <v-icon
+                  icon="mdi-drag"
+                  size="small"
+                  class="drag-handle text-grey mr-1"
+                  draggable="true"
+                  @dragstart="startCheckpointDrag($event, index)"
+                  @dragend="endCheckpointDrag"
+                />
                 {{ index + 1 }}
               </v-col>
-              <v-col cols="7" class="pr-2">
+              <v-col cols="11">
                 <v-select
                   v-model="checkpoint.nfcTag_id"
                   :items="nfcTags"
@@ -199,35 +214,6 @@
                   hide-details
                 />
               </v-col>
-              <v-col cols="4">
-                <v-text-field
-                  v-model.number="checkpoint.travelTime"
-                  placeholder="10"
-                  variant="outlined"
-                  density="compact"
-                  hide-details
-                  suffix="min"
-                  type="number"
-                />
-              </v-col>
-            </v-row>
-          </v-col>
-
-          <!-- Summary -->
-          <v-col cols="12">
-            <v-row no-gutters class="mb-2">
-              <v-col cols="6" class="text-body-2 screen-hint">
-                Tolerance Balance:
-                <span class="font-weight-bold"
-                  >{{ toleranceBalance }} min</span
-                >
-              </v-col>
-              <v-col cols="6" class="text-body-2 screen-hint text-right">
-                Total Travel Time:
-                <span class="font-weight-bold"
-                  >{{ totalTravelTime }} min</span
-                >
-              </v-col>
             </v-row>
           </v-col>
         </v-row>
@@ -333,7 +319,6 @@ const loading = ref(false);
 
 interface Checkpoint {
   nfcTag_id: string;
-  travelTime: number;
 }
 
 const form = ref({
@@ -359,10 +344,30 @@ const dayOptions = [
   { title: "Sunday", value: 0 },
 ];
 
+const MAX_TOLERANCE_MINUTES = 60;
+
 const rules = {
   required: (v: any) => !!v || "This field is required",
+  tolerance: (v: any) => {
+    if (!/^\d+$/.test(String(v ?? ""))) return "Numbers only";
+    if (Number(v) > MAX_TOLERANCE_MINUTES)
+      return `Maximum is ${MAX_TOLERANCE_MINUTES} minutes (1 hour)`;
+    return true;
+  },
 };
 
+// Tolerance is minutes: keep letters and symbols out as they are typed or
+// pasted. Keys like Backspace, Tab and the arrows have longer names and pass.
+function allowDigitsOnly(event: KeyboardEvent) {
+  if (event.ctrlKey || event.metaKey || event.altKey) return;
+  if (event.key.length === 1 && !/\d/.test(event.key)) event.preventDefault();
+}
+
+function pasteDigitsOnly(event: ClipboardEvent) {
+  const text = event.clipboardData?.getData("text") ?? "";
+  if (/\D/.test(text)) event.preventDefault();
+}
+
 // Fetch NFC Tags
 const nfcTags = ref<Array<any>>([]);
 const { getAll: getAllNFCTags } = useNFCPatrolTag();
@@ -385,7 +390,6 @@ function updateCheckpointsCount(count: number) {
     for (let i = currentLength; i < count; i++) {
       form.value.checkPoints.push({
         nfcTag_id: "",
-        travelTime: 10,
       });
     }
   } else if (count < currentLength) {
@@ -395,6 +399,43 @@ function updateCheckpointsCount(count: number) {
 
 }
 
+// Drag a checkpoint onto another to swap their positions
+const dragIndex = ref<number | null>(null);
+const dragOverIndex = ref<number | null>(null);
+
+function startCheckpointDrag(event: DragEvent, index: number) {
+  dragIndex.value = index;
+  if (!event.dataTransfer) return;
+  event.dataTransfer.effectAllowed = "move";
+  // Firefox needs data set to start a drag; a custom type keeps inputs from accepting it on drop
+  event.dataTransfer.setData("application/x-nfc-checkpoint", String(index));
+  const row = (event.target as HTMLElement).closest(".checkpoint-row");
+  if (row) event.dataTransfer.setDragImage(row, 0, 0);
+}
+
+function onCheckpointDragOver(event: DragEvent, index: number) {
+  if (dragIndex.value === null) return;
+  event.preventDefault();
+  dragOverIndex.value = index;
+}
+
+function dropCheckpoint(event: DragEvent, index: number) {
+  if (dragIndex.value === null) return;
+  event.preventDefault();
+  const from = dragIndex.value;
+  if (from !== index) {
+    const list = [...form.value.checkPoints];
+    [list[from], list[index]] = [list[index], list[from]];
+    form.value.checkPoints = list;
+  }
+  endCheckpointDrag();
+}
+
+function endCheckpointDrag() {
+  dragIndex.value = null;
+  dragOverIndex.value = null;
+}
+
 
 const hasDuplicateStartTimes = computed(() => {
   const uniqueTimes = new Set(form.value.startTimes);
@@ -468,20 +509,6 @@ function removeStartTime(index: number) {
   startTimeKeys.value.splice(index, 1);
 }
 
-// Computed values
-const totalTravelTime = computed(() => {
-  const total = form.value.checkPoints.reduce((sum, checkpoint) => {
-    return sum + (checkpoint.travelTime || 0);
-  }, 0);
-  return total;
-});
-
-const toleranceBalance = computed(() => {
-  const tolerance = parseInt(form.value.tolerance) || 0;
-  const balance = tolerance - totalTravelTime.value;
-  return balance;
-});
-
 // Initialize form
 onMounted(() => {
   fetchNFCTags();
@@ -516,7 +543,6 @@ async function initializeEditForm(newRoute: any) {
     Array.isArray(newRoute.checkPoints) && newRoute.checkPoints.length > 0
       ? newRoute.checkPoints.map((cp: any) => ({
           nfcTag_id: cp.nfcTag_id || "",
-          travelTime: cp.travelTime || 10
         }))
       : [];
 
@@ -533,6 +559,11 @@ async function initializeEditForm(newRoute: any) {
   startTimeKeys.value = startTimes.map(() => Date.now() + Math.random());
 
   formInitialized.value = true;
+
+  // A route saved before the 60-minute limit can be over it: say why Submit
+  // is disabled instead of leaving it greyed out with no message.
+  await nextTick();
+  formRef.value?.validate();
 }
 
 watch(
@@ -592,3 +623,23 @@ async function submit() {
   }
 }
 </script>
+
+<style scoped>
+.drag-handle {
+  cursor: grab;
+}
+
+.checkpoint-row {
+  border-radius: 8px;
+  transition: background-color 0.15s;
+}
+
+.checkpoint-row--dragging {
+  opacity: 0.5;
+}
+
+.checkpoint-row--over {
+  background-color: rgba(var(--v-theme-primary), 0.08);
+  outline: 1px dashed rgb(var(--v-theme-primary));
+}
+</style>

package/components/Nfc/NFCPatrolRouteMain.vue

@@ -50,8 +50,7 @@
 
         <template #item.tolerance="{ item }">
           <div class="text-center">
-            <div>{{ item.tolerance ? `${item.tolerance} mins` : "--" }}</div>
-            <div class="text-grey">{{ item.totalTravelTime ? `${item.totalTravelTime} mins` : "--" }}</div>
+            {{ item.tolerance ? `${item.tolerance} mins` : "--" }}
           </div>
         </template>
 
@@ -141,17 +140,6 @@
               </span>
             </v-col>
 
-            <v-col
-              cols="12"
-              class="mb-2"
-              v-if="selectedRoute.totalTravelTime"
-            >
-              Total Travel Time:
-              <span class="font-weight-bold">
-                {{ selectedRoute.totalTravelTime }} mins
-              </span>
-            </v-col>
-
             <v-col cols="12" class="mb-2" v-if="selectedRoute.repeatDays">
               Repeat Every:
               <span class="font-weight-bold">
@@ -178,7 +166,7 @@
               Checkpoints:
               <div class="font-weight-bold">
                 <div v-for="(cp, idx) in selectedRoute.checkpoints" :key="idx" class="my-1">
-                  {{ idx + 1 }}. NFC Tag ID: {{ cp.nfcTagId }} - Travel Time: {{ cp.travelTime }} min
+                  {{ idx + 1 }}. NFC Tag ID: {{ cp.nfcTagId }}
                 </div>
               </div>
             </v-col>
@@ -335,7 +323,7 @@ const props = defineProps({
       { title: "Route Name", value: "routeName", align: "start" },
       { title: "Checkpoints", value: "numberOfCheckpoints", align: "center" },
       { 
-        title: "Tolerance (mins)\nTotal Travel Time (mins)", 
+        title: "Tolerance (mins)",
         value: "tolerance", 
         align: "center",
         sortable: false
@@ -395,7 +383,6 @@ watchEffect(() => {
       name: item.name,
       checkPointNumber: item.checkPointNumber,
       tolerance: item.tolerance,
-      totalTravelTime: item.totalTravelTime,
       days: item.days,
       startTimes: item.startTimes || [],
       checkPoints: item.checkPoints || [],
@@ -412,7 +399,6 @@ watchEffect(() => {
       }).join(', ') || '--',
       checkpoints: item.checkPoints?.map((cp: any) => ({
         nfcTagId: cp.nfcTag_id,
-        travelTime: cp.travelTime
       })) || []
     })) || [];
     
@@ -516,7 +502,6 @@ const selectedRoute = ref<any>({
   checkPointNumber: 5,
   numberOfCheckpoints: 5,
   tolerance: undefined,
-  totalTravelTime: undefined,
   days: [],
   repeatDays: "",
   startTimes: [],

package/components/Nfc/PatrolReport/PatrolActivityTable.vue

@@ -25,10 +25,6 @@
             <th>Security Personnel</th>
             <th>Signature</th>
             <th>Start - End Time</th>
-            <th>
-              Travel time<br />
-              <span class="text-caption text-medium-emphasis">Actual/Expected</span>
-            </th>
             <th>Status</th>
           </tr>
         </thead>
@@ -58,10 +54,6 @@
               <v-icon size="small" class="mr-1">mdi-clock-outline</v-icon>
               {{ activity.endTime }}
             </td>
-            <td>
-              <v-icon size="small" class="mr-1">mdi-clock-outline</v-icon>
-              {{ activity.actualTime }} / {{ activity.expectedTime }}
-            </td>
             <td>
               <v-chip :color="statusColor(activity.status)" size="small" variant="flat">
                 {{ activity.status }}

package/components/Nfc/PatrolReport/PatrolRouteSummary.vue

@@ -28,7 +28,7 @@
             <th>Time</th>
             <th>Start</th>
             <th>End</th>
-            <th>Total travel time</th>
+            <th>Total time</th>
           </tr>
         </thead>
         <tbody>

package/components/ServiceProviderMain.vue

@@ -36,6 +36,14 @@
         >
           Add
         </AppButton>
+        <AppButton
+          v-if="canInviteServiceProvider && siteId"
+          variant="ghost"
+          data-test="sp-provider-changes"
+          @click="providerChange?.openHistory()"
+        >
+          Provider changes
+        </AppButton>
         <AppButton
           v-if="canInviteServiceProvider"
           @click="
@@ -202,6 +210,17 @@
               the engagement itself, not a stored service-providers record, so
               the In-Active move (which acts on that record) does not apply.
             -->
+            <v-menu v-else-if="item.source === 'engagement' && canChangeProvider(item)" location="bottom end">
+              <template #activator="{ props: menuProps }">
+                <v-btn v-bind="menuProps" icon variant="text" density="comfortable" aria-label="Provider actions">
+                  <v-icon>mdi-dots-vertical</v-icon>
+                </v-btn>
+              </template>
+              <v-list density="compact" min-width="200">
+                <v-list-item title="View provider" @click="openProvider(item)" />
+                <v-list-item title="Change or end provider" data-test="sp-change-provider" @click="openProviderChange(item)" />
+              </v-list>
+            </v-menu>
             <v-btn
               v-else-if="item.source === 'engagement'"
               icon
@@ -230,6 +249,12 @@
                   title="View Members"
                   @click="openView(item)"
                 />
+                <v-list-item
+                  v-if="canChangeProvider(item)"
+                  title="Change or end provider"
+                  data-test="sp-change-provider"
+                  @click="openProviderChange(item)"
+                />
                 <v-list-item
                   :title="rowActionLabel(item)"
                   :class="{
@@ -720,6 +745,15 @@
   </v-dialog>
 
   <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
+
+  <SiteProviderChange
+    v-if="siteId"
+    ref="providerChange"
+    :site-id="siteId"
+    :site-name="siteName || site?.name || ''"
+    :owner-org-id="String(site?.orgId || '')"
+    @changed="loadList()"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -998,6 +1032,20 @@ const { data: site } = await useLazyAsyncData(
 
 const searchText = ref("");
 
+// Change or end a provider at this site (owner 2026-10-05). The server decides
+// who may; the menu only offers it to people who may invite providers, on a
+// live provider row that names its company.
+const providerChange = ref<{
+  openChange: (row: { from: string; fromName: string }) => void;
+  openHistory: () => void;
+} | null>(null);
+function canChangeProvider(item: TableRow) {
+  return Boolean(canInviteServiceProvider.value && props.siteId && listTab.value === "active" && item.serviceProviderOrgId);
+}
+function openProviderChange(item: TableRow) {
+  providerChange.value?.openChange({ from: item.serviceProviderOrgId, fromName: item.companyName });
+}
+
 const createDialog = ref(false);
 const createInviteDialog = ref(false);
 // const loadingInviteRoles = ref(false);