@apptimate/core-lib 6.0.0 → 6.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apptimate/core-lib",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {

package/src/api-services/procurement.client.ts

@@ -71,3 +71,8 @@ export async function createGoodsReceiptNote(data: any): Promise<IApiResponse> {
   const response = await sendRequest({ url: `${BASE}/grn`, method: "POST", data });
   return response.responseData as IApiResponse;
 }
+
+export async function cancelGoodsReceiptNote(id: number): Promise<IApiResponse> {
+  const response = await sendRequest({ url: `${BASE}/grn/${id}/cancel`, method: "POST" });
+  return response.responseData as IApiResponse;
+}

package/src/constants/menus.ts

@@ -277,7 +277,7 @@ export const MENU_ITEM_REGISTRY: RegistryItem[] = [
 
   { key: 'construction__site_engineer', label: 'Site Engineer', path: '/construction/dashboard/site-engineer', module: 'Construction', defaultGroup: 'Site Execution', permission: null },
   { key: 'construction__dsr', label: 'Daily Site Reports', path: '/construction/site-execution/dsr', module: 'Construction', defaultGroup: 'Site Execution', permission: null },
-  { key: 'construction__progress', label: 'Progress Measurement', path: '/construction/site-execution/progress', module: 'Construction', defaultGroup: 'Site Execution', permission: null },
+  { key: 'construction__progress_updates', label: 'Progress Measurement', path: '/construction/site-execution/progress-updates', module: 'Construction', defaultGroup: 'Site Execution', permission: null },
   { key: 'construction__subcontractor_progress', label: 'Subcontractor Progress', path: '/construction/site-execution/subcontractor-progress', module: 'Construction', defaultGroup: 'Site Execution', permission: null },
   { key: 'construction__change_orders', label: 'Change Orders', path: '/construction/change-orders', module: 'Construction', defaultGroup: 'Site Execution', permission: null },
   
@@ -602,3 +602,130 @@ export function filterMenusByPermission(menus: MainMenuItem[], can: (code: strin
     return { ...mainMenu, groups: filteredGroups };
   }).filter(mainMenu => mainMenu.groups.length > 0);
 }
+
+const PROJECT_KEY_MAPPING: Record<string, string> = {
+  'project_home': 'construction__dashboard',
+  'project_hierarchy': 'construction__hierarchy',
+  'project_team': 'construction__team',
+  'project_budget': 'construction__budget',
+  'project_resource_calendar': 'construction__schedule_calendar',
+  'project_progress_billing': 'construction__ipcs',
+  'project_variations': 'construction__variations',
+  'project_boq': 'construction__boq',
+  'project_boq_revisions': 'construction__boq_revisions',
+  'project_drawings': 'construction__drawings',
+  'project_rfis': 'construction__rfis',
+  'project_dsr': 'construction__dsr',
+  'project_progress_updates': 'construction__progress_updates',
+  'project_subcontractor_progress': 'construction__subcontractor_progress',
+  'project_attendance': 'construction__attendance',
+  'project_change_orders': 'construction__change_orders',
+  'project_ir': 'construction__quality_ir',
+  'project_ncr': 'construction__quality_ncr',
+  'project_punch_list': 'construction__punch_list',
+  'project_material_testing': 'construction__material_testing',
+  'project_incidents': 'construction__safety_incidents',
+  'project_ptw': 'construction__ptw',
+  'project_workforce_allocation': 'construction__workforce_allocation',
+  'project_equipment_allocation': 'construction__equipment_allocation',
+  'project_fuel_logs': 'construction__fuel_logs',
+  'project_maintenance': 'construction__maintenance',
+};
+
+export const getProjectConstructionGroups = (projectId: string | number): MainMenuItem['groups'] => {
+  const groups: MainMenuItem['groups'] = [
+    {
+      id: 'project_overview',
+      label: 'Overview',
+      items: [
+        { id: 'project_home', label: 'Dashboard', path: `/construction/projects/${projectId}` },
+      ]
+    },
+    {
+      id: 'project_planning',
+      label: 'Planning & Setup',
+      items: [
+        { id: 'project_hierarchy', label: 'Hierarchy', path: `/construction/projects/${projectId}/hierarchy` },
+        { id: 'project_team', label: 'Team', path: `/construction/projects/${projectId}/team` },
+        { id: 'project_budget', label: 'Budget', path: `/construction/projects/${projectId}/budget` },
+        { id: 'project_resource_calendar', label: 'Resource Calendar', path: `/construction/projects/${projectId}/resource-calendar` },
+      ]
+    },
+    {
+      id: 'project_contracts_billing',
+      label: 'Contracts & Billing',
+      items: [
+        { id: 'project_progress_billing', label: 'Progress Billing', path: `/construction/projects/${projectId}/progress-billing` },
+        { id: 'project_variations', label: 'Subcontractor Variations', path: `/construction/projects/${projectId}/variations` },
+      ]
+    },
+    {
+      id: 'project_commercials',
+      label: 'Commercials & BOQ',
+      items: [
+        { id: 'project_boq', label: 'Bill of Quantities (BOQ)', path: `/construction/projects/${projectId}/boq` },
+        { id: 'project_boq_revisions', label: 'BOQ Revisions', path: `/construction/projects/${projectId}/boq/revisions` },
+      ]
+    },
+    {
+      id: 'project_document_control',
+      label: 'Document Control',
+      items: [
+        { id: 'project_drawings', label: 'Drawing Register', path: `/construction/projects/${projectId}/drawings` },
+        { id: 'project_rfis', label: 'RFIs', path: `/construction/projects/${projectId}/rfis` },
+      ]
+    },
+    {
+      id: 'project_execution',
+      label: 'Site Execution',
+      items: [
+        { id: 'project_dsr', label: 'Daily Site Reports', path: `/construction/projects/${projectId}/dsr` },
+        { id: 'project_progress_updates', label: 'Progress Measurement', path: `/construction/projects/${projectId}/progress-updates` },
+        { id: 'project_subcontractor_progress', label: 'Subcontractor Progress', path: `/construction/projects/${projectId}/subcontractor-progress` },
+        { id: 'project_attendance', label: 'Attendance & Timesheets', path: `/construction/projects/${projectId}/attendance` },
+        { id: 'project_change_orders', label: 'Change Orders', path: `/construction/projects/${projectId}/change-orders` },
+      ]
+    },
+    {
+      id: 'project_quality_safety',
+      label: 'Quality & Safety',
+      items: [
+        { id: 'project_ir', label: 'Inspection Requests', path: `/construction/projects/${projectId}/ir` },
+        { id: 'project_ncr', label: 'Non-Conformance Reports', path: `/construction/projects/${projectId}/ncr` },
+        { id: 'project_punch_list', label: 'Snag List', path: `/construction/projects/${projectId}/punch-list` },
+        { id: 'project_material_testing', label: 'Material Testing', path: `/construction/projects/${projectId}/material-testing` },
+        { id: 'project_incidents', label: 'Incident Log', path: `/construction/projects/${projectId}/incidents` },
+        { id: 'project_ptw', label: 'Permit to Work', path: `/construction/projects/${projectId}/ptw` },
+      ]
+    },
+    {
+      id: 'project_workforce',
+      label: 'Workforce',
+      items: [
+        { id: 'project_workforce_allocation', label: 'Workforce Allocation', path: `/construction/projects/${projectId}/workforce/allocation` },
+      ]
+    },
+    {
+      id: 'project_equipment',
+      label: 'Equipment & Plant',
+      items: [
+        { id: 'project_equipment_allocation', label: 'Equipment Allocation', path: `/construction/projects/${projectId}/equipment/allocation` },
+        { id: 'project_fuel_logs', label: 'Fuel Logs', path: `/construction/projects/${projectId}/equipment/fuel-logs` },
+        { id: 'project_maintenance', label: 'Maintenance', path: `/construction/projects/${projectId}/equipment/maintenance` },
+      ]
+    }
+  ];
+
+  return groups.map(group => ({
+    ...group,
+    items: group.items.map(item => {
+      const registryKey = PROJECT_KEY_MAPPING[item.id] || item.id;
+      const registryItem = MENU_ITEM_REGISTRY.find(r => r.key === registryKey);
+      return {
+        ...item,
+        id: registryKey,
+        permission: registryItem?.permission || null,
+      };
+    })
+  }));
+};