Commit Graph

287 Commits (d1b1bbf77764672da03180dcbe55f2440ddf76b2)

Author SHA1 Message Date
haroon amjad 8976f4db9d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/medical_file/medical_file_page.dart
2 months ago
faizatflutter b698b74eb5 Design Updates 2 months ago
aamir-csol e113c4c1ee updates & fixes & RRT Flow 3 months ago
Haroon Amjad 2e16622cc3 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/size_utils.dart
#	lib/presentation/home/widgets/large_service_card.dart
3 months ago
Haroon6138 622851a1a0 Merge pull request 'Design Fixes for Responsiveness (faiz_dev)' (#88) from faiz_dev into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/88
3 months ago
faizatflutter 8c956fc052 Design changes 3 months ago
Fatimah.Alshammari 3f123d12d6 Merge remote-tracking branch 'refs/remotes/origin/master' into fatima
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/utils/utils.dart
#	lib/main.dart
3 months ago
Fatimah.Alshammari de8c7bc605 active medication 3 months ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 3 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
3 months ago
tahaalam 90128a812b call ambulance module design added. 3 months ago
haroon amjad 65220270c2 Size utils & fixes 3 months ago
faizatflutter 72d765e508 Design Updates 3 months ago
faizatflutter 21be3a2d06 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/book_appointment/laser/widgets/body_part_listing.dart
#	lib/widgets/buttons/custom_button.dart
#	lib/widgets/common_bottom_sheet.dart
#	lib/widgets/input_widget.dart
3 months ago
faizatflutter 462f4eba14 Design Updates 3 months ago
haroon amjad 4b52862ba0 updates 3 months ago
faizatflutter eabfaf8182 Design Updates 3 months ago
haroon amjad 1c3ed8f2e1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
3 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 3 months ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 3 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 3 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
3 months ago
haroon amjad 0441d072fa Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_result_via_clinic/LabResultByClinic.dart
3 months ago
haroon amjad d693850ef4 ER services implementation contd. 3 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 3 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 3 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 3 months ago
tahaalam ea92a0c75c laser appointment screen added 3 months ago
haroon amjad 663eda0076 updates & fixes 3 months ago
haroon amjad b27e3268b1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
3 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 3 months ago
aamir-csol 24362f67cb family screen & widgets 3 months ago
aamir-csol aaa8222b1a Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/features/medical_file/medical_file_repo.dart
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
3 months ago
aamir-csol d918b6e464 family screen & widgets 3 months ago
Haroon6138 3bbc014251 Merge pull request 'appointment date filter handled' (#74) from appointment_filter into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/74
3 months ago
tahaalam 61007302c9 appointment date filter handled 3 months ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 3 months ago
haroon amjad c0606fb530 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/my_appointments/my_appointments_view_model.dart
#	lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
#	lib/presentation/lab/lab_orders_page.dart
3 months ago
tahaalam 483a1571d9 Merge remote-tracking branch 'origin/master' into appointment_filter
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/presentation/lab/lab_results/lab_result_details.dart
3 months ago
tahaalam 6cf08c04d2 appointment filters added. 3 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 3 months ago
haroon amjad db979977ca Tamara implementation & enhancements 3 months ago
tahaalam 641df8b51b logs removed 3 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
3 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
3 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
4 months ago
tahaalam 6ef9ae813d doctors search filter added 4 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 4 months ago
tahaalam da89c41925 lab result by hospital and translations are added 4 months ago
haroon amjad 093e645f60 request medical report implementation completed. 4 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
4 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
4 months ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
4 months ago
tahaalam 048f0bb459 graph design change 4 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 4 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
4 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 4 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 4 months ago
faizatflutter dc16a684c5 Merge branch 'master' into faiz_dev 4 months ago
faizatflutter 94313b8870 Improved Error Handling 4 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 4 months ago
aamir-csol 9b33745a57 Merge branch 'master' into dev_aamir 4 months ago
haroon amjad b1af9e1779 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 4 months ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem c35c38aeb1 onboarding screen added. 4 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
4 months ago
aamir-csol 192d617350 family screen & widgets 4 months ago
aamir-csol e48e98d61b Merge branch 'master' into dev_aamir 4 months ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
taha.alam 8621a525a2 Merge remote-tracking branch 'origin/master' into feature/search_by_region 4 months ago
taha.alam 27a0632d6d directional padding and alignment 4 months ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 4 months ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 4 months ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
4 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
4 months ago
aamir-csol 1125437a56 family screen & widgets 4 months ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 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
4 months ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 4 months ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 4 months ago
aamir-csol f9bfc131a8 family screen & widgets 4 months ago
Haroon Amjad 1c2564a1e2 updates 4 months ago
aamir-csol a79dcad221 family screen & widgets 4 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
4 months ago
Sultan khan 5ce7548656 family file work-in-progress 4 months ago
Sultan khan 467f10e952 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 0a653a61f2 family file bottomsheet added 4 months ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 4 months ago
Sikander Saleem 2584e6cc6e route animation improvement. 4 months ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem c96081d07c reverse animation time changed to 500ms. 4 months ago
Sultan khan 030c2a1b8a Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan eafb52ab86 family file work in-progress 4 months ago
Sikander Saleem 57827549b8 language switch added in drawer, and ui improvements 4 months ago
aamir-csol 2b7656d83a otp screen & register Uae & resend Activation Code. 4 months ago
aamir-csol 3ddd7781cd Merge branch 'master' into dev_aamir 4 months ago
Sikander Saleem f04f3bcd9c Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem c00e69ef0c profile wallet linked with view model. 4 months ago
taha.alam 55c51f5742 Merge remote-tracking branch 'origin/master' into feature/search_by_region 4 months ago
taha.alam 033ae12499 api handling for clinic and doctor parameters and state management 4 months ago
aamir-csol 3b1b51ef6f otp screen & register Uae & resend Activation Code. 4 months ago
Sikander Saleem 8f0e910e4f profile and settings ui completed. 4 months ago
aamir-csol 5de8314f3f otp screen & register Uae & resend Activation Code. 4 months ago
taha.alam 788887a7f1 Merge remote-tracking branch 'origin/master' into feature/search_by_region
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/book_appointment_page.dart
#	lib/presentation/home/navigation_screen.dart
4 months ago
taha.alam 2174e0e292 viewmodel and repo updated for the appointment by region selection. 4 months ago
taha.alam 9c2dd721b4 bottom sheets added of region facitlity and hospital. 4 months ago
Sultan khan 6b766e558d Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/app_assets.dart
#	lib/generated/locale_keys.g.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/home/navigation_screen.dart
4 months ago
aamir-csol fbd6ef0cf8 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/en-US.json
#	lib/features/authentication/widgets/otp_verification_screen.dart
#	lib/widgets/input_widget.dart
4 months ago
Sultan khan 009fa1859e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan fdd5d4cf6d fixes 4 months ago
aamir-csol 21a9cc8c89 otp screen & register Uae & resend Activation Code. 4 months ago
haroon amjad 6f745f3666 calendar implementation contd. 4 months ago
haroon amjad 73f8baa77e Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/extensions/string_extensions.dart
#	lib/widgets/input_widget.dart
4 months ago
aamir-csol 6a09c2ec07 validations & otp widget & focus & auto fill 4 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 4 months ago
aamir-csol b7e19a0af8 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
aamir-csol 0c58c22ea5 sign 4 months ago
haroon amjad f812dac059 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
4 months ago
Sultan khan 138862b115 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 299c0b0e29 login flow complete 4 months ago
haroon amjad 8df38ea6d1 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/extensions/widget_extensions.dart
4 months ago
haroon amjad ccd29f0cf9 updates 4 months ago
Sikander Saleem 09e92b8649 Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem 50c3a8e595 collapsing list view added in lab results, search lab results, and shimmer skeleton added for loading 4 months ago
Haroon Amjad 255b3c1565 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
Haroon6138 0e76e95636 Merge pull request 'dev_sultan' (#20) from dev_sultan into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/20
4 months ago
Sultan khan 2a081e30b5 saved login done. 4 months ago
haroon amjad b10523dac3 Online CheckIn implementation contd. 4 months ago
Sultan khan b4667f5c94 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
Sultan khan 075578602e Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
4 months ago
Sultan khan a199ca040b quick login inprogress 4 months ago
aamir-csol 9b063ba764 fixes for signup 4 months ago
Sikander Saleem 60fe32131e Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Sikander Saleem dfe02917fc Merge branch 'refs/heads/master' into dev_sikander 4 months ago
Haroon Amjad f7d62ed2e8 my appointments implementation contd. 4 months ago
Haroon Amjad 003a161b52 custom chips implemented 4 months ago
haroon amjad f8be788a60 updates & fixes 4 months ago
Sikander Saleem 0ce43fde5f Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	assets/images/svg/bell.svg
#	lib/widgets/common_bottom_sheet.dart
4 months ago
Sikander Saleem cb4601050c prescription reminder bottom sheet added. 4 months ago
haroon amjad 542de41a82 updates & fixes 4 months ago
aamir-csol 3db3966c06 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/core/app_state.dart
4 months ago
aamir-csol 484ab56a8e fixes for signup 4 months ago
Sultan khan 7d5b941df3 merged conflict 4 months ago
Sultan khan 384ac814f8 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/app_assets.dart
#	lib/core/dependencies.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/widgets/common_bottom_sheet.dart
4 months ago
haroon amjad 2c45356b07 Payment module implementation contd. 4 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 4 months ago
Sultan khan 7919d40f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/insurance/insurance_home_page.dart
4 months ago
Sultan khan ac17202b7a search lab order updated. 4 months ago
faizatflutter b15ddd1713 completed till otp receiving 4 months ago