@7365admin1/layer-common 1.11.2 → 1.11.6

package/components/VisitorForm.vue

@@ -289,6 +289,7 @@
 
 <script setup lang="ts">
 import useBuildingUnit from '../composables/useBuildingUnit';
+import useWebUsb from '../composables/useWebUsb';
 
 
 const prop = defineProps({
@@ -322,7 +323,8 @@ const { requiredRule, debounce, UTCToLocalTIme } = useUtils();
 const { getSiteById, getSiteLevels, getSiteUnits } = useSiteSettings();
 const { createVisitor, typeFieldMap, contractorTypes, getVisitors, updateVisitor } = useVisitor();
 const { getBySiteId: getEntryPassSettingsBySiteId } = useSiteEntryPassSettings();
-const { createVisitorPass } = useAccessManagement();
+const { createVisitorPass, signQr } = useAccessManagement();
+const { testConnection } = useWebUsb();
 const { findPersonByNRIC, findPersonByContact, searchCompanyList, findUsersByPlateNumber } = usePeople()
 const { getById: getUnitDataById } = useBuildingUnit()
 
@@ -353,7 +355,7 @@ const visitor = reactive<Partial<TVisitorPayload>>({
   members: [],
 });
 
-const passType = ref("");
+const passType = ref<string | null>(null);
 const passQuantity = ref<number | null>(1);
 const passCards = ref<{ _id: string; cardNo: string }[]>([]);
 
@@ -655,15 +657,9 @@ function handleAutofillDataViaVehicleNumber(item: TPeople) {
 const {
   data: entryPassSettings,
   pending: entryPassSettingsPending,
-  refresh: refreshEntryPassSettings,
-} = useLazyAsyncData(`fetch-entrypass-settings-${prop.site}`, () => {
-  if (contractorStep.value !== 2) return Promise.resolve(null);
-  return getEntryPassSettingsBySiteId(prop.site);
-});
-
-watch(contractorStep, (step) => {
-  if (step === 2) refreshEntryPassSettings();
-});
+} = useLazyAsyncData(`fetch-entrypass-settings-${prop.site}`, () =>
+  getEntryPassSettingsBySiteId(prop.site)
+);
 
 const {
   data: siteData,
@@ -908,10 +904,13 @@ async function submit() {
     const res = await createVisitor(payload);
     if (res) {
       if (prop.type === "contractor" && passType.value) {
-        const visitorId = res?._id;
-        const acmUrl = entryPassSettings.value?.data?.settings?.acm_url;
+        const visitorId = res as unknown as string;
+        const rawUrl = entryPassSettings.value?.data?.settings?.url;
+        const { encrypted: acmUrl } = await $fetch<{ encrypted: string }>(
+          `/api/encrypt-acm-url${rawUrl ? `?url=${encodeURIComponent(rawUrl)}` : ""}`
+        );
         if (visitorId && acmUrl) {
-          await createVisitorPass({
+          const passRes = await createVisitorPass({
             site: prop.site,
             unitId: visitor.unit!,
             quantity: passQuantity.value ?? 1,
@@ -920,6 +919,37 @@ async function submit() {
             acm_url: acmUrl,
             visitorId,
           });
+
+          if (passType.value === "QR") {
+            const accessCards: any[] = (passRes as any)?.accessCards ?? [];
+            const printer = entryPassSettings.value?.data?.settings?.printer;
+            if (printer?.vendorId && printer?.productId && accessCards.length) {
+              const vendorId = parseInt(printer.vendorId);
+              const productId = parseInt(printer.productId);
+              const companyName = visitor.company || "";
+              const blockLabel = blocksArray.value.find((b: any) => b.value === visitor.block)?.title || "";
+              const levelLabel = levelsArray.value.find((l: any) => l.value === visitor.level)?.title || "";
+              const unitLabel = unitsArray.value.find((u: any) => u.value === visitor.unit)?.title || "";
+              const address = [blockLabel, levelLabel, unitLabel].filter(Boolean).join("/");
+
+              await nextTick();
+              for (const qrCode of accessCards) {
+                const signed = await signQr({ cardId: qrCode._id, purpose: "vms" });
+                const qrData = signed?.data;
+                if (!qrData) continue;
+                await testConnection(
+                  vendorId,
+                  productId,
+                  true,
+                  qrData,
+                  qrCode.accessLevel,
+                  qrCode.liftAccessLevel,
+                  companyName,
+                  address,
+                );
+              }
+            }
+          }
         }
       }
       if (createMore.value) {

package/composables/useAccessManagement.ts

@@ -279,6 +279,16 @@ export default function useAccessManagement() {
     );
   }
 
+  function signQr(payload: { cardId: string; purpose: string }) {
+    return useNuxtApp().$api<{ message: string; data: string }>(
+      `/api/access-management/sign-qr`,
+      {
+        method: "POST",
+        body: payload,
+      }
+    );
+  }
+
   return {
     getDoorAccessLevels,
     getLiftAccessLevels,
@@ -299,5 +309,6 @@ export default function useAccessManagement() {
     getAvailableContractorCards,
     generateQrVms,
     createVisitorPass,
+    signQr,
   };
 }

package/composables/useAreas.ts

@@ -5,6 +5,7 @@ export default function useAreas() {
     page = 1,
     limit = 10,
     type = "",
+    serviceType = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-areas/site/${site}`,
@@ -15,6 +16,7 @@ export default function useAreas() {
           page,
           limit,
           type,
+          serviceType,
         },
       },
     );
@@ -30,6 +32,7 @@ export default function useAreas() {
           set: payload.set,
           type: payload.type,
           units: payload.units,
+          serviceType: payload.serviceType,
         },
       },
     );

package/composables/useComment.ts

@@ -46,7 +46,7 @@ export default function useComment() {
       "/api/comments/v1",
       {
         method: "POST",
-        body: payload,
+        body: JSON.stringify(payload),
       }
     );
   }

package/composables/useFacilityUtils.ts

@@ -0,0 +1,140 @@
+export default function(){
+
+    function generateTimeSlots(
+        intervalHours: number,
+        startTime?: string | null,
+        endTime?: string | null
+        ): TTimeSlotOption[] {
+        if (!intervalHours || intervalHours <= 0) {
+            throw new Error("Interval must be greater than 0");
+        }
+
+        const intervalMinutes = intervalHours * 60;
+        const startMinutes = toMinutes(startTime ?? "00:00");
+        const endMinutes = toMinutes(endTime ?? "24:00");
+
+        const slots: TTimeSlotOption[] = [];
+        let key = 1;
+
+        let current = startMinutes + intervalMinutes;
+
+        for (; current <= endMinutes; current += intervalMinutes) {
+            slots.push({
+            key: key++,
+            time: toTimeString(current),
+            disabled: false
+            });
+        }
+
+        return slots;
+}
+
+const toMinutes = (time: string): number => {
+            const [h, m] = time.split(":").map(Number);
+            return h * 60 + m;
+};
+
+const toTimeString = (minutes: number): string => {
+            const hours = Math.floor(minutes / 60);
+            const mins = minutes % 60;
+            return `${hours.toString().padStart(2, "0")}:${mins.toString().padStart(2, "0")}`;
+};
+
+function generateTimeSlotsFromStart(
+            intervalHours: number,
+            startTime?: string | null,
+            endTime?: string | null
+            ): TTimeSlotOption[] {
+            if (!intervalHours || intervalHours <= 0) {
+                throw new Error("Interval must be greater than 0");
+            }
+
+            const intervalMinutes = intervalHours * 60;
+            const startMinutes = toMinutes(startTime ?? "00:00");
+            const endMinutes = toMinutes(endTime ?? "24:00");
+
+            const slots: TTimeSlotOption[] = [];
+            let key = 1;
+
+            let current = startMinutes
+
+            for (; current <= endMinutes; current += intervalMinutes) {
+                slots.push({
+                key: key++,
+                time: toTimeString(current),
+                disabled: false
+                });
+            }
+
+            return slots;
+}
+
+// 11/24/2025, 09:05 format
+function toLocalTimeNumeric(utcString: string) {
+  return new Date(utcString).toLocaleString("en-US", {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    hour12: false,
+  })
+}
+
+
+
+const monthlyOptions = [
+    { value: 1, title: "1st" },
+    { value: 2, title: "2nd" },
+    { value: 3, title: "3rd" },
+    { value: 4, title: "4th" },
+    { value: 5, title: "5th" },
+    { value: 6, title: "6th" },
+    { value: 7, title: "7th" },
+    { value: 8, title: "8th" },
+    { value: 9, title: "9th" },
+    { value: 10, title: "10th" },
+    { value: 11, title: "11th" },
+    { value: 12, title: "12th" },
+    { value: 13, title: "13th" },
+    { value: 14, title: "14th" },
+    { value: 15, title: "15th" },
+    { value: 16, title: "16th" },
+    { value: 17, title: "17th" },
+    { value: 18, title: "18th" },
+    { value: 19, title: "19th" },
+    { value: 20, title: "20th" },
+    { value: 21, title: "21st" },
+    { value: 22, title: "22nd" },
+    { value: 23, title: "23rd" },
+    { value: 24, title: "24th" },
+    { value: 25, title: "25th" },
+    { value: 26, title: "26th" },
+    { value: 27, title: "27th" },
+    { value: 28, title: "28th" },
+    { value: "Last Day", title: "Last Day" }
+];
+
+       
+function defaultCurrencyObject (){
+
+    return { 
+            symbol: "S$",
+            code: "SGD",
+            taxType: "GST",
+        }
+}
+
+
+return {
+    generateTimeSlots,
+    toMinutes,
+    toTimeString,
+    generateTimeSlotsFromStart,
+    monthlyOptions,
+    toLocalTimeNumeric,
+    defaultCurrencyObject
+    
+}
+
+}

package/composables/useFeedback.ts

@@ -82,7 +82,7 @@ export default function useFeedback() {
     dateTo?: any;
     date?: any;
     status?: string;
-    provider?: string;
+    provider?: string | any;
     service?: string;
     userId?: string;
   } = {}) {

package/composables/useLocalAuth.ts

@@ -24,6 +24,7 @@ export default function useLocalAuth() {
     role: "",
     primaryPhone: "",
     mobilePhone: "",
+    serviceProviders: [],
   };
 
   const currentUser = useState(

package/composables/useOvernightParking.ts

@@ -0,0 +1,78 @@
+export default function () {
+
+  type GetOvernightParkingRequestsParams = {
+    page?: number
+    limit?: number
+    order?: "asc" | "desc"
+    site?: string
+    status?: string
+  }
+
+  async function getOvernightParkingRequests({
+    page = 1,
+    limit = 10,
+    order = "desc",
+    site = "",
+    status = "",
+  }: GetOvernightParkingRequestsParams = {}) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      "/api/overnight-parking-requests",
+      {
+        method: "GET",
+        query: {
+          page,
+          limit,
+          order,
+          site,
+          status,
+        },
+      }
+    );
+  }
+
+  async function getOvernightParkingRequestById(_id: string) {
+    return await useNuxtApp().$api<TOvernightParkingRequest>(
+      `/api/overnight-parking-requests/id/${_id}`,
+      {
+        method: "GET",
+      }
+    );
+  }
+
+  async function createOvernightParkingRequest(payload: Partial<TOvernightParkingRequest>) {
+    return await useNuxtApp().$api<TOvernightParkingRequest>(
+      "/api/overnight-parking-requests",
+      {
+        method: "POST",
+        body: payload,
+      }
+    );
+  }
+
+  async function updateOvernightParkingRequest(_id: string, payload: Partial<TOvernightParkingRequest>) {
+    return await useNuxtApp().$api<TOvernightParkingRequest>(
+      `/api/overnight-parking-requests/id/${_id}`,
+      {
+        method: "PUT",
+        body: payload,
+      }
+    );
+  }
+
+  async function deleteOvernightParkingRequest(_id: string) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/overnight-parking-requests/id/${_id}`,
+      {
+        method: "DELETE",
+      }
+    );
+  }
+
+  return {
+    getOvernightParkingRequests,
+    getOvernightParkingRequestById,
+    createOvernightParkingRequest,
+    updateOvernightParkingRequest,
+    deleteOvernightParkingRequest,
+  };
+}

package/composables/useSiteSettings.ts

@@ -108,6 +108,25 @@ export default function () {
     );
   }
 
+  async function getOvernightParkingAvailability(siteId: string): Promise<{ data: TOvernightParkingAvailability }> {
+    return await useNuxtApp().$api<TOvernightParkingAvailability>(
+      `/api/overnight-parking-approval-settings/site/${siteId}`,
+      {
+        method: "GET",
+      }
+    );
+  }
+
+  async function updateOvernightParkingAvailability(siteId: string, payload: TOvernightParkingAvailability) {
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/overnight-parking-approval-settings/site/${siteId}`,
+      {
+        method: "PUT",
+        body:  JSON.stringify(payload),
+      }
+    );
+  }
+
   return {
     getSiteById,
     getSiteLevels,
@@ -119,5 +138,7 @@ export default function () {
     updateSiteCamera,
     deleteSiteCameraById,
     updateSitebyId,
+    getOvernightParkingAvailability,
+    updateOvernightParkingAvailability
   };
 }

package/composables/useUnits.ts

@@ -4,6 +4,7 @@ export default function useUnits() {
     search = "",
     page = 1,
     limit = 10,
+    serviceType = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-units/site/${site}`,
@@ -13,20 +14,22 @@ export default function useUnits() {
           search,
           page,
           limit,
+          serviceType,
         },
-      },
+      }
     );
   }
 
-  function createUnit(name: string, site: string) {
+  function createUnit(name: string, site: string, serviceType: string) {
     return useNuxtApp().$api<Record<string, any>>(
       `/api/hygiene-units/site/${site}`,
       {
         method: "POST",
         body: {
           name,
+          serviceType,
         },
-      },
+      }
     );
   }
 
@@ -38,7 +41,7 @@ export default function useUnits() {
         body: {
           name,
         },
-      },
+      }
     );
   }
 
@@ -47,7 +50,7 @@ export default function useUnits() {
       `/api/hygiene-units/id/${id}`,
       {
         method: "DELETE",
-      },
+      }
     );
   }
 
@@ -60,7 +63,7 @@ export default function useUnits() {
       {
         method: "POST",
         body: formData,
-      },
+      }
     );
   }
 

package/composables/useWorkOrder.ts

@@ -9,6 +9,7 @@ export default function useWorkOrder() {
     status?: string;
     assignee?: string | TUser;
     assigneeName?: string;
+    assigneeInfo?: Record<string, any>;
     attachments?: string[];
     createdBy?: string | TUser;
     createdByName?: string;
@@ -66,33 +67,63 @@ export default function useWorkOrder() {
 
   async function getWorkOrders({
     page = 1,
-    site = "",
-    status = "to-do",
-    search = "",
     limit = 10,
-    category = "",
+    organization,
+    provider,
+    providerService,
+    site,
+    status,
+    startDate = "",
+    endDate = "",
+    date,
+    search = "",
+  }: {
+    page?: number;
+    limit?: number;
+    search?: string;
+    startDate?: any;
+    endDate?: any;
+    date?: any;
+    status?: string;
+    organization?: string;
+    site?: string;
+    provider?: string | any;
+    providerService?: string;
+    service?: string;
   } = {}) {
-    try {
-      return useNuxtApp().$api<Record<string, any>>(
-        `/api/work-orders/site/${site}/status/${status}`,
-        {
-          method: "GET",
-          query: { page, search, limit, category },
-        }
-      );
-    } catch (err) {
-      console.error(err);
-    }
+    return useNuxtApp().$api<Record<string, any>[]>("/api/work-orders2/v1", {
+      method: "GET",
+      query: {
+        page,
+        limit,
+        search,
+        status,
+        startDate,
+        endDate,
+        date,
+        organization,
+        site,
+        provider,
+        providerService,
+      },
+    });
   }
 
   function getWorkOrderById(id: string) {
-    return useNuxtApp().$api<TWorkOrder>(`/api/work-orders/${id}`, {
+    return useNuxtApp().$api<TWorkOrder>(`/api/work-orders2/v1/id/${id}`, {
       method: "GET",
     });
   }
 
-  function createWorkOrder(payload: TWorkOrderCreate) {
-    return useNuxtApp().$api<Record<string, any>>("/api/work-orders", {
+  function createWorkOrder(payload: any) {
+    return useNuxtApp().$api<Record<string, any>>("/api/work-orders2/v1", {
+      method: "POST",
+      body: payload,
+    });
+  }
+
+  function updateStatusWorkOrder(payload: any) {
+    return useNuxtApp().$api("/api/work-orders2/status-update", {
       method: "POST",
       body: payload,
     });
@@ -140,6 +171,7 @@ export default function useWorkOrder() {
     pages,
     pageRange,
     createWorkOrder,
+    updateStatusWorkOrder,
     getWorkOrders,
     getWorkOrderById,
     updateWorkOrder,

package/nuxt.config.ts

@@ -17,7 +17,7 @@ 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: 
+      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",
@@ -47,6 +47,7 @@ export default defineNuxtConfig({
         config.plugins.push(vuetify({ autoImport: true }));
       });
     },
+    "nuxt-signature-pad",
   ],
 
   vite: {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.2",
+  "version": "1.11.6",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {

package/pages/require-organization-membership.vue

@@ -31,7 +31,7 @@ definePageMeta({
   layout: "plain",
 });
 
-const { APP_ACCOUNT, APP_NAME, APP_ORG } = useRuntimeConfig().public;
+const { APP_ACCOUNT, APP_NAME, APP_ORG, APP } = useRuntimeConfig().public;
 
 function goToAccount() {
   window.location.href = `${APP_ACCOUNT}/home`;
@@ -39,9 +39,9 @@ function goToAccount() {
 
 function createOrg() {
   if (APP_NAME.toLowerCase() === "org") {
-    navigateTo({ name: "organizations-create" });
+    navigateTo({ name: "organizations-create", query: { app: APP as string ?? "" } });
   } else {
-    window.location.href = `${APP_ORG}/organizations/create`;
+    window.location.href = `${APP_ORG}/organizations/create?app=${APP as string ?? ""}`;
   }
 }
 </script>

package/types/area.d.ts

@@ -19,4 +19,5 @@ declare type TAreaCreate = {
     unit: string;
     name: string;
   }>;
+  serviceType: string;
 };

package/types/customer.d.ts

@@ -17,11 +17,22 @@ declare type TCustomerCreate = Pick<
 declare type TCustomerSite = {
   name: string;
   site?: string;
-  siteOrg: string;
-  siteOrgName: string;
+  siteOrg?: string;
+  siteOrgName?: string;
   org: string;
   status?: string;
   createdAt?: string;
   updatedAt?: string;
   deletedAt?: string;
+  category?: TSiteCategory | string;
+  address: {
+    line1: string;
+    line2: string;
+    city: string;
+    state: string;
+    country: string;
+    postalCode: string;
+  }
 };
+
+declare type TSiteCategory = "residential" | "commercial" | "industrial" | "institutional" | "mixed_development" | "infrastructure" | "hospitality"

package/types/dashboard.d.ts

@@ -1,10 +1,11 @@
 declare type TDashboardValues = "today" | "thisWeek" | "thisMonth";
 
-
 declare type TDashboardCardValue = {
   key: string;
-  periodKey: keyof TPeriodState;
+  periodKey: string;
   title: string;
   icon: string;
   color: string;
-};
+};
+
+