Commit Graph

257 Commits (dev_aamir)

Author SHA1 Message Date
aamir-csol e113c4c1ee updates & fixes & RRT Flow 1 day ago
aamir-csol 8123981092 Merge branch 'master' into dev_aamir 2 weeks ago
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 2 weeks ago
tahaalam 57056e67f3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/widgets/buttons/custom_button.dart
2 weeks ago
tahaalam 90128a812b call ambulance module design added. 2 weeks 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 weeks ago
faizatflutter 462f4eba14 Design Updates 3 weeks ago
haroon amjad 4b52862ba0 updates 3 weeks ago
faizatflutter eabfaf8182 Design Updates 3 weeks 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 weeks ago
haroon amjad 1f7a941aa0 RRT Services implementation contd. 3 weeks ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 3 weeks ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 3 weeks ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
3 weeks 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 weeks ago
haroon amjad d693850ef4 ER services implementation contd. 3 weeks ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 3 weeks ago
tahaalam a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 3 weeks ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 3 weeks ago
aamir-csol 58e65e7a64 Merge branch 'master' into dev_aamir 3 weeks ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 3 weeks ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
3 weeks ago
Haroon6138 5227fa6b58 Merge pull request 'family screen add fixes & remove & switch & widgets' (#79) from dev_aamir into master
Reviewed-on: #79
3 weeks ago
haroon amjad 5e1a7652be lab report download implemented 3 weeks ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 3 weeks ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 3 weeks ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 3 weeks ago
tahaalam ea92a0c75c laser appointment screen added 3 weeks ago
haroon amjad a2310e1447 prescription instructions PDF implemented 3 weeks ago
haroon amjad 663eda0076 updates & fixes 3 weeks 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 weeks ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 3 weeks ago
aamir-csol 24362f67cb family screen & widgets 3 weeks 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
4 weeks ago
aamir-csol d918b6e464 family screen & widgets 4 weeks ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 4 weeks ago
Haroon6138 3bbc014251 Merge pull request 'appointment date filter handled' (#74) from appointment_filter into master
Reviewed-on: #74
4 weeks ago
haroon amjad f1a60a9dfb updates 4 weeks ago
tahaalam 61007302c9 appointment date filter handled 4 weeks ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 4 weeks ago
haroon amjad d220be7283 Tamara payment flow done 4 weeks ago
haroon amjad 30eb8bf5de dental booking flow implemented 4 weeks 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
4 weeks ago
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 4 weeks ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 4 weeks 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
4 weeks ago
tahaalam 6cf08c04d2 appointment filters added. 4 weeks ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 4 weeks ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
4 weeks 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: #69
4 weeks ago