Sultan khan
|
70d5b06987
|
Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New: (45 commits)
Health Calculators
Smartwatch integration started
refactor
Complete UserInfo Selection Module
Complete UserInfo Selection Module
update
Complete USerInfo Selectoiun
Ancillary order fixes, QLine API integrated & other enhancements
Added user_info module IAP
Medical File page updates
Master merged
Services Page Revamp
loading view added
graph shaded region added from horizontal spaces
Refactoring
Appointment Queue implemented, Blood Donation implementation contd.
Integrated the API for Symptoms Checker
Queueing system screen implementation contd.
medical file changes
Added symptoms selector
...
# Conflicts:
# lib/features/authentication/authentication_repo.dart
# lib/features/my_appointments/my_appointments_repo.dart
# lib/features/my_appointments/my_appointments_view_model.dart
# lib/presentation/home/landing_page.dart
|
2 months ago |
Haroon6138
|
4d745a3d15
|
Merge pull request 'dev_aamir' (#118) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/118
|
2 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
|
2 months ago |
aamir-csol
|
335e6a6649
|
Health Calculators
|
2 months ago |
Haroon6138
|
c156d7f0aa
|
Merge pull request 'haroon_dev' (#116) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/116
|
2 months ago |
haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
2 months ago |
Sultan khan
|
1d49308cc7
|
last appointment rated.
|
2 months ago |
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
2 months ago |
Haroon6138
|
79beaf6fb7
|
Merge pull request 'Completed User Info Selection and Symptoms Checker till getSymptomsByOrgans (faiz_dev)' (#114) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/114
|
2 months ago |
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
2 months ago |
faizatflutter
|
449c338c46
|
refactor
|
2 months ago |
faizatflutter
|
5fd1905d8c
|
Complete UserInfo Selection Module
|
2 months ago |
faizatflutter
|
6f72c99975
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
# lib/theme/colors.dart
|
2 months ago |
faizatflutter
|
fbe124f6ee
|
Complete UserInfo Selection Module
|
2 months ago |
haroon amjad
|
2f26e12fd3
|
update
|
2 months ago |
faizatflutter
|
cf26e71645
|
Complete USerInfo Selectoiun
|
2 months ago |
haroon amjad
|
796aeb03d3
|
Ancillary order fixes, QLine API integrated & other enhancements
|
2 months ago |
faizatflutter
|
c7c0a0ac09
|
Added user_info module IAP
|
2 months ago |
haroon amjad
|
c97a492244
|
Medical File page updates
|
2 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
|
2 months ago |
haroon amjad
|
818534e9f6
|
Master merged
|
2 months ago |
haroon amjad
|
7cdb30a364
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
a83a35a284
|
Services Page Revamp
|
2 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
|
2 months ago |
tahaalam
|
2d2380851e
|
loading view added
|
2 months ago |
tahaalam
|
2125e30c23
|
Merge remote-tracking branch 'origin/master' into lab-result-changes
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
2 months ago |
tahaalam
|
95243c250f
|
graph shaded region added from horizontal spaces
|
2 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
|
2 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
|
2 months ago |
faizatflutter
|
9410ad9b60
|
Refactoring
|
2 months ago |
haroon amjad
|
e72e67d9bf
|
Appointment Queue implemented, Blood Donation implementation contd.
|
2 months ago |
faizatflutter
|
2ffd4cc1ae
|
Integrated the API for Symptoms Checker
|
2 months ago |
haroon amjad
|
634a138c7f
|
Queueing system screen implementation contd.
|
2 months ago |
haroon amjad
|
ca47315b2c
|
Merge branch 'master' into haroon_dev
|
2 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
|
2 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
|
2 months ago |
aamir-csol
|
d256eec392
|
medical file changes
|
2 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
|
2 months ago |
faizatflutter
|
2173d091ed
|
Added symptoms selector
|
2 months ago |
aamir-csol
|
19365375f6
|
medical file changes
|
2 months ago |
tahaalam
|
ac15ab26f5
|
graph changes for high and low
|
2 months ago |
haroon amjad
|
3185d1e9e7
|
Allergies list implemented
|
2 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
|
2 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
|
2 months ago |
haroon amjad
|
5c0d3144d6
|
iOS App Icons Added
|
2 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
|
2 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
|
2 months ago |
Haroon6138
|
980b72f23f
|
Merge branch 'master' into dev_sultan
|
2 months ago |
haroon amjad
|
581a4a5a74
|
WalkIn Appointment implementation done
|
2 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
|
2 months ago |