@7365admin1/layer-common 3.0.31-staging.22 → 3.0.31-staging.24

package/components/VisitorForm.vue

@@ -136,7 +136,7 @@
             <v-col cols="12">
               <InputLabel class="text-capitalize" title="Company Name" />
               <v-combobox v-model="visitor.company" v-model:search="companyNameInput" ref="companyCombo"
-                autocomplete="off" :hide-no-data="false" :items="companyNames" item-value="value"
+                autocomplete="off" :hide-no-data="true" :items="companyNames" item-value="value"
                 @update:model-value="handleSelectCompanyName" variant="outlined" density="comfortable" persistent-hint
                 small-chips>
                 <!-- <template v-slot:no-data>
@@ -346,7 +346,7 @@
           </p>
 
           <div class="text-subtitle-1 mb-8">
-            <div>NRIC: {{ visitor.nric || "N/A" }}</div>
+            <div v-if="!skipNonCheckedOutNric">NRIC: {{ visitor.nric || "N/A" }}</div>
             <div>Phone Number: {{ visitor.contact || "N/A" }}</div>
           </div>
 
@@ -754,6 +754,7 @@ type SearchPerson = Omit<Partial<TPeople>, "contact"> & {
   contacts?: string | string[];
   plateNumbers?: string | string[];
   plateNumber?: string | string[];
+  plates?: { plateNumber?: string }[];
 };
 
 function getPeopleSearchItems(res: any): Partial<TPeople>[] {
@@ -803,7 +804,6 @@ async function handleAddNewContractorType() {
 
   combo.isMenuActive = false;
   combo.$el.querySelector("input")?.blur();
-  ``;
 }
 
 async function handleSelectCompanyName(company: string) {
@@ -871,8 +871,10 @@ watch(fetchPersonByNRICReq, (obj) => {
 
 watch(
   () => visitor.nric,
-  (value) => {
-    skipNonCheckedOutNric.value = false;
+  (value, oldValue) => {
+    if (skipNonCheckedOutNric.value && value !== oldValue) {
+      skipNonCheckedOutNric.value = false;
+    }
     if (!value || value.length < 4) {
       nricSearchMenu.value = false;
       nricSearchResults.value = [];
@@ -883,7 +885,6 @@ watch(
 watch(
   () => visitor.contact,
   (value) => {
-    skipNonCheckedOutNric.value = false;
     if (!value || value.length < 4) {
       phoneSearchMenu.value = false;
       phoneSearchResults.value = [];
@@ -973,19 +974,44 @@ function applyNricSearchResult(
 
   currentAutofillSource.value = options.source || "nric";
 
-  visitor.nric = item.nric || visitor.nric;
-  visitor.name = item.name || visitor.name;
-  visitor.contact = options.contacts || getPersonContactOptions(item)[0] || visitor.contact;
-  visitor.plateNumber = options.plateNumber || getPersonPlateOptions(item)[0] || visitor.plateNumber;
+  const shouldAutofillField = (fieldSource?: Exclude<AutofillSource, null>) => {
+    if (!fieldSource) return false;
+    return currentAutofillSource.value === fieldSource;
+  };
+  const getAutofillValue = (
+    currentValue: string | undefined,
+    nextValue: string | undefined,
+    fieldSource?: Exclude<AutofillSource, null>
+  ) => {
+    if (!nextValue) return currentValue;
+    if (currentValue && !shouldAutofillField(fieldSource)) return currentValue;
+    return nextValue;
+  };
+
+  visitor.nric = getAutofillValue(visitor.nric, item.nric, "nric");
+  visitor.name = getAutofillValue(visitor.name, item.name);
+  visitor.contact = getAutofillValue(
+    visitor.contact,
+    options.contacts || getPersonContactOptions(item)[0],
+    "contact"
+  );
+  
+  if(prop.type !== 'walk-in'){
+    visitor.plateNumber = getAutofillValue(
+    visitor.plateNumber,
+    options.plateNumber || getPersonPlateOptions(item)[0],
+    "vehicleNumber"
+  );
+  }
 
   companyNames.value = Array.isArray(item.companyName) ? item.companyName : [];
 
-  if (item.companyName && item.companyName.length === 1) {
+  if (!visitor.company && item.companyName && item.companyName.length === 1) {
     visitor.company = item.companyName?.[0] || visitor.company;
   }
 
-  if (item.companyName && item.companyName.length > 1) {
-    visitor.company = ""
+  if (!visitor.company && item.companyName && item.companyName.length > 1) {
+    visitor.company = "";
   }
 
 
@@ -1018,7 +1044,10 @@ function selectAutofillSearchResult(item: Partial<TPeople>, source: Exclude<Auto
   const selectedPlate =
     findMatchingPlateOption(plateOptions, visitor.plateNumber) || plateOptions[0] || "";
 
-  if (contactOptions.length > 1 || plateOptions.length > 1) {
+  const needsContactChoice = !visitor.contact?.trim() && contactOptions.length > 1;
+  const needsPlateChoice = !visitor.plateNumber?.trim() && plateOptions.length > 1;
+
+  if (needsContactChoice || needsPlateChoice) {
     nricSearchMenu.value = false;
     phoneSearchMenu.value = false;
     vehicleSearchMenu.value = false;
@@ -1134,11 +1163,12 @@ async function checkNonCheckedOutVisitorsBeforeSubmit(
 }
 
 async function handleSkipNricNonCheckedOut() {
+  skipNonCheckedOutNric.value = true;
+
   const canSubmit = await checkNonCheckedOutVisitorsBeforeSubmit({
     skipNric: true,
   });
   if (!canSubmit) return;
-  skipNonCheckedOutNric.value = true;
   dialog.showNonCheckedOutDialog = false;
 }
 
@@ -1377,6 +1407,7 @@ function handleUpdateNRIC() {
   if (skipNricFetch.value) return;
   if (!isNricFieldFocused.value) return;
   if (visitor.nric && visitor.nric?.length < 4) return;
+  if(prop.type === 'walk-in' || prop.type === 'drop-off') return;
   debounceFetchNRIC();
 }
 
@@ -1408,6 +1439,7 @@ function handleUpdatePhoneNumber() {
     phoneSearchMenu.value = false;
     return;
   }
+  if(prop.type === 'walk-in' || prop.type === 'drop-off') return;
 
   debounceFetchPhoneNumber();
 }
@@ -1440,6 +1472,8 @@ function handleUpdateVehicleNumber() {
     return;
   }
 
+  if(prop.type === 'walk-in' || prop.type === 'drop-off') return;
+
   debounceFetchPlateNumber();
 }
 

package/package.json

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