enadhilal
|
f3fdc1454f
|
monthly-attendance design
|
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 |
ashwaq
|
e6642a29e8
|
fix conflit
|
6 years ago |
Mohamed Mekawy
|
a6fe8c183a
|
merdge dashbored services to new design
|
6 years ago |
Mohamed Mekawy
|
213648a9ed
|
Merge branch 'master-newdesign' of https://hmg.git.cloudforge.com/mohemmionic5 into Dashbored
|
6 years ago |
ashwaq
|
335758fbd0
|
add login design
|
6 years ago |
umasoodch
|
fd663493e6
|
fixed plugin firebase issue
|
6 years ago |
umasoodch
|
338205b305
|
Removed onw signal and added firebasex plugin
|
6 years ago |
umasoodch
|
4c5153c69d
|
Merge branch 'master' into firebasex
|
6 years ago |
ashwaq
|
bdab18c114
|
fix infiniteScroll payslip
|
6 years ago |
ashwaq
|
8a4ab39623
|
fix infiniteScroll
|
6 years ago |
ashwaq
|
1d9652ca4c
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
6 years ago |
ashwaq
|
31a3b0a823
|
fix my team load more
|
6 years ago |
umasoodch
|
9218d02195
|
Merge branch 'master' into firebasex
# Conflicts:
# Mohem/package.json
|
6 years ago |
umasoodch
|
3c637df2d5
|
Merge branch 'master' into timecard
|
6 years ago |
umasoodch
|
5c7a30f308
|
added firebase token instead of one signal
|
6 years ago |
umasoodch
|
8dc3f5a57e
|
Merge branch 'master' into timecard
# Conflicts:
# Mohem/src/theme/styles.scss
|
6 years ago |
umasoodch
|
976961e9ee
|
completed time card module
|
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 |
ashwaq
|
4bdc08b42d
|
add dashbored
|
6 years ago |
Mohamed Mekawy
|
02e618c8bd
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
6 years ago |
Mohamed Mekawy
|
1555ad5c91
|
edit change password page
|
6 years ago |
ashwaq
|
10458f2e0f
|
fix page P_PAGE_LIMIT
|
6 years ago |
ashwaq
|
53746fc95f
|
add infinite Scroll
|
6 years ago |
umasoodch
|
e01c73a092
|
completed functionality of time card module
|
6 years ago |
Mohamed Mekawy
|
15b317b5ed
|
call payslip on init
|
6 years ago |
umasoodch
|
167973cedb
|
added time card detail and its summary
|
6 years ago |
ashwaq
|
ee7ac90c18
|
fix conflict
|
6 years ago |
ashwaq
|
b02743ead1
|
PO+MO+PR+Payslip+customAccordin
|
6 years ago |
Mohamed Mekawy
|
ba0d53011b
|
Add Time card & Edit date element & change icons
|
6 years ago |
Mohamed Mekawy
|
2a1ca91daa
|
OpenPayslip from dashboard
|
6 years ago |
ashwaq
|
fefdc5b8c3
|
PR no data
|
6 years ago |
ashwaq
|
6407421ccd
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
6 years ago |
ashwaq
|
a8457cc11e
|
PR fix design
|
6 years ago |
Mohamed Mekawy
|
e59db729a7
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
6 years ago |
Mohamed Mekawy
|
6d99285451
|
handle build error by removin backgroud location plugin
|
6 years ago |
ashwaq
|
594a67cc96
|
fix Error
|
6 years ago |
ashwaq
|
20de05a7b4
|
PR Part 2
|
6 years ago |
ashwaq
|
524b29193a
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
6 years ago |
ashwaq
|
d09d251c71
|
PR Worklist
|
6 years ago |
Mohamed Mekawy
|
5c4377034f
|
enhance
|
6 years ago |
Mohamed Mekawy
|
c9e7e5a851
|
general enhancments
|
6 years ago |
Ashwaq Hasan Jaafar
|
0b4a7090ae
|
fix `Finger/FaceID login
|
6 years ago |
enadhilal
|
0d05073e71
|
push Enad code workList page
|
6 years ago |
enadhilal
|
22f9a0ac56
|
update on workList page
|
6 years ago |
ashwaq
|
8cc0a3fff7
|
fix device token issue
|
6 years ago |
ashwaq
|
4ae7e7566c
|
add oneSignal plugin in install-plugins.bat
|
6 years ago |
ashwaq
|
2a75920565
|
Confirm Login by SMS,Whatsapp,fingerprint and faceID
|
6 years ago |
Mohamed Mekawy
|
7f8a37897c
|
Add Time card Module
|
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
|
d9726a2f46
|
fix profile image design
|
6 years ago |
ashwaq
|
1db1a031ba
|
fix conflict
|
6 years ago |
ashwaq
|
a9be864dc3
|
add plugins to install-plugins
|
6 years ago |
ashwaq
|
c52ee53b99
|
change profile Image
|
6 years ago |
Mohamed Mekawy
|
2d03ed75f3
|
clean projest &will start phase 2
|
6 years ago |
Mohamed Mekawy
|
2117526e5f
|
my team enhancment
|
6 years ago |
mohamed.mekawy
|
ad56814966
|
fix notification & home
|
6 years ago |
mohamed.mekawy
|
492eb5d912
|
edit Icon
|
6 years ago |
haroon amjad
|
9b35e22a98
|
new Al Habib Mohemm App
|
6 years ago |
haroon amjad
|
8b6259723f
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/package.json
|
6 years ago |
haroon amjad
|
7288c37bcb
|
no message
|
6 years ago |
mohamed.mekawy
|
7034aef571
|
add barcode scanner
|
6 years ago |
mohamed.mekawy
|
ce88e72248
|
solve bugs
|
6 years ago |
haroon amjad
|
8915e67b00
|
fixes
|
7 years ago |
Sultan Khan
|
32b9ce319c
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/src/app/app.scss
# Mohem/src/app/home/home.page.scss
# Mohem/src/app/my-team/details/details.component.html
# Mohem/src/app/my-team/home/home.component.html
|
7 years ago |
Sultan Khan
|
10d9533c4b
|
css updates
|
7 years ago |
haroon amjad
|
e15574f1a2
|
style changes
|
7 years ago |
haroon amjad
|
85d28fc27f
|
My Specialist Issue Resolved
|
7 years ago |
haroon amjad
|
a4d0efe6c0
|
Styling changes & improvements
|
7 years ago |
haroon amjad
|
312556c035
|
font style added to app
|
7 years ago |
Sultan Khan
|
f21be03b02
|
specialist page update
|
7 years ago |
haroon amjad
|
985a9a31a7
|
styling added
|
7 years ago |
haroon amjad
|
22a11a3214
|
My Subordinate Page implemented
|
7 years ago |
haroon amjad
|
ae42645e6a
|
My Specialist Page added to Home Page
|
7 years ago |
haroon amjad
|
7af8b9c791
|
My Specialist Page Implemented
|
7 years ago |
haroon amjad
|
0023dd3ad8
|
Work list replacement roll fixes
|
7 years ago |
Sultan Khan
|
9020253679
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
Sultan Khan
|
3327ad4d29
|
notification added
|
7 years ago |
haroon amjad
|
57cf330cef
|
EIT Update List page implemented
|
7 years ago |
haroon amjad
|
31af06d2c9
|
Worklist Main Page Changes
|
7 years ago |
Sultan Khan
|
a87afe1d8e
|
worklist main page update
|
7 years ago |
Sultan Khan
|
faad878c87
|
worklist main page added
|
7 years ago |
haroon amjad
|
6f889347e4
|
Work List Pages Completed
|
7 years ago |
haroon amjad
|
61275a4c85
|
View Note Modal, Work List RFC & View Replacement Modal Implemented
|
7 years ago |
haroon amjad
|
f07de65e5c
|
work list replacement component implemented
|
7 years ago |
haroon amjad
|
20b8ef5693
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
haroon amjad
|
7f03817a38
|
EIT Forms Bug Fixing
|
7 years ago |
Sultan Khan
|
fe054b8ab6
|
worklist-main
|
7 years ago |
Sultan Khan
|
16e26719f0
|
worklist-main added
|
7 years ago |
haroon amjad
|
a2511c41ce
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
haroon amjad
|
7fe2bef41e
|
EIT Form fixes ongoing
|
7 years ago |
Sultan Khan
|
8b5436ced6
|
notification page
|
7 years ago |
Sultan Khan
|
ef0c8a7b8a
|
absence update
|
7 years ago |
haroon amjad
|
08f588c302
|
EIT Flow completed
|
7 years ago |
haroon amjad
|
84643553bf
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/src/app/hmg-common/services/common/common.service.ts
# Mohem/src/app/uI-elements/select.input.ts
|
7 years ago |
haroon amjad
|
700d871dca
|
EIT Forms implementation In-Progress
|
7 years ago |
Sultan Khan
|
628cc89189
|
absence page
|
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
|
ceb4968a69
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
Sultan Khan
|
75c28539a9
|
loader updated
|
7 years ago |
haroon amjad
|
8625ffcfca
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
haroon amjad
|
bd2cc4edb1
|
UI Elements 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
|
d94be71a2b
|
Solving conflict
|
7 years ago |
ansariakhtar
|
66e33ed55f
|
Attendance
|
7 years ago |
ansariakhtar
|
2d58a2ab10
|
Attendance
|
7 years ago |
haroon amjad
|
261eafaa84
|
Vacation Rule Implementation Completed
|
7 years ago |
haroon amjad
|
83ef5b6b50
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
# Conflicts:
# Mohem/src/app/authentication/login/login.component.ts
|
7 years ago |
haroon amjad
|
f66759ad16
|
Vacation Rule Implementation Completed
|
7 years ago |
mohamed.mekawy
|
075cf2a01f
|
configure app plugin
|
7 years ago |
mohamed.mekawy
|
92160a42f4
|
add google service and build configuration
|
7 years ago |
ansariakhtar
|
2ff9b567aa
|
Change password, Password Expiry, Forgot Password completion and minor changes
|
7 years ago |
Sultan Khan
|
40679c2509
|
accrual balances page added
|
7 years ago |
Sultan Khan
|
b8343b1994
|
accrual balances page added
|
7 years ago |
ansariakhtar
|
6b4e95bbe1
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
ansariakhtar
|
be9c56adb3
|
Change password component added
|
7 years ago |
Sultan Khan
|
9985a93701
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
Sultan Khan
|
7282366c03
|
accrual balances page added
|
7 years ago |
ansariakhtar
|
30f0b949c6
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
ansariakhtar
|
d4b0ccb257
|
Authentication code update
|
7 years ago |
ansariakhtar
|
ed5d8a6f39
|
Authentication code update
|
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 |
ansariakhtar
|
93b5ee0ab5
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
ansariakhtar
|
5550730847
|
Code cleanup
|
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 |
haroon amjad
|
1921701ef9
|
Vacation Rule Continued
|
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 |
haroon amjad
|
debded96a0
|
Vacation Rule Continued
|
7 years ago |
Sultan Khan
|
947fbda4da
|
update home
|
7 years ago |
Sultan Khan
|
eea8947dc7
|
update home
|
7 years ago |
Sultan Khan
|
b967536b26
|
update home
|
7 years ago |
ansariakhtar
|
045132915e
|
Login, forgot password update
|
7 years ago |
haroon amjad
|
f24b082f7c
|
working on vacation rule
|
7 years ago |
ansariakhtar
|
1d79849787
|
forgot password completed
|
7 years ago |
haroon amjad
|
ecb14d5df7
|
Merge branch 'master' of https://hmg.git.cloudforge.com/mohemmionic5
|
7 years ago |
haroon amjad
|
50500b39bb
|
package.json changes
|
7 years ago |
Sultan Khan
|
fe7e62bbe6
|
home page update
|
7 years ago |
Sultan Khan
|
cad200261e
|
updated home page
|
7 years ago |
ansariakhtar
|
a46ebcb357
|
Forgot Password, Login and SMS Reader Updated
|
7 years ago |
ansariakhtar
|
a787f6797d
|
Login API
|
7 years ago |
Sultan Khan
|
578d20ea2c
|
update
|
7 years ago |
Sultan Khan
|
7a58598b2c
|
forgot password page added
|
7 years ago |
Sultan Khan
|
8aef27a8f7
|
login page added
|
7 years ago |
Sultan Khan
|
9266affe07
|
skeleton updated
|
7 years ago |
Sultan Khan
|
c5bd2b5693
|
config added
|
7 years ago |
Sultan Khan
|
48a4360ac1
|
application skeleton
|
7 years ago |
ansariakhtar
|
62f2cfcda3
|
Mohem Ionic 4 project created
|
7 years ago |