@7365admin1/layer-common 3.1.4-staging.53 → 3.2.0

package/components/HidServiceSettingsPanel.vue

@@ -12,8 +12,7 @@
     <v-col cols="12" md="4" class="d-flex justify-md-end">
       <v-switch
         v-model="hidEnabled"
-        class="hid-service-switch"
-        color="success"
+        color="primary"
         hide-details
         inset
         :loading="isSaving"
@@ -149,21 +148,3 @@ function goToHidReaders() {
   });
 }
 </script>
-
-<style scoped>
-.hid-service-switch :deep(.v-switch__track) {
-  background-color: #8b9297;
-  opacity: 1;
-}
-
-.hid-service-switch :deep(.v-selection-control--dirty .v-switch__track) {
-  background-color: #2eaf55 !important;
-  color: #2eaf55 !important;
-  opacity: 1;
-}
-
-.hid-service-switch :deep(.v-switch__thumb) {
-  background-color: #fff !important;
-  color: #fff !important;
-}
-</style>

package/components/HidUserEnrollment.vue

@@ -381,7 +381,6 @@ async function loadUsers() {
     const identities = identityResponse?.items ?? identityResponse?.data?.items ?? identityResponse?.data?.identities ?? [];
     const adminRoleIds = getAdministratorRoleUserIds(roleResponse);
     const readerUsers = normalizeHidUsers(readerResponse).filter((user) => {
-      if (Number(user.userTypeId) === 1) return false;
       if (!isAdministratorIdentity()) return true;
       const hidUserId = toHidNumericId(user.hidUserId);
       return Boolean(hidUserId && adminRoleIds.has(hidUserId));
@@ -883,7 +882,6 @@ function normalizeHidUsers(response: Record<string, any>) {
         hidUserId: String(user.id || ""),
         rawHidUserId: user.id,
         registration: user.registration,
-        userTypeId: user.user_type_id,
         cardNo: user.card_value || user.cardNo || "",
         name: user.name,
         metadata: {

package/components/Nfc/NFCPatrolRouteMain.vue

@@ -4,7 +4,6 @@
       <v-row no-gutters class="mb-4" align="center">
         <v-col cols="12" md="6">
           <v-btn
-            v-if="props.canCreateNfcPatrol"
             rounded="pill"
             variant="outlined"
   
@@ -83,12 +82,7 @@
     </v-col>
 
     <!-- Add Dialog -->
-    <v-dialog
-      v-if="props.canCreateNfcPatrol"
-      v-model="dialogAdd"
-      persistent
-      max-width="900"
-    >
+    <v-dialog v-model="dialogAdd" persistent max-width="900">
       <NFCPatrolRouteForm
         title="Add Route"
         :site="props.site"
@@ -100,12 +94,7 @@
     </v-dialog>
 
     <!-- Edit Dialog -->
-    <v-dialog
-      v-if="props.canUpdateNfcPatrol"
-      v-model="dialogEdit"
-      persistent
-      max-width="900"
-    >
+    <v-dialog v-model="dialogEdit" persistent max-width="900">
       <NFCPatrolRouteForm
         title="Edit Route"
         :site="props.site"
@@ -201,10 +190,7 @@
 
         <v-toolbar class="pa-0" density="compact">
           <v-row no-gutters>
-            <v-col
-              :cols="props.canUpdateNfcPatrol || props.canDeleteNfcPatrol ? 6 : 12"
-              class="pa-0"
-            >
+            <v-col cols="6" class="pa-0">
               <v-btn
                 block
                 variant="text"
@@ -217,11 +203,7 @@
               </v-btn>
             </v-col>
 
-            <v-col
-              v-if="props.canUpdateNfcPatrol || props.canDeleteNfcPatrol"
-              cols="6"
-              class="pa-0"
-            >
+            <v-col cols="6" class="pa-0">
               <v-menu>
                 <template #activator="{ props }">
                   <v-btn
@@ -238,17 +220,13 @@
                 </template>
 
                 <v-list class="pa-0">
-                  <v-list-item v-if="props.canUpdateNfcPatrol" @click="openDialogEdit()">
+                  <v-list-item @click="openDialogEdit()">
                     <v-list-item-title class="text-subtitle-2">
                       Edit Route
                     </v-list-item-title>
                   </v-list-item>
 
-                  <v-list-item
-                    v-if="props.canDeleteNfcPatrol"
-                    @click="openDialogDelete()"
-                    class="text-red"
-                  >
+                  <v-list-item @click="openDialogDelete()" class="text-red">
                     <v-list-item-title class="text-subtitle-2">
                       Delete Route
                     </v-list-item-title>
@@ -262,12 +240,7 @@
     </v-dialog>
 
     <!-- Delete Dialog -->
-    <v-dialog
-      v-if="props.canDeleteNfcPatrol"
-      v-model="dialogDelete"
-      persistent
-      width="540"
-    >
+    <v-dialog v-model="dialogDelete" persistent width="540">
       <v-card width="100%">
         <v-card-text
           style="max-height: 100vh; overflow-y: auto"
@@ -331,18 +304,6 @@ const props = defineProps({
     type: String,
     required: true,
   },
-  canCreateNfcPatrol: {
-    type: Boolean,
-    default: false,
-  },
-  canUpdateNfcPatrol: {
-    type: Boolean,
-    default: false,
-  },
-  canDeleteNfcPatrol: {
-    type: Boolean,
-    default: false,
-  },
   headers: {
     type: Array as PropType<Array<any>>,
     default: () => [
@@ -445,8 +406,6 @@ const messageSnackbar = ref(false);
 const messageColor = ref("");
 
 async function openDialogEdit() {
-  if (!props.canUpdateNfcPatrol) return;
-
   try {
     // Fetch the full route details from the API
     const response = await getRouteById(selectedRoute.value._id);
@@ -472,8 +431,6 @@ async function openDialogEdit() {
 }
 
 function openDialogDelete() {
-  if (!props.canDeleteNfcPatrol) return;
-
   dialogDelete.value = true;
 
   if (dialogPreview.value) dialogPreview.value = false;
@@ -545,8 +502,6 @@ function handleRowClick(_: any, data: any) {
 }
 
 async function submitDelete() {
-  if (!props.canDeleteNfcPatrol) return;
-
   try {
     await deleteRouteById(selectedRoute.value._id ?? "");
     await getRoutesRefresh();

package/components/PlanActionsMenu.vue

@@ -0,0 +1,33 @@
+<template>
+  <v-menu location="bottom end">
+    <template #activator="{ props }">
+      <v-btn
+        v-bind="props"
+        icon="mdi-dots-vertical"
+        variant="text"
+        density="comfortable"
+      />
+    </template>
+
+    <v-list density="compact">
+      <v-list-item
+        prepend-icon="mdi-pencil-outline"
+        title="Edit plan"
+        @click="$emit('edit')"
+      />
+
+      <v-list-item
+        prepend-icon="mdi-close-circle-outline"
+        title="Deactivate"
+        @click="$emit('deactivate')"
+      />
+    </v-list>
+  </v-menu>
+</template>
+
+<script setup lang="ts">
+defineEmits<{
+  edit: []
+  deactivate: []
+}>()
+</script>

package/components/PlanStatusBadge.vue

@@ -0,0 +1,26 @@
+<template>
+  <v-chip
+    :color="isActive ? 'success' : 'grey'"
+    size="small"
+    variant="tonal"
+    class="font-weight-medium"
+  >
+    {{ isActive ? 'Active' : 'Deactive' }}
+  </v-chip>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+const props = defineProps<{
+  status: string | boolean
+}>()
+
+const isActive = computed(() => {
+  if (typeof props.status === 'boolean') {
+    return props.status
+  }
+
+  return props.status.toLowerCase() === 'active'
+})
+</script>

package/components/QrTemplate/CreditCardLandscape.vue

@@ -33,7 +33,7 @@
 
                 <qrcode-vue
                   v-if="templateQrCode.CCFrontQREnabled"
-                  :value="getPassNumberValue(card.number)"
+                  :value="`${prefix}0${+printRangeStart + +card.number - 1}`"
                   :size="templateQrCode.CCFrontQRCodeSize"
                   level="H"
                   :style="{
@@ -53,7 +53,9 @@
                   }"
                   class="position-absolute text-center"
                 >
-                  Pass Number: {{ getPassNumberValue(card.number) }}
+                  Pass Number: {{ prefix }}0{{
+                    +printRangeStart + +card.number - 1
+                  }}
                 </div>
               </v-card>
 
@@ -72,7 +74,7 @@
 
                 <qrcode-vue
                   v-if="templateQrCode.CCBackQREnabled"
-                  :value="getPassNumberValue(card.number)"
+                  :value="`${prefix}0${+printRangeStart + +card.number - 1}`"
                   :size="templateQrCode.CCBackQRCodeSize"
                   level="H"
                   :style="{
@@ -91,7 +93,9 @@
                   }"
                   class="position-absolute text-center"
                 >
-                  Pass Number: {{ getPassNumberValue(card.number) }}
+                  Pass Number: {{ prefix }}0{{
+                    +printRangeStart + +card.number - 1
+                  }}
                 </div>
               </v-card>
             </v-col>
@@ -109,22 +113,11 @@ const props = defineProps({
   paginatedCardData: Array,
   templateQrCode: Object,
   prefix: String,
-  printRangeStart: [String, Number],
+  printRangeStart: Number,
+});
+onMounted(() => {
+  console.log("templateQrCode 11", props.templateQrCode.CCOrientation);
 });
-
-const getPassNumberValue = (position) => {
-  const rawStartValue = `${props.printRangeStart ?? ""}`.trim();
-  const startMatch = rawStartValue.match(/(\d+)$/);
-  const startValue = startMatch?.[1] ?? "0";
-  const startNumber = Number(startValue);
-  const sequenceNumber = startNumber + Number(position) - 1;
-  const cleanPrefix = `${props.prefix ?? ""}`.replace(/\d+$/, "");
-  const width = startValue.length;
-  const formattedSequence =
-    width > 0 ? `${sequenceNumber}`.padStart(width, "0") : `${sequenceNumber}`;
-
-  return `${cleanPrefix}${formattedSequence}`;
-};
 </script>
 
 <style scoped>