@7365admin1/layer-common 1.10.7 → 1.10.9

package/components/VisitorManagement.vue

@@ -3,11 +3,11 @@
     <TableMain :headers="headers" :items="items" :loading="getVisitorPending" :page="page" :pages="pages"
       :extension-height="110" :offset="300" :pageRange="pageRange" :canCreate="canAddVisitor"
       @refresh="getVisitorRefresh" @update:page="handleUpdatePage" createLabel="Add Visitor" show-header
-      @row-click="handleRowClick" @create="dialog.showSelection = true">
+      @row-click="handleRowClick" @create="handleAddNew">
       <template #extension>
         <v-row no-gutters class="w-100 d-flex flex-column">
           <v-tabs v-model="activeTab" color="primary" :height="40" @update:model-value="toRoute" class="w-100">
-            <v-tab v-for="tab in tabOptions" :value="tab.status" :key="tab.status" class="text-capitalize">
+            <v-tab v-for="tab in tabOptions" :value="tab.value" :key="tab.value" class="text-capitalize">
               {{ tab.name }}
             </v-tab>
           </v-tabs>
@@ -22,8 +22,9 @@
             </v-checkbox>
             <InputDateTimePicker v-model:utc="dateFrom" density="compact" hide-details />
             <InputDateTimePicker v-model:utc="dateTo" density="compact" hide-details />
-            <v-select v-model="filterTypes" label="Filter by types" item-title="label" item-value="value"
-              :items="visitorSelection" density="compact" clearable multiple max-width="200" hide-details>
+            <v-select v-if="activeTab !== 'guests'" v-model="filterTypes" label="Filter by types" item-title="label"
+              item-value="value" :items="visitorSelection" density="compact" clearable multiple max-width="200"
+              hide-details>
               <template v-slot:selection="{ item, index }">
                 <div class="d-flex align-center text-caption text-nowrap">
                   <v-chip v-if="index === 0" color="error" :text="filterTypeSelectionLabel()" size="x-small"
@@ -49,7 +50,7 @@
           <v-icon icon="mdi-user" size="15" />
           <span v-if="item.type === 'contractor'" class="text-capitalize">{{
             formatCamelCaseToWords(item.contractorType)
-            }}</span>
+          }}</span>
           <span v-else class="text-capitalize">{{ formatType(item) }}</span>
         </span>
         <span class="d-flex align-center ga-2">
@@ -87,33 +88,39 @@
           <v-icon icon="mdi-clock-time-four-outline" color="green" size="20" />
           <span class="text-capitalize">{{
             UTCToLocalTIme(item.checkIn) || "-"
-            }}</span>
+          }}</span>
         </span>
         <span class="d-flex align-center ga-2">
-          <v-icon icon="mdi-clock-time-eight-outline" color="red" size="20" v-if="item.checkOut" />
+          <v-icon icon="mdi-clock-time-eight-outline" color="red" size="20" />
           <template v-if="item.checkOut">
             <span class="text-capitalize">{{
               UTCToLocalTIme(item.checkOut) || "_"
-              }}</span>
+            }}</span>
             <span v-if="item?.manualCheckout">
               <TooltipInfo text="Manual Checkout" density="compact" size="x-small" />
             </span>
           </template>
-          <span v-else>
+          <span v-else-if="!item?.checkOut && item?.status === 'registered'">
             <v-btn size="x-small" class="text-capitalize" color="red" text="Checkout"
               :loading="loading.checkingOut && item?._id === selectedVisitorId" @click.stop="handleCheckout(item._id)"
               v-if="canCheckoutVisitor" />
           </span>
         </span>
       </template>
+
+      <template v-slot:item.action="{ item }">
+        <v-btn v-if="activeTab === 'unregistered' && canAddVisitor" size="small" color="primary" text="Register"
+          @click.stop="handleRegistrationUnregisteredVisitor(item)" />
+      </template>
+
     </TableMain>
 
-  <v-dialog v-model="dialog.showSelection" width="450" persistent>
-      <VisitorFormSelection @cancel="dialog.showSelection = false" @select="handleSelectVisitorType" />
+    <v-dialog v-model="dialog.showSelection" width="450" persistent>
+      <VisitorFormSelection :mode="mode" @cancel="dialog.showSelection = false" @select="handleSelectVisitorType" />
     </v-dialog>
 
-    <v-dialog v-model="dialog.addVisitor" v-if="activeVisitorFormType" width="450" persistent>
-      <VisitorForm mode="add" :org="orgId" :site="siteId" :type="activeVisitorFormType" @back="handleClickBack"
+    <v-dialog v-model="dialog.showForm" v-if="activeVisitorFormType" width="450" persistent>
+      <VisitorForm :mode="mode" :org="orgId" :site="siteId" :visitor-data="selectedVisitorDataObject" :type="activeVisitorFormType" @back="handleClickBack"
         @done="handleVisitorFormDone" @done:more="handleVisitorFormCreateMore" @close:all="handleCloseAll" />
     </v-dialog>
 
@@ -135,7 +142,7 @@
               </span>
 
               <span v-else-if="selectedVisitorObject[key]" class="d-flex ga-3 align-center"><strong>{{ label
-                  }}:</strong>
+              }}:</strong>
                 {{ formatValues(key, selectedVisitorObject[key]) }}
                 <TooltipInfo v-if="key === 'checkOut'" text="Manual Checkout" density="compact" size="x-small" />
               </span>
@@ -183,14 +190,6 @@ const props = defineProps({
   },
 });
 
-const headers = [
-  { title: "Name", value: "name" },
-  { title: "Type/Company", value: "type-company" },
-  { title: "Location", value: "location" },
-  { title: "Contact/Vehicle No.", value: "contact-vehicleNumber" },
-  { title: "Check In/Out", value: "checkin-out" },
-];
-
 const {
   getVisitors,
   visitorSelection,
@@ -225,6 +224,7 @@ const dateFrom = ref("");
 const dateTo = ref("");
 const filterTypes = ref<TVisitorType[]>([]);
 const displayNotCheckedOut = ref<boolean>(false);
+const mode = ref<"add" | "edit" | "register">("add");
 
 const message = ref("");
 const messageColor = ref("");
@@ -238,16 +238,31 @@ const loading = reactive({
 
 const dialog = reactive({
   showSelection: false,
-  addVisitor: false,
+  showForm: false,
   viewVisitor: false,
   deleteConfirmation: false,
 });
 
+const headers = computed(() => [
+  { title: "Name", value: "name" },
+  { title: "Type/Company", value: "type-company" },
+  { title: "Location", value: "location" },
+  { title: "Contact/Vehicle No.", value: "contact-vehicleNumber" },
+  { title: "Check In/Out", value: "checkin-out" },
+  ...(activeTab.value === 'unregistered' ? [{ title: "Action", value: "action" }] : [])
+])
+
+
 const tabOptions = [
-  { name: "Registered", status: "registered" },
-  { name: "Unregistered", status: "unregistered" },
+  { name: "Registered", value: "registered" },
+  { name: "Unregistered", value: "unregistered" },
+  { name: "Guests", value: "guests" },
 ];
 
+const selectedVisitorDataObject = computed(() => {
+  return items.value.find((x: any) => x?._id === selectedVisitorId.value) || {};
+});
+
 const formatType = (item: any) =>
   (item.deliveryType ? item.deliveryType + "-" : "") + item.type;
 
@@ -270,8 +285,9 @@ function filterTypeSelectionLabel() {
   return `${length} selected ${length === 1 ? "type" : "types"}` as string;
 }
 
-function toRoute(status: any) {
-  const obj = tabOptions.find((x) => x.status === status);
+function toRoute(tab: any) {
+
+  const obj = tabOptions.find((x) => x.value === tab);
   if (!obj) return;
   page.value = 1
   navigateTo({
@@ -279,9 +295,9 @@ function toRoute(status: any) {
     params: {
       org: orgId,
     },
-    query: {
-      status: obj.status,
-    },
+    // query: {
+    //   tab
+    // },
   });
 }
 
@@ -296,28 +312,30 @@ const {
     // Optional delay (if needed)
     await new Promise(resolve => setTimeout(resolve, 100))
 
-    return await getVisitors({
+    const params: any = {
       page: page.value,
       site: siteId,
       search: searchInput.value,
       dateTo: dateTo.value,
       dateFrom: dateFrom.value,
       type: filterTypes.value.filter(Boolean).join(","),
-      status: activeTab.value as string,
       checkedOut: displayNotCheckedOut.value ? false : undefined
-    })
+    }
+
+    if (activeTab.value !== "guests") {
+      params.status = activeTab.value
+    } else if (activeTab.value === "guests") {
+      params.type = "guest"
+      params.status = undefined
+    }
+
+    return await getVisitors(params)
   },
   {
     watch: [
       page,
-      activeTab,
-      searchInput,
-      dateFrom,
-      dateTo,
-      filterTypes,
-      displayNotCheckedOut,
-      () => route.query
     ],
+    immediate: false
   }
 )
 
@@ -355,6 +373,12 @@ function formatValues(key: string, value: any) {
   return value;
 }
 
+function handleAddNew() {
+  dialog.showSelection = true;
+  activeVisitorFormType.value = null;
+  mode.value = "add";
+}
+
 function handleRowClick(data: any) {
   selectedVisitorId.value = data?.item?._id;
   dialog.viewVisitor = true;
@@ -366,25 +390,25 @@ function handleUpdatePage(newPageNum: number) {
 
 function handleSelectVisitorType(type: TVisitorType) {
   dialog.showSelection = false;
-  dialog.addVisitor = true;
+  dialog.showForm = true;
   activeVisitorFormType.value = type;
 }
 
 function handleClickBack() {
   dialog.showSelection = true;
-  dialog.addVisitor = false;
+  dialog.showForm = false;
 }
 
 function handleVisitorFormDone() {
   getVisitorRefresh();
   dialog.showSelection = false;
-  dialog.addVisitor = false;
+  dialog.showForm = false;
 }
 
 function handleVisitorFormCreateMore() {
   getVisitorRefresh();
   dialog.showSelection = true;
-  dialog.addVisitor = false;
+  dialog.showForm = false;
 }
 
 function handleDeleteVisitor() {
@@ -400,14 +424,17 @@ function showMessage(msg: string, color: string) {
 
 function handleCloseAll() {
   dialog.showSelection = false;
-  dialog.addVisitor = false;
+  dialog.showForm = false;
 }
 
-function handleUpdateAutofillDetails(people: TPeople) {
-  dialog.vehicleNumberUsersList = false
-  console.log('people', people)
+function handleRegistrationUnregisteredVisitor(item: Partial<TVisitor>) {
+  const id = item?._id || null;
+  selectedVisitorId.value = id;
+  dialog.showSelection = true;
+  mode.value = "register";
 }
 
+
 async function handleProceedDeleteVisitor() {
   try {
     loading.deletingVisitor = true;
@@ -462,7 +489,8 @@ async function handleCheckout(userId: string) {
 
 
 const updateRouteQuery = debounce(
-  (search: string, from: string, to: string, types: string[], status, checkedOut) => {
+  // (search: string, from: string, to: string, types: string[], status, checkedOut) => {
+  ({ search, from, to, types, tab, checkedOut }: { search: string, from: string, to: string, types: string[], tab: string, checkedOut: boolean }) => {
     router.replace({
       query: {
         ...route.query,
@@ -470,7 +498,7 @@ const updateRouteQuery = debounce(
         dateFrom: from || undefined,
         dateTo: to || undefined,
         type: types.filter(Boolean).join(",") || undefined,
-        status: status || undefined,
+        tab: tab || undefined,
         ...(checkedOut === true ? { checkedOut: "true" } : { checkedOut: undefined })
       },
     });
@@ -480,9 +508,10 @@ const updateRouteQuery = debounce(
 
 watch(
   [searchInput, dateFrom, dateTo, filterTypes, activeTab, displayNotCheckedOut],
-  ([search, from, to, types, status, checkedOut]) => {
-    updateRouteQuery(search, from, to, types, status, checkedOut)
-
+  ([search, from, to, types, tab, checkedOut]) => {
+    // updateRouteQuery(search, from, to, types, status, checkedOut)
+    updateRouteQuery({ search, from, to, types, tab, checkedOut })
+    getVisitorRefresh();
   },
   { deep: true }
 );
@@ -490,13 +519,12 @@ watch(
 
 
 onMounted(() => {
-  activeTab.value = (route.query.status as string) || "unregistered"
+  activeTab.value = (route.query.tab as string) || "unregistered"
   searchInput.value = (route.query.search as string) || "";
   dateFrom.value = (route.query.dateFrom as string) || "";
   dateTo.value = (route.query.dateTo as string) || "";
   filterTypes.value = ((route.query.type as string)?.split(",") || []).filter(Boolean) as TVisitorType[];
   displayNotCheckedOut.value = (route.query.checkedOut as string) == 'true' || false
-
 })
 </script>
 

package/composables/useAccessManagement.ts

@@ -55,10 +55,7 @@ export default function useAccessManagement() {
     );
   }
 
-  function getAllAccessCardsCounts(params: {
-    site: string;
-    userType: string;
-  }) {
+  function getAllAccessCardsCounts(params: { site: string; userType: string }) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/access-management/all-access-cards-counts`,
       {
@@ -71,14 +68,16 @@ export default function useAccessManagement() {
     );
   }
 
-  function getUserTypeAccessCards(params: {
-    page?: number;
-    limit?: number;
-    search?: string;
-    organization?: string;
-    userType?: string;
-    site?: string;
-  } = {}) {
+  function getUserTypeAccessCards(
+    params: {
+      page?: number;
+      limit?: number;
+      search?: string;
+      organization?: string;
+      userType?: string;
+      site?: string;
+    } = {}
+  ) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/access-management/user-type-access-cards`,
       {
@@ -200,12 +199,14 @@ export default function useAccessManagement() {
     );
   }
 
-  function getVisitorAccessCards(params: {
-    page?: number;
-    limit?: number;
-    site?: string;
-    search?: string;
-  } = {}) {
+  function getVisitorAccessCards(
+    params: {
+      page?: number;
+      limit?: number;
+      site?: string;
+      search?: string;
+    } = {}
+  ) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/access-management/visitor-access-cards`,
       {
@@ -221,6 +222,27 @@ export default function useAccessManagement() {
     );
   }
 
+  function getAvailableContractorCards(params: {
+    type: "NFC" | "QRCODE";
+    siteId: string;
+    unitId: string;
+    page?: number;
+    limit?: number;
+  }) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/available-card-contractor/${params.type}`,
+      {
+        method: "GET",
+        query: {
+          siteId: params.siteId,
+          unitId: params.unitId,
+          page: params.page ?? 1,
+          limit: params.limit ?? 100,
+        },
+      }
+    );
+  }
+
   return {
     getDoorAccessLevels,
     getLiftAccessLevels,
@@ -238,5 +260,6 @@ export default function useAccessManagement() {
     getVisitorAccessCards,
     saveVisitorAccessCardQrTag,
     getAllVisitorAccessCardsQrTags,
+    getAvailableContractorCards,
   };
 }

package/composables/useCleaningPermission.ts

@@ -162,27 +162,27 @@ export default function useCleaningPermission() {
         description: "Allows the user to check in and check out.",
       },
     },
-    // supply management permissions
+    // equipment management permissions
     "supply-mgmt": {
       "see-all-supplies": {
         check: true,
-        description: "Allows the user to view the list of all supplies.",
+        description: "Allows the user to view the list of all equipments.",
       },
       "add-supply": {
         check: true,
-        description: "Allows the user to create/add a new supply item.",
+        description: "Allows the user to create/add a new equipment item.",
       },
       "update-supply": {
         check: true,
-        description: "Allows the user to update/edit supply details.",
+        description: "Allows the user to update/edit equipment details.",
       },
       "delete-supply": {
         check: true,
-        description: "Allows the user to delete/remove a supply item.",
+        description: "Allows the user to delete/remove an equipment item.",
       },
       "add-stock": {
         check: true,
-        description: "Allows the user to add stock to supply items.",
+        description: "Allows the user to add stock to equipment items.",
       },
       "view-stock": {
         check: true,
@@ -190,7 +190,7 @@ export default function useCleaningPermission() {
       },
       "checkout-item": {
         check: true,
-        description: "Allows the user to checkout supply items.",
+        description: "Allows the user to checkout equipment items.",
       },
     },
     // checkout item management permissions

package/composables/useDashboardData.ts

@@ -137,7 +137,7 @@ const dashboardDataMap: Record<string, ModuleData> = {
         color: '#43A047',
       },
       {
-        title: 'Supply Management',
+        title: 'Equipment Management',
         value: 42,
         percentage: 12.5,
         isPositive: true,
@@ -166,7 +166,7 @@ const dashboardDataMap: Record<string, ModuleData> = {
       'Work Orders',
       'Schedule Task Ticket',
       'Attendance',
-      'Supply Management',
+      'Equipment Management',
       'Checkout Items',
       'Cleaning Schedule - Checklist, Area, Unit',
     ],

package/composables/useEquipment.ts

@@ -0,0 +1,63 @@
+export default function useEquipment() {
+  function getEquipments({ page = 1, search = "", limit = 10, site = "" } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/hygiene-supplies/site/${site}`,
+      {
+        method: "GET",
+        query: { page, search, limit, site },
+      }
+    );
+  }
+
+  function getEquipmentById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/hygiene-supplies/id/${id}`,
+      {
+        method: "GET",
+      }
+    );
+  }
+
+  function createEquipment(payload: TEquipmentCreate, site: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/hygiene-supplies/site/${site}`,
+      {
+        method: "POST",
+        body: {
+          name: payload.name,
+          unitOfMeasurement: payload.unitOfMeasurement,
+        },
+      }
+    );
+  }
+
+  function updateEquipment(id: string, payload: TEquipmentCreate) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/hygiene-supplies/id/${id}`,
+      {
+        method: "PATCH",
+        body: {
+          name: payload.name,
+          unitOfMeasurement: payload.unitOfMeasurement,
+        },
+      }
+    );
+  }
+
+  function deleteEquipment(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/hygiene-supplies/id/${id}`,
+      {
+        method: "DELETE",
+      }
+    );
+  }
+
+  return {
+    getEquipments,
+    getEquipmentById,
+    createEquipment,
+    updateEquipment,
+    deleteEquipment,
+  };
+}

package/composables/{useCheckout.ts → useEquipmentItem.ts}

@@ -1,5 +1,5 @@
-export default function useCheckout() {
-  function getCheckoutItems({
+export default function useEquipmentItem() {
+  function getEquipmentItems({
     page = 1,
     search = "",
     limit = 10,
@@ -14,7 +14,7 @@ export default function useCheckout() {
     );
   }
 
-  function getCheckoutItemById(id: string) {
+  function getEquipmentItemById(id: string) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-checkout-items/id/${id}`,
       {
@@ -23,7 +23,7 @@ export default function useCheckout() {
     );
   }
 
-  function checkoutItems(site: string, payload: TCheckoutItemCreate) {
+  function equipmentItems(site: string, payload: TEquipmentItemCreate) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-checkout-items/site/${site}/batch`,
       {
@@ -52,9 +52,9 @@ export default function useCheckout() {
     );
   }
   return {
-    getCheckoutItems,
-    getCheckoutItemById,
-    checkoutItems,
+    getEquipmentItems,
+    getEquipmentItemById,
+    equipmentItems,
     approveItem,
     disapproveItem,
   };

package/composables/{useCheckoutPermission.ts → useEquipmentItemPermission.ts}

@@ -1,9 +1,9 @@
-export function useCheckoutPermission() {
+export function useEquipmentItemPermission() {
   const { hasPermission } = usePermission();
   const { permissions } = useCleaningPermission();
   const { userAppRole } = useLocalSetup();
 
-  const canViewAllCheckouts = computed(() => {
+  const canViewAllEquipmentItems = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -14,7 +14,7 @@ export function useCheckoutPermission() {
     );
   });
 
-  const canCreateCheckout = computed(() => {
+  const canCreateEquipmentItem = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -25,7 +25,7 @@ export function useCheckoutPermission() {
     );
   });
 
-  const canUpdateCheckout = computed(() => {
+  const canUpdateEquipmentItem = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -36,7 +36,7 @@ export function useCheckoutPermission() {
     );
   });
 
-  const canApproveCheckout = computed(() => {
+  const canApproveEquipmentItem = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -47,7 +47,7 @@ export function useCheckoutPermission() {
     );
   });
 
-  const canDisapproveCheckout = computed(() => {
+  const canDisapproveEquipmentItem = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -58,7 +58,7 @@ export function useCheckoutPermission() {
     );
   });
 
-  const canViewCheckoutDetails = computed(() => {
+  const canViewEquipmentItemDetails = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -70,11 +70,11 @@ export function useCheckoutPermission() {
   });
 
   return {
-    canViewAllCheckouts,
-    canCreateCheckout,
-    canUpdateCheckout,
-    canApproveCheckout,
-    canDisapproveCheckout,
-    canViewCheckoutDetails,
+    canViewAllEquipmentItems,
+    canCreateEquipmentItem,
+    canUpdateEquipmentItem,
+    canApproveEquipmentItem,
+    canDisapproveEquipmentItem,
+    canViewEquipmentItemDetails,
   };
 }

package/composables/{useSupply.ts → useEquipmentManagement.ts}

@@ -1,4 +1,4 @@
-export default function useSupply() {
+export default function useEquipmentManagement() {
   function getSupplies({ page = 1, search = "", limit = 10, site = "" } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-supplies/site/${site}`,