Commit Graph

399 Commits (dev_aamir)

Author SHA1 Message Date
aamir-csol d918b6e464 family screen & widgets 4 weeks ago
haroon amjad 8ff5566f0b dependencies update 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
Haroon6138 156d7b4834 Merge pull request 'id selection from the appropiate list' (#70) from feature/search_by_region into master
Reviewed-on: #70
4 weeks ago
haroon amjad 415c0eb3c7 Dental appointment booking implementation contd. 4 weeks ago
tahaalam 35e145ddf9 id selection from the appropiate list 4 weeks ago
haroon amjad 8291e89ee7 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/book_appointment/select_clinic_page.dart
4 weeks ago
haroon amjad 903248133e Lab order & results enhancements 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
tahaalam bbf83d4dc9 bottom handled when dental and laser clinic is selected from clinic page 4 weeks ago
haroon amjad 3d64ddf78b Merge branch 'master' into haroon_dev 4 weeks ago
haroon amjad db979977ca Tamara implementation & enhancements 4 weeks ago
tahaalam 641df8b51b logs removed 4 weeks 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 weeks ago
tahaalam 42abf9ca1b login bypass removed 4 weeks ago
tahaalam 2e9a462a1c listing resizing if the data is in small numbers. 4 weeks ago
haroon amjad 8166369f85 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
#	lib/widgets/input_widget.dart
4 weeks ago
haroon amjad 5e000db556 updates 4 weeks ago
tahaalam 786aa05b19 doctor list handled to be cleared when going back 4 weeks ago
tahaalam a4a32cca44 doctor filter icon removed from the doctor listing from clininc 4 weeks 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 weeks ago
haroon amjad 8a7f46441c updates 4 weeks ago
tahaalam 6ef9ae813d doctors search filter added 4 weeks ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 4 weeks ago
haroon amjad 10b77206f6 Immediate LiveCare consultation implementation contd. 1 month ago
tahaalam da89c41925 lab result by hospital and translations are added 1 month ago
haroon amjad 2f4d6f5553 immediate livecare consultation implementation contd. 1 month ago
haroon amjad 093e645f60 request medical report implementation completed. 1 month ago
Haroon Amjad 8bb0e495cc request medical report implementation contd. 1 month ago
haroon amjad 2de02102c2 profile settings update 1 month 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
1 month ago
aamir-csol 1335d3a7c8 family screen & widgets 1 month ago
faizatflutter 4cc4a7b0d9 merged main 1 month ago
faizatflutter 23942dc7bc Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
1 month ago
haroon amjad 6565ba719d Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 1af2db5c09 patient profile settings page integration implementation contd. 1 month ago
tahaalam 51a4f83347 Merge remote-tracking branch 'origin/master' into feature/lab_result
# Conflicts:
#	lib/presentation/lab/lab_results/lab_result_details.dart
1 month ago
tahaalam 048f0bb459 graph design change 1 month ago
aamir-csol 060e7a8d68 Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 288a0018ce family screen & widgets 1 month ago
haroon amjad 5f43063f2d Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/app_assets.dart
1 month ago
haroon amjad 6b28b57307 empty state implementation contd. 1 month ago
tahaalam b05b03a6f6 divider changed 1 month ago
tahaalam 512628fb8b Lab result view along with the listing of items is added 1 month 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
1 month ago
aamir-csol 02433e1bef family screen & widgets 1 month ago
Haroon Amjad 62e82a7a31 Empty data state implementation contd. 1 month ago
Sultan khan e2188b5a69 switch family member with super user 1 month ago
faizatflutter dc16a684c5 Merge branch 'master' into faiz_dev 1 month ago
faizatflutter 94313b8870 Improved Error Handling 1 month ago
haroon amjad 918eb18b5f Region flow in select clinic implemented 1 month ago
haroon amjad a07369165d Updates 1 month ago
Sultan khan 318441c77f Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
aamir-csol 45a1ce9254 Merge branch 'master' into dev_aamir 1 month ago
haroon amjad f7e26da6f4 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad 344ecaba18 LiveCare Schedule implementation done 1 month 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
1 month ago
Sikander Saleem 7c90d966c1 improvement 1 month ago
Sikander Saleem 604e503e52 flow improvement & translation added. 1 month ago
aamir-csol 9e8011c34c family screen & widgets 1 month ago
Sultan khan 3acd549de7 no message 1 month ago
aamir-csol 9b33745a57 Merge branch 'master' into dev_aamir 1 month ago
aamir-csol 47ce5022d3 family screen & widgets 1 month ago
haroon amjad b1af9e1779 Merge branch 'master' into haroon_dev 1 month ago
haroon amjad a711d3a6dd LiveCare shcedule implementation contd. 1 month ago
Sikander Saleem c553876c8a Merge branch 'refs/heads/master' into dev_sikander 1 month ago
Sikander Saleem 96cc15a441 improvements. 1 month ago
Sikander Saleem c35c38aeb1 onboarding screen added. 1 month ago
aamir-csol 1b652f877d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
1 month ago
Sultan khan d5bd99f525 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
Haroon6138 938d95cb06 Merge pull request 'feature/search_by_region' (#55) from feature/search_by_region into master
Reviewed-on: #55
1 month ago
aamir-csol 192d617350 family screen & widgets 1 month ago
aamir-csol e48e98d61b Merge branch 'master' into dev_aamir 1 month ago
Sultan khan 12447cdafb no message 1 month ago
Sultan khan 32c7608c83 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan 6d85227f11 lab order by test 1 month ago
taha.alam 8621a525a2 Merge remote-tracking branch 'origin/master' into feature/search_by_region 1 month ago
taha.alam 7093a26cb8 selection region arabic handling 1 month ago
taha.alam 27a0632d6d directional padding and alignment 1 month ago
taha.alam 92c3033087 Merge remote-tracking branch 'origin/master' into functionality/graph 1 month ago
taha.alam 5151997c7f custom linear added with parameters to customize the properties of graph 1 month ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
Sikander Saleem 005157fe5e Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/presentation/habib_wallet/recharge_wallet_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/splashPage.dart
1 month ago
aamir-csol 1125437a56 family screen & widgets 1 month ago
Sikander Saleem 12cef74f16 splash animation added. 1 month ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
haroon amjad 836a72ec22 App directionality changes 1 month ago
haroon amjad 97038f1a25 advance payment implementation done for self & other file number 1 month ago