Mohamed Mekawy
|
b0b76cd5e0
|
add vacation rule icon
|
6 years ago |
Mohamed Mekawy
|
ae3a2e4995
|
merge master-newdesign
|
6 years ago |
umasoodch
|
f1157f48f6
|
fixed timecard module
|
6 years ago |
Mohamed Mekawy
|
5557f7d3ba
|
add vacation rule to service list
|
6 years ago |
Mohamed Mekawy
|
c3339148ed
|
fix my team request for employee list
|
6 years ago |
Mohamed Mekawy
|
1f044cfb3e
|
Merge branch 'master-newdesign' into work-list
|
6 years ago |
umasoodch
|
7ed63baf68
|
added myteam navigation
|
6 years ago |
umasoodch
|
561db9109f
|
Merge branch 'master-newdesign' into myteam
# Conflicts:
# Mohem/package-lock.json
# Mohem/package.json
# Mohem/src/app/eit/home/home.component.html
# Mohem/src/app/hmg-common/hmg-common.module.ts
# Mohem/src/app/home/home.page.ts
# Mohem/src/app/notification/home/home.component.html
# Mohem/src/theme/styles.scss
|
6 years ago |
ashwaq
|
e7e9ec7b63
|
fix conflict
|
6 years ago |
ashwaq
|
527ee02627
|
add get login last info
|
6 years ago |
Mohamed Mekawy
|
a694396f82
|
add click to status button & add icon to service buttons & fix issues
|
6 years ago |
enadhilal
|
36c4bf322b
|
add translate for header and fix the position back arrow in arabic version
|
6 years ago |
Mohamed Mekawy
|
08c8ea71b1
|
Merge branch 'master-newdesign' into home
|
6 years ago |
Mohamed Mekawy
|
05387d81d4
|
merge master-newdesign
|
6 years ago |
Fatimah.Alshammari
|
d2940a70d0
|
add ticket balance
|
6 years ago |
Mohamed Mekawy
|
c37d469ea7
|
add new design for EIT & Absence subpage
|
6 years ago |
ashwaq
|
18dabcb13e
|
add vacation rule
|
6 years ago |
Fatimah.Alshammari
|
e71dd383da
|
finish leave balance chart
|
6 years ago |
umasoodch
|
bf825662a9
|
fixed attendance tracking and removed unnecessary code
|
6 years ago |
enadhilal
|
a3109bc0a8
|
create and design ITG form
|
6 years ago |
umasoodch
|
7ecc3e5048
|
removed unnecessary code
|
6 years ago |
umasoodch
|
a78477c192
|
fixed attendance tracking issue
|
6 years ago |
umasoodch
|
a9128c93e2
|
completed my-team
|
6 years ago |
umasoodch
|
4bf4d4fc24
|
fixed merging conflicts
|
6 years ago |
umasoodch
|
6eeca7479d
|
my team new design componentes created
|
6 years ago |
enadhilal
|
2f55272c91
|
new-time-card
|
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
|
396241bc83
|
merge emp-profile branch
|
6 years ago |
umasoodch
|
7bd0701d75
|
fixed design issues for attendance tracking
|
6 years ago |
umasoodch
|
9177721b59
|
completed worklist task
|
6 years ago |
Mohamed Mekawy
|
594e875156
|
add open time card function
|
6 years ago |
enadhilal
|
f3fdc1454f
|
monthly-attendance design
|
6 years ago |
umasoodch
|
d2fac5c4d5
|
added header for worklist
|
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
|
4fe49bdb18
|
add attend scan service + fix design alert
|
6 years ago |
umasoodch
|
d1fbd34330
|
added logic for attendance
|
6 years ago |
ashwaq
|
5df30f114b
|
add attend-tracking
|
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 |
Mohamed Mekawy
|
e90be39807
|
edit code
|
6 years ago |
Mohamed Mekawy
|
213648a9ed
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into Dashbored
|
6 years ago |
umasoodch
|
338205b305
|
Removed onw signal and added firebasex plugin
|
6 years ago |
Fatimah.Alshammari
|
13df9b7b75
|
add dachboard services
|
6 years ago |
Fatimah.Alshammari
|
d5407c8f90
|
add dachboard services
|
6 years ago |
ashwaq
|
7456ab6e0a
|
add dashbored services
|
6 years ago |
Mohamed Mekawy
|
2a1ca91daa
|
OpenPayslip from dashboard
|
6 years ago |
enadhilal
|
22f9a0ac56
|
update on workList page
|
6 years ago |
ashwaq
|
53fe3813b0
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
6 years ago |
ashwaq
|
061c740c55
|
Add payslip + Fix vacation rule
|
6 years ago |
Mohamed Mekawy
|
7046c7fa43
|
edit my team & erp issues
|
6 years ago |
Mohamed Mekawy
|
17246a58b8
|
add PO & MO & PR
|
6 years ago |
ashwaq
|
1db1a031ba
|
fix conflict
|
6 years ago |
ashwaq
|
c52ee53b99
|
change profile Image
|
6 years ago |
Mohamed Mekawy
|
2117526e5f
|
my team enhancment
|
6 years ago |
mohamed.mekawy
|
ad56814966
|
fix notification & home
|
6 years ago |
haroon amjad
|
9b35e22a98
|
new Al Habib Mohemm App
|
6 years ago |
mohamed.mekawy
|
7034aef571
|
add barcode scanner
|
6 years ago |
mohamed.mekawy
|
ce88e72248
|
solve bugs
|
6 years ago |
Sultan Khan
|
10d9533c4b
|
css updates
|
7 years ago |
haroon amjad
|
ae42645e6a
|
My Specialist Page added to Home Page
|
7 years ago |
Sultan Khan
|
3327ad4d29
|
notification added
|
7 years ago |
Sultan Khan
|
a3d58d4b1c
|
absence list added
|
7 years ago |
Sultan Khan
|
aee81e59ae
|
update
|
7 years ago |
haroon amjad
|
892082fb78
|
My Request Menu implemented
|
7 years ago |
Sultan Khan
|
7d973b62e2
|
my-team page update
|
7 years ago |
Sultan Khan
|
41f804e672
|
my-team page update
|
7 years ago |
ansariakhtar
|
2d58a2ab10
|
Attendance
|
7 years ago |
ansariakhtar
|
2ff9b567aa
|
Change password, Password Expiry, Forgot Password completion and minor changes
|
7 years ago |
Sultan Khan
|
7282366c03
|
accrual balances page added
|
7 years ago |
haroon amjad
|
3b5da38b09
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/src/app/app-routing.module.ts
# Mohem/src/assets/localization/i18n.json
|
7 years ago |
haroon amjad
|
c255bebef9
|
Vacation Rule Going on
|
7 years ago |
Sultan Khan
|
c63489d935
|
profile page added
|
7 years ago |
Sultan Khan
|
823bd01d53
|
dashboard update
|
7 years ago |
Sultan Khan
|
e083d0c783
|
dashboard changes
|
7 years ago |
haroon amjad
|
7609feb6ae
|
Merge branches 'master' and 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/src/assets/localization/i18n.json
|
7 years ago |
Sultan Khan
|
0bf7dbd72e
|
dashboard update
|
7 years ago |
Sultan Khan
|
dc8a66b206
|
home page update
|
7 years ago |
haroon amjad
|
b5f3b6f767
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/src/app/home/home.page.ts
# Mohem/src/assets/localization/i18n.json
|
7 years ago |
Sultan Khan
|
b967536b26
|
update home
|
7 years ago |
haroon amjad
|
f24b082f7c
|
working on vacation rule
|
7 years ago |
Sultan Khan
|
fe7e62bbe6
|
home page update
|
7 years ago |
Sultan Khan
|
cad200261e
|
updated home page
|
7 years ago |
Sultan Khan
|
48a4360ac1
|
application skeleton
|
7 years ago |
ansariakhtar
|
62f2cfcda3
|
Mohem Ionic 4 project created
|
7 years ago |