@7365admin1/layer-common 1.11.8 → 1.11.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.11.9
+
+### Patch Changes
+
+- 07272c0: Update Version
+
 ## 1.11.8
 
 ### Patch Changes

package/components/EquipmentItemMain.vue

@@ -449,6 +449,7 @@ import useUtils from "../composables/useUtils";
 const props = defineProps({
   orgId: { type: String, default: "" },
   site: { type: String, default: "" },
+  serviceType: { type: String, default: "" },
 });
 
 const { canCreateEquipmentItem } = useEquipmentItemPermission();
@@ -492,6 +493,7 @@ const {
       page: page.value,
       search: searchInput.value,
       site: props.site,
+      serviceType: props.serviceType,
     }),
   {
     watch: [page, () => props.site],
@@ -557,6 +559,7 @@ const { data: getSuppliesReq } = await useLazyAsyncData(
     getSupplies({
       site: props.site,
       limit: 100,
+      serviceType: props.serviceType,
     }),
   {}
 );
@@ -661,7 +664,7 @@ async function _equipmentItem() {
         : {}),
     }));
 
-    await equipmentItemApi(props.site, { items });
+    await equipmentItemApi(props.site, { items, serviceType: props.serviceType });
 
     showMessage(
       `Checked out ${equipmentItems.value.length} item(s).`,

package/components/VehicleForm.vue

@@ -32,16 +32,37 @@
             </v-combobox>
           </v-col>
 
+          <v-col v-if="shouldShowField('block')" cols="12">
+            <InputLabel class="text-capitalize" title="Block" required />
+            <v-select v-model="vehicle.block" :items="blocksArray" item-value="value" item-title="title"
+              @update:model-value="handleChangeBlock" density="comfortable" :rules="[requiredRule]"
+               />
+          </v-col>
+
+          <v-col v-if="shouldShowField('level')" cols="12">
+            <InputLabel class="text-capitalize" title="Level" required />
+            <v-select v-model="vehicle.level" :items="levelsArray" density="comfortable"
+              :disabled="!vehicle.block" @update:model-value="handleChangeLevel"
+              :rules="[requiredRule]" />
+          </v-col>
+
+          <v-col v-if="shouldShowField('unit')" cols="12">
+            <InputLabel class="text-capitalize" title="Unit" required />
+            <v-select v-model="vehicle.unit" :items="unitsArray" density="comfortable"
+              :disabled="!vehicle.level" :rules="[requiredRule]" />
+          </v-col>
+
           <v-col v-if="shouldShowField('nric')" cols="12">
             <InputLabel class="text-capitalize" title="NRIC" required />
-            <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]" />
+            <InputNRICNumber v-model="vehicle.nric" density="comfortable" :rules="[requiredRule]"  :disabled="disablePrefilledInputs" />
           </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]" :disabled="disablePrefilledInputs" />
+                <v-text-field v-model.trim="vehicle.name" density="comfortable" :rules="[requiredRule]"
+                  :disabled="disablePrefilledInputs" />
               </v-col>
             </v-row>
           </v-col>
@@ -50,36 +71,16 @@
 
           <v-col v-if="shouldShowField('phone')" cols="12">
             <InputLabel class="text-capitalize" title="Phone Number" required />
-            <InputPhoneNumberV2 v-model="vehicle.phoneNumber" density="comfortable" :rules="[requiredRule]"
-              :disabled="disablePrefilledInputs" />
-          </v-col>
-
-          <v-col v-if="shouldShowField('block')" cols="12">
-            <InputLabel class="text-capitalize" title="Block" required />
-            <v-select v-model="vehicle.block" :items="blocksArray" item-value="value" item-title="title"
-              @update:model-value="handleChangeBlock" density="comfortable" :rules="[requiredRule]"
-              :disabled="disablePrefilledInputs" />
-          </v-col>
-
-          <v-col v-if="shouldShowField('level')" cols="12">
-            <InputLabel class="text-capitalize" title="Level" required />
-            <v-select v-model="vehicle.level" :items="levelsArray" density="comfortable"
-              :disabled="!vehicle.block || disablePrefilledInputs" @update:model-value="handleChangeLevel"
-              :rules="[requiredRule]" />
-          </v-col>
-
-          <v-col v-if="shouldShowField('unit')" cols="12">
-            <InputLabel class="text-capitalize" title="Unit" required />
-            <v-select v-model="vehicle.unit" :items="unitsArray" density="comfortable"
-              :disabled="!vehicle.level || disablePrefilledInputs" :rules="[requiredRule]" />
+            <InputPhoneNumberV2 v-model="vehicle.phoneNumber" density="comfortable" :rules="[requiredRule]" />
           </v-col>
 
           <v-col v-if="shouldShowField('plateNumber')" cols="12">
-            <InputLabel class="text-capitalize" title="Vehicle Numbers" required />
+            
             <!-- <v-text-field v-model="vehicle.plateNumber" density="comfortable" :rules="[requiredRule]" /> -->
             <template v-for="plate in vehicle.plates" :key="plate.plateNumber">
+              <InputLabel class="text-capitalize" title="Existing Vehicle Numbers" required />
               <v-text-field v-model="plate.plateNumber" density="comfortable" :rules="[requiredRule]" class="mb-2"
-                readonly>
+                readonly disabled>
                 <template #append-inner>
                   <v-chip size="small" class="ma-0" :color="formatVehicleStatus(plate?.status)?.color as string">{{
                     formatVehicleStatus(plate?.status)?.label }}</v-chip>
@@ -87,11 +88,12 @@
               </v-text-field>
             </template>
 
+            <InputLabel class="text-capitalize" title="New Vehicle Numbers" required />
             <template v-for="(plate, index) in newPlateNumbers" :key="index">
               <v-row class="" :class="`${index === newPlateNumbers.length - 1 ? 'mb-1' : 'mb-5'}`" no-gutters>
                 <v-col :cols="newPlateNumbers.length > 1 ? '11' : '12'">
                   <InputVehicleNumber v-model="newPlateNumbers[index]" density="comfortable"
-                    placeholder="New Vehicle Number" :rules="[requiredRule]" />
+                    placeholder="New Vehicle Number" :rules="[requiredRule]"  />
                 </v-col>
 
                 <v-col :cols="newPlateNumbers.length > 1 ? '1' : '0'" class="d-flex align-start">
@@ -114,7 +116,7 @@
           <v-col v-if="shouldShowField('start')" cols="12">
             <v-expand-transition v-if="showSubscriptionDateOptions">
               <v-row no-gutters>
-                <v-row dense justify="space-between">
+                <!-- <v-row dense justify="space-between">
                   <template v-for="option in subscriptionOptions" :key="option.value">
                     <v-col cols="4">
                       <v-btn :text="option.label" class="text-capitalize" min-width="120" :ripple="false"
@@ -123,7 +125,7 @@
                     </v-col>
 
                   </template>
-                </v-row>
+                </v-row> -->
 
                 <v-row no-gutters class="mt-5">
                   <v-col cols="12">
@@ -187,7 +189,7 @@
           <v-toolbar-title>
             <v-row no-gutters class="d-flex align-center justify-space-between">
               <span class="font-weight-bold">
-                Matching Records for NRIC: {{ vehicle.nric }}
+                Matching Records for "{{ searchUnitName ?? "-" }}"
               </span>
               <span>
                 <v-btn v-if="matchingPeople.length === 0" icon="mdi-close" variant="text"
@@ -200,14 +202,14 @@
         <v-card-text>
 
           <v-list lines="three">
-            <v-list-item v-if="matchingPeople.length > 0 || checkingNRIC" v-for="v in matchingPeople" :key="v._id"
+            <v-list-item v-if="matchingPeople.length > 0 || checkingUnit" v-for="v in matchingPeople" :key="v._id"
               class="cursor-pointer">
               <v-list-item-title>
                 {{ v.name }}
               </v-list-item-title>
 
               <v-list-item-subtitle>
-                Block {{ v.block }} - {{ v.level }} - {{ v.unitName }}
+               NRIC: {{ v.nric || "-" }}
               </v-list-item-subtitle>
 
               <div class="mt-1">
@@ -217,7 +219,7 @@
               </div>
 
               <template #append>
-                <v-btn variant="flat" color="primary" @click="selectNRICRecord(v)">Select</v-btn>
+                <v-btn variant="flat" color="primary" @click="selectPeopleRecord(v)">Select</v-btn>
               </template>
 
             </v-list-item>
@@ -266,7 +268,7 @@ const prop = defineProps({
 const { requiredRule, formatDateISO8601, debounce } = useUtils();
 const { addVehicle, getCustomSeasonPassTypes, updateVehicle, formatVehicleStatus } = useVehicle();
 const { getSiteById, getSiteLevels, getSiteUnits } = useSiteSettings();
-const { findPersonByNRICMultipleResult } = usePeople();
+const { findPersonByNRICMultipleResult, getPeopleByUnit } = usePeople();
 
 const emit = defineEmits(['back', 'select', 'done', 'error', 'close', 'close:all']);
 
@@ -291,7 +293,7 @@ const vehicle = reactive<Omit<ExceptPartial<TVehicle>, 'type'> & { type: TVehicl
 });
 
 const newPlateNumbers = ref<string[]>(['']);
-const disablePrefilledInputs = ref(false);
+const disablePrefilledInputs = ref(true);
 
 const blocksArray = ref<TDefaultOptionObj[]>([]);
 const levelsArray = ref<TDefaultOptionObj[]>([]);
@@ -301,6 +303,7 @@ const seasonPassTypeArray = ref<{ title: string, value: string }[]>([]);
 const matchingPeople = ref<Partial<TPeople>[]>([]);
 const showMatchingPeopleDialog = ref(false);
 const checkingNRIC = ref(false);
+const checkingUnit = ref(false);
 
 const defaultSeasonPassTypeArray = computed(() => {
   return [
@@ -329,6 +332,11 @@ const shouldShowField = (fieldKey: string): boolean => {
 };
 
 
+const searchUnitName = computed(() => {
+  return unitsArray.value.find(u => u.value === vehicle.unit)?.title || vehicle.unit;
+})
+
+
 const validForm = ref(false);
 const seasonPassTypeInput = ref('')
 const formRef = ref<HTMLFormElement | null>(null);
@@ -636,36 +644,62 @@ watch([() => vehicle.end, () => vehicle.start], () => {
 });
 
 
-function selectNRICRecord(record: TPeople) {
+function selectPeopleRecord(record: TPeople) {
 
   vehicle.name = record.name;
   vehicle.phoneNumber = record.contact;
-  vehicle.block = Number(record.block);
-  vehicle.level = record.level;
-  vehicle.unit = record.unit;
-
+  vehicle.nric = record.nric;
   vehicle.plates = record.plates || [];
-
   disablePrefilledInputs.value = true;
   showMatchingPeopleDialog.value = false;
-
-  refreshLevelsData();
-  refreshUnitsData();
 }
 
 
-async function checkNRIC() {
-  if (!vehicle.nric || vehicle.nric.length < 5) return;
+// async function checkNRIC() {
+//   if (!vehicle.nric || vehicle.nric.length < 5) return;
+
+//   checkingNRIC.value = true;
+//   showMatchingPeopleDialog.value = true;
+//   // Lock editable fields while we verify if this NRIC has existing records.
+//   disablePrefilledInputs.value = true;
+//   try {
+//     const res = await findPersonByNRICMultipleResult(vehicle.nric, prop.site) as { items: TPeople[] } | null;
+
+//     if (res?.items && res.items.length > 0) {
+//       matchingPeople.value = res.items || []
+//       // Force selection from matched records.
+//       disablePrefilledInputs.value = true;
+//     } else {
+//       matchingPeople.value = [];
+//       // No match found, allow manual input.
+//       disablePrefilledInputs.value = false;
+//     }
+
+
+//   } catch (error) {
+//     console.error("NRIC search failed:", error);
+//     disablePrefilledInputs.value = false;
+//   } finally {
+//     checkingNRIC.value = false;
+//   }
+// }
+
+// const debounceedCheckNRIC = debounce(checkNRIC, 500);
+
+
 
-  checkingNRIC.value = true;
+async function checkPeopleById() {
+  if (!vehicle.unit) return;
+
+  checkingUnit.value = true;
   showMatchingPeopleDialog.value = true;
   // Lock editable fields while we verify if this NRIC has existing records.
   disablePrefilledInputs.value = true;
   try {
-    const res = await findPersonByNRICMultipleResult(vehicle.nric, prop.site) as { items: TPeople[] } | null;
+    const res = await getPeopleByUnit(vehicle.unit) as TPeople[]| null;
 
-    if (res?.items && res.items.length > 0) {
-      matchingPeople.value = res.items || []
+    if (Array.isArray(res) && res.length > 0) {
+      matchingPeople.value = res || []
       // Force selection from matched records.
       disablePrefilledInputs.value = true;
     } else {
@@ -676,23 +710,23 @@ async function checkNRIC() {
 
 
   } catch (error) {
-    console.error("NRIC search failed:", error);
-    disablePrefilledInputs.value = false;
+    console.error("Unit search failed:", error);
+    // disablePrefilledInputs.value = false;
   } finally {
-    checkingNRIC.value = false;
+    checkingUnit.value = false;
   }
 }
 
-const debounceedCheckNRIC = debounce(checkNRIC, 500);
+const debounceedCheckUnit = debounce(checkPeopleById, 500);
 
 watch(
-  () => vehicle.nric,
-  async (newNRIC) => {
+  () => vehicle.unit,
+  async (newUnit) => {
     resetVehicleDetails();
     matchingPeople.value = [];
-    if (!newNRIC || newNRIC.length < 3) return;
+    if (!newUnit) return;
 
-    debounceedCheckNRIC();
+    debounceedCheckUnit();
   }
 );
 
@@ -700,10 +734,8 @@ watch(
 const resetVehicleDetails = () => {
   vehicle.name = '';
   vehicle.phoneNumber = '';
-  vehicle.block = '';
-  vehicle.level = '';
-  vehicle.unit = '';
   vehicle.plates = [];
+  vehicle.nric = '';
   disablePrefilledInputs.value = false;
 }
 

package/components/VehicleManagement.vue

@@ -47,7 +47,7 @@
         :org="org" :site="site" @close:all="handleCloseAll" />
     </v-dialog> -->
 
-    <v-dialog v-if="canViewVehicleDetails" v-model="dialog.showMoreActions" width="600" persistent>
+    <v-dialog v-if="canViewVehicleDetails" v-model="dialog.showMoreActions" width="800" persistent>
       <DialogUpdateMoreAction title="Preview" :can-update="false" :can-delete="false"
         @close="dialog.showMoreActions = false">
         <template v-slot:content>
@@ -74,7 +74,7 @@
                     <v-btn text="Add Vehicle Number" class="mt-6 text-capitalize" prepend-icon="mdi-plus"
                       @click="addNewPlateNumbers" color="primary" />
                   </v-card>
-                </v-col>å
+                </v-col>
 
               </v-col>
 
@@ -240,7 +240,7 @@ const selectedVehicleObject = computed(() => {
 
 const { data: getVehiclesReq, refresh: getVehiclesRefresh, pending: getVehiclesPending } =
   await useLazyAsyncData(
-    "get-all-vehicles",
+    `get-all-vehicles-${props.site}`,
     () =>
       getVehicles({
         page: page.value,

package/composables/useEquipmentItem.ts

@@ -4,12 +4,13 @@ export default function useEquipmentItem() {
     search = "",
     limit = 10,
     site = "",
+    serviceType = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-checkout-items/site/${site}`,
       {
         method: "GET",
-        query: { page, search, limit, site },
+        query: { page, search, limit, site, serviceType },
       },
     );
   }

package/composables/useEquipmentManagement.ts

@@ -1,10 +1,10 @@
 export default function useEquipmentManagement() {
-  function getSupplies({ page = 1, search = "", limit = 10, site = "" } = {}) {
+  function getSupplies({ page = 1, search = "", limit = 10, site = "", serviceType = "" } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-supplies/site/${site}`,
       {
         method: "GET",
-        query: { page, search, limit, site },
+        query: { page, search, limit, site, serviceType },
       }
     );
   }

package/composables/useVehicle.ts

@@ -3,14 +3,13 @@ export default function useVehicle() {
     search = "",
     page = 1,
     limit = 10,
-    sort = "asc",
-    order = "",
+    order = "desc",
     type = "",
     category = "",
   } = {}) {
     return await useNuxtApp().$api<Record<string, any>>("/api/vehicles", {
       method: "GET",
-      query: { search, page, limit, sort, order, type, category },
+      query: { search, page, limit, order, type, category },
     });
   }
 

package/package.json

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

package/types/equipment-item.d.ts

@@ -16,6 +16,7 @@ declare type TEquipmentItemCreate = {
     qty: number;
     attachment?: string[];
   }>;
+  serviceType?: string;
 };
 
 declare type TEquipmentItem = {