@7365admin1/layer-common 1.10.6 → 1.10.7

package/composables/useAccessManagement.ts

@@ -172,6 +172,55 @@ export default function useAccessManagement() {
     );
   }
 
+  function saveVisitorAccessCardQrTag(
+    siteId: string,
+    payloads: Array<{
+      _id: string;
+      cardNo: string;
+      qrTag: string;
+      qrTagCardNo: string;
+    }>
+  ) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/qr-tag/${siteId}`,
+      {
+        method: "POST",
+        body: payloads,
+      }
+    );
+  }
+
+  function getAllVisitorAccessCardsQrTags(site: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/qr-tag`,
+      {
+        method: "GET",
+        query: { site },
+      }
+    );
+  }
+
+  function getVisitorAccessCards(params: {
+    page?: number;
+    limit?: number;
+    site?: string;
+    search?: string;
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/access-management/visitor-access-cards`,
+      {
+        method: "GET",
+        query: {
+          type: "Visitor/Resident",
+          ...(params.page ? { page: params.page } : {}),
+          ...(params.limit ? { limit: params.limit } : {}),
+          ...(params.site ? { site: params.site } : {}),
+          ...(params.search ? { search: params.search } : {}),
+        },
+      }
+    );
+  }
+
   return {
     getDoorAccessLevels,
     getLiftAccessLevels,
@@ -186,5 +235,8 @@ export default function useAccessManagement() {
     deleteCard,
     getCardHistory,
     getCardDetails,
+    getVisitorAccessCards,
+    saveVisitorAccessCardQrTag,
+    getAllVisitorAccessCardsQrTags,
   };
 }

package/composables/usePeople.ts

@@ -10,10 +10,11 @@ export default function () {
     dateFrom = "",
     type = "",
     displayNoCheckOut = false,
+    status = "",
   } = {}) {
     return await useNuxtApp().$api<Record<string, any>>("/api/people", {
       method: "GET",
-      query: { page, limit, sort, search, org, site, dateTo, dateFrom, type },
+      query: { page, limit, sort, search, org, site, dateTo, dateFrom, type, status },
     });
   }
 
@@ -87,13 +88,13 @@ export default function () {
 
   async function getPeopleByUnit(
     _id: string,
-    { status = "active", type = "resident" } = {}
+    { status = "active", type = "" } = {}
   ) {
     return await useNuxtApp().$api<Record<string, any>>(
       `/api/people/unit/${_id}`,
       {
         method: "GET",
-        query: { status, type },
+        query: { status },
       }
     );
   }

package/composables/useVehicle.ts

@@ -64,6 +64,19 @@ export default function useVehicle() {
     );
   }
 
+  async function approveVehicle({ site, org, id }: { site: string, org: string, id: string}){
+    return await useNuxtApp().$api<Record<string, any>>(
+      `/api/vehicles/approve/ ${id}`,
+      {
+        method: "PUT",
+        body: {
+          site,
+          org,
+        },
+      }
+    );
+  }
+
   async function getVehicleByNRIC(search: string) {
     return await useNuxtApp().$api<Record<string, any>>(
       `/api/vehicles/nric`,
@@ -109,6 +122,7 @@ export default function useVehicle() {
     updateVehicle,
     deleteVehicle,
     getVehicleByNRIC,
-    formatVehicleStatus
+    formatVehicleStatus,
+    approveVehicle
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.10.6",
+  "version": "1.10.7",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -30,11 +30,12 @@
   "dependencies": {
     "@ckeditor/ckeditor5-vue": "^7.3.0",
     "@iconify/vue": "^5.0.0",
-    "qrcode.vue": "^3.4.1",
     "@mdi/font": "^7.4.47",
     "@types/qrcode": "^1.5.6",
     "ckeditor5": "^47.2.0",
+    "html2pdf.js": "^0.10.2",
     "qrcode": "^1.5.4",
+    "qrcode.vue": "^3.4.1",
     "sass": "^1.80.6",
     "vue3-signature": "^0.2.4",
     "zod": "^3.24.2"

package/types/cleaner-schedule.d.ts

@@ -44,6 +44,7 @@ declare type TChecklistSet = {
   remarks?: string;
   attachments?: string[];
   completedByName?: string;
+  isScheduleTask?: boolean;
 };
 
 declare type TFlattenedUnitItem = TUnitChecklistItem & {

package/types/html2pdf.d.ts

@@ -0,0 +1,19 @@
+declare module "html2pdf.js" {
+  interface Html2PdfOptions {
+    margin?: number | number[];
+    filename?: string;
+    image?: { type?: string; quality?: number };
+    html2canvas?: Record<string, any>;
+    jsPDF?: Record<string, any>;
+  }
+
+  interface Html2Pdf {
+    set(options: Html2PdfOptions): Html2Pdf;
+    from(element: HTMLElement): Html2Pdf;
+    save(): Promise<void>;
+    output(type: string): Promise<any>;
+  }
+
+  function html2pdf(): Html2Pdf;
+  export default html2pdf;
+}

package/types/people.d.ts

@@ -17,9 +17,10 @@ declare type TPeople = {
   site?: string,
   type?: TPeopleType;
   plates?: TPlateNumber[]
+  email?: string;
 };
 
-declare type TPlateNumber = { plateNumber: string, recNo: string }
+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"> 

package/types/site.d.ts

@@ -17,4 +17,12 @@ declare type TSite = {
   createdAt?: string;
   updatedAt?: string;
   deletedAt?: string;
+  address: {
+    line1: string;
+    line2?: string;
+    city: string;
+    state?: string;
+    postalCode: string;
+    country: string;
+  }
 };

package/types/vehicle.d.ts

@@ -20,11 +20,10 @@ declare type TVehicle = {
   recNo?: string;
 };
 
-declare type TVehicleType = "whitelist" | "blocklist" | "seasonpass";
+declare type TVehicleType = "whitelist" | "blocklist";
 
 declare type TVehiclePayload = Pick<
   TVehicle,
-  | "plateNumber"
   | "type"
   | "category"
   | "direction"
@@ -40,4 +39,4 @@ declare type TVehiclePayload = Pick<
   | "end"
   | "site"
   | "org"
->;
+> & { plateNumber: string[] };

package/.playground/app.vue

@@ -1,41 +0,0 @@
-<template>
-  <v-app>
-    <LayoutHeader />
-
-    <LayoutNavigationDrawer :navigation-items="navigationItems" />
-
-    <v-main>
-      <NuxtLayout> <NuxtPage /> </NuxtLayout>
-    </v-main>
-  </v-app>
-</template>
-
-<script setup lang="ts">
-const navigationItems = computed(() => {
-  const items: Array<TNavigationItem> = [];
-  items.push(
-    {
-      title: "Create new request",
-      route: { name: "index" },
-      icon: "mdi-plus",
-    },
-    {
-      title: "Requests",
-      route: { name: "index" },
-      icon: "mdi-account-circle",
-    },
-    {
-      title: "Draft",
-      route: { name: "index" },
-      icon: "mdi-account-circle",
-    },
-    {
-      title: "Feedback",
-      route: { name: "feedback" },
-      icon: "mdi-account-circle",
-    }
-  );
-
-  return items;
-});
-</script>

package/.playground/eslint.config.mjs

@@ -1,6 +0,0 @@
-// @ts-check
-import withNuxt from './.nuxt/eslint.config.mjs'
-
-export default withNuxt(
-  // Your custom configs here
-)

package/.playground/nuxt.config.ts

@@ -1,22 +0,0 @@
-export default defineNuxtConfig({
-  extends: [".."],
-  modules: ["@nuxt/eslint"],
-  compatibilityDate: "2024-11-03",
-
-  runtimeConfig: {
-    public: {
-      cookieConfig: {
-        domain: (process.env.DOMAIN as string) ?? "localhost",
-        secure: true,
-        maxAge: 30 * 24 * 60 * 60,
-      },
-      APP_NAME: (process.env.APP_NAME as string) ?? "App",
-      APP_NAME_ROUTE: (process.env.APP_NAME_ROUTE as string) ?? "index",
-      APP_ACCOUNT: (process.env.APP_ACCOUNT as string) ?? "",
-      API_DO_STORAGE_ENDPOINT:
-        (process.env.API_DO_STORAGE_ENDPOINT as string) ?? "",
-      APP_ADMIN: (process.env.APP_ADMIN as string) ?? "",
-      APP_CBA_RECAP: (process.env.APP_CBA_RECAP as string) ?? "",
-    },
-  },
-});

package/.playground/pages/feedback.vue

@@ -1,30 +0,0 @@
-<template>
-  <v-row class="no-gutters" align="center" justify="center">
-    <v-col cols="12" md="10" lg="10">
-      <FeedbackListView @click:create="showCreateDialog = true" />
-    </v-col>
-
-    <v-dialog
-      v-model="showCreateDialog"
-      fullscreen
-      transition="dialog-right-transition"
-      persistent
-    >
-      <v-card
-        class="ml-auto"
-        style="
-          height: 100vh;
-          width: 400px;
-          border-top-left-radius: 12px;
-          border-bottom-left-radius: 12px;
-        "
-      >
-        <FeedbackFormCreate @close="showCreateDialog = false" />
-      </v-card>
-    </v-dialog>
-  </v-row>
-</template>
-
-<script lang="ts" setup>
-const showCreateDialog = ref(false);
-</script>