@7365admin1/layer-common 3.0.6 → 3.0.8

package/composables/useCommonPermission.ts

@@ -221,6 +221,64 @@ export function useCommonPermissions() {
       },
     }
 
+    const siteSettingsPermissions: Record<string, TPermission> = {
+      "manage-site-information": {
+        check: true,
+        description:
+          "Allows the user to manage site information.",
+      },
+      "manage-anpr-camera": {
+        check: true,
+        description:
+          "Allows the user to manage ANPR camera settings.",
+      },
+      "manage-cctv-camera": {
+        check: true,
+        description:
+          "Allows the user to manage CCTV camera settings.",
+      },
+      "manage-delivery-companies": {
+        check: true,
+        description:
+          "Allows the user to manage delivery companies.",
+      },
+      "manage-resident-visitors": {
+        check: true,
+        description:
+          "Allows the user to manage resident visitors.",
+      },
+      "manage-work-order-settings": {
+        check: true,
+        description: "Allows the user to manage work order settings.",
+      },
+      "manage-billing-and-soa-configuration": {
+        check: true,
+        description:
+          "Allows the user to manage billing and SOA configuration.",
+      },
+      "manage-nfc-management": {
+        check: true,
+        description:
+          "Allows the user to manage NFC management.",
+      },
+      "manage-nfc-patrol-settings": {
+        check: true,
+        description:
+          "Allows the user to manage NFC patrol settings.",
+      },
+      "manage-entry-pass": {
+        check: true,
+        description:
+          "Allows the user to manage entry passes.",
+      },
+      "manage-red-dot-settings": {
+        check: true,
+        description:
+          "Allows the user to manage red dot settings.",
+      },
+
+    }
+  
   return {
     invitationPermissions,
     memberPermissions,
@@ -231,5 +289,6 @@ export function useCommonPermissions() {
     buildingManagementPermissions,
     buildingUnitManagementPermissions,
     bulletinBoardPermissions,
+    siteSettingsPermissions
   };
 }

package/composables/useDashboard.ts

@@ -17,12 +17,16 @@ export default function () {
 
   function getDashboardHygieneWeeklyActivity(
     site = "",
-    serviceType: TServiceType = "cleaning_services"
+    serviceType: TServiceType = "cleaning_services",
+    period?: TDashboardValues
   ) {
     return useNuxtApp().$api<THygieneWeeklyActivityItem[]>(
       `/api/dashboard/serviceType/${serviceType}/site/${site}/weekly-activity`,
       {
         method: "GET",
+        query: {
+          period,
+        },
       }
     );
   }
@@ -80,11 +84,49 @@ export default function () {
     );
   }
 
+  function getDashboardPropertyManagement(
+    site = "",
+    period: TDashboardValues = "today",
+    type = "",
+    facility = ""
+  ) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/dashboard/serviceType/property_management_agency/site/${site}`,
+      {
+        method: "GET",
+        query: {
+          period,
+          ...(type ? { type } : {}),
+          ...(facility ? { facility } : {}),
+        },
+      }
+    );
+  }
+
+  function getDashboardSecurity(
+    site = "",
+    period: TDashboardValues = "today",
+    type = ""
+  ) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/dashboard/serviceType/security_agency/site/${site}`,
+      {
+        method: "GET",
+        query: {
+          period,
+          ...(type ? { type } : {}),
+        },
+      }
+    );
+  }
+
   return {
     getDashboardHygiene,
     getDashboardHygieneWeeklyActivity,
     getDashboardHygieneTaskSchedule,
     getDashboardHygieneAttendance,
     getDashboardHygieneFeedbacks,
+    getDashboardPropertyManagement,
+    getDashboardSecurity,
   };
 }

package/composables/useOnlineForm.ts

@@ -46,22 +46,32 @@ export default function useOnlineForm() {
       query: { id },
     });
   }
+  function getFormEntryById(id: string) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/form-entries/id/${id}`, {
+      method: "GET",
+    });
+  }
+  function updateFormEntryById(id: string, value: any) {
+    return useNuxtApp().$api<Record<string, any>>(`/api/form-entries/id/${id}`, {
+      method: "PUT",
+      body: value,
+    });
+  }
   function getAllBySiteId(
     siteId: string,
-    { page = 1, search = "", limit = 10, status = "active" }
+    { page = 1, search = "", limit = 10, status = "", org = "" } = {}
   ) {
-    return useNuxtApp().$api<Record<string, any>>(
-      `/api/online-forms/site/${siteId}`,
-      {
-        method: "GET",
-        query: {
-          page,
-          search,
-          limit,
-          status,
-        },
-      }
-    );
+    return useNuxtApp().$api<Record<string, any>>(`/api/form-entries`, {
+      method: "GET",
+      query: {
+        page,
+        search,
+        limit,
+        status,
+        org,
+        site: siteId,
+      },
+    });
   }
   return {
     getAll,
@@ -70,5 +80,7 @@ export default function useOnlineForm() {
     updateOnlineFormById,
     deleteOnlineFormById,
     getAllBySiteId,
+    getFormEntryById,
+    updateFormEntryById,
   };
 }

package/composables/useOnlineFormPages.ts

@@ -17,7 +17,7 @@ export type FormBlock =
   | { type: "address"; to: string }
   | { type: "row"; fields: FormFieldDef[] }
   | { type: "field"; field: FormFieldDef }
-  | { type: "checkbox-group"; title?: string; items: CheckboxItemDef[] }
+  | { type: "checkbox-group"; title?: string; single?: boolean; items: CheckboxItemDef[] }
   | { type: "paragraph"; text: string }
   | { type: "section-header"; text: string }
   | { type: "divider" }
@@ -506,7 +506,7 @@ const formPages: Record<string, FormDefinition> = {
   },
 
   "Application for Booking of Rooftop Bar/Dining": {
-    title: "APPLICATION FOR BOOKING OF ROOFTOP BAR/DINNING",
+    title: "APPLICATION FOR BOOKING OF ROOFTOP BAR/DINING",
     blocks: [
       { type: "address", to: "{siteName}" },
       { type: "row", fields: [

package/composables/useSettingsPermission.ts

@@ -0,0 +1,138 @@
+import { useCommonPermissions } from "./useCommonPermission";
+
+export function useSettingsPermission() {
+  const { hasPermission } = usePermission();
+  const { siteSettingsPermissions: permissions } = useCommonPermissions();
+  const { userAppRole } = useLocalSetup();
+
+  const canManageSiteInformation = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-site-information",
+    );
+  });
+  const canManageANPRCamera = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-anpr-camera",
+    );
+  });
+  const canManageCCTVCamera = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-cctv-camera",
+    );
+  });
+  const canManageDeliveryCompanies = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-delivery-companies",
+    );
+  });
+  const canManageResidentVisitors = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-resident-visitors",
+    );
+  });
+  const canManageWorkOrderSettings = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-work-order-settings",
+    );
+  });
+  const canManageBillingAndSOAConfiguration = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-billing-and-soa-configuration",
+    );
+  });
+  const canManageNFCManagement = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-nfc-management",
+    );
+  });
+  const canManageNFCPatrolSettings = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-nfc-patrol-settings",
+    );
+  });
+  const canManageEntryPass = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-entry-pass",
+    );
+  });
+  const canManageRedDotSettings = computed(() => {
+    if (!userAppRole.value) return true;
+    if (userAppRole.value.permissions.includes("*")) return true;
+    return hasPermission(
+      userAppRole.value,
+      permissions,
+      "site-settings",
+      "manage-red-dot-settings",
+    );
+  });
+
+  const canManageSiteSettings = computed(() => {
+    return canManageSiteInformation.value || canManageANPRCamera.value || canManageCCTVCamera.value || canManageDeliveryCompanies.value || canManageResidentVisitors.value || canManageWorkOrderSettings.value || canManageBillingAndSOAConfiguration.value || canManageNFCManagement.value || canManageNFCPatrolSettings.value || canManageEntryPass.value || canManageRedDotSettings.value
+  })
+
+  return {
+    canManageSiteInformation,
+    canManageANPRCamera,
+    canManageCCTVCamera,
+    canManageDeliveryCompanies,
+    canManageResidentVisitors,
+    canManageWorkOrderSettings,
+    canManageBillingAndSOAConfiguration,
+    canManageNFCManagement,
+    canManageNFCPatrolSettings,
+    canManageEntryPass,
+    canManageRedDotSettings,
+    canManageSiteSettings
+
+  };
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.0.6",
+  "version": "3.0.8",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "@iconify/vue": "^5.0.0",
     "@mdi/font": "^7.4.47",
     "@types/qrcode": "^1.5.6",
-    "ckeditor5": "^47.2.0",
+    "ckeditor5": "47.4.0",
     "html2pdf.js": "^0.10.2",
     "html5-qrcode": "^2.3.8",
     "moment-timezone": "^0.6.0",

package/types/dashboard.d.ts

@@ -30,6 +30,7 @@ declare type TDashboardMetric = {
   outOfStock?: number;
   completed?: number;
   total?: number;
+  items?: { name: string; qty: number }[];
 };
 
 declare type THygieneDashboardData = {
@@ -74,4 +75,3 @@ declare type THygienePaginatedResponse<T> = {
   pages: number;
   pageRange: string;
 };
-

package/types/visitor.d.ts

@@ -31,6 +31,7 @@ declare type TVisitor = {
   passKeys?: TPassKeyPayload[];
   checkInRemarks?: string;
   checkOutRemarks?: string;
+  createdBy?: string;
 };
 
 declare type TVisitorType =
@@ -66,6 +67,7 @@ declare type TVisitorPayload = Pick<
   | "passKeys"
   | "checkInRemarks"
   | "checkOutRemarks"
+  | "createdBy"
 > & {
   members?: TMemberInfo[];
 };
@@ -80,8 +82,8 @@ declare type TMemberInfo = {
   nric: string;
   visitorPass?: { keyId: string }[];
   passKeys?: TPassKeyPayload[];
-  contact: string
-}
+  contact: string;
+};
 
 declare type TPassKeyPayload = {
   keyId: string;