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
|
10 months ago |
|
Fatimah.Alshammari
|
0b3fea230f
|
monthly report
|
10 months 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
|
10 months ago |
|
aamir-csol
|
335e6a6649
|
Health Calculators
|
10 months ago |
 haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
10 months ago |
|
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
10 months ago |
faizatflutter
|
449c338c46
|
refactor
|
10 months ago |
|
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 |
|
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
10 months ago |
|
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
10 months ago |
|
haroon amjad
|
c97a492244
|
Medical File page updates
|
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 |
 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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
tahaalam
|
fc0f98da1d
|
calender reminder added
|
10 months ago |
|
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
10 months ago |
|
Sultan khan
|
9e0336687c
|
virtual tour.
|
10 months ago |