@iservice365/layer-common 1.2.0 → 1.3.1

package/composables/useVisitor.ts

@@ -1,19 +1,20 @@
-export default function(){
-
+export default function () {
   type TVisitorSelection = {
     label: string;
-    value: TVisitorType
-  }
+    value: TVisitorType;
+  };
 
   const visitorSelection: TVisitorSelection[] =[
+    { label: "Guest", value: "guest" },
     { label: "Contractor", value: "contractor" },
     { label: "Delivery", value: "delivery" },
-    { label: "Walk-In", value: "walk-in"},
-    { label: "Pick-Up", value: "pick-up"},
-    { label: "Drop-Off", value: "drop-off"}
+    { label: "Walk-In", value: "walk-in" },
+    { label: "Pick-Up", value: "pick-up" },
+    { label: "Drop-Off", value: "drop-off" },
   ];
 
     const typeFieldMap: Record<TVisitorType, (keyof TVisitorPayload)[]> = {
+      guest: ['name', 'nric', 'contact', 'block', 'level', 'unit' , 'unitName', 'remarks'],
       contractor: ['contractorType', 'name', 'nric', 'company', 'contact', 'plateNumber', 'block', 'level', 'unit', 'unitName', 'remarks'],
       delivery: ['attachments', 'name', 'deliveryType', 'company', 'nric', 'contact', 'plateNumber', 'block', 'level', 'unit' , 'unitName',  'remarks'],
       'walk-in': ['name', 'company', 'nric', 'contact', 'block', 'level', 'unit' , 'unitName', 'remarks'],
@@ -22,58 +23,81 @@ export default function(){
   }
 
   const contractorTypes = [
-  { title: "Estate Contractor", value: "estate-contractor" },
-  { title: "Home Contractor", value: "home-contractor" },
-  { title: "Property Agent", value: "property-agent" },
-  { title: "House Mover", value: "house-mover" },
-]
-
+    { title: "Estate Contractor", value: "estate-contractor" },
+    { title: "Home Contractor", value: "home-contractor" },
+    { title: "Property Agent", value: "property-agent" },
+    { title: "House Mover", value: "house-mover" },
+  ];
 
-    async function getVisitors({
-      page = 1,
-      limit = 10,
-      sort = "asc",
-      search = "",
-      org = "",
-      site = "",
-      dateTo = "",
-      dateFrom = "",
-      type="",
-      displayNoCheckOut=false
-      } = {}) {
-      return await useNuxtApp().$api<Record<string, any>>("/api/visitor-transactions", {
+  async function getVisitors({
+    page = 1,
+    limit = 10,
+    sort = "asc",
+    search = "",
+    org = "",
+    site = "",
+    dateTo = "",
+    dateFrom = "",
+    type = "",
+    status = "registered",
+    // status = "registered"
+  } = {}) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      "/api/visitor-transactions",
+      {
         method: "GET",
-        query: { page, limit, sort, search, org, site, dateTo, dateFrom, ...(type.length > 0 && {type}), ...(displayNoCheckOut === true && {checkedOut: false}) },
-      });
+        query: {
+          page,
+          limit,
+          sort,
+          search,
+          org,
+          site,
+          dateTo,
+          dateFrom,
+          type,
+          status,
+        },
+      }
+    );
   }
 
-    async function createVisitor(payload: Partial<TVisitorPayload>){
-      return await useNuxtApp().$api<Record<string, any>>("/api/visitor-transactions", {
+  async function createVisitor(payload: Partial<TVisitorPayload>) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      "/api/visitor-transactions",
+      {
         method: "POST",
         body: payload,
-      });
-    }
+      }
+    );
+  }
 
-    async function updateVisitor(_id: string, payload: Partial<TVisitorPayload>){
-      return await useNuxtApp().$api<Record<string, any>>(`/api/visitor-transactions/id/${_id}`, {
+  async function updateVisitor(_id: string, payload: Partial<TVisitorPayload>) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/visitor-transactions/id/${_id}`,
+      {
         method: "PUT",
         body: payload,
-      }); 
-    }
+      }
+    );
+  }
 
-    async function deleteVisitor(_id: string){
-      return await useNuxtApp().$api<Record<string, any>>(`/api/visitor-transactions/id/${_id}`, {
+  async function deleteVisitor(_id: string) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/visitor-transactions/id/${_id}`,
+      {
         method: "DELETE",
-      }); 
-    }
+      }
+    );
+  }
 
-    return {
-        typeFieldMap,
-        visitorSelection,
-        contractorTypes,
-        createVisitor,
-        getVisitors,
-        updateVisitor,
-        deleteVisitor
-    }
-}
+  return {
+    typeFieldMap,
+    visitorSelection,
+    contractorTypes,
+    createVisitor,
+    getVisitors,
+    updateVisitor,
+    deleteVisitor,
+  };
+}

package/composables/useWorkOrder.ts

@@ -32,18 +32,18 @@ export default function useWorkOrder() {
 
   async function getWorkOrders({
     page = 1,
-    organization = "",
     site = "",
     status = "to-do",
     search = "",
     limit = 10,
+    category = "",
   } = {}) {
     try {
       return useNuxtApp().$api<Record<string, any>>(
-        `/api/work-orders/organization/${organization}/site/${site}/status/${status}`,
+        `/api/work-orders/site/${site}/status/${status}`,
         {
           method: "GET",
-          query: { page, search, limit },
+          query: { page, search, limit, category },
         }
       );
     } catch (err) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@iservice365/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/types/building.d.ts

@@ -4,6 +4,7 @@ declare type TBuilding = {
   name: string;
   block: number | null;
   levels: string[];
+  buildingFloorPlan: string[]
 };
 
 declare type TBuildingUnit = {
@@ -16,4 +17,5 @@ declare type TBuildingUnit = {
   level: string | null;
   category: string;
   status: string;
+  buildingUnitFiles: string[]
 };

package/types/people.d.ts

@@ -2,17 +2,18 @@ declare type TPeople = {
   name?: string;
   block?: number | string;
   level?: string;
-  unit?: string | Partial<TBuildingUnit>;
+  unit?: string
+  companyName?: sring[];
   unitName?: string;
-  contact: string;
-  plateNumber: string;
+  contact?: string;
+  plateNumber?: string;
   nric?: string;
   contact?: string;
   remarks?: string;
-  start: string;
-  end: string;
-  org: string;
-  site: string,
+  start?: string;
+  end?: string;
+  org?: string;
+  site?: string,
   type?: TPeoplePayload;
 };
 

package/types/visitor.d.ts

@@ -21,7 +21,7 @@ declare type TVisitor = {
   manualCheckout?: boolean;
 };
 
-declare type TVisitorType = "contractor" | "delivery" | "walk-in" | "pick-up" | "drop-off";
+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"> & {
   members?: TMemberInfo[]