Commit Graph

254 Commits (5b0a8ad8987cfb7bc2d4ab178c0afd4e8d0a8a2f)

Author SHA1 Message Date
tahaalam 5b0a8ad898 cancel and listing request added 11 months ago
tahaalam 1ca39e1332 Ambulance order screens and geocoding request added 11 months ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
12 months ago
tahaalam 90128a812b call ambulance module design added. 12 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
12 months ago
faizatflutter 462f4eba14 Design Updates 12 months ago
haroon amjad 4b52862ba0 updates 12 months ago
faizatflutter eabfaf8182 Design Updates 12 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
12 months ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 12 months ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 12 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 12 months 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 a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 1 year ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 1 year ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
1 year 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
1 year ago
haroon amjad 5e1a7652be lab report download implemented 1 year ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 1 year ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 1 year ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 1 year ago
tahaalam ea92a0c75c laser appointment screen added 1 year ago
haroon amjad a2310e1447 prescription instructions PDF implemented 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
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 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
haroon amjad f1a60a9dfb updates 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 d220be7283 Tamara payment flow done 1 year ago
haroon amjad 30eb8bf5de dental booking flow implemented 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
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 1 year ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 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 415c0eb3c7 Dental appointment booking implementation contd. 1 year ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
1 year 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
1 year ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 1 year ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 1 year ago
haroon amjad db979977ca Tamara implementation & enhancements 1 year ago