@7365admin1/layer-common 1.10.5 → 1.10.7

package/components/AccessCardQrTaggingPrintQr.vue

@@ -0,0 +1,75 @@
+<template>
+  <v-container ref="printContent" fluid style="overflow-y: auto">
+    <v-row no-gutters class="main-container">
+      <v-col v-for="(card, idx) in accessCards" :key="idx" cols="auto">
+        <div class="qr-box">
+          <p><strong>Access Level:</strong> {{ card.accessLevel }}</p>
+          <p><strong>HID NO:</strong> {{ card.cardNumber }}</p>
+          <img :src="card.qrDataImage" alt="QR Code" />
+          <p><strong>Card No.:</strong> C{{ card.qrTagCardNo }}</p>
+        </div>
+      </v-col>
+    </v-row>
+  </v-container>
+</template>
+
+<script setup lang="ts">
+import type { ComponentPublicInstance } from "vue";
+
+defineProps<{ accessCards?: any[] }>();
+defineEmits(["close"]);
+
+const printContent = ref<HTMLElement | null>(null);
+
+async function downloadPDF() {
+  const html2pdf = (await import("html2pdf.js")).default;
+  const component = printContent.value as unknown as ComponentPublicInstance;
+  const el = component.$el ?? printContent.value;
+
+  if (!el || !(el instanceof HTMLElement)) return;
+
+  const opt = {
+    margin: 0.1,
+    filename: `Access-cards-qr.pdf`,
+    image: { type: "jpeg", quality: 0.98 },
+    html2canvas: { scale: 2, useCORS: true },
+    jsPDF: { unit: "in", format: "a4", orientation: "portrait" },
+  };
+
+  await html2pdf().set(opt).from(el).save();
+}
+
+defineExpose({ downloadPDF });
+</script>
+
+<style scoped>
+.main-container {
+  background-color: #fff;
+  padding: 8px;
+  display: grid;
+  grid-template-columns: repeat(6, 1fr);
+  gap: 4px;
+  width: 100%;
+}
+.qr-box {
+  height: 3cm;
+  width: 2.7cm;
+  border: 1px solid #ccc;
+  padding: 8px;
+  text-align: center;
+  page-break-inside: avoid;
+  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 6px;
+}
+.qr-box p {
+  font-size: 8px;
+  line-height: 1.2;
+}
+img {
+  width: 1cm;
+  height: 1cm;
+}
+</style>

package/components/AccessManagement.vue

@@ -112,6 +112,7 @@
       :can-delete-access-card="canDeleteAccessCard"
       :is-selected-card-assigned-physical="isSelectedCardAssignedPhysical"
       :is-selected-card-physical="isSelectedCardPhysical"
+      :site-id="siteId"
       @replace="openReplaceDialog()"
       @delete="openDeleteDialog()"
     />
@@ -354,8 +355,11 @@ async function handleDeleteCard(remarks: string) {
     selectedCardId.value = null;
     confirmDialog.value = false;
     previewDialog.value = false;
+    showMessage("Access card deleted successfully!", "success");
   } catch (error: any) {
-    deleteError.value = error?.response?._data?.message || "Failed to delete card";
+    const msg = error?.response?._data?.message || "Failed to delete card";
+    deleteError.value = msg;
+    showMessage(msg, "error");
   } finally {
     deleteLoading.value = false;
   }

package/components/AreaChecklistHistoryLogs.vue

@@ -119,6 +119,15 @@
                         class="text-subtitle-2 font-weight-bold px-0"
                       >
                         Set {{ checklistSet.set }}
+                        <v-chip
+                          v-if="checklistSet.isScheduleTask"
+                          size="x-small"
+                          color="info"
+                          variant="tonal"
+                          class="text-none ml-2"
+                        >
+                          Schedule Task
+                        </v-chip>
                       </v-list-subheader>
 
                       <v-list-item

package/components/BuildingForm.vue

@@ -3,7 +3,7 @@
     <v-toolbar>
       <v-row no-gutters class="fill-height px-6" align="center">
         <span class="font-weight-bold text-h5 text-capitalize">
-          {{ prop.mode }} Building
+          {{ prop.mode }} Block
         </span>
       </v-row>
     </v-toolbar>
@@ -40,7 +40,10 @@
                     <v-select
                       v-model.number="building.block"
                       :items="blocks"
+                      item-title="label"
+                      item-value="value"
                       density="comfortable"
+                      :disabled="prop.mode === 'edit'"
                       :rules="[
                         requiredRule,
                         () =>
@@ -48,7 +51,12 @@
                           'Block is required',
                       ]"
                       type="number"
-                    ></v-select>
+                    >
+                  <template v-slot:item="{ props: itemProps, item}">
+                    <v-list-item v-bind="itemProps" :disabled="item?.raw?.disabled" ></v-list-item>
+                  </template>
+                  
+                  </v-select>
                   </v-col>
                 </v-row>
               </v-col>
@@ -114,10 +122,10 @@
           </v-row>
         </v-expand-transition>
 
-         <v-col cols="12" class="px-6">
+         <!-- <v-col cols="12" class="px-6">
             <InputLabel class="text-capitalize" title="Building Floor plan" />
             <InputFileV2 v-model="building.buildingFloorPlan" :multiple="true" :max-length="10" title="Upload Images" />
-          </v-col>
+          </v-col> -->
 
         <v-col cols="12" class="mt-2">
           <v-checkbox v-model="createMore" density="comfortable" hide-details>
@@ -199,6 +207,10 @@ const prop = defineProps({
       buildingFloorPlan: []
     }),
   },
+  blocks: {
+    type: Array as PropType<TBuilding[]>,
+    default: () => [],
+  },
 });
 
 const { getSiteById } = useSite();
@@ -218,7 +230,20 @@ watchEffect(() => {
 
 const blocks = computed(() => {
   if (!site.value) return [];
-  return Array.from({ length: site.value?.metadata?.block || 0 }, (_, i) => i + 1);
+  // return 
+  // return [ { label: "1", value: 1, disabled: true }, { label: "2", value: 2 }, { label: "3", value: 3 } ];
+  const array = Array.from({ length: site.value?.metadata?.block || 0 }, (_, i) => i + 1);
+
+  const formattedArray = array.map((num) => {
+    const isDisabled = prop.blocks.some((block) => block.block === num) 
+    return {
+      label: num.toString(),
+      value: num,
+      disabled: isDisabled
+    };
+  });
+
+  return formattedArray;
 });
 
 const emit = defineEmits(["cancel", "success", "success:create-more"]);
@@ -295,6 +320,12 @@ async function submit() {
   }
 }
 
+watch(buildingLevels, (newVal) => {
+  setTimeout(() => {
+    show.value = newVal > 0 && !!newVal;
+  }, 500);
+});
+
 function cancel() {
   createMore.value = false;
   message.value = "";

package/components/BuildingManagement/buildings.vue

@@ -4,7 +4,7 @@
       <v-row no-gutters>
         <v-btn class="text-none" rounded="pill" variant="tonal" @click="setBuilding()" size="large"
           v-if="canCreate && canCreateBuilding">
-          Add Building
+          Add Block
         </v-btn>
       </v-row>
     </v-col>
@@ -33,19 +33,22 @@
           <template #item.createdAt="{ value }">
             {{ new Date(value).toLocaleDateString() }}
           </template>
+          <template #item.levels="{ item }">
+            {{ item.levels.length }}
+          </template>
         </v-data-table>
       </v-card>
     </v-col>
 
     <!-- Create Dialog -->
     <v-dialog v-model="createDialog" width="450" persistent>
-      <BuildingForm :site="site" @cancel="createDialog = false" @success="successCreate()"
+      <BuildingForm :site="site" :blocks="items" @cancel="createDialog = false" @success="successCreate()"
         @success:create-more="getBuildings()" />
     </v-dialog>
 
     <!-- Edit Dialog -->
     <v-dialog v-model="editDialog" width="450" persistent>
-      <BuildingForm :site="site" mode="edit" @cancel="editDialog = false" @success="successUpdate()"
+      <BuildingForm :site="site" :blocks="items" mode="edit" @cancel="editDialog = false" @success="successUpdate()"
         :building="selectedBuilding" />
     </v-dialog>
 
@@ -67,14 +70,14 @@
               <strong>Levels:</strong>
               {{ selectedBuilding?.levels.length ?? "N/A" }}
             </v-col>
-            <template v-if="selectedBuilding?.buildingFloorPlan.length > 0">
+            <!-- <template v-if="selectedBuilding?.buildingFloorPlan.length > 0">
               <v-col cols="12">
                 <strong>Building Floor Plan:</strong>
               </v-col>
               <v-col cols="12">
                 <InputFileV2 :model-value="selectedBuilding?.buildingFloorPlan" view-mode />
               </v-col>
-            </template>
+            </template> -->
           </v-row>
         </v-card-text>
 
@@ -171,10 +174,16 @@ const props = defineProps({
         title: "Name",
         value: "name",
       },
-      // {
-      //   title: "Director",
-      //   value: "directorName",
-      // },
+      {
+        title: "Block",
+        value: "block",
+        align: "center",
+      },
+      {
+        title: "Levels",
+        value: "levels",
+        align: "center",
+      },
       // { title: "Action", value: "action-table" },
     ],
   },

package/components/BuildingManagement/units.vue

@@ -30,121 +30,22 @@
         <v-data-table :headers="props.headers" :items="items" item-value="_id" items-per-page="20" fixed-header
           hide-default-footer  @click:row="tableRowClickHandler"
           style="max-height: calc(100vh - (200px))">
-          <template #item.block="{ value }">
-            {{ value ? `blk ${value}` : "" }}
+          <template #item.block="{ value, item }">
+            {{ value ? `Block ${value}` : "" }}
           </template>
         </v-data-table>
       </v-card>
     </v-col>
 
     <!-- Create Dialog -->
-    <v-dialog v-model="createDialog" :width="smAndUp ? '70svw' : '100%'" persistent>
+    <v-dialog v-model="createDialog" :width="smAndUp ? '50svw' : '100%'" persistent>
       <BuildingUnitFormAdd :site="site" @cancel="createDialog = false" @success="successCreate()"
         @success:create-more="getBuildingUnit()" />
     </v-dialog>
-
-    <!-- Edit Dialog -->
-    <v-dialog v-model="dialogEdit" :width="smAndUp ? '70svw' : '100%'" persistent>
-      <BuildingUnitFormEdit v-if="selectedBuildingUnit" @cancel="dialogEdit = false" @success="successUpdate()"
-        :roomFacility="selectedBuildingUnit" />
-    </v-dialog>
-
-    <!-- Preview Dialog -->
-
     
-    <v-dialog v-if="canViewUnitDetails" v-model="dialogPreview" width="450" persistent>
-      <v-card width="100%">
-        <v-card-text style="max-height: 100vh; overflow-y: auto" class="pb-0">
-          <v-row no-gutters v-if="selectedBuildingUnit" class="mb-4">
-            <v-col cols="12">
-              <strong>Name:</strong> {{ selectedBuildingUnit.name }}
-            </v-col>
-
-            <v-col cols="12">
-              <strong>Block:</strong>
-              {{ selectedBuildingUnit.block }}
-            </v-col>
-
-            <v-col cols="12">
-              <strong>Floors:</strong>
-              {{ selectedBuildingUnit.level }}
-            </v-col>
-
-            <v-col cols="12">
-              <strong>Category:</strong>
-              {{ selectedBuildingUnit.category }}
-            </v-col>
-
-            <v-col cols="12">
-              <strong>Company Name:</strong>
-              {{ selectedBuildingUnit.companyName || "" }}
-            </v-col>
-
-            <v-col cols="12">
-              <strong>Company Registration Number:</strong>
-              {{ selectedBuildingUnit.companyRegistrationNumber || "" }}
-            </v-col>
-
-            <v-col cols="12">
-              <strong>Lease Start:</strong>
-              {{ formatDateDDMMYYYYLocal(selectedBuildingUnit.leaseStart) || "" }}
-            </v-col>
-            <v-col cols="12">
-              <strong>Lease End:</strong>
-              {{ formatDateDDMMYYYYLocal(selectedBuildingUnit.leaseEnd) || "" }}
-            </v-col>
-
-            <v-col cols="12">
-              <strong>Owner Name:</strong>
-              {{ selectedBuildingUnit.ownerName || "" }}
-            </v-col>
-
-            <template v-if="selectedBuildingUnit?.buildingUnitFiles.length > 0">
-              <v-col cols="12">
-                <strong>Uploaded Files:</strong>
-              </v-col>
-              <v-col cols="12">
-                <InputFileV2 :model-value="selectedBuildingUnit?.buildingUnitFiles" view-mode />
-              </v-col>
-            </template>
-          </v-row>
-        </v-card-text>
-
-        <v-toolbar class="pa-0" density="compact">
-          <v-row no-gutters>
-            <v-col cols="6" class="pa-0">
-              <v-btn block variant="text" class="text-none" size="large" @click="dialogPreview = false" height="48">
-                Close
-              </v-btn>
-            </v-col>
-
-            <v-col cols="6" class="pa-0" v-if="canUpdate">
-              <v-menu>
-                <template #activator="{ props }">
-                  <v-btn block variant="flat" color="black" class="text-none" height="48" v-bind="props" tile
-                    :disabled="!canUpdateUnit && !canDeleteUnit">
-                    More actions
-                  </v-btn>
-                </template>
-
-                <v-list class="pa-0">
-                  <v-list-item v-if="canUpdateUnit" @click="openEditDialog()">
-                    <v-list-item-title class="text-subtitle-2">
-                      Edit Unit
-                    </v-list-item-title>
-                  </v-list-item>
-
-                  <v-list-item v-if="canDeleteUnit" @click="openDeleteDialog()" class="text-red">
-                    <v-list-item-title class="text-subtitle-2">
-                      Delete Unit
-                    </v-list-item-title>
-                  </v-list-item>
-                </v-list>
-              </v-menu>
-            </v-col>
-          </v-row>
-        </v-toolbar>
-      </v-card>
+    <v-dialog v-if="canViewUnitDetails"  v-model="dialogPreview":width="smAndUp ? '70svw' : '100%'" persistent>
+       <BuildingUnitFormEdit v-if="selectedBuildingUnit" @cancel="dialogPreview = false" @success="successUpdate()" @delete-unit="openDeleteDialog()"
+        :roomFacility="selectedBuildingUnit" />
     </v-dialog>
 
     <v-dialog v-model="dialogDelete" :loading="deleteLoading" width="450" persistent>
@@ -200,22 +101,19 @@ const props = defineProps({
         title: "Name",
         value: "name",
       },
-      {
-        title: "Building",
-        value: "buildingName",
+       {
+        title: "Floor",
+        value: "level",
       },
       {
         title: "Block",
         value: "block",
       },
       {
-        title: "Floor",
-        value: "level",
-      },
-      {
-        title: "Category",
-        value: "category",
+        title: "Block Name",
+        value: "buildingName",
       },
+     
       // {
       //   title: "Type",
       //   value: "type",

package/components/BuildingUnitFormAdd.vue

@@ -25,11 +25,40 @@
             <v-row>
               <v-col cols="12" md="6" class="mt-2">
                 <v-row no-gutters>
-                  <InputLabel class="text-capitalize" title="Building" required />
+                  <InputLabel class="text-capitalize" title="Block" required />
                   <v-col cols="12">
                     <v-autocomplete v-model="buildingUnit.building" :items="buildings" item-title="name"
                       item-value="_id" v-model:search="searchBuilding" :hide-no-data="false" density="comfortable"
-                      :rules="[requiredRule]" variant="outlined"></v-autocomplete>
+                      :rules="[requiredRule]" variant="outlined">
+                      <template v-slot:item="{ props: itemProps, item }">
+                        <v-list-item v-bind="itemProps" :title="`Block ${item?.raw?.block} (${item?.raw?.name})`">
+
+                        </v-list-item>
+                      </template>
+                      <template v-slot:selection="{ item }">
+                        {{ buildingUnit.building && `Block ${item?.raw?.block} (${item?.raw?.name})`  }}
+                      </template>
+                    </v-autocomplete>
+                  </v-col>
+                </v-row>
+              </v-col>
+
+              <v-col cols="12" md="6"  class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel class="text-capitalize" title="Level" required />
+                  <v-col cols="12">
+                    <v-select v-model="buildingUnit.level" :items="buildingLevels" density="comfortable"
+                      :rules="[requiredRule]"></v-select>
+                  </v-col>
+                </v-row>
+              </v-col>
+
+              <v-col cols="12" md="6" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel class="text-capitalize" title="No. of Units to be added" required />
+                  <v-col cols="12">
+                    <v-text-field v-model.number="buildingUnitQty" density="comfortable" :rules="[requiredRule]"
+                      type="number" @update:model-value="setBuildingLevels()"></v-text-field>
                   </v-col>
                 </v-row>
               </v-col>
@@ -128,33 +157,6 @@
               </v-col>
             </v-row>
           </v-col> -->
-
-
-
-          <v-col cols="12">
-            <v-row>
-              <v-col cols="6" class="mt-2">
-                <v-row no-gutters>
-                  <InputLabel class="text-capitalize" title="Level" required />
-                  <v-col cols="12">
-                    <v-select v-model="buildingUnit.level" :items="buildingLevels" density="comfortable"
-                      :rules="[requiredRule]"></v-select>
-                  </v-col>
-                </v-row>
-              </v-col>
-
-              <v-col cols="6" class="mt-2">
-                <v-row no-gutters>
-                  <InputLabel class="text-capitalize" title="No. of Units" required />
-                  <v-col cols="12">
-                    <v-text-field v-model.number="buildingUnitQty" density="comfortable" :rules="[requiredRule]"
-                      type="number" @update:model-value="setBuildingLevels()"></v-text-field>
-                  </v-col>
-                </v-row>
-              </v-col>
-            </v-row>
-          </v-col>
-
           <v-col v-if="buildingLevels" cols="12">
             <v-row justify="center">
               <v-col cols="6">
@@ -167,7 +169,7 @@
           <v-expand-transition>
             <v-row v-show="show" no-gutters>
               <v-row>
-                <template v-for="(unitLabel, unitLabelIndex) in unitLabels" :key="levelIndex">
+                <template v-for="(unitLabel, unitLabelIndex) in unitLabels" :key="unitLabelIndex">
                   <v-col cols="12" md="4">
                     <v-row>
                       <v-col cols="12">
@@ -379,6 +381,13 @@ async function submit() {
   }
 }
 
+watch(buildingUnitQty, (newVal) => {
+  setTimeout(() => {
+    show.value = newVal > 0 && !!newVal;
+  }, 500);
+});
+
+
 function cancel() {
   name.value = "";
   directorName.value = "";