@7365admin1/layer-common 1.10.8 → 1.10.9

package/components/EntryPassInformation.vue

@@ -46,12 +46,19 @@
           No printer is configured in the settings. QR Pass may not print.
         </v-alert>
         <template v-else>
-          <InputLabel title="Quantity" class="mt-3" />
+          <div class="d-flex align-center justify-space-between mt-3">
+            <InputLabel title="Quantity" />
+            <span v-if="availableCount !== null" class="text-caption text-grey">
+              {{ availableCount }} available
+            </span>
+            <v-progress-circular v-else-if="cardsLoading" size="14" width="2" indeterminate color="grey" />
+          </div>
           <v-text-field
             v-model.number="quantity"
             type="number"
             density="comfortable"
             :min="1"
+            :max="availableCount ?? undefined"
             hide-details
           />
         </template>
@@ -65,7 +72,7 @@
             v-model="selectedCards"
             :items="cardItems"
             :loading="cardsLoading"
-            item-title="cardNumber"
+            item-title="cardNo"
             item-value="_id"
             density="comfortable"
             multiple
@@ -78,7 +85,7 @@
             <template #item="{ props: itemProps, item }">
               <v-list-item v-bind="itemProps">
                 <template #subtitle>
-                  <span class="text-caption text-grey">{{ item.raw.cardNumber }}</span>
+                  <span class="text-caption text-grey">{{ item.raw.cardNo }}</span>
                 </template>
               </v-list-item>
             </template>
@@ -207,11 +214,19 @@ const props = defineProps({
     type: Array as PropType<any[]>,
     default: () => [],
   },
+  siteId: {
+    type: String as PropType<string | null>,
+    default: null,
+  },
+  unitId: {
+    type: String as PropType<string | null>,
+    default: null,
+  },
 });
 
 const emit = defineEmits(["update:modelValue", "update:quantity", "update:cards"]);
 
-const { getAll: getAllCards } = useCard();
+const { getAvailableContractorCards } = useAccessManagement();
 
 const nfcEnabled = computed(() => props.settings?.data?.settings?.nfcPass ?? false);
 const printer = computed(() => props.settings?.data?.settings?.printer ?? { vendorId: null, productId: null });
@@ -238,12 +253,19 @@ const selectedCards = computed({
 // ─── Card fetching ────────────────────────────────────────────────
 const cardItems = ref<any[]>([]);
 const cardsLoading = ref(false);
+const availableCount = ref<number | null>(null);
 
-async function fetchCards() {
+async function fetchCards(type: "NFC" | "QRCODE" = "NFC") {
+  if (!props.siteId || !props.unitId) return;
   cardsLoading.value = true;
   try {
-    const res = await getAllCards({ assignFilter: "available", limit: 100 });
-    cardItems.value = res?.data ?? [];
+    const res = await getAvailableContractorCards({
+      type,
+      siteId: props.siteId,
+      unitId: props.unitId,
+    });
+    cardItems.value = res?.data?.[0]?.items ?? [];
+    availableCount.value = (res?.data?.[2] as any)?.count ?? cardItems.value.length;
   } finally {
     cardsLoading.value = false;
   }
@@ -268,7 +290,7 @@ const toggleBarcodeScanning = () => {
 };
 
 const validateScannedBarcode = (scannedCode: string) => {
-  const card = cardItems.value.find((c) => c.cardNumber === scannedCode);
+  const card = cardItems.value.find((c) => c.cardNo === scannedCode);
   if (card) addCard(card);
   barcodeBuffer.value = "";
 };
@@ -360,7 +382,7 @@ const scanFrame = async () => {
   try {
     const barcodes = await barcodeDetector.detect(canvas);
     for (const barcode of barcodes) {
-      const card = cardItems.value.find((c) => c.cardNumber === barcode.rawValue);
+      const card = cardItems.value.find((c) => c.cardNo === barcode.rawValue);
       if (card) {
         addCard(card);
         closeCameraDialog();
@@ -390,9 +412,13 @@ watch(
   () => passType.value,
   (val) => {
     if (val === "NFC") {
-      fetchCards();
+      fetchCards("NFC");
       window.addEventListener("keydown", handleBarcodeInput);
+    } else if (val === "QR") {
+      availableCount.value = null;
+      fetchCards("QRCODE");
     } else {
+      availableCount.value = null;
       isBarcodeScanningActive.value = false;
       barcodeBuffer.value = "";
       if (barcodeTimeout.value) clearTimeout(barcodeTimeout.value);

package/components/EquipmentItemMain.vue

@@ -283,7 +283,9 @@
                               >mdi-delete-outline</v-icon
                             >
                           </template>
-                          <v-list-item-title>Remove Equipment</v-list-item-title>
+                          <v-list-item-title
+                            >Remove Equipment</v-list-item-title
+                          >
                         </v-list-item>
                       </v-list>
                     </v-menu>
@@ -440,7 +442,8 @@
 <script setup lang="ts">
 import useEquipmentItem from "../composables/useEquipmentItem";
 import { useEquipmentItemPermission } from "../composables/useEquipmentItemPermission";
-import useSupply from "../composables/useSupply";
+import useEquipmentManagement from "../composables/useEquipmentManagement";
+import useFile from "../composables/useFile";
 import useUtils from "../composables/useUtils";
 
 const props = defineProps({
@@ -546,7 +549,7 @@ watchEffect(() => {
   }
 });
 
-const { getSupplies } = useSupply();
+const { getSupplies } = useEquipmentManagement();
 
 const { data: getSuppliesReq } = await useLazyAsyncData(
   "get-supplies-for-equipment-item",
@@ -568,7 +571,9 @@ watchEffect(() => {
   }
 });
 
-const supplyItems = ref<Array<{ name: string; value: string; stockQty: number }>>([]);
+const supplyItems = ref<
+  Array<{ name: string; value: string; stockQty: number }>
+>([]);
 const selectedSupplyForAdd = ref<string>("");
 const equipmentItems = ref<TEquipmentItem[]>([]);
 

package/components/Feedback/Form.vue

@@ -31,7 +31,7 @@
       <template #label> Subject <span class="text-red">*</span> </template>
     </v-autocomplete>
 
-    <v-autocomplete
+    <!-- <v-autocomplete
       v-model="localFeedback.category"
       :items="categories"
       item-title="title"
@@ -45,7 +45,7 @@
       :rules="[requiredRule]"
     >
       <template #label> Category <span class="text-red">*</span> </template>
-    </v-autocomplete>
+    </v-autocomplete> -->
 
     <v-text-field
       label="Location"
@@ -91,7 +91,7 @@ const props = defineProps<{
   feedback: TFeedbackCreate;
   isEditMode: boolean;
   loading: boolean;
-  categories: { title: string; value: string }[];
+  // categories: { title: string; value: string }[];
   erroredImages?: string[];
   maxFiles?: number;
 }>();
@@ -133,7 +133,7 @@ const { requiredRule } = useUtils();
 const isFormValid = computed(() => {
   return (
     localFeedback.value.subject &&
-    localFeedback.value.category &&
+    // localFeedback.value.category &&
     localFeedback.value.location &&
     localFeedback.value.description
   );