Skip to content

Commit 7aac1f1

Browse files
jmfarook7jmfarook7
authored
Merge pull request #22 from SyncfusionExamples/EJ2-947756
947756: Need to fix the UI changes from UX team in employee management showcase application.
2 parents 28cc7d6 + bbd2fec commit 7aac1f1

File tree

7 files changed

+301
-81
lines changed

7 files changed

+301
-81
lines changed

‎Employee_Managment_App/src/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function App() {
1616
<div className="xyz-management-content" style={{ width: '100%' }}>
1717
<div className="row">
1818
<div className="col-md-2 sidebar">
19-
<div className="title">NexGen7 Software PVT LTD</div>
19+
<div className="title">NexGen7 Software</div>
2020
<ul className="nav flex-column">
2121
<li className="nav-item">
2222
<NavLink className="nav-link" to="/">

‎Employee_Managment_App/src/components/Achievements.tsx

+53-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ const Achievements = () => {
3232
</div>
3333
</div>
3434
</div>
35-
</div>
36-
</div>
37-
<div className="row">
38-
<div className="row card-layout">
3935
<div className="col-xs-6 col-sm-6 col-lg-6 col-md-6">
4036
<div className="e-card" id="basic_card">
4137
<div className="e-card-header">
@@ -94,10 +90,63 @@ const Achievements = () => {
9490
</div>
9591
</div>
9692
</div>
93+
<div className="col-xs-6 col-sm-6 col-lg-6 col-md-6">
94+
<div className="e-card" id="basic_card">
95+
<div className="e-card-header">
96+
<div className="e-card-header-caption">
97+
<div className="e-card-header-title">
98+
Professional Development and Skills Mastery
99+
</div>
100+
<div className="e-card-sub-title">
101+
Certification Attainment
102+
</div>
103+
</div>
104+
</div>
105+
<div className="e-card-content">
106+
Celebrating individuals who acquire new skills and
107+
certifications. Recognizing dedication to continuous
108+
learning and professional growth. Validating expertise and
109+
proficiency in specific technologies or methodologies.
110+
Encouraging a culture of lifelong learning and skill
111+
enhancement.
112+
</div>
113+
<div className="e-card-actions">
114+
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
115+
Read More
116+
</a>
117+
</div>
118+
</div>
119+
</div>
97120
</div>
98121
</div>
99122
<div className="row">
100123
<div className="row card-layout">
124+
<div className="col-xs-6 col-sm-6 col-lg-6 col-md-6">
125+
<div className="e-card" id="basic_card">
126+
<div className="e-card-header">
127+
<div className="e-card-header-caption">
128+
<div className="e-card-header-title">
129+
Client Impact and Customer Success
130+
</div>
131+
<div className="e-card-sub-title">
132+
Customer Satisfaction Excellence
133+
</div>
134+
</div>
135+
</div>
136+
<div className="e-card-content">
137+
Recognizing teams that go above and beyond to deliver exceptional
138+
customer experiences. Celebrating innovative solutions that address
139+
client needs and enhance user satisfaction. Acknowledging effortsin
140+
building strong customer relationships through reliable support and service.
141+
Encouraging a customer-first mindset to drive long-term business success.
142+
</div>
143+
<div className="e-card-actions">
144+
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
145+
Read More
146+
</a>
147+
</div>
148+
</div>
149+
</div>
101150
<div className="col-xs-6 col-sm-6 col-lg-6 col-md-6">
102151
<div className="e-card" id="basic_card">
103152
<div className="e-card-header">

‎Employee_Managment_App/src/components/Announcement.tsx

+16-7
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ const Announcement = () => {
2323
growth and innovation. Expanding our reach allows us to
2424
better serve our diverse clientele. Join us as we embark
2525
on this exciting journey of expansion and opportunity.
26+
We look forward to collaborating with new partners and strengthening our global presence.
27+
This expansion will unlock new possibilities and create exciting opportunities for our customers and employees alike.
2628
</div>
2729
<div className="e-card-actions">
2830
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
@@ -46,7 +48,8 @@ const Announcement = () => {
4648
emerging market demands and challenges. Experience
4749
unparalleled features designed to enhance productivity and
4850
efficiency. Stay tuned for the official launch event and
49-
product demonstrations.
51+
product demonstrations. Be among the first to explore how this breakthrough technology can transform your workflow.
52+
We are committed to pushing the boundaries of technology to bring you smarter, more efficient solutions.
5053
</div>
5154
<div className="e-card-actions">
5255
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
@@ -74,7 +77,8 @@ const Announcement = () => {
7477
invaluable in driving our company's success. We extend our
7578
heartfelt appreciation for their commitment and passion.
7679
Let's continue to inspire and support each other in
77-
achieving greatness.
80+
achieving greatness. Together, we create a workplace where excellence and teamwork thrive.
81+
Your dedication and perseverance are the foundation of our continued success and innovation.
7882
</div>
7983
<div className="e-card-actions">
8084
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
@@ -98,7 +102,8 @@ const Announcement = () => {
98102
latest skills and knowledge to excel in your role. Explore
99103
a range of professional development opportunities tailored
100104
to your needs. Invest in your future success and unleash
101-
your full potential with us.
105+
your full potential with us. Continuous learning is key to staying ahead in today’s evolving industry landscape.
106+
Take this opportunity to expand your expertise and gain a competitive edge in your field.
102107
</div>
103108
<div className="e-card-actions">
104109
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
@@ -126,7 +131,8 @@ const Announcement = () => {
126131
accomplishments and looking forward to the future. Join us
127132
as we celebrate this momentous occasion with gratitude and
128133
pride. Together, we celebrate our resilience, dedication,
129-
and shared success.
134+
and shared success. This achievement is a testament to our unwavering commitment and hard work.
135+
We couldn't have reached this milestone without the collective efforts of our incredible team.
130136
</div>
131137
<div className="e-card-actions">
132138
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
@@ -150,7 +156,8 @@ const Announcement = () => {
150156
activities that contribute to sustainable development
151157
goals. Join us in giving back to the community and
152158
creating a brighter future for all. Together, we can drive
153-
positive change and leave a lasting legacy.
159+
positive change and leave a lasting legacy. By working together, we can make a tangible difference in the world.
160+
Through collective action and responsibility, we aim to build a more sustainable and inclusive future.
154161
</div>
155162
<div className="e-card-actions">
156163
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
@@ -178,7 +185,8 @@ const Announcement = () => {
178185
in our operational guidelines and protocols. Stay informed
179186
about changes that may affect your work and
180187
responsibilities. Your compliance and cooperation are
181-
vital in upholding our standards of excellence.
188+
vital in upholding our standards of excellence. Adapting to these
189+
updates ensures smooth operations and continued workplace efficiency.
182190
</div>
183191
<div className="e-card-actions">
184192
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">
@@ -202,7 +210,8 @@ const Announcement = () => {
202210
range of wellness programs and resources. Join us in
203211
fostering a supportive and healthy workplace culture for
204212
all. Invest in your physical, mental, and emotional
205-
wellness with us.
213+
wellness with us. A healthier workforce leads to greater
214+
productivity and overall happiness.
206215
</div>
207216
<div className="e-card-actions">
208217
<a href="https://ej2.syncfusion.com/" target="_blank" rel="noopener noreferrer">

‎Employee_Managment_App/src/components/EmployeeInfo.tsx

+30-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { TabComponent, TabItemDirective, TabItemsDirective } from '@syncfusion/ej2-react-navigations';
33
import { Internationalization } from '@syncfusion/ej2-base';
44
import { useLocation } from 'react-router-dom';
5-
import { EmployeeDetails } from '../interface';
5+
import { EmployeeDetails } from '../../interface';
66
import EmployeeLeave from './EmployeeLeave';
77
import EmployeePayStub from './EmployeePayStub';
88
import EmployeePayRoll from './EmployeePayRoll';
@@ -91,6 +91,34 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ
9191
<span className="gap">:</span>
9292
<span className="information">{experience}+ years</span>
9393
</div>
94+
<div className="detail">
95+
<span className="sub-heading">User Work Shift</span>
96+
<span className="gap">:</span>
97+
<span className="information">
98+
{"Regular"}
99+
</span>
100+
</div>
101+
<div className="detail">
102+
<span className="sub-heading">WFH</span>
103+
<span className="gap">:</span>
104+
<span className="information">
105+
{"Yes"}
106+
</span>
107+
</div>
108+
<div className="detail">
109+
<span className="sub-heading">Employment Type</span>
110+
<span className="gap">:</span>
111+
<span className="information">
112+
{"Full-Time"}
113+
</span>
114+
</div>
115+
<div className="detail">
116+
<span className="sub-heading">Company Benefits</span>
117+
<span className="gap">:</span>
118+
<span className="information">
119+
{"Health Insurance, Gift Cards"}
120+
</span>
121+
</div>
94122
</div>
95123
);
96124
};
@@ -192,6 +220,7 @@ const EmployeeInfo = (props: { employeeData?: EmployeeDetails; userInfo?: Employ
192220
<b>{employeeData.Name}</b>
193221
</div>
194222
<div className="profile-data">{employeeData.Designation}</div>
223+
<div className="profile-data">Mail Id: {employeeData.Mail}</div>
195224
<div className="profile-data">Branch: {employeeData.Branch}</div>
196225
<div className="profile-data">Lead: {employeeData.TeamLead}</div>
197226
</div>

‎Employee_Managment_App/src/components/Employees.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ const Employees = (props?: { employeeData?: EmployeeDetails; userInfo?: Employee
124124
dataSource={data}
125125
query={props?.employeeData ? query : undefined}
126126
allowPaging={true}
127+
pageSettings={{ pageCount: 4, pageSize: 15 }}
127128
allowExcelExport={true}
128-
height={270}
129129
width={'100%'}
130130
allowGrouping={true}
131131
groupSettings={{ enableLazyLoading: true }}

0 commit comments

Comments
 (0)