Fatimah.Alshammari
|
3d8daeb58d
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/core/utils/calendar_utils.dart
# lib/features/hmg_services/models/ui_models/hmg_services_component_model.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/hmg_services/services_view.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/theme/colors.dart
# pubspec.yaml
|
1 month ago |
aamir-csol
|
7d71d994ea
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/core/app_assets.dart
# lib/core/enums.dart
# lib/core/utils/calender_utils_new.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/hmg_services/services_view.dart
# lib/routes/app_routes.dart
|
1 month ago |
aamir-csol
|
335e6a6649
|
Health Calculators
|
1 month ago |
faizatflutter
|
6f72c99975
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
|
1 month ago |
faizatflutter
|
cf26e71645
|
Complete USerInfo Selectoiun
|
1 month ago |
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
1 month ago |
tahaalam
|
2125e30c23
|
Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
1 month ago |
tahaalam
|
95243c250f
|
graph shaded region added from horizontal spaces
|
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
|
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 |
faizatflutter
|
2173d091ed
|
Added symptoms selector
|
1 month ago |
aamir-csol
|
19365375f6
|
medical file changes
|
1 month ago |
tahaalam
|
ac15ab26f5
|
graph changes for high and low
|
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
|
36bf63dcde
|
Incoming call updates
|
1 month ago |
faizatflutter
|
ac84d268e9
|
triage design
|
1 month ago |
tahaalam
|
e200479332
|
old calender util deleted
|
2 months ago |
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
1e5744cf44
|
Updates & enhancements
|
2 months ago |
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
2 months ago |
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
2 months ago |
Sultan khan
|
a4d3bb3533
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
|
2 months ago |
Sultan khan
|
fb69723a65
|
e-referral done.
|
2 months ago |
haroon amjad
|
9fd7f71a34
|
prescription delivery implementation contd
|
2 months ago |
faizatflutter
|
8068de70cb
|
Completed the HHC and CMC
|
2 months ago |
haroon amjad
|
b90883a596
|
prescription order implementation contd.
|
2 months ago |
tahaalam
|
cbaea9d5e6
|
screen documentation added.
|
2 months ago |
tahaalam
|
5983caf83a
|
single map screen added to the project for multiple place usage
|
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 |
Fatimah.Alshammari
|
89ff10f506
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/theme/colors.dart
|
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 |
faizatflutter
|
91e3e9387e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/features/emergency_services/emergency_services_view_model.dart
|
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 |
faizatflutter
|
95bd2a2a7e
|
CMC Tweaks Completed
|
2 months ago |
tahaalam
|
f3676f5596
|
ui issues resolve for ambulance and rrt request
|
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 |
faizatflutter
|
721bf95c1b
|
Comprehensive checkup in progress
|
2 months ago |