Commit Graph

430 Commits (da579dfd09957aa6a5263154b5fd5b3c4a8fb70a)

Author SHA1 Message Date
haroon amjad 1f7a941aa0 RRT Services implementation contd. 4 months ago
tahaalam d480798053 location dennied forever handled and error builder added to the image network 4 months ago
tahaalam 47d158c1e2 Merge remote-tracking branch 'origin/master' 4 months ago
tahaalam c146747e5e nearest er clinic repo viewmodel and view added 4 months ago
tahaalam d9796154dc Merge remote-tracking branch 'origin/master' into laser_appointment
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
4 months ago
haroon amjad d755eb0df8 contd. 4 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
4 months ago
haroon amjad d693850ef4 ER services implementation contd. 4 months ago
tahaalam baf7cf0ea0 dental routing fixed and laser exception removed 4 months ago
tahaalam a7bd5f61cb Merge remote-tracking branch 'origin/master' into feature/lab_result 4 months ago
tahaalam 9e3035f02b units added to lab result and it graph and unwanted values removed from graph 4 months ago
haroon amjad 7a35f0ded6 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 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
4 months ago
haroon amjad 5e1a7652be lab report download implemented 4 months ago
tahaalam 773cc9229b Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
4 months ago
tahaalam cc458b2ec7 files and packages renamed 4 months ago
tahaalam 81a6c7d034 files and packages renamed 4 months ago
haroon amjad e1ac77855c Merge branch 'master' into haroon_dev 4 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
4 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
4 months ago
tahaalam ab74a61969 lab severity values handled and size of lab description fixed 4 months ago
haroon amjad 1e08394ba1 Lab report PDF implementation contd. 4 months ago
aamir-csol bf8f98ffb1 family screen add fixes & remove & switch & widgets 4 months ago
tahaalam ea92a0c75c laser appointment screen added 4 months ago
haroon amjad a2310e1447 prescription instructions PDF implemented 4 months ago
haroon amjad 663eda0076 updates & fixes 4 months ago
haroon amjad fe5b6c35ac insurance approval implementation done 4 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
4 months ago
haroon amjad 25fa1acc9e Medical file widgets, Insurance approval implementation contd. 4 months ago
aamir-csol 24362f67cb family screen & widgets 4 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
4 months ago
aamir-csol d918b6e464 family screen & widgets 4 months ago
haroon amjad 8ff5566f0b dependencies update 4 months ago
haroon amjad 9d48a00b21 Merge branch 'master' into haroon_dev 4 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
4 months ago
haroon amjad f1a60a9dfb updates 4 months ago
tahaalam 61007302c9 appointment date filter handled 4 months ago
tahaalam e5dcabacce lab prescription details are added andgraph visibility added to the graph page for result that are IRR 4 months ago
haroon amjad d220be7283 Tamara payment flow done 4 months ago
haroon amjad 30eb8bf5de dental booking flow implemented 4 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
4 months ago
haroon amjad b05e4e2a15 Dental appointment booking flow implementation contd. 4 months ago
haroon amjad 2b21086cc1 Dental appointment booking flow implementation contd. 4 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
4 months ago
tahaalam 6cf08c04d2 appointment filters added. 4 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
4 months ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 4 months ago
tahaalam 35e145ddf9 id selection from the appropiate list 4 months ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
4 months ago
haroon amjad 903248133e Lab order & results enhancements 4 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
4 months ago
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 4 months ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 4 months ago
haroon amjad db979977ca Tamara implementation & enhancements 4 months ago
tahaalam 641df8b51b logs removed 4 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
4 months ago
tahaalam 42abf9ca1b login bypass removed 4 months ago
tahaalam 2e9a462a1c listing resizing if the data is in small numbers. 4 months ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
4 months ago
haroon amjad 5e000db556 updates 4 months ago
tahaalam 786aa05b19 doctor list handled to be cleared when going back 4 months ago
tahaalam a4a32cca44 doctor filter icon removed from the doctor listing from clininc 4 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
4 months ago
haroon amjad 8a7f46441c updates 4 months ago
tahaalam 6ef9ae813d doctors search filter added 4 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 months ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 4 months ago
tahaalam da89c41925 lab result by hospital and translations are added 4 months ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 4 months ago
haroon amjad 093e645f60 request medical report implementation completed. 4 months ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 4 months ago
haroon amjad 2de02102c2 profile settings update 4 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
4 months ago
aamir-csol 1335d3a7c8 family screen & widgets 4 months ago
faizatflutter 4cc4a7b0d9 merged main 4 months ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
4 months ago
haroon amjad 6565ba719d Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 4 months ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
4 months ago
tahaalam 048f0bb459 graph design change 4 months ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 4 months ago
aamir-csol 288a0018ce family screen & widgets 4 months ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
4 months ago
haroon amjad 6b28b57307 empty state implementation contd. 4 months ago
tahaalam b05b03a6f6 divider changed 4 months ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 4 months ago
aamir-csol 36193d349c Merge remote-tracking branch 'origin/dev_sultan' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_repo.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/features/medical_file/medical_file_view_model.dart
4 months ago
aamir-csol 02433e1bef family screen & widgets 4 months ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 4 months ago
Sultan khan e2188b5a69 switch family member with super user 4 months ago
faizatflutter dc16a684c5 Merge branch 'master' into faiz_dev 4 months ago
faizatflutter 94313b8870 Improved Error Handling 4 months ago
haroon amjad 918eb18b5f Region flow in select clinic implemented 5 months ago
haroon amjad a07369165d Updates 5 months ago
Sultan khan 318441c77f Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 5 months ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 5 months ago
haroon amjad f7e26da6f4 Merge branch 'master' into haroon_dev 5 months ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 5 months ago
Sultan khan 3642523fdf Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
5 months ago
Sikander Saleem 7c90d966c1 improvement 5 months ago