@7365admin1/layer-common 1.11.21 → 1.11.23

package/composables/useVisitor.ts

@@ -4,7 +4,7 @@ export default function () {
     value: TVisitorType;
   };
 
-  const visitorSelection: TVisitorSelection[] =[
+  const visitorSelection: TVisitorSelection[] = [
     { label: "Drive-in", value: "guest" },
     { label: "Contractor", value: "contractor" },
     { label: "Walk-In", value: "walk-in" },
@@ -13,14 +13,62 @@ export default function () {
     { label: "Drop-Off", value: "drop-off" },
   ];
 
-    const typeFieldMap: Record<TVisitorType, (keyof TVisitorPayload | 'delivery-company')[]> = {
-      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', 'delivery-company', 'nric', 'contact', 'plateNumber', 'block', 'level', 'unit' , 'unitName',  'remarks'],
-      'pick-up': ['plateNumber', 'block', 'remarks'],
-      'drop-off': ['plateNumber', 'block', 'remarks'],
-  }
+  const typeFieldMap: Record<
+    TVisitorType,
+    (keyof TVisitorPayload | "delivery-company")[]
+  > = {
+    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",
+      "delivery-company",
+      "nric",
+      "contact",
+      "plateNumber",
+      "block",
+      "level",
+      "unit",
+      "unitName",
+      "remarks",
+    ],
+    "pick-up": ["plateNumber", "block", "remarks"],
+    "drop-off": ["plateNumber", "block", "remarks"],
+  };
 
   const contractorTypes = [
     { title: "Estate Contractor", value: "estate-contractor" },
@@ -29,21 +77,20 @@ export default function () {
     { title: "House Mover", value: "house-mover" },
   ];
 
-
   type GetVisitorsParams = {
-  page?: number
-  limit?: number
-  order?: "asc" | "desc"
-  search?: string
-  org?: string
-  site?: string
-  dateTo?: string
-  dateFrom?: string
-  type?: string
-  status?: string
-  checkedOut?: boolean
-  plateNumber?: string
-}
+    page?: number;
+    limit?: number;
+    order?: "asc" | "desc";
+    search?: string;
+    org?: string;
+    site?: string;
+    dateTo?: string;
+    dateFrom?: string;
+    type?: string;
+    status?: string;
+    checkedOut?: boolean;
+    plateNumber?: string;
+  };
 
   async function getVisitors({
     page = 1,
@@ -58,7 +105,7 @@ export default function () {
     status = "",
     // status = "registered"
     plateNumber = "",
-    checkedOut
+    checkedOut,
   }: GetVisitorsParams = {}) {
     return await useNuxtApp().$api<Record<string, any>>(
       "/api/visitor-transactions",
@@ -76,7 +123,7 @@ export default function () {
           status,
           checkedOut,
           plateNumber,
-          order
+          order,
         },
       }
     );
@@ -111,6 +158,29 @@ export default function () {
     );
   }
 
+  function validateVisitorQrCode(site: string, id: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/visitors/visitor-qr-code/${id}?site=${site}`
+    );
+  }
+
+  async function updateVisitorPassKey(_id: string, payload: TPassKeyPayload[]) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/visitor-transactions/replace-keys/id/${_id}`,
+      {
+        method: "PUT",
+        body: payload,
+      }
+    );
+  }
+
+  function visitorDataFromScannedQRCodeCheckInOut(payload: any) {
+    return useNuxtApp().$api<Record<string, any>>("/api/visitors/update-one", {
+      method: "PUT",
+      body: payload,
+    });
+  }
+
   return {
     typeFieldMap,
     visitorSelection,
@@ -119,5 +189,8 @@ export default function () {
     getVisitors,
     updateVisitor,
     deleteVisitor,
+    validateVisitorQrCode,
+    updateVisitorPassKey,
+    visitorDataFromScannedQRCodeCheckInOut,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.21",
+  "version": "1.11.23",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -34,6 +34,7 @@
     "@types/qrcode": "^1.5.6",
     "ckeditor5": "^47.2.0",
     "html2pdf.js": "^0.10.2",
+    "html5-qrcode": "^2.3.8",
     "moment-timezone": "^0.6.0",
     "nuxt-signature-pad": "^1.8.0",
     "qrcode": "^1.5.4",

package/types/visitor.d.ts

@@ -16,39 +16,69 @@ declare type TVisitor = {
   nric?: string;
   contact?: string;
   remarks?: string;
+  purpose?: string;
   attachments: string[];
   org: string;
-  site: string,
+  site: string;
   manualCheckout?: boolean;
   visitorPass?: TPassKeyPayload[];
-  passKeys?: TPassKeyPayload[]
+  passKeys?: TPassKeyPayload[];
   checkInRemarks?: string;
   checkOutRemarks?: string;
 };
 
-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" | "status" | "visitorPass" | "passKeys" | "checkInRemarks" | "checkOutRemarks"> & {
-  members?: TMemberInfo[]
-}
-
+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"
+  | "status"
+  | "visitorPass"
+  | "passKeys"
+  | "checkInRemarks"
+  | "checkOutRemarks"
+> & {
+  members?: TMemberInfo[];
+};
 
 declare type TDefaultOptionObj = {
   title: string;
   value: any;
-}
+};
 
 declare type TMemberInfo = {
-    name: string;
-    nric: string;
-    visitorPass?: string;
-    passKeys?: TPassKeyPayload[];
-    contact: string
+  name: string;
+  nric: string;
+  visitorPass?: { keyId: string }[];
+  passKeys?: TPassKeyPayload[];
+  contact: string
 }
 
 declare type TPassKeyPayload = {
   keyId: string;
   status?: string;
   remarks?: string;
-}
+};