diff --git a/FRONTEND/src/components/Navbar/Navbar.tsx b/FRONTEND/src/components/Navbar/Navbar.tsx index 6492cad..740a662 100755 --- a/FRONTEND/src/components/Navbar/Navbar.tsx +++ b/FRONTEND/src/components/Navbar/Navbar.tsx @@ -57,7 +57,7 @@ const data = [ link: '/tracking', label: 'Check in/out', icon: IconScan, - group: 'normal', + group: 'admin', }, { link: '/worklogs', diff --git a/FRONTEND/src/pages/Allocation/Allocation.tsx b/FRONTEND/src/pages/Allocation/Allocation.tsx index 53ee51c..c275a3b 100644 --- a/FRONTEND/src/pages/Allocation/Allocation.tsx +++ b/FRONTEND/src/pages/Allocation/Allocation.tsx @@ -3311,11 +3311,20 @@ const Allocation = () => { + + Admin/ + Personnel Allocation + "P:" is the timspent/timeestimate number within the project itself + "A:" is the timspent/timeestimate of all projects + + {!loading && Object.keys(data?.projects).map((pro) => { return ( @@ -3511,7 +3520,7 @@ const Allocation = () => { } /> - WARNING + WARNING - NO ASSIGNMENT @@ -3537,6 +3546,7 @@ const Allocation = () => { })} + diff --git a/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx b/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx index 0131682..4aa1d0f 100644 --- a/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx +++ b/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx @@ -247,7 +247,7 @@ const LeaveManagement = () => {

- Admin/ Leave Management + Leave Management

{

- Admin/ Tickets