 polscm32
|
40b9d6736a
Merge branch 'UI' into UI-superBolus
|
%!s(int64=2) %!d(string=hai) anos |
 Jon B Mårtensson
|
2dbf718e85
Allow future and past dates for meals (#361)
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
a9142c5d4a
pull in latest dev and solve merge conflicts
|
%!s(int64=2) %!d(string=hai) anos |
 Deniz Cengiz
|
2e16d7d724
Add Timezone Offset Indicator (#323)
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
3078840a04
.
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
e8f3ce196c
solve merge conflicts
|
%!s(int64=2) %!d(string=hai) anos |
 Jon Mårtensson
|
2158d52e9b
Setting for displaying/not displaying predictions
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
a44d2814b9
Merge remote-tracking branch 'upstream/dev' into superBolus_test
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon B Mårtensson
|
f781fec66e
Bolus from watch (#326)
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon B Mårtensson
|
d6f817543e
Update Bolus View and Meal View
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
6b2c920da6
Merge remote-tracking branch 'upstream/alpha' into superBolus_experimentell
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
a96d220026
Add Eventual Glucose
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
ec02ba749d
Add Predictions to both bolus views.
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon B Mårtensson
|
36e6791b91
New meal view (#308)
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
5018e215da
fix calc for super bolus and add info in popup when super bolus is ticked/chosen
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
10d85396dc
add calculation for superbolus in BolusStateModel and toggle in AlternativeBolusCalcRootView
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
bddaa53bcd
retrieve current basal from settings (not suggestion, because this value is 0 most of the time and therefore not useful for a superbolus)
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
9904fbb6cd
Don't use glucoseStorage
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon B.M
|
3dfa8e2812
Merge branch 'alpha' into dev
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
58064baafa
Round to nearest increment
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
8a1fae698a
A hack to make it appear as not saved until you enact or tap "Save"
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
3507cfa2f2
A hack t0 make it appear as not saved until you enact or tap "Save"
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon B Mårtensson
|
044f5d5a1b
Alternate Bolus Calculator and Edit of Meals
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
0636150833
Fix update of calc
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
f039dc329b
Fix deletion of fpus in NS. Still exessive, though.
|
%!s(int64=2) %!d(string=hai) anos |
|
Deniz Cengiz
|
1e600499ec
Change labels (#289)
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
72c999f67e
Only use the CoreData data when needed
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
eb7c23b38f
Refactor.
|
%!s(int64=2) %!d(string=hai) anos |
|
Jon Mårtensson
|
4185165ad6
Edit Meal entries from Boluse View (go back and forth).
|
%!s(int64=2) %!d(string=hai) anos |
|
polscm32
|
b8ea284d7c
Small fixes for new bolus calc (#290)
|
%!s(int64=2) %!d(string=hai) anos |
