@7365admin1/layer-common 1.10.7 → 1.10.8

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.10.8
+
+### Patch Changes
+
+- 8d61e72: Update layer-common changes as of March 17, 2028
+
 ## 1.10.7
 
 ### Patch Changes

package/components/{AddSupplyForm.vue → AddEqupmentForm.vue}

@@ -4,7 +4,7 @@
       <v-toolbar>
         <v-row no-gutters class="fill-height px-6" align="center">
           <span class="font-weight-bold text-h6 text-capitalize">
-            {{ prop.mode === "edit" ? "Edit Supply" : "Add New Supply" }}
+            {{ prop.mode === "edit" ? "Edit Equipment" : "Add New Equipment" }}
           </span>
         </v-row>
       </v-toolbar>
@@ -19,7 +19,7 @@
                 :rules="[requiredRule]"
                 density="comfortable"
                 variant="outlined"
-                placeholder="Enter supply name"
+                placeholder="Enter equipment name"
                 hide-details="auto"
                 class="mb-0"
               />
@@ -94,7 +94,7 @@ const prop = defineProps({
     type: String,
     default: "add",
   },
-  supplyData: {
+  equipmentData: {
     type: Object,
     default: null,
   },
@@ -122,8 +122,8 @@ const unitOfMeasurementOptions = [
 ];
 
 watchEffect(() => {
-  nameModel.value = prop.supplyData?.name || "";
-  unitOfMeasurementModel.value = prop.supplyData?.unitOfMeasurement || "";
+  nameModel.value = prop.equipmentData?.name || "";
+  unitOfMeasurementModel.value = prop.equipmentData?.unitOfMeasurement || "";
 });
 
 function close() {

package/components/BuildingManagement/units.vue

@@ -98,11 +98,11 @@ const props = defineProps({
     type: Array as PropType<Array<Record<string, any>>>,
     default: () => [
       {
-        title: "Name",
+        title: "Unit Name",
         value: "name",
       },
        {
-        title: "Floor",
+        title: "Level",
         value: "level",
       },
       {

package/components/BuildingUnitFormAdd.vue

@@ -63,7 +63,7 @@
                 </v-row>
               </v-col>
 
-              <v-col cols="12" md="6" class="mt-2">
+              <!-- <v-col cols="12" md="6" class="mt-2">
                 <v-row no-gutters>
                   <InputLabel class="text-capitalize" title="Category" required />
                   <v-col cols="12">
@@ -71,7 +71,7 @@
                       :rules="[requiredRule]"></v-autocomplete>
                   </v-col>
                 </v-row>
-              </v-col>
+              </v-col> -->
             </v-row>
           </v-col>
 
@@ -282,7 +282,7 @@ const buildingUnit = ref<TBuildingUnit>({
   buildingName: "",
   block: 0,
   level: "",
-  category: "",
+  // category: "",
   status: "active",
   buildingUnitFiles: [],
   companyName: "",
@@ -344,7 +344,7 @@ function setBuildingUnit() {
   buildingUnit.value.building = "";
   buildingUnit.value.buildingName = "";
   buildingUnit.value.level = "";
-  buildingUnit.value.category = "";
+  // buildingUnit.value.category = "";
   buildingUnit.value.status = "active";
   buildingUnit.value.buildingUnitFiles = [];
   buildingUnitQty.value = 1;

package/components/BuildingUnitFormEdit.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-card width="100%" :loading="getUnitPeoplePending">
+  <v-card width="100%" :loading="getUnitPeoplePending || loading.ownerProcessing" :disabled="loading.ownerProcessing">
     <v-toolbar>
       <v-row no-gutters class="fill-height px-6" align="center">
         <span class="font-weight-bold text-h5"> Unit Info ( {{ buildingUnit.name }} ) </span>
@@ -58,7 +58,7 @@
               <v-row no-gutters>
                 <InputLabel class="text-capitalize font-weight-bold" title="Billing Address Line 1" />
                 <v-col cols="12">
-                  <v-text-field :model-value="siteData?.address?.line1" density="compact" readonly
+                  <v-text-field :model-value="buildingUnit?.site?.address?.line1" density="compact" readonly
                     class="no-pointer"></v-text-field>
                 </v-col>
               </v-row>
@@ -67,7 +67,7 @@
               <v-row no-gutters>
                 <InputLabel class="text-capitalize font-weight-bold" title="Billing Address Line 2" />
                 <v-col cols="12">
-                  <v-text-field :model-value="siteData?.address?.line2" density="compact" readonly
+                  <v-text-field :model-value="buildingUnit?.site?.address?.line2" density="compact" readonly
                     class="no-pointer"></v-text-field>
                 </v-col>
               </v-row>
@@ -76,7 +76,7 @@
               <v-row no-gutters>
                 <InputLabel class="text-capitalize font-weight-bold" title="City" />
                 <v-col cols="12">
-                  <v-text-field :model-value="siteData?.address?.city" density="compact" readonly
+                  <v-text-field :model-value="buildingUnit?.site?.address?.city" density="compact" readonly
                     class="no-pointer"></v-text-field>
                 </v-col>
               </v-row>
@@ -85,7 +85,7 @@
               <v-row no-gutters>
                 <InputLabel class="text-capitalize font-weight-bold" title="State" />
                 <v-col cols="12">
-                  <v-text-field :model-value="siteData?.address?.state" density="compact" readonly
+                  <v-text-field :model-value="buildingUnit?.site?.address?.state" density="compact" readonly
                     class="no-pointer"></v-text-field>
                 </v-col>
               </v-row>
@@ -94,7 +94,7 @@
               <v-row no-gutters>
                 <InputLabel class="text-capitalize font-weight-bold" title="Country" />
                 <v-col cols="12">
-                  <v-text-field :model-value="siteData?.address?.country" density="compact" readonly
+                  <v-text-field :model-value="buildingUnit?.site?.address?.country" density="compact" readonly
                     class="no-pointer"></v-text-field>
                 </v-col>
               </v-row>
@@ -103,7 +103,7 @@
               <v-row no-gutters>
                 <InputLabel class="text-capitalize font-weight-bold" title="Postal Code" />
                 <v-col cols="12">
-                  <v-text-field :model-value="siteData?.address?.postalCode" density="compact" readonly
+                  <v-text-field :model-value="buildingUnit?.site?.address?.postalCode" density="compact" readonly
                     class="no-pointer"></v-text-field>
                 </v-col>
               </v-row>
@@ -114,7 +114,7 @@
 
       <template v-else-if="tab === 'residents'">
         <v-card width="100%">
-          <v-expansion-panels v-model="panels" variant="accordion" >
+          <v-expansion-panels v-model="panels" variant="accordion">
 
             <!-- Residents -->
             <v-expansion-panel value="residents">
@@ -123,10 +123,12 @@
               </v-expansion-panel-title>
 
               <v-expansion-panel-text>
-                <template v-if="unitResidentsArray.length" v-for="resident, residentIndex in unitResidentsArray" :key="residentIndex">
-                  <UnitPersonCard 
-                    :person="resident" :readOnly="true" />
-                  <v-divider v-if="(residentIndex + 1) !== unitResidentsArray.length" thickness="2" color="primary" class="my-4" />
+                <template v-if="unitResidentsArray.length" v-for="resident, residentIndex in unitResidentsArray"
+                  :key="residentIndex">
+                  <UnitPersonCard :person="resident" :readOnly="true" show-owner-option
+                    @update:owner="handleUpdateOwner" :loading-owner-processing="loading.ownerProcessing" />
+                  <v-divider v-if="(residentIndex + 1) !== unitResidentsArray.length" thickness="2" color="primary"
+                    class="my-4" />
                 </template>
                 <p v-else class="font-weight-semibold  text-caption ml-2 mt-5">
                   **No residents to display**
@@ -141,42 +143,32 @@
               </v-expansion-panel-title>
 
               <v-expansion-panel-text>
-                <template v-if="unitTenantsArray.length" v-for="(tenant, tenantIndex) in unitTenantsArray" :key="tenant._id || tenantIndex">
-                  <UnitPersonCard  :person="tenant" :readOnly="true" />
-                  <v-divider v-if="(tenantIndex + 1) !== unitTenantsArray.length" thickness="2" color="primary" class="my-4" />
+                <template v-if="unitTenantsArray.length" v-for="(tenant, tenantIndex) in unitTenantsArray"
+                  :key="tenant._id || tenantIndex">
+                  <UnitPersonCard :person="tenant" :readOnly="true" />
+                  <v-divider v-if="(tenantIndex + 1) !== unitTenantsArray.length" thickness="2" color="primary"
+                    class="my-4" />
                 </template>
                 <p v-else class=" font-weight-semibold text-caption ml-2 mt-5">
                   **No tenants to display**
                 </p>
               </v-expansion-panel-text>
             </v-expansion-panel>
-
-              <!-- Guests -->
-              <v-expansion-panel value="guests">
-                <v-expansion-panel-title class="bg-primary">
-                  Guests ({{ unitGuestsArray.length }})
-                </v-expansion-panel-title>
-  
-                <v-expansion-panel-text>
-                  <template v-if="unitGuestsArray.length" v-for="(guest, guestIndex) in unitGuestsArray" :key="guest._id || guestIndex">
-                    <UnitPersonCard  :person="guest" :readOnly="true" />
-                    <v-divider v-if="(guestIndex + 1) !== unitGuestsArray.length" thickness="2" color="primary" class="my-4" />
-                  </template>
-                  <p v-else class=" font-weight-semibold text-caption ml-2 mt-5">
-                    **No guests to display**
-                  </p>
-                </v-expansion-panel-text>
-              </v-expansion-panel>
-
           </v-expansion-panels>
         </v-card>
       </template>
       <template v-else-if="tab === 'vehicles'">
-        <p class="font-weight-semibold text-caption ml-2 mt-5">
-          **No vehicles to display**
-        </p>
-       </template>
-   
+        <TableMain :headers="vehicleHeaders" :show-header="true" :page="vehiclePage" :pages="vehicleTotalPages"
+        :pageRange="vehiclePageRange"  :items="unitVehicleItems"  @refresh="getUnitVehiclesRefresh"  @update:page="handleUpdateVehiclePage">
+
+          <template #item.status="{value}">
+            <v-chip :color="formatVehicleStatus(value).color" class="ma-0" small>
+              {{ formatVehicleStatus(value).label }}
+            </v-chip>
+          </template>
+        </TableMain>
+      </template>
+
       <template v-else-if="tab === 'others'">
         <v-row>
           <!-- <v-col cols="12" md="6" class="mt-2">
@@ -294,24 +286,7 @@ const prop = defineProps({
   },
   roomFacility: {
     type: Object as PropType<TBuildingUnit>,
-    default: () => ({
-      _id: "",
-      site: "",
-      name: "",
-      owner: "",
-      ownerName: "",
-      building: "",
-      buildingName: "",
-      // category: "",
-      block: null,
-      level: 0,
-      status: "active",
-      buildingUnitFiles: [],
-      companyName: "",
-      companyRegistrationNumber: "",
-      leaseStart: "",
-      leaseEnd: "",
-    }),
+    required: true,
   },
   canUpdateUnit: {
     type: Boolean,
@@ -325,7 +300,18 @@ const prop = defineProps({
 
 const buildingUnit = ref({
   _id: "",
-  site: "",
+  site: {
+    _id: "",
+    name: "",
+    address: {
+      line1: "",
+      line2: "",
+      city: "",
+      state: "",
+      country: "",
+      postalCode: "",
+    },
+  },
   name: "",
   owner: "",
   ownerName: "",
@@ -343,8 +329,6 @@ const buildingUnit = ref({
 });
 
 
-const siteData = ref<TSite | null>(null);
-
 buildingUnit.value = JSON.parse(JSON.stringify(prop.roomFacility));
 
 const emit = defineEmits(["cancel", "success", "success:create-more", "delete-unit"]);
@@ -358,11 +342,29 @@ const tab = ref('general')
 const validForm = ref(false);
 
 const { getAll } = useBuilding();
-const { getPeopleByUnit } = usePeople();
+const { getPeopleByUnit, updateById: updatePeopleById } = usePeople();
 const { debounce } = useUtils();
+const { searchMultipleVehiclesByUnitId, formatVehicleStatus } = useVehicle();
+
+const loading = reactive({
+  ownerProcessing: false,
+})
 
 const buildings = ref<Record<string, any>[]>([]);
 const peopleItems = ref<TPeople[]>([]);
+const unitVehicleItems = ref<TVehicle[]>([]);
+
+const vehiclePage = ref(1);
+const vehiclePageRange = ref("-- - -- of --");
+const vehicleTotalPages = ref(0); 
+
+const vehicleHeaders = [
+  { title: "Plate Number", value: "plateNumber" },
+  { title: "Owner Name", value: "name" },
+  { title: "NRIC", value: "nric" },
+  { title: "Type", value: "type" },
+  { title: "Status", value: "status" },
+];
 
 const { data: getBuildingReq } = useLazyAsyncData(
   "get-all-buildings",
@@ -388,6 +390,18 @@ watch(getUnitPeople, (newData: TPeople[]) => {
   peopleItems.value = newData ?? [];
 });
 
+const { data: getUnitVehicles, refresh: getUnitVehiclesRefresh } = useLazyAsyncData(
+  "get-unit-vehicles",
+  async () => await searchMultipleVehiclesByUnitId({unitId: buildingUnit.value._id, page: 1, limit: 10})
+);
+
+watch(getUnitVehicles, (newData) => {
+  unitVehicleItems.value = Array.isArray(newData?.items) ? newData.items : [];
+  vehiclePage.value = newData?.page || 1;
+  vehiclePageRange.value = newData?.pageRange || "-- - -- of --";
+  vehicleTotalPages.value = newData?.totalPages || 0;
+});
+
 const unitResidentsArray = computed(() => {
   return peopleItems.value.filter((person) => person?.type === 'resident');
 });
@@ -396,21 +410,19 @@ const unitTenantsArray = computed(() => {
   return peopleItems.value.filter((person) => person?.type === 'tenant');
 });
 
-const unitGuestsArray = computed(() => {
-  return peopleItems.value.filter((person) => person?.type === 'guest');
-});
 
-buildingUnit.value.site = prop.site;
+// buildingUnit.value.site = prop.site;
 
 const selectedBuilding = computed(() => {
   return buildings.value.find((b) => b.value === buildingUnit.value.building);
 });
 
 const buildingLevels = computed(() => {
-  return Array.from(
-    { length: selectedBuilding.value?.levels || 0 },
-    (_, i) => i + 1
-  );
+  const levels = selectedBuilding.value?.levels ?? [];
+  return levels.map((level: string) => ({
+    title: level,
+    value: level,
+  }))
 });
 
 const disable = ref(false);
@@ -468,6 +480,40 @@ async function submit() {
   }
 }
 
+
+const handleUpdateOwner = async ({ person, isOwner }: { person: TPeople; isOwner: boolean }) => {
+  const owners = peopleItems.value.filter(p => p.isOwner)
+  message.value = ""
+  // console.log('Updating owner status for', person._id, 'to', isOwner)
+
+  const userId = person._id ?? null;
+
+  if (!isOwner && owners.length <= 1 && owners[0]._id === person._id) {
+    message.value = "There must be at least one owner for this unit."
+    return
+  }
+
+  if (!userId) return message.value = "Resident user ID is missing."
+
+
+  try {
+    loading.ownerProcessing = true;
+    await updatePeopleById(userId, { isOwner })
+    getUnitPeopleRefresh();
+  } catch (error: any) {
+    message.value = error.response?._data?.message || "Failed to update owner status."
+  } finally {
+    loading.ownerProcessing = false;
+
+  }
+
+}
+
+function handleUpdateVehiclePage(newPageNum: number) {
+  vehiclePage.value = newPageNum;
+}
+
+
 function cancel() {
   message.value = "";
   emit("cancel");