@7365admin1/layer-common 1.10.8 → 1.10.10

package/composables/useVisitor.ts

@@ -13,11 +13,11 @@ export default function () {
     { label: "Drop-Off", value: "drop-off" },
   ];
 
-    const typeFieldMap: Record<TVisitorType, (keyof TVisitorPayload)[]> = {
+    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', 'company', 'nric', 'contact', 'plateNumber', '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'],
   }
@@ -33,7 +33,7 @@ export default function () {
   type GetVisitorsParams = {
   page?: number
   limit?: number
-  sort?: "asc" | "desc"
+  order?: "asc" | "desc"
   search?: string
   org?: string
   site?: string
@@ -42,12 +42,13 @@ export default function () {
   type?: string
   status?: string
   checkedOut?: boolean
+  plateNumber?: string
 }
 
   async function getVisitors({
     page = 1,
     limit = 10,
-    sort = "asc",
+    order = "desc",
     search = "",
     org = "",
     site = "",
@@ -56,6 +57,7 @@ export default function () {
     type = "",
     status = "",
     // status = "registered"
+    plateNumber = "",
     checkedOut
   }: GetVisitorsParams = {}) {
     return await useNuxtApp().$api<Record<string, any>>(
@@ -65,7 +67,6 @@ export default function () {
         query: {
           page,
           limit,
-          sort,
           search,
           org,
           site,
@@ -73,7 +74,9 @@ export default function () {
           dateFrom,
           type,
           status,
-          checkedOut
+          checkedOut,
+          plateNumber,
+          order
         },
       }
     );

package/constants/app.ts

@@ -0,0 +1,12 @@
+export const APP_CONSTANTS = {
+    PROPERTY_MANAGEMENT: "property_management_agency",
+    HYGIENE: "cleaning_services",
+    SECURITY: "security_agency",
+    MECHANICAL_ELECTRICAL: "mechanical_electrical",
+    RESIDENT: "resident",
+    LANDSCAPING: "landscaping_services",
+    PEST_CONTROL: "pest_control_services",
+    POOL_MAINTENANCE: "pool_maintenance_services"
+
+
+}

package/nuxt.config.ts

@@ -17,6 +17,8 @@ export default defineNuxtConfig({
       APP: (process.env.APP as string) ?? "App",
       API_DO_STORAGE_ENDPOINT:
         (process.env.API_DO_STORAGE_ENDPOINT as string) ?? "",
+      API_DO_STORAGE_ENDPOINT_ANPR: 
+        (process.env.API_DO_STORAGE_ENDPOINT_ANPR as string) ?? "",
       APP_NAME: (process.env.APP_NAME as string) ?? "App",
       APP_NAME_ROUTE: (process.env.APP_NAME_ROUTE as string) ?? "index",
       APP_MAIN: (process.env.APP_MAIN as string) ?? "",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.10.8",
+  "version": "1.10.10",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -34,9 +34,11 @@
     "@types/qrcode": "^1.5.6",
     "ckeditor5": "^47.2.0",
     "html2pdf.js": "^0.10.2",
+    "moment-timezone": "^0.6.0",
     "qrcode": "^1.5.4",
     "qrcode.vue": "^3.4.1",
     "sass": "^1.80.6",
+    "vue-draggable-next": "^2.3.0",
     "vue3-signature": "^0.2.4",
     "zod": "^3.24.2"
   }

package/plugins/vue-draggable-next.client.ts

@@ -0,0 +1,5 @@
+import { VueDraggableNext } from 'vue-draggable-next'
+
+export default defineNuxtPlugin((nuxtApp) => {
+  nuxtApp.vueApp.component('draggable', VueDraggableNext)
+})

package/types/feedback.d.ts

@@ -22,6 +22,7 @@ declare type TFeedback = {
   createdBy?: string;
   workOrderNo?: string;
   workOrderId?: string;
+  app?: string;
 };
 
 declare type TFeedbackMetadata = {
@@ -38,7 +39,6 @@ declare type TFeedbackMetadata = {
 declare type TFeedbackCreate = Pick<
   TFeedback,
   | "subject"
-  | "category"
   | "location"
   | "description"
   | "attachments"
@@ -48,7 +48,10 @@ declare type TFeedbackCreate = Pick<
   | "organization"
   | "site"
   | "createdBy"
->;
+  | "app"
+> & {
+  category?: string;
+};
 
 declare type TFeedbackUpdate = Pick<
   TFeedback,

package/types/site.d.ts

@@ -24,5 +24,6 @@ declare type TSite = {
     state?: string;
     postalCode: string;
     country: string;
-  }
+  },
+  deliveryCompanyList: string[];
 };

package/types/user.d.ts

@@ -9,6 +9,7 @@ declare type TUser = {
   year?: number;
   profile?: string;
   defaultOrg: string;
+  serviceProvider?: string;
   createdAt: string;
   updatedAt: string;
   status: string;