@7365admin1/layer-common 1.10.7 → 1.10.8

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/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;
@@ -90,7 +100,7 @@ export default function useVehicle() {
   }
 
 
-  function formatVehicleStatus(status: string){
+  function formatVehicleStatus(status: TVehicleStatus) {
     let label = ""
     let color = ""
     switch (status) {
@@ -106,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"
@@ -123,6 +141,7 @@ export default function useVehicle() {
     deleteVehicle,
     getVehicleByNRIC,
     formatVehicleStatus,
-    approveVehicle
+    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.7",
+  "version": "1.10.8",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

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/{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;

package/types/{supply.d.ts → equipment.d.ts}

@@ -1,4 +1,4 @@
-declare type TSupply = {
+declare type TEquipment = {
   _id: string;
   name: string;
   qty: number;
@@ -8,4 +8,4 @@ declare type TSupply = {
   updatedAt: string;
 };
 
-declare type TSupplyCreate = Pick<TSupply, "name" | "unitOfMeasurement">;
+declare type TEquipmentCreate = Pick<TEquipment, "name" | "unitOfMeasurement">;

package/types/people.d.ts

@@ -18,11 +18,13 @@ declare type TPeople = {
   type?: TPeopleType;
   plates?: TPlateNumber[]
   email?: string;
+  files?: { name: string, id: string }[];
+  isOwner?: boolean;
 };
 
 declare type TPlateNumber = { plateNumber: string, recNo: string, _id?: string, status: "active" | "deleted" | "pending", type: TVehicleType };
 
 
-declare type TPeoplePayload = Pick<TGuest, "name" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "nric" | "contact" | "remarks" | "org" | "site" | "start" | "end" | "type"> 
+declare type TPeoplePayload = Pick<TGuest, "name" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "nric" | "contact" | "remarks" | "org" | "site" | "start" | "end" | "type" | "isOwner"> 
 
 declare type TPeopleType = "guest" | "resident" | "tenant"

package/types/vehicle.d.ts

@@ -18,9 +18,11 @@ declare type TVehicle = {
   org?: string;
   _id?: string;
   recNo?: string;
+  status?: TVehicleStatus;
 };
 
 declare type TVehicleType = "whitelist" | "blocklist";
+declare type TVehicleStatus = "active" | 'inactive' | "pending" | "deleted" | "rejected" ;
 
 declare type TVehiclePayload = Pick<
   TVehicle,

package/types/visitor.d.ts

@@ -1,4 +1,5 @@
 declare type TVisitor = {
+  _id?: string;
   name?: string;
   type: TVisitorType;
   company?: string | "";
@@ -23,7 +24,7 @@ declare type TVisitor = {
 
 declare type TVisitorType = "contractor" | "delivery" | "walk-in" | "pick-up" | "drop-off" | "guest";
 
-declare type TVisitorPayload = Pick<TVisitor, "name" | "type" | "company" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "checkOut" | "contractorType" | "deliveryType" | "nric" | "contact" | "remarks" | "attachments" | "org" | "site"> & {
+declare type TVisitorPayload = Pick<TVisitor, "name" | "type" | "company" | "block" | "level" | "unit" | "unitName" | "contact" | "plateNumber" | "checkOut" | "contractorType" | "deliveryType" | "nric" | "contact" | "remarks" | "attachments" | "org" | "site" | "status"> & {
   members?: TMemberInfo[]
 }