@7365admin1/layer-common 3.0.27 → 3.0.29

package/components/VisitorManagement.vue

@@ -579,6 +579,7 @@
         :visitor-data="selectedVisitorDataObject"
         :current-user="currentUser._id"
         :type="activeVisitorFormType"
+        :enable-unregistered="enableUnregistered"
         @back="handleClickBack"
         @done="handleVisitorFormDone"
         @done:more="handleVisitorFormCreateMore"
@@ -1824,7 +1825,7 @@ const nfcCardReturnStatuses = ref<
 const canConfirmCheckout = computed(() => {
   const allEntries = [...passReturnStatuses.value, ...keyReturnStatuses.value];
   return allEntries.every((entry) => {
-    if (!entry.status || entry.status === "In Use") return false;
+    if (!entry.status || ["In Use","Not Returned"].includes(entry.status)) return false;
     if (
       (entry.status === "Lost" || entry.status === "Damaged") &&
       !entry.remarks.trim()
@@ -2190,29 +2191,60 @@ watch([searchInput, dateFrom, dateTo, filterTypes, activeTab], () => {
   page.value = 1;
 });
 
-onMounted(() => {
+const syncVisitorFiltersFromRoute = () => {
   const requestedTab = (route.query.tab as string) || "registered";
-  activeTab.value = enableUnregisteredTab.value
+  const nextTab = enableUnregisteredTab.value
     ? requestedTab
     : requestedTab === "unregistered"
     ? "registered"
     : requestedTab;
-  searchInput.value = (route.query.search as string) || "";
+
+  if (activeTab.value !== nextTab) {
+    activeTab.value = nextTab;
+  }
+
+  const nextSearch = (route.query.search as string) || "";
+  if (searchInput.value !== nextSearch) {
+    searchInput.value = nextSearch;
+  }
+
   if (route.query.dateFrom) {
-    dateFrom.value = normalizeDateOnly(route.query.dateFrom as string);
+    const nextDateFrom = normalizeDateOnly(route.query.dateFrom as string);
+    if (dateFrom.value !== nextDateFrom) {
+      dateFrom.value = nextDateFrom;
+    }
   }
+
   if (route.query.dateTo) {
-    dateTo.value = normalizeDateOnly(route.query.dateTo as string);
+    const nextDateTo = normalizeDateOnly(route.query.dateTo as string);
+    if (dateTo.value !== nextDateTo) {
+      dateTo.value = nextDateTo;
+    }
   }
+
   if (activeTab.value === "registered") {
-    filterTypes.value = ((route.query.type as string)?.split(",") || []).filter(
-      Boolean
-    ) as TVisitorType[];
+    const nextFilterTypes = (
+      (route.query.type as string)?.split(",") || []
+    ).filter(Boolean) as TVisitorType[];
+    if (filterTypes.value.join(",") !== nextFilterTypes.join(",")) {
+      filterTypes.value = nextFilterTypes;
+    }
 
-    displayNotCheckedOut.value =
+    const nextDisplayNotCheckedOut =
       (route.query.checkedOut as string) == "true" || false;
+    if (displayNotCheckedOut.value !== nextDisplayNotCheckedOut) {
+      displayNotCheckedOut.value = nextDisplayNotCheckedOut;
+    }
   }
-});
+};
+
+onMounted(syncVisitorFiltersFromRoute);
+
+watch(
+  () => route.query,
+  syncVisitorFiltersFromRoute,
+  { deep: true }
+);
 
 const { socketUnregisteredVisitorTrigger, visitorSocketData } =
   useVisitorSocket();

package/composables/useAccessManagement.ts

@@ -314,7 +314,7 @@ export default function useAccessManagement() {
     );
   }
 
-  function assignUser(payload: { assignees: string[]; unit: string; type: string; acm_url: string }) {
+  function assignUser(payload: { assignees: string[]; unit: string; type: string; acm_url: string; id?: string }) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/access-management/assign-user`,
       { method: "POST", body: payload }

package/composables/useVisitor.ts

@@ -94,6 +94,25 @@ export default function () {
     tab?: string;
   };
 
+  type SearchUncheckedOutUnregisteredVisitorParams = {
+    site: string;
+    plateNumber: string;
+    hourAgo?: number;
+    page?: number;
+    limit?: number;
+  };
+
+  type SearchVisitorObjectParams = {
+    page?: number;
+    limit?: number;
+    site: string;
+    searchObject: {
+      nric?: string | null;
+      contact?: string | null;
+    };
+    notCheckedOut?: boolean;
+  };
+
   const tab = useState("visitorsTab", () => "visitor");
 
   async function getVisitors({
@@ -159,6 +178,48 @@ export default function () {
     );
   }
 
+  async function checkSearchUncheckedOutUnregisteredVisitor({
+    site,
+    plateNumber,
+    hourAgo = 24,
+    page = 1,
+    limit = 100,
+  }: SearchUncheckedOutUnregisteredVisitorParams) {
+    return await useNuxtApp().$api<Record<string, any>>("/api/visitors", {
+      method: "GET",
+      query: {
+        site,
+        type: "uncheckout-unregistered",
+        plateNumber,
+        hourAgo,
+        page,
+        limit,
+      },
+    });
+  }
+
+  async function searchVisitorObject({
+    page = 1,
+    limit = 1000,
+    site,
+    searchObject,
+    notCheckedOut = true,
+  }: SearchVisitorObjectParams) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      "/api/visitors/search-object",
+      {
+        method: "POST",
+        body: {
+          page,
+          limit,
+          site,
+          searchObject,
+          notCheckedOut,
+        },
+      }
+    );
+  }
+
   async function deleteVisitor(_id: string) {
     return await useNuxtApp().$api<Record<string, any>>(
       `/api/visitor-transactions/id/${_id}`,
@@ -198,6 +259,8 @@ export default function () {
     contractorTypes,
     createVisitor,
     getVisitors,
+    checkSearchUncheckedOutUnregisteredVisitor,
+    searchVisitorObject,
     updateVisitor,
     deleteVisitor,
     validateVisitorQrCode,

package/package.json

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