Commit Graph

256 Commits (ambulance_ui)

Author SHA1 Message Date
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
10 months ago
tahaalam 90128a812b call ambulance module design added. 10 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
10 months ago
faizatflutter 462f4eba14 Design Updates 10 months ago
haroon amjad 4b52862ba0 updates 10 months ago
faizatflutter eabfaf8182 Design Updates 10 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
10 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 10 months ago
tahaalam d480798053 location dennied forever handled and error builder added to the image network 10 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 10 months ago
haroon amjad d755eb0df8 contd. 10 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
10 months ago
haroon amjad d693850ef4 ER services implementation contd. 10 months ago
tahaalam a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 10 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 10 months ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
10 months ago
Haroon6138 5227fa6b58 Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/79
10 months ago
haroon amjad 5e1a7652be lab report download implemented 10 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 10 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 10 months ago
tahaalam ea92a0c75c laser appointment screen added 10 months ago
haroon amjad a2310e1447 prescription instructions PDF implemented 10 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
10 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 10 months ago
aamir-csol 24362f67cb family screen & widgets 10 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
11 months ago
aamir-csol d918b6e464 family screen & widgets 11 months ago
haroon amjad 8ff5566f0b dependencies update 11 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 11 months ago
haroon amjad f1a60a9dfb updates 11 months ago
tahaalam 61007302c9 appointment date filter handled 11 months ago
haroon amjad d220be7283 Tamara payment flow done 11 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 11 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 11 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 11 months ago
haroon amjad 903248133e Lab order & results enhancements 11 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 11 months ago
haroon amjad db979977ca Tamara implementation & enhancements 11 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
11 months ago
tahaalam 42abf9ca1b login bypass removed 11 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
11 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
11 months ago
haroon amjad 8a7f46441c updates 11 months ago
tahaalam 6ef9ae813d doctors search filter added 11 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 11 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 11 months ago
tahaalam da89c41925 lab result by hospital and translations are added 11 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 11 months ago
haroon amjad 093e645f60 request medical report implementation completed. 11 months ago