@7365admin1/layer-common 3.0.2 → 3.0.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 3.0.3
+
+### Patch Changes
+
+- 8cae579: add document management layer fix
+
 ## 3.0.2
 
 ### Patch Changes

package/components/DashboardMain.vue

@@ -395,12 +395,12 @@
                 </div>
                 <v-chip
                   size="small"
-                  :color="getStaffTone(item.status)"
+                  color="blue-grey-darken-1"
                   variant="tonal"
                   label
-                  class="ml-auto flex-shrink-0"
+                  class="ml-auto flex-shrink-0 font-weight-bold"
                 >
-                  {{ item.status }}
+                  {{ item.totalHours || 0 }} hrs
                 </v-chip>
               </div>
             </v-card>
@@ -625,6 +625,7 @@ type StaffItem = {
   name: string;
   role: string;
   status: string;
+  totalHours?: number | string;
   raw?: Record<string, any>;
 };
 
@@ -1549,6 +1550,7 @@ function normalizeStaffItem(
         item.attendanceStatus ||
         "Off duty"
     ),
+    totalHours: item.totalHours || 0,
     raw: item,
   };
 }

package/components/Facility/BookingSetup.vue

@@ -501,7 +501,7 @@
           </v-col>
           <v-col cols="3" class="d-flex align-center justify-end">
             <v-switch
-              v-model="facility.isBookingUnitLimitEnabled"
+              v-model="isBookingUnitLimitEnabled"
               class="d-flex align-center"
               color="primary"
               hide-details
@@ -519,7 +519,7 @@
               :min="1"
               :max="500"
               hide-details
-              :disabled="!facility.isBookingUnitLimitEnabled"
+              :disabled="!isBookingUnitLimitEnabled"
             />
           </v-col>
         </v-row>
@@ -539,7 +539,7 @@
           </v-col>
           <v-col cols="3" class="d-flex align-center justify-end">
             <v-switch
-              v-model="facility.isMaxNumberGuestLimitEnabled"
+              v-model="isMaxNumberGuestLimitEnabled"
               class="d-flex align-center"
               color="primary"
               hide-details
@@ -557,7 +557,7 @@
               :min="1"
               :max="500"
               hide-details
-              :disabled="!facility.isMaxNumberGuestLimitEnabled"
+              :disabled="!isMaxNumberGuestLimitEnabled"
             />
           </v-col>
         </v-row>
@@ -576,7 +576,7 @@
           </v-col>
           <v-col cols="3" class="d-flex align-center justify-end">
             <v-switch
-              v-model="facility.isCancelAllowedLimitEnabled"
+              v-model="isCancelAllowedLimitEnabled"
               class="d-flex align-center"
               color="primary"
               hide-details
@@ -594,7 +594,7 @@
               :min="1"
               :max="500"
               hide-details
-              :disabled="!facility.isCancelAllowedLimitEnabled"
+              :disabled="!isCancelAllowedLimitEnabled"
             />
           </v-col>
         </v-row>
@@ -1013,32 +1013,56 @@ const handlePolicy = (newContent: string) => {
   facility.value.bookingPolicy = newContent;
 };
 
+const isBookingUnitLimitEnabled = ref<boolean>(false);
+const isMaxNumberGuestLimitEnabled = ref<boolean>(false);
+const isCancelAllowedLimitEnabled = ref<boolean>(false);
+
+watchEffect(() => {
+  if (facility.value.bookingUnitLimit > 0) {
+    isBookingUnitLimitEnabled.value = true;
+  } else {
+    isBookingUnitLimitEnabled.value = false;
+  }
+
+  if (facility.value.maxNumberGuestLimit > 0) {
+    isMaxNumberGuestLimitEnabled.value = true;
+  } else {
+    isMaxNumberGuestLimitEnabled.value = false;
+  }
+
+  if (facility.value.daysAllowedCancel > 0) {
+    isCancelAllowedLimitEnabled.value = true;
+  } else {
+    isCancelAllowedLimitEnabled.value = false;
+  }
+});
+
 function onToggleBookingUnitLimit(val: any) {
   if (val) {
-    facility.value.isBookingUnitLimitEnabled = true;
+    isBookingUnitLimitEnabled.value = true;
     facility.value.bookingUnitLimit = 1;
   } else {
-    facility.value.isBookingUnitLimitEnabled = false;
+    isBookingUnitLimitEnabled.value = false;
     facility.value.bookingUnitLimit = null;
   }
 }
 
 function onToggleMaxNumberGuestLimit(val: any) {
   if (val) {
-    facility.value.isMaxNumberGuestLimitEnabled = true;
+    isMaxNumberGuestLimitEnabled.value = true;
     facility.value.maxNumberGuestLimit = 1;
   } else {
-    facility.value.isMaxNumberGuestLimitEnabled = false;
+    isMaxNumberGuestLimitEnabled.value = false;
     facility.value.maxNumberGuestLimit = null;
   }
 }
 
 function onToggleCancelAllowedLimit(val: any) {
   if (val) {
-    facility.value.isCancelAllowedLimitEnabled = true;
+    isCancelAllowedLimitEnabled.value = true;
     facility.value.daysAllowedCancel = 1;
   } else {
-    facility.value.isCancelAllowedLimitEnabled = false;
+    isCancelAllowedLimitEnabled.value = false;
     facility.value.daysAllowedCancel = null;
   }
 }

package/components/VisitorDataFromScannedQRCodeForm.vue

@@ -29,8 +29,8 @@
         </v-col>
 
         <v-col v-if="!visitorInfo.checkIn" cols="12">
-          <InputLabel class="text-capitalize" title="NRIC/Passport/ID No." />
-          <v-text-field
+          <InputLabel class="text-capitalize" title="NRIC" />
+          <!-- <v-text-field
             v-if="!visitorInfo.checkIn"
             v-model="visitorInfo.nric"
             density="comfortable"
@@ -43,7 +43,17 @@
             density="comfortable"
             hide-details
             readonly
-          />
+          /> -->
+          <NRICNumber  v-if="!visitorInfo.checkIn"
+            v-model="visitorInfo.nric"
+            density="comfortable"
+            hide-details
+            clearable />
+          <NRICNumber v-else
+            v-model="visitorNric"
+            density="comfortable"
+            hide-details
+            readonly />
         </v-col>
 
         <v-col v-if="!visitorInfo.checkIn" cols="12" class="mt-4">
@@ -222,6 +232,8 @@
   </v-card>
 </template>
 <script setup lang="ts">
+import NRICNumber from './Input/NRICNumber.vue';
+
 const prop = defineProps({
   site: {
     type: String,
@@ -271,15 +283,15 @@ const location = computed({
   get: () => {
     if (
       visitorInfo.value &&
-      visitorInfo.value.block &&
-      visitorInfo.value.level &&
+      visitorInfo.value.block?.name &&
+      visitorInfo.value.level?.name &&
       visitorInfo.value.unitName
     ) {
-      return `${visitorInfo.value.block} / ${visitorInfo.value.level} / ${visitorInfo.value.unitName}`;
+      return `${visitorInfo.value.block?.name} / ${visitorInfo.value.level?.name} / ${visitorInfo.value.unitName}`;
     } else if (
       visitorInfo.value &&
-      visitorInfo.value.block &&
-      !visitorInfo.value.level &&
+      visitorInfo.value.block?.name &&
+      !visitorInfo.value.level?.name &&
       !visitorInfo.value.unitName
     ) {
       return visitorInfo.value.block;

package/composables/useFacility.ts

@@ -95,11 +95,8 @@ export default function usetFacility() {
       count: number;
       permanentRemarks: string;
     }[] = [];
-    isBookingUnitLimitEnabled: boolean;
     bookingUnitLimit: number | null;
-    isMaxNumberGuestLimitEnabled: boolean;
     maxNumberGuestLimit: number | null;
-    isCancelAllowedLimitEnabled: boolean;
     daysAllowedCancel: number | null;
 
     constructor(
@@ -191,11 +188,8 @@ export default function usetFacility() {
         isBookingPolicyEnabled = false,
         bookingPolicy = "",
         securityCheckList = [],
-        isBookingUnitLimitEnabled = false,
         bookingUnitLimit = null,
-        isMaxNumberGuestLimitEnabled = false,
         maxNumberGuestLimit = null,
-        isCancelAllowedLimitEnabled = false,
         daysAllowedCancel = null,
       } = {} as TFacility
     ) {
@@ -256,11 +250,8 @@ export default function usetFacility() {
       this.isCancellationAutoRefundEnabled = isCancellationAutoRefundEnabled;
       this.bookingPolicy = bookingPolicy;
       this.securityCheckList = securityCheckList ?? [];
-      this.isBookingUnitLimitEnabled = isBookingUnitLimitEnabled || false;
       this.bookingUnitLimit = bookingUnitLimit ?? null;
-      this.isMaxNumberGuestLimitEnabled = isMaxNumberGuestLimitEnabled || false;
       this.maxNumberGuestLimit = maxNumberGuestLimit ?? null;
-      this.isCancelAllowedLimitEnabled = isCancelAllowedLimitEnabled || false;
       this.daysAllowedCancel = daysAllowedCancel ?? null;
       this.isBookingPolicyEnabled = isBookingPolicyEnabled || false;
     }

package/package.json

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

package/types/facility.d.ts

@@ -92,11 +92,8 @@ declare type TFacility = {
     count: number;
     permanentRemarks: string;
   }[];
-  isBookingUnitLimitEnabled: boolean;
   bookingUnitLimit: number | null;
-  isMaxNumberGuestLimitEnabled: boolean;
   maxNumberGuestLimit: number | null;
-  isCancelAllowedLimitEnabled: boolean;
   daysAllowedCancel: number | null;
   isBookingPolicyEnabled: boolean;
   updatedBy?: string;

package/types/visitor.d.ts

@@ -3,8 +3,14 @@ declare type TVisitor = {
   name?: string;
   type: TVisitorType;
   company?: string | "";
-  block?: number | string;
-  level?: string;
+  block?: {
+    name: string;
+    _id: string;
+  };
+  level?: {
+    name: string;
+    _id: string;
+  };
   unit?: string;
   unitName?: string; // only for display purpose
   contact: string;