@7365admin1/layer-common 1.11.40 → 1.11.41

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @iservice365/layer-common
 
+## 1.11.41
+
+### Patch Changes
+
+- bc096ed: Fix navigation not get children item
+- 5031c18: Update Vehicle Management
+
 ## 1.11.40
 
 ### Patch Changes

package/components/AccessCardPreviewDialog.vue

@@ -5,6 +5,96 @@
     :site-id="siteId"
   />
 
+  <!-- Assign to Person Dialog -->
+  <v-dialog :model-value="showAssignForm" width="420" persistent>
+    <v-card width="100%">
+      <v-toolbar density="compact" color="surface">
+        <v-row no-gutters class="fill-height px-4" align="center">
+          <span class="font-weight-bold">Assign Card to Person</span>
+        </v-row>
+      </v-toolbar>
+
+      <v-card-text class="pa-4">
+        <div class="text-caption text-grey mb-4">
+          Card: <strong class="text-body-2 text-black">{{ selectedCardInUnit?.cardNo }}</strong>
+        </div>
+
+        <!-- Person Type Filter -->
+        <div class="text-caption font-weight-bold mb-1 text-uppercase text-grey-darken-1">Person Type</div>
+        <v-btn-toggle
+          v-model="assignPersonType"
+          color="primary"
+          density="compact"
+          variant="outlined"
+          rounded="pill"
+          class="mb-4"
+        >
+          <v-btn value="" size="small" class="text-none px-3">All</v-btn>
+          <v-btn value="owner" size="small" class="text-none px-3">Unit Owner</v-btn>
+          <v-btn value="resident" size="small" class="text-none px-3">Resident</v-btn>
+          <v-btn value="tenant" size="small" class="text-none px-3">Tenant</v-btn>
+        </v-btn-toggle>
+
+        <!-- Person Selector -->
+        <div class="text-caption font-weight-bold mb-1 text-uppercase text-grey-darken-1">
+          Person <span class="text-error">*</span>
+        </div>
+        <v-autocomplete
+          v-model="assignPerson"
+          :items="filteredPeopleItems"
+          density="compact"
+          item-title="name"
+          item-value="_id"
+          hide-details="auto"
+          placeholder="Select person..."
+          persistent-placeholder
+          :loading="peopleLoading"
+          return-object
+          no-data-text="No residents or tenants found for this unit"
+        >
+          <template #item="{ props: itemProps, item }">
+            <v-list-item v-bind="itemProps" :subtitle="personTypeLabel(item.raw)" />
+          </template>
+          <template #selection="{ item }">
+            <span>{{ item.raw.name }}</span>
+            <v-chip size="x-small" class="ml-2" color="grey" variant="tonal">
+              {{ personTypeLabel(item.raw) }}
+            </v-chip>
+          </template>
+        </v-autocomplete>
+      </v-card-text>
+
+      <v-toolbar density="compact">
+        <v-row no-gutters>
+          <v-col cols="6" class="pa-0">
+            <v-btn
+              block
+              variant="text"
+              class="text-none"
+              height="48"
+              @click="cancelAssign"
+            >
+              Cancel
+            </v-btn>
+          </v-col>
+          <v-col cols="6" class="pa-0">
+            <v-btn
+              block
+              variant="flat"
+              color="black"
+              class="text-none"
+              height="48"
+              :disabled="!assignPerson"
+              @click="confirmAssign"
+            >
+              Assign
+            </v-btn>
+          </v-col>
+        </v-row>
+      </v-toolbar>
+    </v-card>
+  </v-dialog>
+
   <v-dialog :model-value="modelValue" width="450" persistent>
     <v-card width="100%">
       <v-card-text style="max-height: 100vh; overflow-y: auto" class="pb-0">
@@ -211,6 +301,14 @@
                 </v-btn>
               </template>
               <v-list class="pa-0">
+                <v-list-item
+                  v-if="canAssignToPerson && isSelectedCardAvailable"
+                  @click="openAssignForm"
+                >
+                  <v-list-item-title class="text-subtitle-2">
+                    Assign to Person
+                  </v-list-item-title>
+                </v-list-item>
                 <v-list-item
                   :disabled="!isSelectedCardAssignedPhysical"
                   @click="emit('replace')"
@@ -270,6 +368,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  canAssignToPerson: {
+    type: Boolean,
+    default: true,
+  },
   isSelectedCardAssignedPhysical: {
     type: Boolean,
     default: false,
@@ -289,9 +391,26 @@ const emit = defineEmits<{
   "update:selectedCardInUnit": [value: Record<string, any> | null];
   replace: [];
   delete: [];
+  "assign-to-person": [{ card: Record<string, any> | null; person: Record<string, any> | null }];
 }>();
 
+const { getPeopleByUnit: _getPeopleByUnit } = usePeople();
+
 const historyDialog = ref(false);
+const showAssignForm = ref(false);
+const assignPersonType = ref<string>("");
+const assignPerson = ref<Record<string, any> | null>(null);
+const peopleItems = ref<Record<string, any>[]>([]);
+const peopleLoading = ref(false);
+
+const isSelectedCardAvailable = computed(() => {
+  if (!props.selectedCardInUnit?._id) return false;
+  const id = props.selectedCardInUnit._id;
+  return [
+    ...(props.unit?.available?.physical ?? []),
+    ...(props.unit?.available?.non_physical ?? []),
+  ].some((c) => c._id === id);
+});
 
 const isSelectedCardDeletable = computed(() => {
   if (!props.selectedCardInUnit?._id) return false;
@@ -304,6 +423,51 @@ const isSelectedCardDeletable = computed(() => {
   ].some((c) => c._id === id);
 });
 
+const filteredPeopleItems = computed(() => {
+  if (!assignPersonType.value) return peopleItems.value;
+  if (assignPersonType.value === "owner") return peopleItems.value.filter((p) => p.isOwner);
+  return peopleItems.value.filter((p) => p.type === assignPersonType.value && !p.isOwner);
+});
+
+const personTypeLabel = (person: Record<string, any>) => {
+  if (person.isOwner) return "Unit Owner";
+  if (person.type === "resident") return "Resident";
+  if (person.type === "tenant") return "Tenant";
+  return person.type ?? "";
+};
+
+async function openAssignForm() {
+  showAssignForm.value = true;
+  assignPerson.value = null;
+  assignPersonType.value = "";
+  peopleItems.value = [];
+
+  if (!props.unit?._id) return;
+  peopleLoading.value = true;
+  try {
+    const res = await _getPeopleByUnit(props.unit._id);
+    peopleItems.value = res?.data ?? [];
+  } catch {
+    peopleItems.value = [];
+  } finally {
+    peopleLoading.value = false;
+  }
+}
+
+function cancelAssign() {
+  showAssignForm.value = false;
+  assignPerson.value = null;
+  assignPersonType.value = "";
+}
+
+function confirmAssign() {
+  emit("assign-to-person", {
+    card: props.selectedCardInUnit,
+    person: assignPerson.value,
+  });
+  cancelAssign();
+}
+
 function toggleCard(card: Record<string, any>) {
   emit(
     "update:selectedCardInUnit",

package/components/Layout/NavigationDrawer.vue

@@ -24,16 +24,11 @@
       >
         <template #activator="{ props: tooltipProps }">
           <div v-bind="tooltipProps">
-            <NavigationItem
-              :title="item.title"
-              :icon="item.icon"
-              :route="item.route"
-              :link="item.link"
-              :class="{
+            <NavigationItem :title="item.title" :icon="item.icon" :route="item.route" :link="item.link"
+              :children="item.children" :class="{
                 'opacity-50 pointer-events-none': item.disabled
-              }"
-              @click="() => handleClick(item)"
-            />
+              }" @click="() => handleClick(item)" />
+
           </div>
         </template>
 

package/components/VehicleForm.vue

@@ -53,14 +53,15 @@
           <v-col v-if="shouldShowField('nric')" cols="12">
             <InputLabel class="text-capitalize" title="NRIC" required />
             <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]"
-              :disabled="disablePrefilledInputs && type !== 'blocklist'" />
+              :disabled="disablePrefilledInputs && type !== 'blocklist' && prop.mode !== 'edit'" />
           </v-col>
 
           <v-col v-if="shouldShowField('name')" cols="12">
             <v-row>
               <v-col cols="12">
                 <InputLabel class="text-capitalize" title="Full Name" required />
-                <v-text-field v-model.trim="vehicle.name" density="comfortable" :rules="[requiredRule]" />
+                <v-text-field v-model.trim="vehicle.name" density="comfortable" :rules="[requiredRule]"
+                  :disabled="disablePrefilledInputs && type !== 'blocklist' && prop.mode !== 'edit'" />
               </v-col>
             </v-row>
           </v-col>
@@ -777,6 +778,7 @@ onMounted(() => {
       vehicle.start = prop.vehicleData.start || '';
       vehicle.plateNumber = prop.vehicleData.plateNumber
       vehicle.peopleId = prop.vehicleData.peopleId || '';
+      vehicle.block = prop.vehicleData.block === 0 ? null  : prop.vehicleData.block || null;
 
       if(prop.type === "seasonpass"){
         showSubscriptionDateOptions.value = true;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.40",
+  "version": "1.11.41",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {