Haroon6138
|
58b1e3a386
|
Merge pull request 'dev_aamir' (#133) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/133
|
1 month ago |
aamir-csol
|
6c1707128b
|
Merge branch 'master' into dev_aamir
|
1 month ago |
aamir-csol
|
3601e39a29
|
Health calculators & converters
|
1 month ago |
Haroon6138
|
e0606ceb65
|
Merge pull request 'dev_sultan' (#132) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/132
|
1 month ago |
Sultan khan
|
6ceee6973f
|
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:
sickleave fix
Health calculators & converters
updates
updates
updates
updates
Nearest Appointment selected
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
1 month ago |
Sultan khan
|
68a34369ee
|
no message
|
1 month ago |
Sultan khan
|
873b2a1591
|
sorting done, covid inprogress
|
1 month ago |
Haroon6138
|
37574412a5
|
Merge pull request 'haroon_dev' (#130) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/130
|
1 month ago |
haroon amjad
|
b353de3cf8
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/book_appointment/select_doctor_page.dart
# lib/presentation/book_appointment/widgets/doctor_card.dart
|
1 month ago |
haroon amjad
|
dcdd17f0e9
|
sickleave fix
|
1 month ago |
Haroon6138
|
8b90a84adf
|
Merge pull request 'dev_aamir' (#129) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/129
|
1 month ago |
aamir-csol
|
54f8391066
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/lab/lab_orders_page.dart
|
1 month ago |
aamir-csol
|
135b05e561
|
Health calculators & converters
|
1 month ago |
haroon amjad
|
510d82b592
|
Merge branch 'master' into haroon_dev
|
1 month ago |
Haroon6138
|
e1a021129b
|
Merge pull request 'dev_sultan' (#128) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/128
|
1 month ago |
Sultan khan
|
366429f083
|
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:
Health calculators & converters
Health calculators & converters
collapsing_list_view improvement
# Conflicts:
# lib/widgets/appbar/collapsing_list_view.dart
|
1 month ago |
haroon amjad
|
3cc2610d30
|
updates
|
1 month ago |
haroon amjad
|
f886357bcd
|
updates
|
2 months ago |
Sultan khan
|
40638cfec4
|
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:
collapsing_list_view improvement
Updated design for HHC
updates & fixes
QLine API implementation enhancements
LiveCare flow from clinic selection implemented
# Conflicts:
# lib/presentation/home/landing_page.dart
|
2 months ago |
haroon amjad
|
5581346a2d
|
updates
|
2 months ago |
haroon amjad
|
b8ecb70aa2
|
Merge branch 'master' into haroon_dev
|
2 months ago |
Haroon6138
|
cf51b95f84
|
Merge pull request 'dev_aamir' (#126) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/126
|
2 months ago |
aamir-csol
|
ada169f83f
|
Health calculators & converters
|
2 months ago |
aamir-csol
|
c921228ad9
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/book_appointment/select_clinic_page.dart
# lib/presentation/health_calculators/health_calculator_result.dart
|
2 months ago |
aamir-csol
|
f509a09b34
|
Health calculators & converters
|
2 months ago |
Haroon6138
|
89d684d600
|
Merge pull request 'dev_sikander' (#125) from dev_sikander into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/125
|
2 months ago |
Sikander Saleem
|
60f6fcfecb
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
Sikander Saleem
|
edcab9d26d
|
collapsing_list_view improvement
|
2 months ago |
Haroon6138
|
4690537462
|
Merge pull request 'dev_sikander' (#124) from dev_sikander into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/124
|
2 months ago |
Sikander Saleem
|
5191ffeb2c
|
Merge branch 'refs/heads/master' into dev_sikander
|
2 months ago |
Sikander Saleem
|
a78769df67
|
collapsing_list_view improvement
|
2 months ago |
haroon amjad
|
15f5eaf8e5
|
updates
|
2 months ago |
haroon amjad
|
87fd9a42b7
|
Nearest Appointment selected
|
2 months ago |
Haroon6138
|
3044b901c2
|
Merge pull request 'Updated design for HHC and few symptoms checker changes (faiz_dev)' (#123) from faiz_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/123
|
2 months ago |
faizatflutter
|
94668997aa
|
Updated design for HHC
|
2 months ago |
Haroon6138
|
7d0a42fd32
|
Merge pull request 'haroon_dev' (#122) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/122
|
2 months ago |
haroon amjad
|
450f07d39d
|
updates & fixes
|
2 months ago |
haroon amjad
|
d8c7503c56
|
QLine API implementation enhancements
|
2 months ago |
haroon amjad
|
a80410d64b
|
LiveCare flow from clinic selection implemented
|
2 months ago |
Sultan khan
|
d28c94606b
|
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:
updates
updates
updates & fixes
|
2 months ago |
Haroon6138
|
345e2a1fca
|
Merge pull request 'haroon_dev' (#120) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/120
|
2 months ago |
Sultan khan
|
68e1b116f9
|
last rated updated.
|
2 months ago |
haroon amjad
|
fe294ae8f6
|
updates
|
2 months ago |
haroon amjad
|
bee4aafc44
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
3060c57201
|
updates
|
2 months ago |
Haroon6138
|
ceeeea59e3
|
Merge pull request 'dev_sultan' (#119) from dev_sultan into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/119
|
2 months ago |
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 |
haroon amjad
|
f1004f39af
|
Merge branch 'master' into haroon_dev
|
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 |