Skip to content

Commit 6bc3426

Browse files
authored
Merge pull request #36 from SyncfusionExamples/104398-employee
104398: Need to Resolve UI issue in employee management
2 parents 85f6f55 + 98f0291 commit 6bc3426

File tree

4 files changed

+23
-8
lines changed

4 files changed

+23
-8
lines changed

Employee_Managment_App/src/App.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,31 +181,30 @@ function App() {
181181
>
182182
</button>
183183
</div>
184-
185184
<ul className="nav flex-column">
186185
<li className="nav-item">
187-
<NavLink className="nav-link" to="/" end>
186+
<NavLink className="nav-link" to="/" end title={collapsed ? 'My Profile' : undefined} aria-label="My Profile">
188187
<span className="nav-icon e-icons e-user" aria-hidden="true">
189188
</span>
190189
{!collapsed && <span className="nav-text">My Profile</span>}
191190
</NavLink>
192191
</li>
193192
<li className="nav-item">
194-
<NavLink className="nav-link" to="/organization">
193+
<NavLink className="nav-link" to="/organization" title={collapsed ? 'Organization' : undefined} aria-label="Organization">
195194
<span className="nav-icon e-icons e-xml-mapping" aria-hidden="true">
196195
</span>
197196
{!collapsed && <span className="nav-text">Organization</span>}
198197
</NavLink>
199198
</li>
200199
<li className="nav-item">
201-
<NavLink className="nav-link" to="/policies">
200+
<NavLink className="nav-link" to="/policies" title={collapsed ? 'Policies' : undefined} aria-label="Policies">
202201
<span className="nav-icon e-icons e-file-format" aria-hidden="true">
203202
</span>
204203
{!collapsed && <span className="nav-text">Policies</span>}
205204
</NavLink>
206205
</li>
207206
<li className="nav-item">
208-
<NavLink className="nav-link" to="/achievements">
207+
<NavLink className="nav-link" to="/achievements" title={collapsed ? 'Achievements' : undefined} aria-label="Achievements">
209208
<span className="nav-icon e-icons e-activities" aria-hidden="true">
210209
</span>
211210
{!collapsed && <span className="nav-text">Achievements</span>}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#employees_grid .e-content {
2+
overflow-y: hidden !important;
3+
}

Employee_Managment_App/src/components/Employees.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { TooltipComponent, TooltipEventArgs } from '@syncfusion/ej2-react-popups
1212
import { EmployeeDetails } from '../interface.ts';
1313
import { ClickEventArgs } from '@syncfusion/ej2-navigations';
1414
import type { SelectedFilter } from './Organization';
15+
import './Employees.css';
1516

1617
DataUtil.serverTimezoneOffset = 0;
1718

@@ -203,10 +204,10 @@ const Employees = (props?: EmployeesProps) => {
203204
/>
204205
<ColumnDirective
205206
field="EmployeeCode"
206-
headerText="ID"
207+
headerText="Employee ID"
207208
template={codeTemplate}
208209
customAttributes={{ class: 'infotooltip' }}
209-
width="120"
210+
width="140"
210211
/>
211212
<ColumnDirective field="Name" customAttributes={{ class: 'infotooltip' }} width="150" />
212213
<ColumnDirective field="Mail" clipMode="EllipsisWithTooltip" width="260" />

Employee_Managment_App/src/index.css

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70805,7 +70805,7 @@ a.employee-popover:hover {
7080570805
font-size: 13px;
7080670806
font-family: 'Roboto', sans-serif;
7080770807
line-height: 20px;
70808-
padding: 0 0 50px 0;
70808+
padding: 0 0 25px 0;
7080970809
}
7081070810

7081170811
.employeeLeave-header span {
@@ -70835,21 +70835,33 @@ a.employee-popover:hover {
7083570835
.badge-casual {
7083670836
background-color: #65cea7;
7083770837
color: #fff;
70838+
border-radius: 20px;
70839+
padding: 2px 10px;
70840+
display: inline-block;
7083870841
}
7083970842

7084070843
.badge-sick {
7084170844
background-color: #23c6c8;
7084270845
color: #fff;
70846+
border-radius: 20px;
70847+
padding: 2px 10px;
70848+
display: inline-block;
7084370849
}
7084470850

7084570851
.badge-others {
7084670852
background-color: #5c8a8a;
7084770853
color: #fff;
70854+
border-radius: 20px;
70855+
padding: 2px 10px;
70856+
display: inline-block;
7084870857
}
7084970858

7085070859
.badge-request {
7085170860
background-color: #f3ce85;
7085270861
color: #fff;
70862+
border-radius: 20px;
70863+
padding: 2px 10px;
70864+
display: inline-block;
7085370865
}
7085470866

7085570867
td.cardcell {

0 commit comments

Comments
 (0)