Commit Graph

330 Commits (ambulance_ui)

Author SHA1 Message Date
tahaalam 35e145ddf9 id selection from the appropiate list 10 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
10 months ago
haroon amjad 903248133e Lab order & results enhancements 10 months ago
Haroon6138 7e92cad55b Merge pull request 'bottom handled when dental and laser clinic is selected from clinic page' (#69) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/69
10 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 10 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 10 months ago
haroon amjad db979977ca Tamara implementation & enhancements 10 months ago
tahaalam 36bf229787 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/api/api_client.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
10 months ago
tahaalam 2e9a462a1c listing resizing if the data is in small numbers. 10 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
10 months ago
haroon amjad 5e000db556 updates 10 months ago
tahaalam 786aa05b19 doctor list handled to be cleared when going back 10 months ago
tahaalam a4a32cca44 doctor filter icon removed from the doctor listing from clininc 10 months ago
haroon amjad 1d22e53f63 Merge branch 'master' into haroon_dev
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart
10 months ago
haroon amjad 8a7f46441c updates 10 months ago
tahaalam 6ef9ae813d doctors search filter added 10 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 10 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 10 months ago
tahaalam da89c41925 lab result by hospital and translations are added 10 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 10 months ago
haroon amjad 093e645f60 request medical report implementation completed. 10 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 10 months ago
haroon amjad 2de02102c2 profile settings update 10 months ago
aamir-csol e5488299b8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
#	lib/widgets/common_bottom_sheet.dart
10 months ago
aamir-csol 1335d3a7c8 family screen & widgets 10 months ago
faizatflutter 4cc4a7b0d9 merged main 10 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
10 months ago
haroon amjad 6565ba719d Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 10 months ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
10 months ago
tahaalam 048f0bb459 graph design change 10 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 10 months ago
aamir-csol 288a0018ce family screen & widgets 10 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
10 months ago
haroon amjad 6b28b57307 empty state implementation contd. 10 months ago
tahaalam b05b03a6f6 divider changed 10 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 10 months ago
aamir-csol 36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart
10 months ago
aamir-csol 02433e1bef family screen & widgets 10 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 11 months ago
faizatflutter dc16a684c5 Merge branch 'master' into faiz_dev 11 months ago
faizatflutter 94313b8870 Improved Error Handling 11 months ago
haroon amjad 918eb18b5f Region flow in select clinic implemented 11 months ago
haroon amjad a07369165d Updates 11 months ago
Sultan khan 318441c77f Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 11 months ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 11 months ago
haroon amjad f7e26da6f4 Merge branch 'master' into haroon_dev 11 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 11 months ago
Sultan khan 3642523fdf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
11 months ago
Sikander Saleem 604e503e52 flow improvement & translation added. 11 months ago
Sultan khan 3acd549de7 no message 11 months ago
aamir-csol 9b33745a57 Merge branch 'master' into dev_aamir 11 months ago
haroon amjad b1af9e1779 Merge branch 'master' into haroon_dev 11 months ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 11 months ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 11 months ago
Sikander Saleem 96cc15a441 improvements. 11 months ago
Sikander Saleem c35c38aeb1 onboarding screen added. 11 months ago
aamir-csol 1b652f877d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
11 months ago
Sultan khan d5bd99f525 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
11 months ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/55
11 months ago
aamir-csol 192d617350 family screen & widgets 11 months ago
Sultan khan 12447cdafb no message 11 months ago
Sultan khan 6d85227f11 lab order by test 11 months ago
taha.alam 7093a26cb8 selection region arabic handling 11 months ago
taha.alam 27a0632d6d directional padding and alignment 11 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
11 months ago
Sikander Saleem 005157fe5e Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart
11 months ago
aamir-csol 1125437a56 family screen & widgets 11 months ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 11 months ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
11 months ago
haroon amjad 836a72ec22 App directionality changes 11 months ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 11 months ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 11 months ago
aamir-csol f9bfc131a8 family screen & widgets 11 months ago
Haroon Amjad 1c2564a1e2 updates 11 months ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 11 months ago
aamir-csol a79dcad221 family screen & widgets 11 months ago
Sultan khan 4d52987c83 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/medical_file/medical_file_page.dart
11 months ago
aamir-csol 8240d3e78d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/authentication/register_step2.dart
11 months ago
Haroon Amjad a4854bbe4a Habib Wallet updates 11 months ago
Haroon6138 25f0b9d415 Merge pull request 'haroon_dev' (#49) from haroon_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/49
11 months ago
Haroon Amjad bdde6c224d Merge branch 'master' into haroon_dev 11 months ago
Haroon6138 2c405aa0c3 Merge pull request 'ui improvement.' (#47) from dev_sikander into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/47
11 months ago
Haroon6138 5e82e02323 Merge pull request 'Location functionality' (#48) from functionality/location into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/48
11 months ago
Haroon Amjad c9206f1ab8 Radiology report implemented 11 months ago
haroon amjad 3b5d2d27a4 Updates 11 months ago
Sultan khan 467f10e952 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 11 months ago
taha.alam 3fdd17ccaa code added to get the location for gms hms and iphone. fallback added if the last known location is null. 11 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 11 months ago
Sikander Saleem 2584e6cc6e route animation improvement. 11 months ago
Sikander Saleem 99e1036043 ui improvement. 11 months ago
haroon amjad 4f4bef9d6f Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
11 months ago
haroon amjad 2961583414 update 11 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 11 months ago
Sultan khan 030c2a1b8a Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 11 months ago
Sultan khan eafb52ab86 family file work in-progress 11 months ago
haroon amjad 928a056cbc Merge branch 'master' into haroon_dev 11 months ago
haroon amjad 5e81ba1ed8 updates 11 months ago
Sikander Saleem 3267317457 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/home/landing_page.dart
11 months ago
Sikander Saleem 57827549b8 language switch added in drawer, and ui improvements 11 months ago