@7365admin1/layer-common 4.97.1-staging.586 → 4.97.1-staging.588

package/components/Nfc/NFCPatrolRouteForm.vue

@@ -33,17 +33,21 @@
             <label class="text-caption screen-hint mb-1 d-block">
               Checkpoints <span class="text-error">*</span>
             </label>
-            <v-select
-              v-model="form.checkPointNumber"
-              :items="checkpointOptions"
+            <!-- Any number of checkpoints (it was a 1-10 list). -->
+            <v-text-field
+              :model-value="form.checkPointNumber"
+              type="number"
+              min="1"
+              inputmode="numeric"
               variant="outlined"
               density="comfortable"
-              hide-details
-              @update:model-value="updateCheckpointsCount"
+              :rules="[rules.checkpointCount]"
+              hide-details="auto"
+              @update:model-value="onCheckpointCountInput"
             />
           </v-col>
 
-          <v-col cols="12" md="4" class="mb-4 px-md-1">
+          <v-col v-if="form.timed" cols="12" md="4" class="mb-4 px-md-1">
             <label class="text-caption screen-hint mb-1 d-block">
               Tolerance (mins) <span class="text-error">*</span>
             </label>
@@ -74,11 +78,46 @@
               density="comfortable"
               hide-details
               chips
+            >
+              <template #prepend-item>
+                <v-list-item
+                  :title="allDaysSelected ? 'Unselect all' : 'Select all'"
+                  @click="toggleAllDays"
+                >
+                  <template #prepend>
+                    <v-checkbox-btn
+                      :model-value="allDaysSelected"
+                      :indeterminate="someDaysSelected"
+                      @click.stop="toggleAllDays"
+                    />
+                  </template>
+                </v-list-item>
+                <v-divider class="mt-1" />
+              </template>
+            </v-select>
+          </v-col>
+
+          <!-- Route timing. Off: no start times or tolerance, and the route can be
+               patrolled at any time of the day. -->
+          <v-col cols="12" class="mb-4">
+            <v-switch
+              v-model="form.timed"
+              color="primary"
+              inset
+              hide-details
+              :label="form.timed ? 'Route timing: On' : 'Route timing: Off'"
             />
+            <div class="text-caption screen-hint">
+              {{
+                form.timed
+                  ? "Patrols start at the route's start times, within the tolerance."
+                  : "No time window: this route can be patrolled at any time."
+              }}
+            </div>
           </v-col>
 
           <!-- Start Times -->
-          <v-col cols="12" class="mb-4">
+          <v-col v-if="form.timed" cols="12" class="mb-4">
             <v-card variant="outlined" class="pa-4" rounded="lg">
               <div class="d-flex align-center justify-space-between mb-3">
                 <span class="text-h6 font-weight-medium">Start Times</span>
@@ -264,6 +303,8 @@
 <script setup lang="ts">
 import useNFCPatrolRoute from "../../composables/useNFCPatrolRoute";
 import useNFCPatrolTag from "../../composables/useNFCPatrolTag";
+import { collectAllPages } from "../../utils/nfc-patrol-report";
+import { allDaysToggled, checkpointCountError } from "../../utils/nfc-patrol-schedule";
 
 const props = defineProps({
   title: {
@@ -329,11 +370,12 @@ const form = ref({
   startTimes: ["08:00"] as string[],
   endTimes: ["09:00"] as string[],
   checkPoints: [] as Checkpoint[],
+  // Route timing; false = no time window (patrol at any time).
+  timed: true,
 });
 
 const startTimeKeys = ref<number[]>([Date.now()]);
 
-const checkpointOptions = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 const dayOptions = [
   { title: "Monday", value: 1 },
   { title: "Tuesday", value: 2 },
@@ -344,10 +386,29 @@ const dayOptions = [
   { title: "Sunday", value: 0 },
 ];
 
+const allDaysSelected = computed(() => form.value.days.length === dayOptions.length);
+const someDaysSelected = computed(
+  () => form.value.days.length > 0 && !allDaysSelected.value,
+);
+
+function toggleAllDays() {
+  form.value.days = allDaysToggled(
+    form.value.days,
+    dayOptions.map((day) => day.value),
+  );
+}
+
+function onCheckpointCountInput(value: string | number) {
+  const count = Number(value);
+  form.value.checkPointNumber = count;
+  if (Number.isInteger(count) && count >= 1) updateCheckpointsCount(count);
+}
+
 const MAX_TOLERANCE_MINUTES = 60;
 
 const rules = {
   required: (v: any) => !!v || "This field is required",
+  checkpointCount: (v: any) => checkpointCountError(v) ?? true,
   tolerance: (v: any) => {
     if (!/^\d+$/.test(String(v ?? ""))) return "Numbers only";
     if (Number(v) > MAX_TOLERANCE_MINUTES)
@@ -374,8 +435,11 @@ const { getAll: getAllNFCTags } = useNFCPatrolTag();
 
 async function fetchNFCTags() {
   try {
-    const response = await getAllNFCTags({ site: props.site, limit: 100 });
-    nfcTags.value = response.items || [];
+    // Every page: a site can have any number of tags (it read the first 100).
+    nfcTags.value = await collectAllPages(
+      (page) => getAllNFCTags({ site: props.site, page, limit: 100 }) as any,
+      1000,
+    );
   } catch (error) {
     console.error("Error fetching NFC tags:", error);
   }
@@ -554,6 +618,7 @@ async function initializeEditForm(newRoute: any) {
   form.value.startTimes = startTimes;
   form.value.endTimes = endTimes;
   form.value.checkPoints = existingCheckPoints;
+  form.value.timed = newRoute.timed !== false;
 
   // Reinitialize keys for each start time
   startTimeKeys.value = startTimes.map(() => Date.now() + Math.random());
@@ -598,14 +663,17 @@ async function submit() {
       ),
     ];
 
+    // Timing off keeps the tolerance as it was (the server requires one) but
+    // sends no start times: the route has no schedule.
     const payload = {
       name: form.value.name,
-      checkPointNumber: form.value.checkPointNumber,
-      tolerance: form.value.tolerance,
+      checkPointNumber: Number(form.value.checkPointNumber),
+      tolerance: Number(form.value.tolerance) || 0,
       days: form.value.days,
-      startTimes: uniqueStartTimes,
+      startTimes: form.value.timed ? uniqueStartTimes : [],
       checkPoints: form.value.checkPoints,
       site: props.site,
+      timed: form.value.timed,
     };
 
     if (props.mode === "create") {

package/components/Nfc/NFCPatrolRouteMain.vue

@@ -50,14 +50,15 @@
 
         <template #item.tolerance="{ item }">
           <div class="text-center">
-            {{ item.tolerance ? `${item.tolerance} mins` : "--" }}
+            {{ item.timed && item.tolerance ? `${item.tolerance} mins` : "--" }}
           </div>
         </template>
 
         <!-- Earliest first, one unbreakable pill per window; past three the
              rest fold into "+N more" so a busy route keeps a normal row. -->
-        <template #item.schedules="{ value }">
-          <NFCRouteScheduleTimes :windows="value || []" :limit="3" />
+        <template #item.schedules="{ item, value }">
+          <span v-if="!item.timed">Anytime (timing off)</span>
+          <NFCRouteScheduleTimes v-else :windows="value || []" :limit="3" />
         </template>
 
         <template #item.repeatDays="{ value }">
@@ -132,7 +133,12 @@
               </span>
             </v-col>
 
-            <v-col cols="12" class="mb-2" v-if="selectedRoute.tolerance">
+            <v-col cols="12" class="mb-2" v-if="selectedRoute.timed === false">
+              Security Check Schedule:
+              <span class="font-weight-bold">Anytime (timing off)</span>
+            </v-col>
+
+            <v-col cols="12" class="mb-2" v-if="selectedRoute.timed !== false && selectedRoute.tolerance">
               Tolerance:
               <span class="font-weight-bold">
                 {{ selectedRoute.tolerance }} mins
@@ -149,7 +155,7 @@
             <v-col
               cols="12"
               class="mb-2"
-              v-if="selectedRoute.schedules && selectedRoute.schedules.length"
+              v-if="selectedRoute.timed !== false && selectedRoute.schedules && selectedRoute.schedules.length"
             >
               <div class="mb-2">
                 Security Check Schedule
@@ -376,6 +382,7 @@ watchEffect(() => {
       days: item.days,
       startTimes: item.startTimes || [],
       checkPoints: item.checkPoints || [],
+      timed: item.timed !== false,
       // Display fields for the table
       routeName: item.name,
       numberOfCheckpoints: item.checkPointNumber,
@@ -392,6 +399,11 @@ watchEffect(() => {
   }
 });
 
+// A new search starts on page 1 (from page 2 or later it could show nothing).
+watch(searchInput, () => {
+  page.value = 1;
+});
+
 const dialogAdd = ref(false);
 const dialogEdit = ref(false);
 const dialogPreview = ref(false);

package/components/Nfc/PatrolReport/SummaryReportTable.vue

@@ -108,6 +108,7 @@ function skipped(row: NFCPatrolReportSummaryRow) {
 }
 
 function statusClass(status: NFCPatrolReportSummaryStatus) {
+  if (status === "In progress") return "text-warning";
   return status === "Completed" ? "text-success" : "text-error";
 }
 </script>