Symptoms Checker and User Info Selection (faiz_dev) #113

Merged
FaizHashmiCS22 merged 68 commits from faiz_dev into main 10 months ago

68 Commits (main)

Author SHA1 Message Date
faizatflutter 5fd1905d8c Complete UserInfo Selection Module 10 months ago
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
10 months ago
faizatflutter fbe124f6ee Complete UserInfo Selection Module 10 months ago
faizatflutter cf26e71645 Complete USerInfo Selectoiun 10 months ago
faizatflutter c7c0a0ac09 Added user_info module IAP 10 months ago
Haroon6138 dd8f3b95a7 Merge pull request 'haroon_dev' (#112) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/112
10 months ago
haroon amjad 818534e9f6 Master merged 10 months ago
haroon amjad 7cdb30a364 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad a83a35a284 Services Page Revamp 10 months ago
Haroon6138 95325dad02 Merge pull request 'lab result added along with the available characters scroll bar' (#111) from lab-result-changes into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/111
10 months ago
tahaalam 2d2380851e loading view added 10 months ago
tahaalam 2125e30c23 Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
10 months ago
tahaalam 95243c250f graph shaded region added from horizontal spaces 10 months ago
faizatflutter 34f4cd4f91 Merge branch 'refs/heads/master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
10 months ago
Haroon6138 2061ace278 Merge pull request 'haroon_dev' (#110) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/110
10 months ago
faizatflutter 9410ad9b60 Refactoring 10 months ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 10 months ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 10 months ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 10 months ago
haroon amjad ca47315b2c Merge branch 'master' into haroon_dev 10 months ago
Haroon6138 df3b3bc26b Merge pull request 'dev_aamir' (#109) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/109
10 months ago
aamir-csol f91f8e63d7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/medical_file/widgets/lab_rad_card.dart
10 months ago
aamir-csol d256eec392 medical file changes 10 months ago
faizatflutter e35fe9ac05 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/dependencies.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/lab/lab_orders_page.dart
#	lib/routes/app_routes.dart
#	lib/widgets/appbar/collapsing_list_view.dart
10 months ago
faizatflutter 2173d091ed Added symptoms selector 10 months ago
aamir-csol 19365375f6 medical file changes 10 months ago
tahaalam ac15ab26f5 graph changes for high and low 10 months ago
haroon amjad 3185d1e9e7 Allergies list implemented 10 months ago
Haroon6138 03811586f1 Merge pull request 'haroon_dev' (#107) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/107
10 months ago
haroon amjad b37804d012 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/features/prescriptions/prescriptions_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
10 months ago
haroon amjad 5c0d3144d6 iOS App Icons Added 10 months ago
Haroon6138 88039534e2 Merge pull request 'Calendar reminder added for both prescription and appointment.' (#105) from calender_reminder into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/105
10 months ago
Haroon6138 de0227dd57 Merge pull request 'silent login case handled.' (#106) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/106
10 months ago
Haroon6138 980b72f23f Merge branch 'master' into dev_sultan 10 months ago
haroon amjad 581a4a5a74 WalkIn Appointment implementation done 10 months ago
aamir-csol 0f17a655ed Merge branch 'master' into dev_aamir
# Conflicts:
#	ios/Runner/AppDelegate.swift
#	lib/core/dependencies.dart
#	lib/core/utils/utils.dart
#	lib/features/emergency_services/emergency_services_view_model.dart
#	lib/presentation/authentication/quick_login.dart
#	lib/presentation/emergency_services/RRT/rrt_request_type_select.dart
#	lib/presentation/emergency_services/call_ambulance/call_ambulance_page.dart
#	lib/presentation/emergency_services/call_ambulance/requesting_services_page.dart
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/emergency_services/emergency_services_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
#	lib/widgets/appbar/collapsing_list_view.dart
#	lib/widgets/common_bottom_sheet.dart
10 months ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 10 months ago
haroon amjad 36bf63dcde Incoming call updates 10 months ago
faizatflutter ac84d268e9 triage design 10 months ago
Sultan khan ddac155a6a silent login case handled. 10 months ago
tahaalam 393eaad2c7 Merge remote-tracking branch 'origin/master' 10 months ago
tahaalam e200479332 old calender util deleted 10 months ago
tahaalam e0e41d1900 calender reminder added on appointment and pescription 11 months ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 11 months ago
haroon amjad 1e5744cf44 Updates & enhancements 11 months ago
faizatflutter acb6d31ff3 Added possible conditions screen 11 months ago
tahaalam fc0f98da1d calender reminder added 11 months ago
Haroon6138 a3d89c7afa Merge pull request 'dev_sultan' (#104) from dev_sultan into master
Reviewed-on: #104
11 months ago
Sultan khan 9e0336687c virtual tour. 11 months ago
faizatflutter 757ace2ba1 Added Organ Selector 11 months ago
Sultan khan 2532b494f7 e-referral done. 11 months ago
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 11 months ago
Sultan khan fb69723a65 e-referral done. 11 months ago
faizatflutter 8068de70cb Completed the HHC and CMC 11 months ago
faizatflutter 5e437e42a9 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/location/location_view_model.dart
11 months ago
faizatflutter c84564dafd minor changes 11 months ago
Sultan khan 5f047e1b6f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/hmg_services/hmg_services_repo.dart
#	lib/features/hmg_services/hmg_services_view_model.dart
#	lib/presentation/emergency_services/call_ambulance/widgets/pickup_location.dart
11 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 11 months ago
Sultan khan 9a04974db3 Merge branch 'faiz_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
11 months ago
Sultan khan c43f96c619 e-referral work in progress 11 months ago
aamir-csol e113c4c1ee updates & fixes & RRT Flow 11 months ago
aamir-csol 3e5c3a3a27 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
12 months ago
aamir-csol 8123981092 Merge branch 'master' into dev_aamir 12 months ago
aamir-csol 987fe73128 family screen add fixes & remove & switch & widgets 12 months ago
aamir-csol 6f01f92dd0 Merge remote-tracking branch 'origin/faiz_dev' into dev_aamir 12 months ago
aamir-csol 02ae79c458 Merge branch 'refs/heads/master' into dev_aamir 12 months ago
aamir-csol 58e65e7a64 Merge branch 'master' into dev_aamir 1 year ago
aamir-csol cd81372fc6 family screen add fixes & remove & switch & widgets 1 year ago