@7365admin1/layer-common 3.0.31-staging.23 → 3.0.31-staging.25

package/components/ManageChecklistMain.vue

@@ -97,7 +97,10 @@
                     Rejected
                   </v-chip>
                 </div>
-                <div v-if="item.remarks" class="text-body-2 text-medium-emphasis">
+                <div
+                  v-if="item.remarks"
+                  class="text-body-2 text-medium-emphasis"
+                >
                   {{ item.remarks }}
                 </div>
                 <div
@@ -225,11 +228,7 @@
       <v-card-text class="pa-4">
         <v-row>
           <v-col cols="12">
-            <InputLabel
-              title="Remarks (Optional)"
-              :required="false"
-              class="mb-2"
-            />
+            <InputLabel title="Remarks" :required="false" class="mb-2" />
             <v-textarea
               v-model="modalData.remark"
               placeholder="Enter your remarks here"
@@ -243,7 +242,7 @@
           <v-col cols="12">
             <v-divider class="mb-4" />
             <PhotoUpload
-              title="Take/Upload Photo"
+              title="Take/Upload Photos"
               :required="false"
               v-model="modalData.photos"
               v-model:photo-ids="modalData.photoIds"
@@ -442,12 +441,12 @@ const { back } = useUtils();
 const route = useRoute();
 const scheduleTitle = computed(() => {
   const path = route.path;
-  if (path.includes('cleaning-schedule')) return 'Cleaning Checklist';
-  if (path.includes('technician-schedule')) return 'Technician Checklist';
-  if (path.includes('landscape-schedule')) return 'Landscape Checklist';
-  if (path.includes('pool-schedule')) return 'Pool Checklist';
-  if (path.includes('pest-schedule')) return 'Pest Checklist';
-  return 'Cleaner Checklist';
+  if (path.includes("cleaning-schedule")) return "Cleaning Checklist";
+  if (path.includes("technician-schedule")) return "Technician Checklist";
+  if (path.includes("landscape-schedule")) return "Landscape Checklist";
+  if (path.includes("pool-schedule")) return "Pool Checklist";
+  if (path.includes("pest-schedule")) return "Pest Checklist";
+  return "Cleaner Checklist";
 });
 
 const canAddRemarks = computed(() => props.canAddRemarks);

package/components/VisitorForm.vue

@@ -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) {
@@ -974,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 = "";
   }
 
 
@@ -1019,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;
@@ -1379,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();
 }
 
@@ -1410,6 +1439,7 @@ function handleUpdatePhoneNumber() {
     phoneSearchMenu.value = false;
     return;
   }
+  if(prop.type === 'walk-in' || prop.type === 'drop-off') return;
 
   debounceFetchPhoneNumber();
 }
@@ -1442,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.23",
+  "version": "3.0.31-staging.25",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {