@7365admin1/layer-common 1.10.6 → 1.10.8

package/composables/useAccessManagement.ts

@@ -172,6 +172,55 @@ export default function useAccessManagement() {
     );
   }
 
+  function saveVisitorAccessCardQrTag(
+    siteId: string,
+    payloads: Array<{
+      _id: string;
+      cardNo: string;
+      qrTag: string;
+      qrTagCardNo: string;
+    }>
+  ) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/qr-tag/${siteId}`,
+      {
+        method: "POST",
+        body: payloads,
+      }
+    );
+  }
+
+  function getAllVisitorAccessCardsQrTags(site: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/qr-tag`,
+      {
+        method: "GET",
+        query: { site },
+      }
+    );
+  }
+
+  function getVisitorAccessCards(params: {
+    page?: number;
+    limit?: number;
+    site?: string;
+    search?: string;
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/visitor-access-cards`,
+      {
+        method: "GET",
+        query: {
+          type: "Visitor/Resident",
+          ...(params.page ? { page: params.page } : {}),
+          ...(params.limit ? { limit: params.limit } : {}),
+          ...(params.site ? { site: params.site } : {}),
+          ...(params.search ? { search: params.search } : {}),
+        },
+      }
+    );
+  }
+
   return {
     getDoorAccessLevels,
     getLiftAccessLevels,
@@ -186,5 +235,8 @@ export default function useAccessManagement() {
     deleteCard,
     getCardHistory,
     getCardDetails,
+    getVisitorAccessCards,
+    saveVisitorAccessCardQrTag,
+    getAllVisitorAccessCardsQrTags,
   };
 }

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/{useSupply.ts → useEquipment.ts}

@@ -1,5 +1,5 @@
-export default function useSupply() {
-  function getSupplies({ page = 1, search = "", limit = 10, site = "" } = {}) {
+export default function useEquipment() {
+  function getEquipments({ page = 1, search = "", limit = 10, site = "" } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-supplies/site/${site}`,
       {
@@ -9,7 +9,7 @@ export default function useSupply() {
     );
   }
 
-  function getSupplyById(id: string) {
+  function getEquipmentById(id: string) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-supplies/id/${id}`,
       {
@@ -18,7 +18,7 @@ export default function useSupply() {
     );
   }
 
-  function createSupply(payload: TSupplyCreate, site: string) {
+  function createEquipment(payload: TEquipmentCreate, site: string) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-supplies/site/${site}`,
       {
@@ -31,7 +31,7 @@ export default function useSupply() {
     );
   }
 
-  function updateSupply(id: string, payload: TSupplyCreate) {
+  function updateEquipment(id: string, payload: TEquipmentCreate) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-supplies/id/${id}`,
       {
@@ -44,7 +44,7 @@ export default function useSupply() {
     );
   }
 
-  function deleteSupply(id: string) {
+  function deleteEquipment(id: string) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-supplies/id/${id}`,
       {
@@ -54,10 +54,10 @@ export default function useSupply() {
   }
 
   return {
-    getSupplies,
-    getSupplyById,
-    createSupply,
-    updateSupply,
-    deleteSupply,
+    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/useEquipmentManagementPermission.ts

@@ -0,0 +1,96 @@
+import useCleaningPermission from "./useCleaningPermission";
+import { useLocalSetup } from "./useLocalSetup";
+import usePermission from "./usePermission";
+
+export function useEquipmentManagementPermission() {
+  const { hasPermission } = usePermission();
+  const { permissions } = useCleaningPermission();
+  const { userAppRole } = useLocalSetup();
+
+  const canViewEquipments = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "see-all-supplies"
+    );
+  });
+
+  const canAddEquipment = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "add-supply"
+    );
+  });
+
+  const canUpdateEquipment = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "update-supply"
+    );
+  });
+
+  const canDeleteEquipment = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "delete-supply"
+    );
+  });
+
+  const canAddStock = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "add-stock"
+    );
+  });
+
+  const canViewStock = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "view-stock"
+    );
+  });
+
+  const canRequestItem = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "supply-mgmt",
+      "request-item"
+    );
+  });
+
+  return {
+    canViewEquipments,
+    canAddEquipment,
+    canUpdateEquipment,
+    canDeleteEquipment,
+    canAddStock,
+    canViewStock,
+    canRequestItem,
+  };
+}

package/composables/{useSupplyPermission.ts → useEquipmentPermission.ts}

@@ -1,9 +1,9 @@
-export function useSupplyPermission() {
+export function useEquipmentPermission() {
   const { hasPermission } = usePermission();
   const { permissions } = useCleaningPermission();
   const { userAppRole } = useLocalSetup();
 
-  const canViewSupplies = computed(() => {
+  const canViewEquipments = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -14,7 +14,7 @@ export function useSupplyPermission() {
     );
   });
 
-  const canAddSupply = computed(() => {
+  const canAddEquipment = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -25,7 +25,7 @@ export function useSupplyPermission() {
     );
   });
 
-  const canUpdateSupply = computed(() => {
+  const canUpdateEquipment = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -36,7 +36,7 @@ export function useSupplyPermission() {
     );
   });
 
-  const canDeleteSupply = computed(() => {
+  const canDeleteEquipment = computed(() => {
     if (!userAppRole.value) return true;
     if (userAppRole.value.permissions.includes("*")) return true;
     return hasPermission(
@@ -81,10 +81,10 @@ export function useSupplyPermission() {
   });
 
   return {
-    canViewSupplies,
-    canAddSupply,
-    canUpdateSupply,
-    canDeleteSupply,
+    canViewEquipments,
+    canAddEquipment,
+    canUpdateEquipment,
+    canDeleteEquipment,
     canAddStock,
     canViewStock,
     canRequestItem,

package/composables/usePeople.ts

@@ -10,10 +10,11 @@ export default function () {
     dateFrom = "",
     type = "",
     displayNoCheckOut = false,
+    status = "",
   } = {}) {
     return await useNuxtApp().$api<Record<string, any>>("/api/people", {
       method: "GET",
-      query: { page, limit, sort, search, org, site, dateTo, dateFrom, type },
+      query: { page, limit, sort, search, org, site, dateTo, dateFrom, type, status },
     });
   }
 
@@ -87,13 +88,13 @@ export default function () {
 
   async function getPeopleByUnit(
     _id: string,
-    { status = "active", type = "resident" } = {}
+    { status = "active", type = "" } = {}
   ) {
     return await useNuxtApp().$api<Record<string, any>>(
       `/api/people/unit/${_id}`,
       {
         method: "GET",
-        query: { status, type },
+        query: { status },
       }
     );
   }

package/composables/useVehicle.ts

@@ -43,6 +43,16 @@ export default function useVehicle() {
     );
   }
 
+  async function searchMultipleVehiclesByUnitId({unitId, page = 1, limit = 10}: {unitId: string, page?: number, limit?: number}) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/vehicles/unit/${unitId}`,
+      {
+        method: "GET",
+        query: { page, limit },
+      }
+    );
+  }
+
   interface IDeleteVehicleParams {
     site: string;
     id: string;
@@ -64,6 +74,19 @@ export default function useVehicle() {
     );
   }
 
+  async function approveVehicle({ site, org, id }: { site: string, org: string, id: string}){
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/vehicles/approve/ ${id}`,
+      {
+        method: "PUT",
+        body: {
+          site,
+          org,
+        },
+      }
+    );
+  }
+
   async function getVehicleByNRIC(search: string) {
     return await useNuxtApp().$api<Record<string, any>>(
       `/api/vehicles/nric`,
@@ -77,7 +100,7 @@ export default function useVehicle() {
   }
 
 
-  function formatVehicleStatus(status: string){
+  function formatVehicleStatus(status: TVehicleStatus) {
     let label = ""
     let color = ""
     switch (status) {
@@ -93,6 +116,14 @@ export default function useVehicle() {
             label = "Rejected"
             color = "red"
             break;
+        case 'deleted':
+            label = "Deleted"
+            color = "grey"
+            break;
+        case 'inactive':
+            label = "Deleted"
+            color = "grey"
+            break;
         default:
             label = status?.charAt(0).toUpperCase() + status?.slice(1) || ""
             color = "grey"
@@ -109,6 +140,8 @@ export default function useVehicle() {
     updateVehicle,
     deleteVehicle,
     getVehicleByNRIC,
-    formatVehicleStatus
+    formatVehicleStatus,
+    approveVehicle,
+    searchMultipleVehiclesByUnitId
   };
 }

package/composables/useVisitor.ts

@@ -5,7 +5,7 @@ export default function () {
   };
 
   const visitorSelection: TVisitorSelection[] =[
-    // { label: "Guest", value: "guest" },
+    { label: "Drive-in", value: "guest" },
     { label: "Contractor", value: "contractor" },
     { label: "Walk-In", value: "walk-in" },
     { label: "Delivery", value: "delivery" },
@@ -14,7 +14,7 @@ export default function () {
   ];
 
     const typeFieldMap: Record<TVisitorType, (keyof TVisitorPayload)[]> = {
-      guest: ['name', 'nric', 'contact', 'company', 'block', 'level', 'unit' , 'unitName', 'remarks'],
+      guest: ['name', 'nric', 'contact', 'block', 'plateNumber', 'level', 'unit' , 'unitName', 'remarks'],
       contractor: ['contractorType', 'name', 'nric', 'company', 'contact', 'plateNumber', 'block', 'level', 'unit', 'unitName', 'remarks'],
       'walk-in': ['name', 'company', 'nric', 'contact', 'block', 'level', 'unit' , 'unitName', 'remarks'],
       delivery: ['attachments', 'name', 'deliveryType', 'company', 'nric', 'contact', 'plateNumber', 'block', 'level', 'unit' , 'unitName',  'remarks'],
@@ -54,7 +54,7 @@ export default function () {
     dateTo = "",
     dateFrom = "",
     type = "",
-    status = "registered",
+    status = "",
     // status = "registered"
     checkedOut
   }: GetVisitorsParams = {}) {

package/composables/useWorkOrder.ts

@@ -72,9 +72,29 @@ export default function useWorkOrder() {
   }
 
   function deleteWorkOrder(id: string) {
-    return useNuxtApp().$api<Record<string, any>>(`/api/work-orders/deleted/work-order/${id}`, {
-      method: "PUT",
-      // query: { id },
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/work-orders/deleted/work-order/${id}`,
+      {
+        method: "PUT",
+        // query: { id },
+      }
+    );
+  }
+
+  function getWorkOrderSettings(_workOrderSettings: Record<string, any>) {
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/work-order-settings/get-by-site",
+      {
+        method: "POST",
+        body: _workOrderSettings,
+      }
+    );
+  }
+
+  function createWorkOrderSettings(_workOrderSettings: Record<string, any>) {
+    return useNuxtApp().$api<Record<string, any>>("/api/work-order-settings", {
+      method: "POST",
+      body: _workOrderSettings,
     });
   }
 
@@ -89,5 +109,7 @@ export default function useWorkOrder() {
     getWorkOrderById,
     updateWorkOrder,
     deleteWorkOrder,
+    getWorkOrderSettings,
+    createWorkOrderSettings,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.10.6",
+  "version": "1.10.8",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -30,11 +30,12 @@
   "dependencies": {
     "@ckeditor/ckeditor5-vue": "^7.3.0",
     "@iconify/vue": "^5.0.0",
-    "qrcode.vue": "^3.4.1",
     "@mdi/font": "^7.4.47",
     "@types/qrcode": "^1.5.6",
     "ckeditor5": "^47.2.0",
+    "html2pdf.js": "^0.10.2",
     "qrcode": "^1.5.4",
+    "qrcode.vue": "^3.4.1",
     "sass": "^1.80.6",
     "vue3-signature": "^0.2.4",
     "zod": "^3.24.2"

package/types/building.d.ts

@@ -9,7 +9,7 @@ declare type TBuilding = {
 
 declare type TBuildingUnit = {
   _id?: string;
-  site: string;
+  site: TSite;
   name?: string;
   owner?: string;
   ownerName?: string;

package/types/cleaner-schedule.d.ts

@@ -44,6 +44,7 @@ declare type TChecklistSet = {
   remarks?: string;
   attachments?: string[];
   completedByName?: string;
+  isScheduleTask?: boolean;
 };
 
 declare type TFlattenedUnitItem = TUnitChecklistItem & {

package/types/{checkout-item.d.ts → equipment-item.d.ts}

@@ -1,4 +1,4 @@
-declare type TCheckoutItemApi = {
+declare type TEquipmentItemApi = {
   _id: string;
   createdAt: string;
   name: string;
@@ -10,7 +10,7 @@ declare type TCheckoutItemApi = {
   attachment?: string[];
 };
 
-declare type TCheckoutItemCreate = {
+declare type TEquipmentItemCreate = {
   items: Array<{
     supply: string;
     qty: number;
@@ -18,7 +18,7 @@ declare type TCheckoutItemCreate = {
   }>;
 };
 
-declare type TCheckoutItem = {
+declare type TEquipmentItem = {
   supply: string;
   supplyName: string;
   qty: number;