@7365admin1/layer-common 1.10.6 → 1.10.7

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 = "";