Commit Graph

326 Commits (79beaf6fb704cbb99a0f7e8829f8feb36d02e0e7)

Author SHA1 Message Date
faizatflutter 6f72c99975 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/presentation/lab/lab_orders_page.dart
#	lib/theme/colors.dart
1 month ago
faizatflutter c7c0a0ac09 Added user_info module IAP 1 month ago
haroon amjad a83a35a284 Services Page Revamp 1 month 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
1 month ago
haroon amjad e72e67d9bf Appointment Queue implemented, Blood Donation implementation contd. 1 month ago
faizatflutter 2ffd4cc1ae Integrated the API for Symptoms Checker 1 month ago
haroon amjad 634a138c7f Queueing system screen implementation contd. 1 month 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
1 month ago
aamir-csol d256eec392 medical file changes 1 month 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
1 month 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
1 month 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
1 month 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
1 month ago
haroon amjad 2b7379c1c3 Waiting appointment implementation in progress 1 month ago
haroon amjad 36bf63dcde Incoming call updates 1 month ago
Sultan khan ddac155a6a silent login case handled. 2 months ago
tahaalam e200479332 old calender util deleted 2 months ago
tahaalam e0e41d1900 calender reminder added on appointment and pescription 2 months ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 2 months ago
haroon amjad 1e5744cf44 Updates & enhancements 2 months ago
faizatflutter acb6d31ff3 Added possible conditions screen 2 months ago
tahaalam fc0f98da1d calender reminder added 2 months ago
Sultan khan 9e0336687c virtual tour. 2 months ago
faizatflutter 757ace2ba1 Added Organ Selector 2 months ago
Sultan khan fb69723a65 e-referral done. 2 months ago
faizatflutter 8068de70cb Completed the HHC and CMC 2 months ago
haroon amjad b90883a596 prescription order implementation contd. 2 months ago
haroon amjad fee84a2928 Nearest appointment implemented 2 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
2 months ago
Sultan khan d8a9d8443a e-referral work done search-referral in progress. 2 months ago
haroon amjad eb9c38729b Prescription delivery implementation contd. 2 months ago
haroon amjad 07a3052b8e appointment prescription implemented 2 months ago
haroon amjad 63d844a5e9 Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/core/dependencies.dart
#	lib/features/radiology/radiology_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
#	lib/presentation/emergency_services/history/widget/ambulance_history_item.dart
#	lib/presentation/emergency_services/history/widget/rrt_item.dart
2 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 2 months ago
faizatflutter 8ddfdeeac4 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/app_assets.dart
#	lib/core/utils/date_util.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
#	lib/widgets/common_bottom_sheet.dart
2 months ago
faizatflutter fe00447483 HHC in Progress 2 months ago
haroon amjad ffca4317aa updates 2 months ago
haroon amjad b13adde9d2 send feedback implementation done 2 months ago
faizatflutter da579dfd09 CMC Module Completed 2 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 2 months ago
haroon amjad 938463aabc Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/core/utils/date_util.dart
2 months ago
haroon amjad 9f845f1de8 Feedback page implementation contd. 2 months ago
tahaalam 31261092a8 rrt request creation and history listing 2 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
2 months ago
Sultan khan c43f96c619 e-referral work in progress 2 months ago
faizatflutter 721bf95c1b Comprehensive checkup in progress 2 months ago
Haroon Amjad 37a0692be4 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 2 months ago
haroon amjad f9f17f3a76 LiveChat implemented 2 months ago
Sultan khan 8e132e964f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/emergency_services/call_ambulance/tracking_screen.dart
#	lib/presentation/profile_settings/profile_settings.dart
#	lib/presentation/radiology/radiology_orders_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
2 months ago
Sultan khan 171bd644d1 e-referral work in progress. 2 months ago