Sultan khan
|
449c693fdb
|
Merge branch 'refs/heads/faiz_dev' into dev_sultan
# Conflicts:
# lib/presentation/book_appointment/laser/laser_appointment.dart
|
4 weeks ago |
faizatflutter
|
f8fdd7570e
|
Merge branch 'master' into faiz_dev
# Conflicts:
# lib/routes/app_routes.dart
# lib/theme/colors.dart
|
4 weeks ago |
haroon amjad
|
162337b317
|
Added appointment nearest gate & floor
|
4 weeks ago |
faizatflutter
|
d4dd475e0b
|
Added Graph
|
4 weeks ago |
Sultan khan
|
0e26505692
|
covid page inprogress
|
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
|
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
|
873b2a1591
|
sorting done, covid inprogress
|
1 month ago |
faizatflutter
|
a1aaa041d1
|
Water Intake Final Touches
|
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 |
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 |
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
|
1 month ago |
faizatflutter
|
fd2abbbc7b
|
Water Intake Design completed
|
1 month 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
|
1 month ago |
aamir-csol
|
f509a09b34
|
Health calculators & converters
|
1 month ago |
haroon amjad
|
450f07d39d
|
updates & fixes
|
1 month 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 |
Sultan khan
|
68e1b116f9
|
last rated updated.
|
2 months ago |
haroon amjad
|
bee4aafc44
|
Merge branch 'master' into haroon_dev
|
2 months ago |
haroon amjad
|
3060c57201
|
updates
|
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 |
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 |
haroon amjad
|
d202aa8423
|
Smartwatch integration started
|
2 months ago |
haroon amjad
|
ff98262cf7
|
Merge branch 'master' into haroon_dev
# Conflicts:
# lib/presentation/home/landing_page.dart
|
2 months ago |
Sultan khan
|
f28762a5c5
|
last appointment rated done.
|
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 |
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 |
haroon amjad
|
a83a35a284
|
Services Page Revamp
|
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 |
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 |
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 |
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 |
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 |
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 |
haroon amjad
|
2b7379c1c3
|
Waiting appointment implementation in progress
|
2 months ago |
haroon amjad
|
36bf63dcde
|
Incoming call updates
|
2 months ago |
Sultan khan
|
ddac155a6a
|
silent login case handled.
|
2 months ago |
tahaalam
|
e200479332
|
old calender util deleted
|
2 months ago |
tahaalam
|
e0e41d1900
|
calender reminder added on appointment and pescription
|
2 months ago |
haroon amjad
|
5a1c58e6b2
|
Merge branch 'master' into haroon_dev
|
2 months ago |