@7365admin1/layer-common 3.0.30 → 3.0.31-staging.11

package/components/VisitorManagement.vue

@@ -315,7 +315,9 @@
                 style="cursor: pointer"
               >
                 <v-chip
-                  v-for="pass in item.visitorPass"
+                  v-for="pass in item.visitorPass.filter(
+                    (i) => i.status != 'Removed'
+                  )"
                   :key="(pass as any)._id ?? (pass as any).keyId"
                   prepend-icon="mdi-card-bulleted-outline"
                   size="x-small"
@@ -325,7 +327,9 @@
                   {{ (pass as any)?.prefixAndName }}
                 </v-chip>
                 <v-chip
-                  v-for="key in item.passKeys"
+                  v-for="key in item.passKeys.filter(
+                    (i) => i.status != 'Removed'
+                  )"
                   :key="(key as any)._id ?? (key as any).keyId"
                   prepend-icon="mdi-key"
                   size="x-small"
@@ -404,9 +408,16 @@
           </v-menu>
 
           <!-- QRCODE identifier -->
-          <div v-if="item.accessCards?.type === 'QRCODE' && item.accessCards?.cardNo" class="d-flex align-center ga-1 mt-1">
+          <div
+            v-if="
+              item.accessCards?.type === 'QRCODE' && item.accessCards?.cardNo
+            "
+            class="d-flex align-center ga-1 mt-1"
+          >
             <v-icon size="15" icon="mdi-qrcode" color="teal" />
-            <v-chip size="x-small" variant="tonal" color="teal">QR · ({{ item.cards?.flat().length ?? 1 }})</v-chip>
+            <v-chip size="x-small" variant="tonal" color="teal"
+              >QR · ({{ item.cards?.flat().length ?? 1 }})</v-chip
+            >
           </div>
         </v-row>
       </template>
@@ -814,7 +825,9 @@
                 item-title="label"
                 item-value="value"
                 v-model="pass.status"
-                :disabled="selectedVisitorObject.checkOut"
+                :disabled="
+                  selectedVisitorObject.checkOut || pass.status == 'Removed'
+                "
               ></v-select>
               <v-textarea
                 v-if="pass.status === 'Lost' || pass.status === 'Damaged'"
@@ -851,7 +864,9 @@
                 item-title="label"
                 item-value="value"
                 v-model="key.status"
-                :disabled="selectedVisitorObject.checkOut"
+                :disabled="
+                  selectedVisitorObject.checkOut || key.status == 'Removed'
+                "
               ></v-select>
               <v-textarea
                 v-if="key.status === 'Lost' || key.status === 'Damaged'"
@@ -911,37 +926,87 @@
     <v-dialog v-model="dialog.returnNfcCard" max-width="450" persistent>
       <v-card>
         <v-toolbar density="compact" color="">
-          <v-row no-gutters class="d-flex fill-height justify-space-between align-center px-4">
+          <v-row
+            no-gutters
+            class="d-flex fill-height justify-space-between align-center px-4"
+          >
             <span class="font-weight-bold">Return NFC Card</span>
-            <v-btn icon="mdi-close" variant="text" @click="dialog.returnNfcCard = false" />
+            <v-btn
+              icon="mdi-close"
+              variant="text"
+              @click="dialog.returnNfcCard = false"
+            />
           </v-row>
         </v-toolbar>
         <v-card-text class="px-4 pb-2">
-          <p class="text-body-2 mb-3">Please indicate the status of the NFC card before checking out.</p>
+          <p class="text-body-2 mb-3">
+            Please indicate the status of the NFC card before checking out.
+          </p>
           <div>
             <InputLabel class="text-capitalize" title="Full Name" />
-            <v-text-field v-model="selectedVisitorObject.name" density="comfortable" readonly />
+            <v-text-field
+              v-model="selectedVisitorObject.name"
+              density="comfortable"
+              readonly
+            />
           </div>
           <div>
             <InputLabel class="text-capitalize" title="Location" />
-            <v-text-field v-model="selectedVisitorObject.location" density="comfortable" readonly />
+            <v-text-field
+              v-model="selectedVisitorObject.location"
+              density="comfortable"
+              readonly
+            />
           </div>
-          <div v-for="(card, idx) in nfcCardReturnStatuses" :key="card.cardId" class="mb-4">
+          <div
+            v-for="(card, idx) in nfcCardReturnStatuses"
+            :key="card.cardId"
+            class="mb-4"
+          >
             <div class="d-flex align-center ga-2 mb-2">
               <v-icon size="18" icon="mdi-credit-card-outline" color="purple" />
-              <v-chip size="small" variant="tonal" color="purple">{{ card.cardNo }}</v-chip>
+              <v-chip size="small" variant="tonal" color="purple">{{
+                card.cardNo
+              }}</v-chip>
             </div>
-            <v-select v-model="nfcCardReturnStatuses[idx].status" :items="nfcPassStatusOptions" item-title="label" item-value="value" density="comfortable" hide-details />
-            <v-textarea v-if="card.status === 'Lost' || card.status === 'Damage'" v-model="nfcCardReturnStatuses[idx].remarks" label="Remarks (required)" no-resize rows="3" class="mt-2" density="compact" />
+            <v-select
+              v-model="nfcCardReturnStatuses[idx].status"
+              :items="nfcPassStatusOptions"
+              item-title="label"
+              item-value="value"
+              density="comfortable"
+              hide-details
+            />
+            <v-textarea
+              v-if="card.status === 'Lost' || card.status === 'Damage'"
+              v-model="nfcCardReturnStatuses[idx].remarks"
+              label="Remarks (required)"
+              no-resize
+              rows="3"
+              class="mt-2"
+              density="compact"
+            />
           </div>
         </v-card-text>
         <v-toolbar class="pa-0" density="compact">
           <v-row no-gutters>
             <v-col cols="6">
-              <v-btn variant="text" block @click="dialog.returnNfcCard = false">Close</v-btn>
+              <v-btn variant="text" block @click="dialog.returnNfcCard = false"
+                >Close</v-btn
+              >
             </v-col>
             <v-col cols="6">
-              <v-btn color="red" variant="flat" height="48" rounded="0" block :loading="loading.checkingOut" :disabled="!canConfirmNfcCheckout" @click="handleNfcCheckout">Confirm Checkout</v-btn>
+              <v-btn
+                color="red"
+                variant="flat"
+                height="48"
+                rounded="0"
+                block
+                :loading="loading.checkingOut"
+                :disabled="!canConfirmNfcCheckout"
+                @click="handleNfcCheckout"
+                >Confirm Checkout</v-btn
+              >
             </v-col>
           </v-row>
         </v-toolbar>
@@ -971,7 +1036,7 @@
         @close="dialog.editPassKey = false"
         @done="
           () => {
-            dialog.editPassKey = false;
+            // dialog.editPassKey = false;
             getVisitorRefresh();
           }
         "
@@ -1826,7 +1891,8 @@ const nfcCardReturnStatuses = ref<
 const canConfirmCheckout = computed(() => {
   const allEntries = [...passReturnStatuses.value, ...keyReturnStatuses.value];
   return allEntries.every((entry) => {
-    if (!entry.status || ["In Use","Not Returned"].includes(entry.status)) return false;
+    if (!entry.status || ["In Use", "Not Returned"].includes(entry.status))
+      return false;
     if (
       (entry.status === "Lost" || entry.status === "Damaged") &&
       !entry.remarks.trim()
@@ -1840,7 +1906,8 @@ const canConfirmNfcCheckout = computed(() => {
   if (nfcCardReturnStatuses.value.length === 0) return false;
   return nfcCardReturnStatuses.value.every(({ status, remarks }) => {
     if (!status || status === "In Use") return false;
-    if ((status === "Lost" || status === "Damage") && !remarks.trim()) return false;
+    if ((status === "Lost" || status === "Damage") && !remarks.trim())
+      return false;
     return true;
   });
 });
@@ -1883,17 +1950,28 @@ function handleCheckout(userId: string) {
     return;
   }
 
-  const hasNfc = visitor?.accessCards?.type === "NFC" && !!visitor?.accessCards?.cardNo;
+  const hasNfc =
+    visitor?.accessCards?.type === "NFC" && !!visitor?.accessCards?.cardNo;
   if (hasNfc) {
     const allCards: any[] = visitor.cards?.flat() ?? [];
     nfcCardReturnStatuses.value = allCards.map((card: any) => ({
       cardId: card._id,
-      cardNo: card._id === visitor.accessCards._id ? visitor.accessCards.cardNo : card._id,
+      cardNo:
+        card._id === visitor.accessCards._id
+          ? visitor.accessCards.cardNo
+          : card._id,
       status: "In Use",
       remarks: "",
     }));
     if (nfcCardReturnStatuses.value.length === 0) {
-      nfcCardReturnStatuses.value = [{ cardId: visitor.accessCards._id, cardNo: visitor.accessCards.cardNo, status: "In Use", remarks: "" }];
+      nfcCardReturnStatuses.value = [
+        {
+          cardId: visitor.accessCards._id,
+          cardNo: visitor.accessCards.cardNo,
+          status: "In Use",
+          remarks: "",
+        },
+      ];
     }
     dialog.returnNfcCard = true;
     return;
@@ -1961,7 +2039,9 @@ async function handleNfcCheckout() {
       })),
     });
     if (res) {
-      await updateVisitor(userId as string, { checkOut: new Date().toISOString() });
+      await updateVisitor(userId as string, {
+        checkOut: new Date().toISOString(),
+      });
       showMessage("Visitor successfully checked-out!", "info");
       await getVisitorRefresh();
       dialog.returnNfcCard = false;
@@ -1969,7 +2049,10 @@ async function handleNfcCheckout() {
     }
   } catch (error: any) {
     const errorMessage = error?.response?._data?.message;
-    showMessage(errorMessage || "Something went wrong. Please try again later.", "error");
+    showMessage(
+      errorMessage || "Something went wrong. Please try again later.",
+      "error"
+    );
   } finally {
     loading.checkingOut = false;
   }
@@ -2241,11 +2324,7 @@ const syncVisitorFiltersFromRoute = () => {
 
 onMounted(syncVisitorFiltersFromRoute);
 
-watch(
-  () => route.query,
-  syncVisitorFiltersFromRoute,
-  { deep: true }
-);
+watch(() => route.query, syncVisitorFiltersFromRoute, { deep: true });
 
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();

package/composables/useCleaningSchedulePermission.ts

@@ -1,58 +1,23 @@
 export function useCleaningSchedulePermission() {
-  const { hasPermission } = usePermission();
-  const { permissions } = useCleaningPermission();
-
   const { userAppRole } = useLocalSetup();
 
-  const canViewSchedules = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "see-all-schedules");
-  });
-
-  const canViewScheduleDetails = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "see-schedule-details");
-  });
-
-  const canDownloadSchedule = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "download-schedule");
-  });
-
-  const canManageScheduleTasks = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "manage-schedule-tasks");
-  });
-
-  const canGenerateChecklist = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "generate-checklist");
-  });
-
-  const canViewHistory = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "view-history");
-  });
-
-  const canAddRemarks = computed(() => {
-    if (!userAppRole.value) return false;
-    if (userAppRole.value.permissions.includes("*")) return true;
-    return hasPermission(userAppRole.value, permissions, "cleaning-schedule-mgmt", "add-remarks");
-  });
+  const can = (action: string) =>
+    computed(() => {
+      const permissions = userAppRole.value?.permissions;
+      if (!permissions) return false;
+      if (permissions.includes("*")) return true;
+      return permissions.some((permission) =>
+        permission.endsWith(`-schedule-mgmt:${action}`),
+      );
+    });
 
   return {
-    canViewSchedules,
-    canViewScheduleDetails,
-    canDownloadSchedule,
-    canManageScheduleTasks,
-    canGenerateChecklist,
-    canViewHistory,
-    canAddRemarks,
+    canViewSchedules: can("see-all-schedules"),
+    canViewScheduleDetails: can("see-schedule-details"),
+    canDownloadSchedule: can("download-schedule"),
+    canManageScheduleTasks: can("manage-schedule-tasks"),
+    canGenerateChecklist: can("generate-checklist"),
+    canViewHistory: can("view-history"),
+    canAddRemarks: can("add-remarks"),
   };
 }

package/package.json

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

package/types/customer.d.ts

@@ -41,4 +41,5 @@ type TSiteCategory =
   | "shopping_mall"
   | "mix_development"
   | "industrial"
-  | "co_working_co_living";
+  | "co_working"
+  | "co_living";

package/types/people.d.ts

@@ -10,6 +10,8 @@ declare type TPeople = {
   plateNumber?: string;
   nric?: string;
   contact?: string;
+  contacts?: string[] //used in autofill only in VMS
+  visitorPlateNumbers?: string [] //used in autofill only in VMS
   remarks?: string;
   start?: string;
   end?: string;