@iservice365/layer-common 1.3.1 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 1.4.0
+
+### Minor Changes
+
+- 1183813: Add new apps
+
+## 1.3.2
+
+### Patch Changes
+
+- 34a35ff: Update dependencies
+
 ## 1.3.1
 
 ### Patch Changes

package/components/BuildingManagement/units.vue

@@ -8,7 +8,7 @@
           variant="tonal"
           @click="setBuilding()"
           size="large"
-          v-if="canCreate"
+          v-if="canCreate && canCreateUnit"
         >
           Add Unit
         </v-btn>
@@ -82,7 +82,7 @@
     </v-dialog>
 
     <!-- Preview Dialog -->
-    <v-dialog v-model="dialogPreview" width="450" persistent>
+    <v-dialog v-if="canViewUnitDetails" v-model="dialogPreview" width="450" persistent>
       <v-card width="100%">
         <v-card-text style="max-height: 100vh; overflow-y: auto" class="pb-0">
           <v-row no-gutters v-if="selectedBuildingUnit" class="mb-4">
@@ -133,19 +133,24 @@
                     height="48"
                     v-bind="props"
                     tile
+                    :disabled="!canUpdateUnit && !canDeleteUnit"
                   >
                     More actions
                   </v-btn>
                 </template>
 
                 <v-list class="pa-0">
-                  <v-list-item @click="openEditDialog()">
+                  <v-list-item v-if="canUpdateUnit" @click="openEditDialog()">
                     <v-list-item-title class="text-subtitle-2">
                       Edit Unit
                     </v-list-item-title>
                   </v-list-item>
 
-                  <v-list-item @click="openDeleteDialog()" class="text-red">
+                  <v-list-item
+                    v-if="canDeleteUnit"
+                    @click="openDeleteDialog()"
+                    class="text-red"
+                  >
                     <v-list-item-title class="text-subtitle-2">
                       Delete Unit
                     </v-list-item-title>
@@ -264,6 +269,22 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  canCreateUnit: {
+    type: Boolean,
+    default: true,
+  },
+  canUpdateUnit: {
+    type: Boolean,
+    default: true,
+  },
+  canDeleteUnit: {
+    type: Boolean,
+    default: true,
+  },
+  canViewUnitDetails: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 const site = (useRoute().params.site as string) ?? "";

package/components/BuildingUnitFormAdd.vue

@@ -48,6 +48,89 @@
             </v-row>
           </v-col>
 
+          <v-col cols="12">
+            <v-row>
+              <v-col cols="12" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel
+                    class="text-capitalize"
+                    title="Company Name"
+                    required
+                  />
+                  <v-col cols="12">
+                    <v-text-field
+                      v-model="buildingUnit.companyName"
+                      density="comfortable"
+                      :rules="[requiredRule]"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12">
+            <v-row>
+              <v-col cols="12" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel
+                    class="text-capitalize"
+                    title="Company Registration Number"
+                  />
+                  <v-col cols="12">
+                    <v-text-field
+                      v-model="buildingUnit.companyRegistrationNumber"
+                      density="comfortable"
+                      :rules="[]"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12">
+            <v-row>
+              <v-col cols="12" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel
+                    class="text-capitalize"
+                    title="Lease Start"
+                    required
+                  />
+                  <v-col cols="12">
+                    <InputDateTimePicker
+                      ref="startDateRef"
+                      v-model="buildingUnit.leaseStart"
+                      :rules="[requiredRule]"
+                    />
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12">
+            <v-row>
+              <v-col cols="12" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel
+                    class="text-capitalize"
+                    title="Lease End"
+                    required
+                  />
+                  <v-col cols="12">
+                    <InputDateTimePicker
+                      ref="endDateRef"
+                      v-model="buildingUnit.leaseEnd"
+                      :rules="[requiredRule]"
+                    />
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-col>
+
           <v-col cols="12" class="mt-2">
             <v-row no-gutters>
               <InputLabel class="text-capitalize" title="Category" required />
@@ -139,8 +222,17 @@
           </v-expand-transition>
 
           <v-col cols="12" class="mt-5">
-            <InputLabel class="text-capitalize" title="Upload Files (Lease of Contract, Cert. of Occupancy)" />
-            <InputFileV2 v-model="buildingUnit.buildingUnitFiles" :multiple="false" :max-length="10" title="Upload PDF Files" accept="application/pdf" />
+            <InputLabel
+              class="text-capitalize"
+              title="Upload Files (Lease of Contract, Cert. of Occupancy)"
+            />
+            <InputFileV2
+              v-model="buildingUnit.buildingUnitFiles"
+              :multiple="false"
+              :max-length="10"
+              title="Upload PDF Files"
+              accept="application/pdf"
+            />
           </v-col>
 
           <v-col cols="12" class="mt-2">
@@ -244,9 +336,16 @@ const buildingUnit = ref<TBuildingUnit>({
   level: "",
   category: "",
   status: "active",
-  buildingUnitFiles: []
+  buildingUnitFiles: [],
+  companyName: "",
+  companyRegistrationNumber: "",
+  leaseStart: "",
+  leaseEnd: "",
 });
 
+const startDateRef = ref<HTMLInputElement | null>(null);
+const expiryDateRef = ref<HTMLInputElement | null>(null);
+
 buildingUnit.value.site = prop.site;
 
 const selectedBuilding = computed(() => {
@@ -284,7 +383,7 @@ const directorName = ref("");
 const createMore = ref(false);
 const disable = ref(false);
 
-const { requiredRule } = useUtils();
+const { requiredRule, validateDate } = useUtils();
 
 const message = ref("");
 
@@ -298,9 +397,13 @@ function setBuildingUnit() {
   buildingUnit.value.level = "";
   buildingUnit.value.category = "";
   buildingUnit.value.status = "active";
-  buildingUnit.value.buildingUnitFiles = []
+  buildingUnit.value.buildingUnitFiles = [];
   buildingUnitQty.value = 1;
   message.value = "";
+  buildingUnit.value.companyName = "";
+  buildingUnit.value.companyRegistrationNumber = "";
+  buildingUnit.value.leaseStart = "";
+  buildingUnit.value.leaseEnd = "";
 }
 
 async function submit() {

package/components/BuildingUnitFormEdit.vue

@@ -60,6 +60,88 @@
             </v-row>
           </v-col>
 
+          <v-col cols="12">
+            <v-row>
+              <v-col cols="12" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel
+                    class="text-capitalize"
+                    title="Company Name"
+                    required
+                  />
+                  <v-col cols="12">
+                    <v-text-field
+                      v-model="buildingUnit.companyName"
+                      density="comfortable"
+                      :rules="[requiredRule]"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12">
+            <v-row>
+              <v-col cols="12" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel
+                    class="text-capitalize"
+                    title="Company Registration Number"
+                  />
+                  <v-col cols="12">
+                    <v-text-field
+                      v-model="buildingUnit.companyRegistrationNumber"
+                      density="comfortable"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12">
+            <v-row>
+              <v-col cols="12" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel
+                    class="text-capitalize"
+                    title="Lease Start"
+                    required
+                  />
+                  <v-col cols="12">
+                    <InputDateTimePicker
+                      ref="startDateRef"
+                      v-model="buildingUnit.leaseStart"
+                      :rules="[requiredRule]"
+                    />
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12">
+            <v-row>
+              <v-col cols="12" class="mt-2">
+                <v-row no-gutters>
+                  <InputLabel
+                    class="text-capitalize"
+                    title="Lease End"
+                    required
+                  />
+                  <v-col cols="12">
+                    <InputDateTimePicker
+                      ref="endDateRef"
+                      v-model="buildingUnit.leaseEnd"
+                      :rules="[requiredRule]"
+                    />
+                  </v-col>
+                </v-row>
+              </v-col>
+            </v-row>
+          </v-col>
+
           <v-col cols="12" class="mt-2">
             <v-row no-gutters>
               <InputLabel
@@ -101,8 +183,17 @@
           </v-col>
 
           <v-col cols="12" class="mt-5">
-            <InputLabel class="text-capitalize" title="Upload Files (Lease of Contract, Cert. of Occupancy)" />
-            <InputFileV2 v-model="buildingUnit.buildingUnitFiles" :multiple="false" :max-length="10" title="Upload PDF Files" accept="application/pdf" />
+            <InputLabel
+              class="text-capitalize"
+              title="Upload Files (Lease of Contract, Cert. of Occupancy)"
+            />
+            <InputFileV2
+              v-model="buildingUnit.buildingUnitFiles"
+              :multiple="false"
+              :max-length="10"
+              title="Upload PDF Files"
+              accept="application/pdf"
+            />
           </v-col>
 
           <v-col cols="12" class="my-2">
@@ -143,7 +234,7 @@
             color="black"
             class="text-none"
             size="48"
-            :disabled="!validForm || !hasChanges || disable"
+            :disabled="!validForm || disable"
             @click="submit"
             :loading="disable"
           >
@@ -173,7 +264,11 @@ const prop = defineProps({
       block: null,
       level: 0,
       status: "active",
-      buildingUnitFiles: []
+      buildingUnitFiles: [],
+      companyName: "",
+      companyRegistrationNumber: "",
+      leaseStart: "",
+      leaseEnd: "",
     }),
   },
 });
@@ -188,7 +283,11 @@ const buildingUnit = ref({
   category: "",
   block: null,
   status: "active",
-  buildingUnitFiles: []
+  buildingUnitFiles: [],
+  companyName: "",
+  companyRegistrationNumber: "",
+  leaseStart: "",
+  leaseEnd: "",
 });
 
 buildingUnit.value = JSON.parse(JSON.stringify(prop.roomFacility));
@@ -241,14 +340,15 @@ function arraysAreEqual(a: any[], b: any[]): boolean {
   return a.length === b.length && a.every((val, index) => val === b[index]);
 }
 
-
-
 const hasChanges = computed(() => {
   return (
     prop.roomFacility.name !== buildingUnit.value.name ||
     prop.roomFacility.category !== buildingUnit.value.category ||
-    prop.roomFacility.level !== buildingUnit.value.level || 
-    !arraysAreEqual(prop.roomFacility.buildingUnitFiles, buildingUnit.value.buildingUnitFiles)
+    prop.roomFacility.level !== buildingUnit.value.level ||
+    !arraysAreEqual(
+      prop.roomFacility.buildingUnitFiles,
+      buildingUnit.value.buildingUnitFiles
+    )
   );
 });
 
@@ -259,7 +359,11 @@ async function submit() {
       name: buildingUnit.value.name,
       level: buildingUnit.value.level,
       category: buildingUnit.value.category,
-      buildingUnitFiles: buildingUnit.value.buildingUnitFiles || []
+      buildingUnitFiles: buildingUnit.value.buildingUnitFiles || [],
+      companyName: buildingUnit.value.companyName,
+      companyRegistrationNumber: buildingUnit.value.companyRegistrationNumber || "",
+      leaseStart: buildingUnit.value.leaseStart,
+      leaseEnd: buildingUnit.value.leaseEnd,
     });
 
     emit("success");

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/useCommonPermission.ts

@@ -120,11 +120,88 @@ export function useCommonPermissions() {
     },
   };
 
+  const visitorManagementPermissions: Record<string, TPermission> = {
+    "add-visitor": {
+      check: true,
+      description: "Allows the user to add a new visitor to the system.",
+    },
+    "see-all-visitor": {
+      check: true,
+      description: "Allows the user to view the list of all visitors.",
+    },
+    "see-visitor-details": {
+      check: true,
+      description: "Allows the user to view the details of a specific visitor.",
+    },
+    "update-visitor": {
+      check: true,
+      description: "Allows the user to update visitor details.",
+    },
+    "delete-visitor": {
+      check: true,
+      description:
+        "Allows the user to remove a visitor from the system permanently.",
+    },
+  };
+
+  const buildingManagementPermissions: Record<string, TPermission> = {
+    "add-building": {
+      check: true,
+      description: "Allows the user to add a new building to the system.",
+    },
+    "see-all-buildings": {
+      check: true,
+      description: "Allows the user to view the list of all buildings.",
+    },
+    "see-building-details": {
+      check: true,
+      description:
+        "Allows the user to view the details of a specific building.",
+    },
+    "update-building": {
+      check: true,
+      description: "Allows the user to update building details.",
+    },
+    "delete-building": {
+      check: true,
+      description:
+        "Allows the user to remove a building from the system permanently.",
+    },
+  };
+
+  const buildingUnitManagementPermissions: Record<string, TPermission> = {
+    "add-building-unit": {
+      check: true,
+      description: "Allows the user to add a new building unit to the system.",
+    },
+    "see-all-building-units": {
+      check: true,
+      description: "Allows the user to view the list of all building units.",
+    },
+    "see-building-unit-details": {
+      check: true,
+      description:
+        "Allows the user to view the details of a specific building unit.",
+    },
+    "update-building-unit": {
+      check: true,
+      description: "Allows the user to update building unit details.",
+    },
+    "delete-building-unit": {
+      check: true,
+      description:
+        "Allows the user to remove a building unit from the system permanently.",
+    },
+  };
+
   return {
     invitationPermissions,
     memberPermissions,
     rolePermissions,
     feedbackPermissions,
     workOrderPermissions,
+    visitorManagementPermissions,
+    buildingManagementPermissions,
+    buildingUnitManagementPermissions
   };
 }

package/composables/useLocal.ts

@@ -45,6 +45,8 @@ 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" },
   ];
 
   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.1",
+  "version": "1.4.0",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/types/building.d.ts

@@ -17,5 +17,9 @@ declare type TBuildingUnit = {
   level: string | null;
   category: string;
   status: string;
-  buildingUnitFiles: string[]
+  buildingUnitFiles: string[];
+  companyName: string;
+  companyRegistrationNumber: number | string;
+  leaseStart: string;
+  leaseEnd: string;
 };