@iservice365/layer-common 1.3.2 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.4.1
+
+### Patch Changes
+
+- 8290615: Add pool maintenance services
+
+## 1.4.0
+
+### Minor Changes
+
+- 1183813: Add new apps
+
 ## 1.3.2
 
 ### Patch Changes

package/components/Input/InputPhoneNumberV2.vue

@@ -8,7 +8,7 @@
                     <v-list-item v-bind="itemProps" :title="item.raw.name" :subtitle="item.raw.dial_code" width="300" />
                 </template>
             </v-select>
-            <v-mask-input v-model="phone" :mask="currentMask" :rules="[...props.rules, validatePhone]"
+            <v-mask-input v-model="phone" :mask="currentMask" :rules="[...props.rules, validatePhone]" :loading="loading"
                 :variant="variant" hint="Enter a valid phone number" hide-details persistent-hint return-masked-value
                 :density="density" :placeholder="placeholder || currentMask"></v-mask-input>
         </v-col>
@@ -41,6 +41,10 @@ const props = defineProps({
     hideDetails: {
         type: Boolean,
         default: false
+    },
+    loading: {
+        type: Boolean,
+        default: false
     }
 })
 
@@ -109,6 +113,11 @@ function handleUpdateCountry() {
     phone.value = ''
 }
 
+const emit = defineEmits(['update:modelValue'])
+
+watch(phone, (newVal) => {
+  emit('update:modelValue', newVal)
+})
 
 
 </script>

package/components/Input/NRICNumber.vue

@@ -48,6 +48,6 @@ function onInput(event) {
 
 
 watch(model, (newVal) => {
-  emit('update:modelValue:', newVal)
+  emit('update:modelValue', newVal)
 })
 </script>

package/components/VisitorForm.vue

@@ -60,7 +60,7 @@
 
           <v-col v-if="shouldShowField('contact')" cols="12">
             <InputLabel class="text-capitalize" title="Phone Number" required />
-            <InputPhoneNumberV2 v-model="visitor.contact" :rules="[requiredRule]" density="comfortable" />
+            <InputPhoneNumberV2 v-model="visitor.contact" :rules="[requiredRule]" density="comfortable" :loading="fetchPersonByContactPending" @update:model-value="handleUpdateContact" />
           </v-col>
 
           <v-col v-if="shouldShowField('deliveryType')" cols="12">
@@ -207,7 +207,7 @@ const prop = defineProps({
 const { requiredRule, debounce } = useUtils();
 const { getSiteById, getSiteLevels, getSiteUnits } = useSiteSettings();
 const { createVisitor, typeFieldMap, contractorTypes } = useVisitor();
-const { findPersonByNRIC } = usePeople()
+const { findPersonByNRIC, findPersonByContact } = usePeople()
 
 const emit = defineEmits([
   "back",
@@ -307,7 +307,7 @@ const {
   data: fetchPersonByNRICReq,
   refresh: fetchPersonByNRICRefresh,
   pending: fetchPersonByNRICPending,
-} = useLazyAsyncData(`fetch-company-list`, () =>{
+} = useLazyAsyncData(`fetch-person`, () =>{
   const NRIC = visitor.nric;
   if(!NRIC) return Promise.resolve(null)
   return findPersonByNRIC(NRIC)
@@ -329,6 +329,32 @@ watch(fetchPersonByNRICReq, (obj) => {
   }
 })
 
+const {
+  data: fetchPersonByContactReq,
+  refresh: fetchPersonByContactRefresh,
+  pending: fetchPersonByContactPending,
+} = useLazyAsyncData(`fetch-contact`, () =>{
+  const contact = visitor.contact;
+  if(!contact) return Promise.resolve(null)
+  return findPersonByContact(contact)
+}
+);
+
+watch(fetchPersonByContactReq, (obj) => {
+  if(obj){
+    companyNames.value = obj.companyName ?? []
+    visitor.name = obj.name
+    if(!visitor.company){
+      visitor.company = companyNames.value?.[0]
+    }
+    visitor.plateNumber = obj.plateNumber ?? ""
+    visitor.block = obj.block ?? ""
+    visitor.level = obj.level ?? ""
+    visitor.unit = obj.unit ?? ""
+    visitor.nric = obj.nric
+  }
+})
+
 const {
   data: siteData,
   refresh: refreshSiteData,
@@ -428,11 +454,16 @@ function handleUpdateUnit(value: any) {
 }
 
 const debounceFetchNRIC = debounce(fetchPersonByNRICRefresh, 500)
+const debounceFetchContact = debounce(fetchPersonByContactRefresh, 500)
 
 function handleUpdateNRIC(){
     debounceFetchNRIC()
 }
 
+function handleUpdateContact(){
+    debounceFetchContact()
+}
+
 function backToSelection() {
   emit("back");
   message.value = "";

package/components/VisitorManagement.vue

@@ -118,7 +118,7 @@
     </v-dialog>
 
     <v-dialog v-model="dialog.viewVisitor" width="450" persistent>
-      <VehicleUpdateMoreAction title="Preview" :can-update="canUpdateVisitor" :can-delete="canDeleteVisitor"
+      <VehicleUpdateMoreAction title="Preview" :can-update="false" :can-delete="canDeleteVisitor"
         @close="dialog.viewVisitor = false" edit-button-label="Edit Visitor" delete-button-label="Delete Visitor"
         @delete="handleDeleteVisitor">
         <template v-slot:content>

package/composables/useLocal.ts

@@ -45,6 +45,9 @@ export default function useLocal() {
       value: "mechanical_electrical_services",
     },
     { title: "Cleaning Services", value: "cleaning_services" },
+    { title: "Pest Control Services", value: "pest_control_services" },
+    { title: "Landscaping Services", value: "landscaping_services" },
+    { title: "Pool Maintenance Services", value: "pool_maintenance_services" },
   ];
 
   const landingPage = useCookie("landing-page", cookieConfig);

package/composables/usePeople.ts

@@ -25,6 +25,12 @@ export default function(){
       });
   }
 
+  async function findPersonByContact(contact: string): Promise<null | Partial<TPeople>> {
+      return await $fetch<Record<string, any>>(`/api/people/contact/${contact}`, {
+        method: "GET",
+      });
+  }
+
     async function create(payload: Partial<TPeoplePayload>){
       return await useNuxtApp().$api<Record<string, any>>("/api/people", {
         method: "POST",
@@ -51,6 +57,7 @@ export default function(){
         getAll,
         updateById,
         deleteById,
-        findPersonByNRIC
+        findPersonByNRIC,
+        findPersonByContact
     }
 }

package/nuxt.config.ts

@@ -29,6 +29,9 @@ export default defineNuxtConfig({
         (process.env.APP_PROPERTY_MANAGEMENT as string) ?? "",
       APP_MECHANICAL_ELECTRICAL:
         (process.env.APP_MECHANICAL_ELECTRICAL as string) ?? "",
+      APP_PEST_CONTROL: (process.env.APP_PEST_CONTROL as string) ?? "",
+      APP_LANDSCAPING: (process.env.APP_LANDSCAPING as string) ?? "",
+      APP_POOL_MAINTENANCE: (process.env.APP_POOL_MAINTENANCE as string) ?? "",
     },
   },
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@iservice365/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",