haroon amjad
|
c63844dcf7
|
My requests & CCP
|
2 years ago |
Fatimah Alshammari
|
0820f87877
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
d1cc9bd468
|
fix issue
|
2 years ago |
 Sikander Saleem
|
fabb847fd8
|
Merge branch 'development_sultan' into 'master'
Development sultan
See merge request mirza.shafique/mohem_flutter_app!49
|
2 years ago |
Sultan Khan
|
ff4a546e5f
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
1137e585e3
|
update button check
|
2 years ago |
|
Fatimah Alshammari
|
058e287b25
|
fix translation
|
2 years ago |
|
Fatimah Alshammari
|
d52cc2d5cd
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
b502e038a5
|
fix issue
|
2 years ago |
|
Sikander Saleem
|
0d812cf266
|
Vacation rule added.
|
2 years ago |
|
Sikander Saleem
|
4ebba3900c
|
dashboard improvements, monthly attendance & vacation rule added.
|
2 years ago |
|
Sikander Saleem
|
04520250a5
|
badge on work list in bottom navigation bar.
|
2 years ago |
|
Sikander Saleem
|
68146ecd97
|
dynamic forms finalized & improvements
|
2 years ago |
|
Sikander Saleem
|
48de28c0b3
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Fatimah Alshammari
|
aca788ae26
|
fix translations
|
2 years ago |
|
Fatimah Alshammari
|
2e5a8e7a6b
|
fix issue.
|
2 years ago |
|
Sikander Saleem
|
c390d87fca
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
d5b1512eb4
|
improvements
|
2 years ago |
devmirza121
|
7ca9096d89
|
Merge issue 2.0
|
2 years ago |
|
devmirza121
|
8fe51a654c
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/extensions/string_extensions.dart
# lib/main.dart
# lib/ui/landing/today_attendance_screen.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
2 years ago |
|
devmirza121
|
4dc4a3fafb
|
Merge issue 1.0
|
2 years ago |
|
Fatimah Alshammari
|
1604cba140
|
fix translation.
|
2 years ago |
|
Sultan Khan
|
2b93d43380
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Fatimah Alshammari
|
57bf34a93a
|
fix translation.
|
2 years ago |
|
Sultan Khan
|
3c777d220e
|
basic details
|
2 years ago |
|
Fatimah Alshammari
|
1ef3783fb9
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/api/profile_api_client.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/profile/delete_familyMember.dart
# lib/ui/profile/family_members.dart
# lib/ui/profile/phone_numbers.dart
# lib/ui/screens/profile/profile_screen.dart
|
2 years ago |
|
Fatimah Alshammari
|
30ca1894db
|
fix issues.
|
2 years ago |
|
Sikander Saleem
|
0b2a87aaaf
|
dynamic forms logic improvement.
|
2 years ago |
|
Fatimah Alshammari
|
d74d8ff369
|
fixed footer design.
|
2 years ago |
|
Sultan Khan
|
b10e6184d6
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
26bbff6844
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Fatimah Alshammari
|
23110b792f
|
completed add and update family member
|
2 years ago |
|
devmirza121
|
2ced8313da
|
QR, Digital Card & Employee ID Implementation
|
2 years ago |
|
Sikander Saleem
|
2f013ba1ad
|
lint rules added.
|
2 years ago |
|
Sultan Khan
|
06b14394bd
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
e6e150b9e3
|
address phone numbers
|
2 years ago |
|
Sikander Saleem
|
0786a1fa03
|
lint rules added.
|
2 years ago |
|
Sikander Saleem
|
2966ca129c
|
monthly pay slip improvement
|
2 years ago |
|
Sikander Saleem
|
f1c36b5821
|
monthly pay slip added.
|
2 years ago |
|
Fatimah Alshammari
|
a4ca7433a4
|
add and update family member in progress
|
2 years ago |
|
haroon amjad
|
6d1b942dca
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
d614532956
|
Announcements implemented
|
2 years ago |
|
Sikander Saleem
|
9362f8bf91
|
Merge branch 'development_haroon' into 'master'
pubspec update
See merge request mirza.shafique/mohem_flutter_app!36
|
2 years ago |
|
haroon amjad
|
556215807b
|
pubspec update
|
2 years ago |
|
Sikander Saleem
|
2adb1e34bf
|
Merge branch 'development_haroon' into 'master'
Development haroon
See merge request mirza.shafique/mohem_flutter_app!35
|
2 years ago |
|
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
2 years ago |
|
Sikander Saleem
|
e01bb920a7
|
Merge branch 'development_haroon' into 'master'
Pending Transactions implemented
See merge request mirza.shafique/mohem_flutter_app!34
|
2 years ago |
|
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
2 years ago |
|
Fatimah Alshammari
|
17ca565f4c
|
Merge branch 'development_sultan' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
lib/api/profile_api_client.dart
|
2 years ago |
|
Fatimah Alshammari
|
c3945d2583
|
family member in progress
|
2 years ago |
|
Sultan Khan
|
9b213dc9ab
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
ea5178fe20
|
profle dynamic forms
|
2 years ago |
|
Sikander Saleem
|
4c18f038e5
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
cb88f12ced
|
return from leave done.
|
2 years ago |
|
haroon amjad
|
12225d8a25
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
9e8bc47f7e
|
Mowadhafhi request completed
|
2 years ago |
|
Sikander Saleem
|
42e93e42a9
|
merge issue fixed
|
2 years ago |
|
haroon amjad
|
cf523566cd
|
Mowadhafi home & details page done
|
2 years ago |
|
Sultan Khan
|
f329f7030d
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
23326a769a
|
PHONE NUMBERS
|
2 years ago |
|
Sikander Saleem
|
ce7183a137
|
merge conflicts fixed.
|
2 years ago |
|
Sikander Saleem
|
95e2e74fd0
|
Merge branch 'master' into development_sikander
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/my_attendance/my_attendance_screen.dart
# lib/ui/work_list/worklist_detail_screen.dart
|
2 years ago |
|
Sikander Saleem
|
eaac923580
|
imp
|
2 years ago |
|
Fatimah Alshammari
|
15cfc0b9f4
|
merge conflict fixed
|
2 years ago |
|
Fatimah Alshammari
|
4ddd967177
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/generated/codegen_loader.g.dart
# pubspec.yaml
|
2 years ago |
|
devmirza121
|
2010e9d6a0
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/colors.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/attendance/monthly_attendance.dart
# lib/ui/landing/dashboard.dart
# lib/widgets/radio/show_radio.dart
# pubspec.yaml
|
2 years ago |
|
Fatimah Alshammari
|
fd07de072c
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
lib/main.dart
lib/ui/profile/contact_details.dart
|
2 years ago |
|
Fatimah Alshammari
|
7be1bdcdc2
|
fix family member
|
2 years ago |
|
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
2 years ago |
|
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
2 years ago |
|
Sultan Khan
|
794cd2b1e8
|
phone number inprogress
|
2 years ago |
|
Fatimah Alshammari
|
60db9041a1
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima
Conflicts:
assets/langs/en-US.json
lib/ui/profile/contact_details.dart
lib/ui/profile/personal_info.dart
pubspec.yaml
|
2 years ago |
|
Fatimah Alshammari
|
d2a6ed8de7
|
fix monthly attendance
|
2 years ago |
|
Sultan Khan
|
88d2e05ae7
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
91a67638c4
|
phone number inprogress
|
2 years ago |
|
devmirza121
|
a03eb8b11a
|
Worklist (ITG sikp, Delegats and HR multiple requests)
|
2 years ago |
|
Sikander Saleem
|
ae0a788728
|
Merge branch 'master' into development_sikander
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/models/generic_response_model.dart
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
# pubspec.yaml
|
2 years ago |
|
Sikander Saleem
|
3e6fdd2cb5
|
missing swipe added.
|
2 years ago |
|
Sikander Saleem
|
cee80111fc
|
for comment
|
2 years ago |
|
Sikander Saleem
|
1e9a26e3df
|
missing swipe cont
|
2 years ago |
|
Sultan Khan
|
979879a286
|
phone number is progress
|
2 years ago |
|
Sikander Saleem
|
c4096bd44d
|
improvements
|
2 years ago |
|
Sikander Saleem
|
9cc86751eb
|
missing swipe cont
|
2 years ago |
|
Sultan Khan
|
8f80bbb9db
|
profile dynamic forms
|
2 years ago |
|
Sultan Khan
|
b5a5399b95
|
profile
|
2 years ago |
|
Sultan Khan
|
13150321d4
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sikander Saleem
|
dadaeed10e
|
dynamic forms cont.
|
2 years ago |
|
Sikander Saleem
|
f2b378e33a
|
dynamic forms cont.
|
2 years ago |
|
Fatimah Alshammari
|
1305e895a1
|
fix arabic translation
|
2 years ago |
|
Sultan Khan
|
f8651ab49a
|
app bar
|
2 years ago |
|
Sultan Khan
|
a0ccacf078
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
fad58931f3
|
profile
|
2 years ago |
|
Fatimah Alshammari
|
44c9a090f9
|
fix personal details
|
2 years ago |
|
Sultan Khan
|
57f789ca6d
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Fatimah Alshammari
|
6529c2aeba
|
profile pages
|
2 years ago |
|
Sultan Khan
|
74c06203db
|
Merge branch 'Fatima' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
6e86c0ba38
|
profile details
|
2 years ago |
|
Fatimah Alshammari
|
393e28b32c
|
fix profile
|
2 years ago |
|
devmirza121
|
3fce58b379
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_last_login_screen.dart
|
2 years ago |
|
devmirza121
|
2887894330
|
Merge branch 'master' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/generated/locale_keys.g.dart
# lib/ui/login/login_screen.dart
|
2 years ago |
|
devmirza121
|
ec845756be
|
Login Issue Fix's
|
2 years ago |
|
Fatimah Alshammari
|
b281efe14c
|
fix monthly attendance
|
2 years ago |
|
Sultan Khan
|
82570b9ba6
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sultan Khan
|
49bc689351
|
Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
2 years ago |
|
Sikander Saleem
|
25d020441c
|
my attendance working cont-1
|
2 years ago |
|
Fatimah Alshammari
|
0e560558dc
|
Merge branch 'master' into Fatima
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/extensions/widget_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard.dart
# pubspec.lock
# pubspec.yaml
|
3 years ago |
|
Fatimah Alshammari
|
4d9405a8db
|
fix
|
3 years ago |
|
Fatimah Alshammari
|
339b343c4c
|
fix calendar
|
3 years ago |
|
Sultan Khan
|
2f395f29df
|
Merge branch 'development_sikander' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Sultan Khan
|
ff17adfd09
|
Merge branch 'main' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Sikander Saleem
|
9b5147b565
|
merge improvements
|
3 years ago |
|
Sultan Khan
|
06b3726d4a
|
Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan
|
3 years ago |
|
Sultan Khan
|
0974861463
|
updated menus
|
3 years ago |
|
Sikander Saleem
|
4817781fe1
|
Merge branch 'development_mirza' into development_sikander
# Conflicts:
# lib/provider/dashboard_provider_model.dart
# lib/ui/landing/dashboard_screen.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_last_login_screen.dart
|
3 years ago |
|
Sikander Saleem
|
807d4b4046
|
item creation added.
|
3 years ago |
|
Sikander Saleem
|
a431913bb6
|
purchase order & move order, item history & quotation analysis added.
|
3 years ago |
|
devmirza121
|
b898481cf7
|
Merge branch 'Fatima' into development_mirza
# Conflicts:
# assets/langs/ar-SA.json
# assets/langs/en-US.json
# lib/extensions/string_extensions.dart
# lib/extensions/widget_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/landing/dashboard.dart
# pubspec.lock
# pubspec.yaml
|
3 years ago |
|
devmirza121
|
a4fb526b68
|
NFC Attendance implement 1.4
|
3 years ago |
|
Sikander Saleem
|
384aa8d9b4
|
wokrlist api's added & improvements
|
3 years ago |
|
Fatimah Alshammari
|
0cd37ce0fa
|
fix calendar
|
3 years ago |
|
devmirza121
|
eb3ddb3d9e
|
NFC Attendance implement 1.3
|
3 years ago |
|
devmirza121
|
35d683a8ae
|
NFC Attendance implement 1.0
|
3 years ago |
|
devmirza121
|
68729ddbb9
|
NFC Attendance implement
|
3 years ago |
|
Sultan Khan
|
da6b935c0b
|
subpages changes
|
3 years ago |
|
devmirza121
|
681fe7fb38
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/ui/login/login_screen.dart
|
3 years ago |
|
devmirza121
|
48a261d674
|
Dashboard API's 1.4
|
3 years ago |
|
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & improvements
|
3 years ago |
|
devmirza121
|
a4465a8c23
|
Merge branch 'master' into development_mirza
# Conflicts:
# lib/ui/login/login_screen.dart
|
3 years ago |
|
devmirza121
|
c4b7046a90
|
Dashboard API's 1.3
|
3 years ago |
|
Sikander Saleem
|
7027299a48
|
merge improvements
|
3 years ago |
|
Sikander Saleem
|
e7a67cc58d
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/app_state/app_state.dart
# lib/classes/consts.dart
# lib/config/routes.dart
# lib/generated/locale_keys.g.dart
# lib/main.dart
# lib/models/generic_response_model.dart
# lib/ui/login/login_screen.dart
# lib/ui/login/verify_login_screen.dart
# pubspec.yaml
|
3 years ago |
|
Sikander Saleem
|
9c40878c4a
|
locale commited
|
3 years ago |
|
Sikander Saleem
|
6b9ea200ad
|
login flow added.
|
3 years ago |
|
devmirza121
|
b6670289b1
|
Dashboard API's 1.2
|
3 years ago |
|
devmirza121
|
fb8d6c7b20
|
Dashboard API's 1.1
|
3 years ago |
|
devmirza121
|
baa7182655
|
Dashboard API's 1.0
|
3 years ago |
|
devmirza121
|
ab25a98a9e
|
1.1
|
3 years ago |
|
devmirza121
|
181d857347
|
Merge branch 'master' into development_mirza
|
3 years ago |
|
Sikander Saleem
|
b5c9b83fdd
|
api structure improvement.
|
3 years ago |
|
devmirza121
|
a109a0529f
|
Merge branch 'master' into development_mirza
|
3 years ago |
|
Sikander Saleem
|
02be1cde49
|
api structure improvement.
|
3 years ago |
|
Sikander Saleem
|
e3d331a223
|
loading icon added
|
3 years ago |
|
devmirza121
|
c2ced77bca
|
shimmer
|
3 years ago |
|
Sikander Saleem
|
f1beefbc46
|
login apis, models & forgot password screen added.
|
3 years ago |
|
Sikander Saleem
|
bf08417bfa
|
login apis and models added.
|
3 years ago |
tall3at
|
22a9b3e818
|
Request and Delegate sheets
|
3 years ago |
|
Sikander Saleem
|
cbe471c7b0
|
improvements
|
3 years ago |
|
Sikander Saleem
|
c6ac45fc3d
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/colors.dart
# lib/config/routes.dart
# lib/extensions/string_extensions.dart
# lib/generated/codegen_loader.g.dart
# lib/ui/landing/dashboard.dart
|
3 years ago |
|
Sikander Saleem
|
b38f4287b6
|
today attendance progress added(cont)
|
3 years ago |
|
tall3at
|
80781c8e6d
|
internal Work List screen 1.2
|
3 years ago |