From dd5f3674050a11e62ac210131993f0da52ad9fc2 Mon Sep 17 00:00:00 2001 From: TamilRamGanesan-SF5080 Date: Thu, 12 Feb 2026 14:35:02 +0530 Subject: [PATCH] 1009504: addressed the UI changes in Organization page --- Employee_Managment_App/src/components/Employees.tsx | 2 +- Employee_Managment_App/src/components/Organization.tsx | 1 + Employee_Managment_App/src/components/Policies.tsx | 1 + Employee_Managment_App/src/index.css | 6 +++++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Employee_Managment_App/src/components/Employees.tsx b/Employee_Managment_App/src/components/Employees.tsx index c2a4f25..6e80a1b 100644 --- a/Employee_Managment_App/src/components/Employees.tsx +++ b/Employee_Managment_App/src/components/Employees.tsx @@ -84,7 +84,7 @@ const Employees = (props?: EmployeesProps) => { grid.filterByColumn('TeamLead', 'equal', props.userInfo.Name); } else if (sel === 'directReporters' && props?.userInfo?.Team) { // Show colleagues in the same Team - grid.filterByColumn('Team', 'equal', props.userInfo.Team); + grid.filterByColumn('TeamLead', 'equal', props.userInfo.Name); } else { // 'active' or no selection => no filter (loads all) // clearFiltering already done above diff --git a/Employee_Managment_App/src/components/Organization.tsx b/Employee_Managment_App/src/components/Organization.tsx index 6979c92..9b006be 100644 --- a/Employee_Managment_App/src/components/Organization.tsx +++ b/Employee_Managment_App/src/components/Organization.tsx @@ -62,6 +62,7 @@ const Organization = () => { handleSelect('directReporters')} + title='Including employees in India and the US' aria-pressed={selected === 'directReporters'} > Direct Reporters diff --git a/Employee_Managment_App/src/components/Policies.tsx b/Employee_Managment_App/src/components/Policies.tsx index 99985dc..3242d4f 100644 --- a/Employee_Managment_App/src/components/Policies.tsx +++ b/Employee_Managment_App/src/components/Policies.tsx @@ -152,6 +152,7 @@ const Policies: React.FC = () => { dataSource={filteredData} allowPaging={false} allowSorting + className='policy-Grid' enableAdaptiveUI={true} allowResizing toolbar={['Search']} diff --git a/Employee_Managment_App/src/index.css b/Employee_Managment_App/src/index.css index 16aad59..e1a696b 100644 --- a/Employee_Managment_App/src/index.css +++ b/Employee_Managment_App/src/index.css @@ -45119,9 +45119,12 @@ body.e-colorpicker-overflow { .e-toolbar .e-toolbar-items.e-multirow-pos .e-toolbar-right { display: inline; } - +#leave_grid, #paystub_grid, #payroll_grid, .policy-Grid{ + box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12); +} .e-toolbar .e-toolbar-items.e-tbar-pos { display: block; + background: rgb(255, 255, 255); } .e-toolbar .e-toolbar-items.e-tbar-pos .e-toolbar-left, @@ -70904,6 +70907,7 @@ a.employee-popover:hover { .employees-content #content { /* height: calc(100vh - 150px); */ + box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12); } .employeeLeave-header {