FaizHashmiCS22
|
199a65a994
|
Merge branch 'master' into development_faiz
|
2 years ago |
|
FaizHashmiCS22
|
5ed9991428
|
Added new Intimmation Screens with Lottie
|
2 years ago |
haroon amjad
|
8b0bae0891
|
Worklist updates
|
2 years ago |
|
FaizHashmiCS22
|
38c7d78db3
|
Added UI Components for Marathon Module.. WIP
|
2 years ago |
|
FaizHashmiCS22
|
5c848fec87
|
Added UI Components for Marathon Module.. WIP
|
2 years ago |
 Sikander Saleem
|
d200624ac2
|
Merge branch 'master' into development_sikander
# Conflicts:
# lib/classes/consts.dart
# lib/generated/locale_keys.g.dart
# lib/ui/landing/dashboard_screen.dart
|
2 years ago |
 Aamir Muhammad
|
57ebe40b5d
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/landing/dashboard_screen.dart
|
2 years ago |
|
Sikander Saleem
|
d26b7e0753
|
worklist improvements
|
2 years ago |
|
Sikander Saleem
|
91abaa8475
|
improvements.
|
2 years ago |
|
Sikander Saleem
|
5c5da60b12
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
f0ec4843b4
|
end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed.
|
2 years ago |
|
Aamir Muhammad
|
b190a248bf
|
Chat Implementation Version 1
|
2 years ago |
Sultan khan
|
398880c4ad
|
bug fixes
|
2 years ago |
|
Sultan khan
|
8d9561b570
|
COC changes
|
2 years ago |
|
Sikander Saleem
|
95b60181b1
|
bug fixes
|
2 years ago |
|
haroon amjad
|
dd26452663
|
Fixes & updates
|
2 years ago |
|
haroon amjad
|
c14bfd22db
|
Mohemm Android build given to QA
|
2 years ago |
|
haroon amjad
|
e6405b2251
|
NFC fixes
|
2 years ago |
|
haroon amjad
|
eb29553d26
|
NFC Fixes
|
2 years ago |
|
Sikander Saleem
|
a45b6aece2
|
improvements
|
2 years ago |
|
Sikander Saleem
|
4e22784676
|
ticket balance dashboard added.
|
2 years ago |
|
Sikander Saleem
|
4b935f1dc5
|
leave balance dashboard added.
|
2 years ago |
Sikander Saleem
|
f3855c3883
|
Merge branch 'master' into development_sikander
|
2 years ago |
|
Sikander Saleem
|
cbcb3cdc00
|
item for sale improvement cont.
|
2 years ago |
Fatimah Alshammari
|
6a1f655b1f
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Sikander Saleem
|
8e94d57dae
|
performance evaluation improvements.
|
2 years ago |
|
Sikander Saleem
|
b79edd701c
|
code improvement & translation added.
|
2 years ago |
|
Fatimah Alshammari
|
e2720c7057
|
fix design issues
|
2 years ago |
|
haroon amjad
|
fb2924964b
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# pubspec.yaml
|
2 years ago |
|
Sikander Saleem
|
2f6e40da46
|
add leave balance cont.
|
2 years ago |
|
Fatimah Alshammari
|
89058f9e59
|
Merge branch 'master' into Fatima
|
2 years ago |
|
Fatimah Alshammari
|
416a33b2fd
|
fix design
|
2 years ago |
|
haroon amjad
|
a05d037211
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/colors.dart
# lib/extensions/string_extensions.dart
# lib/ui/screens/announcements/announcement_details.dart
# lib/ui/screens/announcements/announcements.dart
# lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
# lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
|
2 years ago |
|
Sikander Saleem
|
d6cc5fcc6c
|
pending transaction.
|
2 years ago |
|
haroon amjad
|
a855e535cd
|
Item for sale implemented
|
2 years ago |
|
Fatimah Alshammari
|
dc880df35a
|
Merge branch 'master' into Fatima
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/models/profile_menu.model.dart
|
2 years ago |
|
Fatimah Alshammari
|
a22f679908
|
my team module and workList settings
|
2 years ago |
|
Sikander Saleem
|
20f7d98ce5
|
profile improvements
|
2 years ago |
|
Sikander Saleem
|
4edb19c2bb
|
Vacation rule added cont.
|
2 years ago |
|
haroon amjad
|
1719c7029e
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/config/routes.dart
# lib/models/generic_response_model.dart
# lib/ui/landing/widget/app_drawer.dart
# lib/ui/screens/announcements/announcement_details.dart
# pubspec.yaml
|
2 years ago |
|
haroon amjad
|
c63844dcf7
|
My requests & CCP
|
2 years ago |
|
Sikander Saleem
|
2f013ba1ad
|
lint rules added.
|
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 |
|
haroon amjad
|
e045374703
|
Not found svg added, Pending transactions, Announcements.
|
2 years ago |
|
haroon amjad
|
427c5fb5b6
|
Pending Transactions implemented
|
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 |
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 |
|
Sikander Saleem
|
959750da9b
|
ticket request cont.
|
2 years ago |
|
devmirza121
|
42510259bc
|
Worklist & Wifi attendance
|
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
|
9cc86751eb
|
missing swipe cont
|
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
|
f2b378e33a
|
dynamic forms cont.
|
2 years ago |
|
Sultan Khan
|
fad58931f3
|
profile
|
2 years ago |
|
Fatimah Alshammari
|
6529c2aeba
|
profile pages
|
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 |
|
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
|
2 years ago |
|
Sikander Saleem
|
9b5147b565
|
merge improvements
|
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
|
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 |
|
Sikander Saleem
|
384aa8d9b4
|
wokrlist api's added & improvements
|
3 years ago |
|
Fatimah Alshammari
|
0cd37ce0fa
|
fix calendar
|
3 years ago |
|
devmirza121
|
68729ddbb9
|
NFC Attendance implement
|
3 years ago |
|
Sikander Saleem
|
4b5ab2cd7f
|
wokrlist api's added & 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
|
6b9ea200ad
|
login flow added.
|
3 years ago |
|
devmirza121
|
baa7182655
|
Dashboard API's 1.0
|
3 years ago |
|
Sikander Saleem
|
e3d331a223
|
loading icon added
|
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
|
b2466122d3
|
internal Work List screen
|
3 years ago |
|
tall3at
|
bf8dce2afd
|
Work List screen
|
3 years ago |
|
Sikander Saleem
|
f16b3c5c79
|
dashboard ui added.
|
3 years ago |
|
Sikander Saleem
|
78ca9e2c70
|
icons added & dashboard ui
|
3 years ago |
|
Sikander Saleem
|
311ebd9c13
|
confirm login screen added & structure improvement.
|
3 years ago |