Commit Graph

191 Commits (fbe5d35013a9ac4dcec8c5829991bb0c64707e1b)

Author SHA1 Message Date
tahaalam a669265076 Merge remote-tracking branch 'origin/master' into ambulance_listing_and_request
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/dependencies.dart
#	lib/features/emergency_services/emergency_services_repo.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/features/emergency_services/models/resp_model/EROnlineCheckInPaymentDetailsResponse.dart
#	lib/main.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/HospitalBottomSheetBody.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/type_selection_widget.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/widgets/input_widget.dart
2 weeks ago
haroon amjad 2a6c7fc0a1 Find us implemented 3 weeks ago
tahaalam 5b0a8ad898 cancel and listing request added 3 weeks ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 3 weeks 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
4 weeks ago
haroon amjad 8dcc8dfbe3 updates 4 weeks ago
faizatflutter f96f3e563c Fixed App CustomChip 4 weeks 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
4 weeks ago
faizatflutter b698b74eb5 Design Updates 4 weeks 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
1 month 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
1 month ago
faizatflutter 8c956fc052 Design changes 1 month ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 1 month ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
2 months ago
tahaalam 90128a812b call ambulance module design added. 2 months ago
haroon amjad 65220270c2 Size utils & fixes 2 months ago
faizatflutter 72d765e508 Design Updates 2 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
2 months ago
faizatflutter 462f4eba14 Design Updates 2 months ago
haroon amjad 4b52862ba0 updates 2 months ago
faizatflutter eabfaf8182 Design Updates 2 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
2 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 2 months ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 2 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 2 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
2 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
2 months ago
haroon amjad d693850ef4 ER services implementation contd. 2 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 2 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 2 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 2 months ago
tahaalam ea92a0c75c laser appointment screen added 2 months ago
haroon amjad 663eda0076 updates & fixes 2 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
2 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 2 months ago
aamir-csol 24362f67cb family screen & widgets 2 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
2 months ago
aamir-csol d918b6e464 family screen & widgets 2 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
2 months ago
tahaalam 61007302c9 appointment date filter handled 2 months ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 2 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
2 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
2 months ago
tahaalam 6cf08c04d2 appointment filters added. 2 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 2 months ago
haroon amjad db979977ca Tamara implementation & enhancements 2 months ago
tahaalam 641df8b51b logs removed 2 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
2 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
2 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
2 months ago