Commit Graph

337 Commits (fbe124f6ee76c8df0b6667cc4c11b166315468c0)

Author SHA1 Message Date
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
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
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 ca47315b2c Merge branch 'master' into haroon_dev 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
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
haroon amjad 3185d1e9e7 Allergies list implemented 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
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
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 e0e41d1900 calender reminder added on appointment and pescription 10 months ago
haroon amjad 5a1c58e6b2 Merge branch 'master' into haroon_dev 10 months ago
haroon amjad 1e5744cf44 Updates & enhancements 10 months ago
faizatflutter acb6d31ff3 Added possible conditions screen 10 months ago
Sultan khan 9e0336687c virtual tour. 10 months ago
faizatflutter 757ace2ba1 Added Organ Selector 10 months ago
Sultan khan a4d3bb3533 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 10 months ago
Sultan khan fb69723a65 e-referral done. 10 months ago
haroon amjad 32adf754ce prescription delivery implemented 10 months ago
haroon amjad 9fd7f71a34 prescription delivery implementation contd 10 months ago
Haroon Amjad bad76059c0 prescription delivery implementation contd. 11 months ago
haroon amjad b90883a596 prescription order implementation contd. 11 months ago
haroon amjad 1be430aa76 Merge branch 'master' into haroon_dev 11 months ago
haroon amjad fee84a2928 Nearest appointment implemented 11 months ago
tahaalam 5983caf83a single map screen added to the project for multiple place usage 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
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
11 months ago
faizatflutter 91e3e9387e Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/features/emergency_services/emergency_services_view_model.dart
11 months ago
haroon amjad c03c84287c Appointment details Lab & radiology integration implemented 11 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
11 months ago
faizatflutter fe00447483 HHC in Progress 11 months ago
tahaalam 224463feb4 closing the login first dialog 11 months ago
tahaalam 8f46dddbd6 terms and condition added to the rrt module. 11 months ago
haroon amjad ffca4317aa updates 11 months ago
faizatflutter 95bd2a2a7e CMC Tweaks Completed 11 months ago
tahaalam f3676f5596 ui issues resolve for ambulance and rrt request 11 months ago
haroon amjad b13adde9d2 send feedback implementation done 11 months ago
faizatflutter da579dfd09 CMC Module Completed 11 months ago
faizatflutter 3331edc10d Comprehensive checkup Completed 11 months ago