haroon amjad
|
3e6ee8c10c
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/routes/app_routes.dart
|
2 weeks ago |
haroon amjad
|
87422e8e05
|
translation updates
|
2 weeks ago |
Fatimah.Alshammari
|
9795276ef9
|
fixed errors
|
2 weeks ago |
Fatimah.Alshammari
|
97a47ce4e8
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/routes/app_routes.dart
|
2 weeks ago |
Fatimah.Alshammari
|
287e2b9562
|
fixed QR
|
2 weeks ago |
haroon amjad
|
a0008c9104
|
Nearest Appointment sorting fixed
|
2 weeks ago |
Fatimah.Alshammari
|
1d224702ac
|
Merge branch 'refs/heads/master' into fatima
|
2 weeks ago |
Fatimah.Alshammari
|
69666a6f6c
|
fixed button
|
2 weeks ago |
haroon amjad
|
475a9b9acb
|
Merge branch 'master' into haroon_dev
|
2 weeks ago |
Sultan khan
|
0ddaa6899d
|
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:
fixed parking qr
added parking part
added monthly report
added monthly report
added monthly report
fix error
monthly report
fix toggle
fix toggle
active medication
active medication
active medication
|
2 weeks ago |
haroon amjad
|
609ae6ab83
|
updates
|
2 weeks ago |
haroon amjad
|
344adf23c0
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/home/landing_page.dart
|
2 weeks ago |
Fatimah.Alshammari
|
250af1506c
|
Merge branch 'master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
# lib/services/dialog_service.dart
# lib/theme/colors.dart
|
2 weeks ago |
haroon amjad
|
d848291930
|
updates
|
2 weeks ago |
Sultan khan
|
8ee0e3b4ea
|
no message
|
2 weeks ago |
haroon amjad
|
e454c9c991
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
|
2 weeks ago |
faizatflutter
|
ff2bcbae3f
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/api_consts.dart
# lib/core/dependencies.dart
# lib/main.dart
|
2 weeks ago |
haroon amjad
|
91c16f13d1
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/core/app_assets.dart
|
2 weeks ago |
faizatflutter
|
3f5bd0a759
|
Completed the health Tracker Module, Only the email part is left.
|
2 weeks ago |
aamir-csol
|
c7e4018ddc
|
Merge branch 'master' into dev_aamir
# Conflicts:
# lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_bottom_sheet_body.dart
|
2 weeks ago |
aamir-csol
|
b815affe5c
|
blood group
|
2 weeks ago |
haroon amjad
|
02930a901e
|
Indoor navigation implementation & Landing page swiper card updates
|
3 weeks ago |
Fatimah.Alshammari
|
20e4f82df3
|
Merge branch 'master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/main.dart
# lib/presentation/hmg_services/services_page.dart
# lib/presentation/medical_file/medical_file_page.dart
# lib/routes/app_routes.dart
|
3 weeks ago |
Fatimah.Alshammari
|
8ae81d2b24
|
fixed parking qr
|
3 weeks ago |
haroon amjad
|
ede8844f19
|
Monthly Reports implemented
|
3 weeks ago |
haroon amjad
|
6f067d92d6
|
My invoices implemented
|
3 weeks ago |
Fatimah.Alshammari
|
62bb667cb8
|
added parking part
|
4 weeks ago |
faizatflutter
|
d4dd475e0b
|
Added Graph
|
4 weeks ago |
faizatflutter
|
333046951c
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/core/app_assets.dart
# lib/core/dependencies.dart
# lib/main.dart
# lib/routes/app_routes.dart
|
4 weeks ago |
faizatflutter
|
a1aaa041d1
|
Water Intake Final Touches
|
4 weeks ago |
Fatimah.Alshammari
|
f3674ba06f
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/core/dependencies.dart
# lib/presentation/hmg_services/services_page.dart
# lib/routes/app_routes.dart
|
1 month ago |
Fatimah.Alshammari
|
68f044de52
|
added monthly report
|
1 month ago |
faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
1 month ago |
aamir-csol
|
f509a09b34
|
Health calculators & converters
|
1 month ago |
Fatimah.Alshammari
|
c9de23347a
|
fix error
|
1 month ago |
Fatimah.Alshammari
|
190492a191
|
Merge branch 'refs/heads/master' into fatima
# Conflicts:
# lib/routes/app_routes.dart
|
1 month ago |
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 |
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
|
1 month ago |
Fatimah.Alshammari
|
0b3fea230f
|
monthly report
|
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 |
haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
1 month ago |
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
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
|
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 |
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 |
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
2 months ago |
Fatimah.Alshammari
|
86a91ab383
|
Merge branch 'refs/heads/master' into fatima
|
2 months ago |
faizatflutter
|
757ace2ba1
|
Added Organ Selector
|
2 months ago |