@7365admin1/layer-common 3.1.4-staging.50 → 3.1.4-staging.52

package/components/HidServiceSettingsPanel.vue

@@ -12,7 +12,8 @@
     <v-col cols="12" md="4" class="d-flex justify-md-end">
       <v-switch
         v-model="hidEnabled"
-        color="primary"
+        class="hid-service-switch"
+        color="success"
         hide-details
         inset
         :loading="isSaving"
@@ -148,3 +149,21 @@ 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,6 +381,7 @@ 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));
@@ -882,6 +883,7 @@ 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/QrTemplate/CreditCardLandscape.vue

@@ -33,7 +33,7 @@
 
                 <qrcode-vue
                   v-if="templateQrCode.CCFrontQREnabled"
-                  :value="`${prefix}0${+printRangeStart + +card.number - 1}`"
+                  :value="getPassNumberValue(card.number)"
                   :size="templateQrCode.CCFrontQRCodeSize"
                   level="H"
                   :style="{
@@ -53,9 +53,7 @@
                   }"
                   class="position-absolute text-center"
                 >
-                  Pass Number: {{ prefix }}0{{
-                    +printRangeStart + +card.number - 1
-                  }}
+                  Pass Number: {{ getPassNumberValue(card.number) }}
                 </div>
               </v-card>
 
@@ -74,7 +72,7 @@
 
                 <qrcode-vue
                   v-if="templateQrCode.CCBackQREnabled"
-                  :value="`${prefix}0${+printRangeStart + +card.number - 1}`"
+                  :value="getPassNumberValue(card.number)"
                   :size="templateQrCode.CCBackQRCodeSize"
                   level="H"
                   :style="{
@@ -93,9 +91,7 @@
                   }"
                   class="position-absolute text-center"
                 >
-                  Pass Number: {{ prefix }}0{{
-                    +printRangeStart + +card.number - 1
-                  }}
+                  Pass Number: {{ getPassNumberValue(card.number) }}
                 </div>
               </v-card>
             </v-col>
@@ -113,11 +109,22 @@ const props = defineProps({
   paginatedCardData: Array,
   templateQrCode: Object,
   prefix: String,
-  printRangeStart: Number,
-});
-onMounted(() => {
-  console.log("templateQrCode 11", props.templateQrCode.CCOrientation);
+  printRangeStart: [String, Number],
 });
+
+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>