Commit Graph

395 Commits (calender_reminder)

Author SHA1 Message Date
haroon amjad 8dcc8dfbe3 updates 9 months ago
faizatflutter f96f3e563c Fixed App CustomChip 9 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
9 months ago
haroon amjad 2160f87c59 updates 9 months ago
faizatflutter b698b74eb5 Design Updates 9 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
10 months ago
faizatflutter dc5eba7d12 refactored code 10 months ago
faizatflutter 28f8aec60f resolved fSize issue 10 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
10 months ago
faizatflutter 8c956fc052 Design changes 10 months ago
haroon amjad 487b29fec3 Merge branch 'master' into haroon_dev 10 months ago
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 3e61df218b Some Minor design updated 10 months ago
haroon amjad 65220270c2 Size utils & fixes 10 months ago
haroon amjad 3c81cffa75 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 8a6f94cc1d updates 10 months ago
faizatflutter 72d765e508 Design Updates 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
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 47d158c1e2 Merge remote-tracking branch 'origin/master' 10 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 10 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
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 baf7cf0ea0 dental routing fixed and laser exception removed 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
tahaalam 773cc9229b Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
10 months ago
tahaalam cc458b2ec7 files and packages renamed 10 months ago
tahaalam 81a6c7d034 files and packages renamed 10 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 10 months ago
Haroon6138 51d225e206 Merge pull request 'laser appointment screen added' (#78) from laser_appointment into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/78
10 months ago
Haroon6138 084efb7d32 Merge pull request 'lab severity values handled and size of lab description fixed' (#80) from feature/lab_result into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/80
10 months ago
tahaalam ab74a61969 lab severity values handled and size of lab description fixed 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 663eda0076 updates & fixes 10 months ago
haroon amjad fe5b6c35ac insurance approval implementation done 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
10 months ago
aamir-csol d918b6e464 family screen & widgets 10 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad f1a60a9dfb updates 10 months ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 10 months ago
haroon amjad d220be7283 Tamara payment flow done 10 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 10 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
10 months ago
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 10 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 10 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
10 months ago
tahaalam 6cf08c04d2 appointment filters added. 10 months ago
Haroon6138 156d7b4834 Merge pull request 'id selection from the appropiate list' (#70) from feature/search_by_region into master
Reviewed-on: http://34.17.52.180/Haroon6138/HMG_Patient_App_New/pulls/70
10 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 10 months ago
tahaalam 35e145ddf9 id selection from the appropiate list 10 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
10 months ago
haroon amjad 903248133e Lab order & results enhancements 10 months 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
10 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 10 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 10 months ago
haroon amjad db979977ca Tamara implementation & enhancements 10 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
10 months ago
tahaalam 2e9a462a1c listing resizing if the data is in small numbers. 10 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
10 months ago
haroon amjad 5e000db556 updates 10 months ago
tahaalam 786aa05b19 doctor list handled to be cleared when going back 10 months ago
tahaalam a4a32cca44 doctor filter icon removed from the doctor listing from clininc 10 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
10 months ago
haroon amjad 8a7f46441c updates 10 months ago
tahaalam 6ef9ae813d doctors search filter added 10 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 10 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 10 months ago
tahaalam da89c41925 lab result by hospital and translations are added 10 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 10 months ago
haroon amjad 093e645f60 request medical report implementation completed. 10 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 10 months ago
haroon amjad 2de02102c2 profile settings update 10 months 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
10 months ago
aamir-csol 1335d3a7c8 family screen & widgets 10 months ago
faizatflutter 4cc4a7b0d9 merged main 10 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
10 months ago
haroon amjad 6565ba719d Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 10 months ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
10 months ago
tahaalam 048f0bb459 graph design change 10 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 10 months ago
aamir-csol 288a0018ce family screen & widgets 10 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
11 months ago
haroon amjad 6b28b57307 empty state implementation contd. 11 months ago