enadhilal
|
8c1b6dce0e
|
add all for ITG
|
6 years ago |
enadhilal
|
1f50906684
|
make segment active when first open & fixing skip function
|
6 years ago |
umasoodch
|
05ea5e349f
|
fixed tslint issues
|
6 years ago |
umasoodch
|
8f83946c48
|
Merge branch 'itg-new-design' into work-list
# Conflicts:
# Mohem/src/app/notification/home/home.component.html
# Mohem/src/app/notification/home/home.component.scss
# Mohem/src/app/notification/home/home.component.ts
|
6 years ago |
umasoodch
|
14e1c27591
|
added item-type in search
|
6 years ago |
enadhilal
|
a3109bc0a8
|
create and design ITG form
|
6 years ago |
enadhilal
|
b27f976bc9
|
push to merge with worklist work
|
6 years ago |
ashwaq
|
2c5c0599d8
|
fix conflict worklist
|
6 years ago |
ashwaq
|
93f973022c
|
fix conflict
|
6 years ago |
ashwaq
|
838e7cf99b
|
add worklist+ fix conflict
|
6 years ago |
ashwaq
|
eb9413edb9
|
add worklist fix conflict
|
6 years ago |
ashwaq
|
ece6e45d97
|
add worklist new design
|
6 years ago |
umasoodch
|
5208584999
|
added worklist filters logic
|
6 years ago |
umasoodch
|
96971a6b68
|
resolved conflict issues with master branch
|
6 years ago |
umasoodch
|
09afc19dbb
|
fixed multiple swipe alert issue
|
6 years ago |
Mohamed Mekawy
|
f316629cb0
|
merge master-newdesign branch
|
6 years ago |
Mohamed Mekawy
|
396241bc83
|
merge emp-profile branch
|
6 years ago |
umasoodch
|
7bd0701d75
|
fixed design issues for attendance tracking
|
6 years ago |
Fatimah.Alshammari
|
afc8c99639
|
add new design to payslip
|
6 years ago |
umasoodch
|
9177721b59
|
completed worklist task
|
6 years ago |
Mohamed Mekawy
|
52d9e04dac
|
merge master-newdesign with emp-profile
|
6 years ago |
Fatimah.Alshammari
|
b9e1a95601
|
Add new profile page & years of experience & Performance appraisal
|
6 years ago |
umasoodch
|
d2fac5c4d5
|
added header for worklist
|
6 years ago |
umasoodch
|
e629aab07a
|
merged and fixed all the conflicting issues and also removed unnecessary code
|
6 years ago |
umasoodch
|
86e96c11d0
|
added search modal and its CSS
|
6 years ago |
umasoodch
|
2e6dd95004
|
completed work list ui part
|
6 years ago |
umasoodch
|
f7002f3eae
|
completed dashboard and attendance timer work
|
6 years ago |
umasoodch
|
ecbdf62c74
|
merged and resolved conflicts
|
6 years ago |
umasoodch
|
dcf6bd5d79
|
no message
|
6 years ago |
ashwaq
|
9b58f9e9e0
|
add
|
6 years ago |
ashwaq
|
4fe49bdb18
|
add attend scan service + fix design alert
|
6 years ago |
umasoodch
|
884e518971
|
Merge branch 'master-newdesign' into home
# Conflicts:
# Mohem/src/app/hmg-common/hmg-common.module.ts
|
6 years ago |
umasoodch
|
d1fbd34330
|
added logic for attendance
|
6 years ago |
ashwaq
|
6d3dd907a6
|
fix attend-tracking
|
6 years ago |
ashwaq
|
81504b0491
|
fix merge conflit
|
6 years ago |
ashwaq
|
5df30f114b
|
add attend-tracking
|
6 years ago |
Mohamed Mekawy
|
5b7e435a31
|
fix login type issue
|
6 years ago |
umasoodch
|
a8f9640f68
|
added remaining services for dashboard
|
6 years ago |
umasoodch
|
ffc3bca0a6
|
added navigation at home page
|
6 years ago |
umasoodch
|
c7decd88a0
|
fixed home ts file
|
6 years ago |
umasoodch
|
1c62b10486
|
merged master-newdesign with home branch and resolved all conflicts
|
6 years ago |
umasoodch
|
11432b633e
|
timer added according to the shift hours
|
6 years ago |
umasoodch
|
c955a19ae8
|
pushed timer code
|
6 years ago |
ashwaq
|
c069ae5282
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into login
|
6 years ago |
ashwaq
|
f23d6e7bf4
|
fix login localstorge
|
6 years ago |
Fatimah.Alshammari
|
ab30d50808
|
Merge branch 'master-newdesign' into side-menu
|
6 years ago |
Fatimah.Alshammari
|
cb1aad91f9
|
edit side menue new design
|
6 years ago |
ashwaq
|
7779a2ed61
|
fix conflict
|
6 years ago |
Mohamed Mekawy
|
e90be39807
|
edit code
|
6 years ago |
ashwaq
|
a670c06790
|
fix design
|
6 years ago |