@7365admin1/layer-common 3.0.25 → 3.0.27

package/components/VisitorManagement.vue

@@ -151,8 +151,15 @@
         >
       </template>
 
-      <template v-slot:item.email="{ value }">
-        {{ value ?? "N/A" }}
+      <template v-slot:item.email-vehicleNumber="{ item }">
+        <span class="d-flex align-center ga-2">
+          <v-icon icon="mdi-email" size="15" />
+          <span class="text-capitalize">{{ item?.email || "N/A" }}</span>
+        </span>
+        <span class="d-flex align-center ga-2">
+          <v-icon icon="mdi-car-back" size="15" />
+          <span class="text-capitalize">{{ item?.plateNumber || "N/A" }}</span>
+        </span>
       </template>
 
       <template v-slot:item.invited-by="{ item }">
@@ -353,6 +360,54 @@
               />
             </v-list>
           </v-menu>
+
+          <!-- NFC Access Cards -->
+          <v-menu
+            v-if="item.accessCards?.type === 'NFC' && item.accessCards?.cardNo"
+            :close-on-content-click="false"
+          >
+            <template #activator="{ props: nfcMenuProps }">
+              <div
+                class="d-flex align-center ga-1 mt-1"
+                style="cursor: pointer"
+                v-bind="nfcMenuProps"
+                @click.stop
+              >
+                <v-icon
+                  size="15"
+                  icon="mdi-credit-card-outline"
+                  color="purple"
+                />
+                <v-chip size="x-small" variant="tonal" color="purple">
+                  {{ item.accessCards.cardNo }}
+                  <template v-if="(item.cards?.flat().length ?? 0) > 1">
+                    (+{{ item.cards.flat().length - 1 }})
+                  </template>
+                </v-chip>
+              </div>
+            </template>
+            <v-list density="compact" min-width="200">
+              <v-list-subheader>NFC Cards</v-list-subheader>
+              <v-list-item
+                prepend-icon="mdi-credit-card-outline"
+                :title="item.accessCards.cardNo"
+              />
+              <template v-for="(cardGroup, gi) in item.cards" :key="gi">
+                <v-list-item
+                  v-for="card in cardGroup.filter((c: any) => c._id !== item.accessCards._id)"
+                  :key="card._id"
+                  prepend-icon="mdi-credit-card-outline"
+                  :title="card._id"
+                />
+              </template>
+            </v-list>
+          </v-menu>
+
+          <!-- QRCODE identifier -->
+          <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>
+          </div>
         </v-row>
       </template>
 
@@ -852,6 +907,46 @@
       </v-card>
     </v-dialog>
 
+    <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">
+            <span class="font-weight-bold">Return NFC Card</span>
+            <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>
+          <div>
+            <InputLabel class="text-capitalize" title="Full Name" />
+            <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 />
+          </div>
+          <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>
+            </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" />
+          </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-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-col>
+          </v-row>
+        </v-toolbar>
+      </v-card>
+    </v-dialog>
+
     <v-dialog v-model="dialog.addPassKey" width="450" persistent>
       <AddPassKeyToVisitor
         mode="add"
@@ -1039,6 +1134,16 @@ const props = defineProps({
 const { authenticate, currentUser } = useLocalAuth();
 authenticate();
 
+const route = useRoute();
+const router = useRouter();
+const { org: orgId, site: siteId } = route.params as {
+  org: string;
+  site: string;
+};
+
+const { enableUnregistered } = useANPRSettings(siteId);
+const enableUnregisteredTab = computed(() => enableUnregistered.value);
+
 const {
   getVisitors,
   visitorSelection,
@@ -1046,6 +1151,7 @@ const {
   updateVisitor,
   visitorDataFromScannedQRCodeCheckIn,
 } = useVisitor();
+const { visitorCheckout } = useAccessManagement();
 const {
   debounce,
   formatCamelCaseToWords,
@@ -1058,12 +1164,6 @@ const { formatLocation } = useSecurityUtils();
 const { getFileUrlAnpr } = useFile();
 // const { status: visitorStatus, search } = useRoute().query as { status: string, search: string};
 
-const route = useRoute();
-const router = useRouter();
-const { org: orgId, site: siteId } = route.params as {
-  org: string;
-  site: string;
-};
 const routeName = route.name;
 
 const items = ref<Array<Record<string, any>>>([]);
@@ -1112,6 +1212,7 @@ const dialog = reactive({
   scanVisitorQRCode: false,
   showVisitorDataFromScannedQRCode: false,
   approveRejectOvernightParkingRequestDialog: false,
+  returnNfcCard: false,
 });
 
 const snapshotImageUrl = ref("");
@@ -1126,7 +1227,7 @@ const headers = computed(() => {
   if (tab === "overnight-parking") {
     return [
       { title: "Name", value: "name" },
-      { title: "Email", value: "email" },
+      { title: "Email/Vehicle No.", value: "email-vehicleNumber" },
       { title: "Invited By", value: "invited-by" },
       { title: "Arrival Date/Time", value: "arrival-date-time" },
       { title: "Check In/Out", value: "checkin-out" },
@@ -1167,13 +1268,19 @@ const headers = computed(() => {
   return list;
 });
 
-const tabOptions = [
-  { name: "Registered", value: "registered" },
-  { name: "Unregistered", value: "unregistered" },
-  { name: "Guests", value: "guests" },
-  { name: "Resident Transactions", value: "resident-transactions" },
-  { name: "Overnight Parking", value: "overnight-parking" },
-];
+const tabOptions = computed(() => {
+  const baseTabs = [
+    { name: "Registered", value: "registered" },
+    ...(enableUnregisteredTab.value
+      ? [{ name: "Unregistered", value: "unregistered" }]
+      : []),
+    { name: "Guests", value: "guests" },
+    { name: "Resident Transactions", value: "resident-transactions" },
+    { name: "Overnight Parking", value: "overnight-parking" },
+  ];
+
+  return baseTabs;
+});
 
 function getOvernightParkingRequestStatusColor(status: string) {
   switch (status) {
@@ -1319,10 +1426,17 @@ const passStatusOptions = [
   { label: "Lost", value: "Lost" },
 ];
 
+const nfcPassStatusOptions = [
+  { label: "Returned", value: "Returned" },
+  { label: "Not Returned", value: "In Use" },
+  { label: "Damaged", value: "Damage" },
+  { label: "Lost", value: "Lost" },
+];
+
 function toRoute(tab: any) {
   items.value = [];
 
-  const obj = tabOptions.find((x) => x.value === tab);
+  const obj = tabOptions.value.find((x) => x.value === tab);
   if (!obj) return;
   page.value = 1;
   getVisitorRefresh();
@@ -1605,7 +1719,7 @@ function handleRegistrationUnregisteredVisitor(item: Partial<TVisitor>) {
   dialog.showSelection = true;
   mode.value = "register";
 
-  if(!selectedVisitorDataObject.value){
+  if (!selectedVisitorDataObject.value) {
     getVisitorRefresh();
   }
 }
@@ -1703,6 +1817,9 @@ const passReturnStatuses = ref<
 const keyReturnStatuses = ref<
   { keyId: string; status: string; prefixAndName: string; remarks: string }[]
 >([]);
+const nfcCardReturnStatuses = ref<
+  { cardId: string; cardNo: string; status: string; remarks: string }[]
+>([]);
 
 const canConfirmCheckout = computed(() => {
   const allEntries = [...passReturnStatuses.value, ...keyReturnStatuses.value];
@@ -1717,6 +1834,15 @@ const canConfirmCheckout = computed(() => {
   });
 });
 
+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;
+    return true;
+  });
+});
+
 function handleCheckin(user: Record<string, any>) {
   visitorDataFromScannedQRCode.value = user;
   dialog.showVisitorDataFromScannedQRCode = true;
@@ -1755,6 +1881,22 @@ function handleCheckout(userId: string) {
     return;
   }
 
+  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,
+      status: "In Use",
+      remarks: "",
+    }));
+    if (nfcCardReturnStatuses.value.length === 0) {
+      nfcCardReturnStatuses.value = [{ cardId: visitor.accessCards._id, cardNo: visitor.accessCards.cardNo, status: "In Use", remarks: "" }];
+    }
+    dialog.returnNfcCard = true;
+    return;
+  }
+
   proceedCheckout();
 }
 
@@ -1803,6 +1945,34 @@ async function proceedCheckout() {
   }
 }
 
+async function handleNfcCheckout() {
+  const userId = selectedVisitorId.value;
+  if (!userId) return;
+  try {
+    loading.checkingOut = true;
+    const res = await visitorCheckout({
+      cards: nfcCardReturnStatuses.value.map(({ cardId, status, remarks }) => ({
+        cardId,
+        userId,
+        status,
+        remarks: remarks ?? "",
+      })),
+    });
+    if (res) {
+      await updateVisitor(userId as string, { checkOut: new Date().toISOString() });
+      showMessage("Visitor successfully checked-out!", "info");
+      await getVisitorRefresh();
+      dialog.returnNfcCard = false;
+      dialog.viewVisitor = false;
+    }
+  } catch (error: any) {
+    const errorMessage = error?.response?._data?.message;
+    showMessage(errorMessage || "Something went wrong. Please try again later.", "error");
+  } finally {
+    loading.checkingOut = false;
+  }
+}
+
 function buildReportParams(): any {
   const params: any = {
     site: siteId,
@@ -2021,7 +2191,12 @@ watch([searchInput, dateFrom, dateTo, filterTypes, activeTab], () => {
 });
 
 onMounted(() => {
-  activeTab.value = (route.query.tab as string) || "unregistered";
+  const requestedTab = (route.query.tab as string) || "registered";
+  activeTab.value = enableUnregisteredTab.value
+    ? requestedTab
+    : requestedTab === "unregistered"
+    ? "registered"
+    : requestedTab;
   searchInput.value = (route.query.search as string) || "";
   if (route.query.dateFrom) {
     dateFrom.value = normalizeDateOnly(route.query.dateFrom as string);
@@ -2042,29 +2217,48 @@ onMounted(() => {
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();
 
-  watchEffect(async () => {
-    if (visitorSocketData.value && visitorSocketData.value.reload && activeTab.value === "unregistered") {
-      await getVisitorRefresh();
-      visitorSocketData.value = null;
-      socketUnregisteredVisitorTrigger.value = false;
+watch(
+  enableUnregisteredTab,
+  (enabled) => {
+    if (!enabled && activeTab.value === "unregistered") {
+      activeTab.value = "registered";
     }
+  },
+  { immediate: true }
+);
 
-    if(visitorSocketData.value && visitorSocketData.value.plateNumber && socketUnregisteredVisitorTrigger.value && activeTab.value === "unregistered" && dialog.showSelection === false) {
-      // await getVisitorRefresh();
-      // visitorSocketData.value = null;
-      // socketUnregisteredVisitorTrigger.value = false;
-      setTimeout(async() => {
-        const { _id } = visitorSocketData.value;
-        await handleRegistrationUnregisteredVisitor({ _id });
-        socketUnregisteredVisitorTrigger.value = false;
-
-        setTimeout(() => {
-          visitorSocketData.value = null;
-        }, 1000)
-      }, 1000)
-    }
-  })
+watchEffect(async () => {
+  if (
+    visitorSocketData.value &&
+    visitorSocketData.value.reload &&
+    activeTab.value === "unregistered"
+  ) {
+    await getVisitorRefresh();
+    visitorSocketData.value = null;
+    socketUnregisteredVisitorTrigger.value = false;
+  }
+
+  if (
+    visitorSocketData.value &&
+    visitorSocketData.value.plateNumber &&
+    socketUnregisteredVisitorTrigger.value &&
+    activeTab.value === "unregistered" &&
+    dialog.showSelection === false
+  ) {
+    // await getVisitorRefresh();
+    // visitorSocketData.value = null;
+    // socketUnregisteredVisitorTrigger.value = false;
+    setTimeout(async () => {
+      const { _id } = visitorSocketData.value;
+      await handleRegistrationUnregisteredVisitor({ _id });
+      socketUnregisteredVisitorTrigger.value = false;
 
+      setTimeout(() => {
+        visitorSocketData.value = null;
+      }, 1000);
+    }, 1000);
+  }
+});
 </script>
 
 <style scoped></style>

package/components/VisitorSocketPopUp.vue

@@ -32,7 +32,7 @@
     </section> -->
 
     <v-snackbar
-      v-if="!isUnregisteredVisitorRoute"
+      v-if="!isUnregisteredVisitorRoute && enableUnregisteredSnackbar && canViewVisitor"
       v-model="snackBarMessage.modal"
       :color="snackBarMessage.color"
       :timeout="snackBarMessage.timeout"
@@ -94,12 +94,20 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  canViewVisitor: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const config = useRuntimeConfig();
 const publicConfig = config.public as Record<string, string | undefined>;
 const route = useRoute();
 const { tab } = useVisitor();
+const { enableUnregistered, ensureANPRSettings } = useANPRSettings(
+  props.siteId
+);
+const enableUnregisteredSnackbar = computed(() => enableUnregistered.value);
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();
 
@@ -124,6 +132,16 @@ const permanentMessageDialog = reactive({
   text: "",
 });
 
+watch(
+  () => props.siteId,
+  async (siteId) => {
+    if (siteId && !route.path.includes("/settings")) {
+      await ensureANPRSettings();
+    }
+  },
+  { immediate: true }
+);
+
 const path = computed(() => route.path);
 const isVisitorManagementPath = (path: string) =>
   path.includes("/visitor-management");
@@ -166,6 +184,10 @@ const showTransientMessage = (
   color: string,
   isUnregistered = false
 ) => {
+  if (!enableUnregisteredSnackbar.value) {
+    return;
+  }
+
   snackBarMessage.text = text;
   snackBarMessage.color = color;
   snackBarMessage.modal = true;
@@ -283,6 +305,12 @@ watch(
   { immediate: true }
 );
 
+watch(enableUnregisteredSnackbar, (enabled) => {
+  if (!enabled) {
+    snackBarMessage.modal = false;
+  }
+});
+
 onUnmounted(() => {
   disconnectSocket();
 });

package/composables/useANPRSettings.ts

@@ -1,26 +1,75 @@
-export default function () {
-  async function getANPRSettingBySite(data: any) {
-    return await useNuxtApp().$api<Record<string, any>>(
+export default function (siteId?: string) {
+  const stateKey = computed(() =>
+    siteId ? `anpr-settings-${siteId}` : "anpr-settings"
+  );
+
+  const anprSettings = useState<Record<string, any> | null>(
+    stateKey.value,
+    () => null
+  );
+
+  const enableUnregistered = computed(
+    () => anprSettings.value?.ANPRSwitches?.enableUnregistered === true
+  );
+
+  async function fetchANPRSettings(data?: any) {
+    const payload = data ?? (siteId ? { site: siteId, userType: "site" } : undefined);
+
+    if (!payload) {
+      return anprSettings.value;
+    }
+
+    const response = await useNuxtApp().$api<Record<string, any>>(
       `/api/anpr-settings/get/v1`,
       {
         method: "POST",
-        body: data,
+        body: payload,
       }
     );
+
+    if (response) {
+      anprSettings.value = response;
+    }
+
+    return response;
   }
-  async function createUpdateANPRSettings(
-    data: any
-  ) {
-    return await useNuxtApp().$api<Record<string, any>>(
+
+  async function ensureANPRSettings(force = false) {
+    if (!siteId) {
+      return anprSettings.value;
+    }
+
+    if (!force && anprSettings.value) {
+      return anprSettings.value;
+    }
+
+    return await fetchANPRSettings({ site: siteId, userType: "site" });
+  }
+
+  async function getANPRSettingBySite(data: any) {
+    return await fetchANPRSettings(data);
+  }
+
+  async function createUpdateANPRSettings(data: any) {
+    const response = await useNuxtApp().$api<Record<string, any>>(
       `/api/anpr-settings/v1`,
       {
         method: "POST",
         body: data,
       }
     );
+
+    if (response) {
+      anprSettings.value = response;
+    }
+
+    return response;
   }
 
   return {
+    anprSettings,
+    enableUnregistered,
+    ensureANPRSettings,
     getANPRSettingBySite,
     createUpdateANPRSettings,
   };

package/composables/useAccessManagement.ts

@@ -268,7 +268,15 @@ export default function useAccessManagement() {
     type: string;
     nfcCards: { _id: string; cardNo: string }[];
     acm_url: string;
-    visitorId: string;
+    user: {
+      visitorId: string;
+      name?: string;
+      nric?: string;
+      contact?: string;
+      company?: string;
+      type?: string;
+      plateNumber?: string;
+    };
   }) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/access-management/visitor`,
@@ -313,6 +321,13 @@ export default function useAccessManagement() {
     );
   }
 
+  function visitorCheckout(payload: { cards: { cardId: string; userId: string; status: string; remarks: string }[] }) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/visitor-checkout`,
+      { method: "PATCH", body: payload }
+    );
+  }
+
   return {
     getResidents,
     assignUser,
@@ -337,5 +352,6 @@ export default function useAccessManagement() {
     createVisitorPass,
     signQr,
     getBlockLevelUnitList,
+    visitorCheckout,
   };
 }

package/composables/useCleaningPermission.ts

@@ -6,7 +6,7 @@ export default function useCleaningPermission() {
     workOrderPermissions,
     invitationPermissions,
     bulletinBoardPermissions,
-    dashboardPermissions,
+ 
   } = useCommonPermissions();
   const permissions: TPermissions = {
     members: memberPermissions,
@@ -15,7 +15,7 @@ export default function useCleaningPermission() {
     roles: rolePermissions,
     invitations: invitationPermissions,
     "bulletin-board": bulletinBoardPermissions,
-    dashboard: dashboardPermissions,
+ 
     inventory: {
       "view-inventory": {
         check: true,

package/composables/useCommonPermission.ts

@@ -279,44 +279,7 @@ export function useCommonPermissions() {
 
     }
 
-    const dashboardPermissions: Record<string, TPermission> = {
-      "view-activity": {
-        check: true,
-        description: "Allows the user to view the activity chart widget.",
-      },
-      "view-task-schedule": {
-        check: true,
-        description: "Allows the user to view the task schedule widget.",
-      },
-      "view-attendance-widget": {
-        check: true,
-        description: "Allows the user to view the attendance/staff status widget.",
-      },
-      "view-feedbacks-widget": {
-        check: true,
-        description: "Allows the user to view the feedbacks widget.",
-      },
-      "view-upcoming-events": {
-        check: true,
-        description: "Allows the user to view the upcoming events widget.",
-      },
-      "view-today-reminders": {
-        check: true,
-        description: "Allows the user to view the today's reminders widget.",
-      },
-      "view-today-attentions": {
-        check: true,
-        description: "Allows the user to view the today's attentions widget.",
-      },
-      "view-work-order-status": {
-        check: true,
-        description: "Allows the user to view the work order status widget.",
-      },
-      "view-active-patrol": {
-        check: true,
-        description: "Allows the user to view the active patrol widget.",
-      },
-    }
+
   
   return {
     invitationPermissions,
@@ -329,6 +292,6 @@ export function useCommonPermissions() {
     buildingUnitManagementPermissions,
     bulletinBoardPermissions,
     siteSettingsPermissions,
-    dashboardPermissions
+
   };
 }

package/composables/useDocument.ts

@@ -76,6 +76,25 @@ export default function useDocument() {
     return add({ ...value, type: "folder" });
   }
 
+  function updateFolderById(id: string, value: any) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/documents/folder/${id}`,
+      {
+        method: "PUT",
+        body: value,
+      }
+    );
+  }
+
+  function deleteFolderById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/documents/folder/${id}`,
+      {
+        method: "DELETE",
+      }
+    );
+  }
+
   return {
     getAll,
     getById,
@@ -85,5 +104,7 @@ export default function useDocument() {
     getDocumentsBySiteId,
     create,
     createFolder,
+    updateFolderById,
+    deleteFolderById,
   };
 }