Commit Graph

243 Commits (fbe124f6ee76c8df0b6667cc4c11b166315468c0)

Author SHA1 Message Date
haroon amjad 2a6c7fc0a1 Find us implemented 11 months ago
tahaalam 5b0a8ad898 cancel and listing request added 11 months ago
faizatflutter 100d4bda9f Completed Ancillary flow with CardPayments 11 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 11 months ago
Sultan khan c701572dde radiology search 11 months ago
haroon amjad d3a8d545b2 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
11 months ago
haroon amjad 8dcc8dfbe3 updates 11 months ago
faizatflutter f96f3e563c Fixed App CustomChip 11 months ago
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
11 months ago
faizatflutter b698b74eb5 Design Updates 11 months ago
aamir-csol e113c4c1ee updates & fixes & RRT Flow 12 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
12 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
12 months ago
faizatflutter 8c956fc052 Design changes 12 months ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 12 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
1 year ago
tahaalam 90128a812b call ambulance module design added. 1 year ago
haroon amjad 65220270c2 Size utils & fixes 1 year ago
faizatflutter 72d765e508 Design Updates 1 year 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
1 year ago
faizatflutter 462f4eba14 Design Updates 1 year ago
haroon amjad 4b52862ba0 updates 1 year ago
faizatflutter eabfaf8182 Design Updates 1 year 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
1 year ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 1 year ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 1 year ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 1 year ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
1 year 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
1 year ago
haroon amjad d693850ef4 ER services implementation contd. 1 year ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 1 year ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 1 year ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 1 year ago
tahaalam ea92a0c75c laser appointment screen added 1 year ago
haroon amjad 663eda0076 updates & fixes 1 year 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
1 year ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 1 year ago
aamir-csol 24362f67cb family screen & widgets 1 year 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
1 year ago
aamir-csol d918b6e464 family screen & widgets 1 year 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
1 year ago
tahaalam 61007302c9 appointment date filter handled 1 year ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 1 year 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
1 year 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
1 year ago
tahaalam 6cf08c04d2 appointment filters added. 1 year ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 1 year ago
haroon amjad db979977ca Tamara implementation & enhancements 1 year ago
tahaalam 641df8b51b logs removed 1 year 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
1 year ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
1 year ago
haroon amjad 1d22e53f63 Merge branch 'master' into haroon_dev
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/presentation/medical_file/medical_file_page.dart
1 year ago
tahaalam 6ef9ae813d doctors search filter added 1 year ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 1 year ago
tahaalam da89c41925 lab result by hospital and translations are added 1 year ago
haroon amjad 093e645f60 request medical report implementation completed. 1 year 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
1 year ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
1 year ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
1 year ago
tahaalam 048f0bb459 graph design change 1 year ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 1 year ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
1 year ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 1 year ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 1 year ago
faizatflutter dc16a684c5 Merge branch 'master' into faiz_dev 1 year ago
faizatflutter 94313b8870 Improved Error Handling 1 year ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 1 year ago
aamir-csol 9b33745a57 Merge branch 'master' into dev_aamir 1 year ago
haroon amjad b1af9e1779 Merge branch 'master' into haroon_dev 1 year ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 1 year ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 1 year ago
Sikander Saleem c35c38aeb1 onboarding screen added. 1 year 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
1 year ago
aamir-csol 192d617350 family screen & widgets 1 year ago
aamir-csol e48e98d61b Merge branch 'master' into dev_aamir 1 year ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 year ago
taha.alam 8621a525a2 Merge remote-tracking branch 'origin/master' into feature/search_by_region 1 year ago
taha.alam 27a0632d6d directional padding and alignment 1 year ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 1 year ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 1 year ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 year 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
1 year ago
aamir-csol 1125437a56 family screen & widgets 1 year ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 year 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
1 year ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 1 year ago
haroon amjad 3e95999bf3 Merge branch 'master' into haroon_dev 1 year ago
aamir-csol f9bfc131a8 family screen & widgets 1 year ago
Haroon Amjad 1c2564a1e2 updates 1 year ago
aamir-csol a79dcad221 family screen & widgets 1 year 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
1 year ago
Sultan khan 5ce7548656 family file work-in-progress 1 year ago
Sultan khan 467f10e952 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 year ago
Sultan khan 0a653a61f2 family file bottomsheet added 1 year ago
aamir-csol 17c47d093c otp screen & register Uae & resend Activation Code. 1 year ago
Sikander Saleem 2584e6cc6e route animation improvement. 1 year ago
Sikander Saleem bb0ac4a0fe Merge branch 'refs/heads/master' into dev_sikander 1 year ago
Sikander Saleem c96081d07c reverse animation time changed to 500ms. 1 year ago
Sultan khan 030c2a1b8a Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 year ago
Sultan khan eafb52ab86 family file work in-progress 1 year ago