Milos Kozak
2af47d4b83
Merge pull request #891 from MilosKozak/carbsgen0418
...
Dana Queue for Carbs Generator
2018-04-18 17:00:13 +02:00
AdrianLxM
38a0dc5c05
Merge branch 'carbs-gen-pr' into carbsgen0418
2018-04-18 16:55:19 +02:00
Milos Kozak
c2fa5c06e7
Merge branch 'dev' into carbs-gen-pr
2018-04-18 16:45:34 +02:00
Milos Kozak
2fb199ae6c
fix insulin dialog TT & TT sync from NS
2018-04-18 16:34:46 +02:00
Milos Kozak
75076b43e8
Merge pull request #890 from jotomo/nstreatment-dialog-hypo-tt-preset
...
NewNSTreatmentDialog: add Hypo TT preset.
2018-04-18 16:34:45 +02:00
AdrianLxM
dd8d907f4f
fix TT units
2018-04-18 16:23:40 +02:00
AdrianLxM
2561c3f8b6
Carbs only treatments in Queue
2018-04-18 16:13:02 +02:00
Johannes Mockenhaupt
49a836eda9
NewNSTreatmentDialog: add Hypo TT preset.
2018-04-18 16:03:23 +02:00
AdrianLxM
2cf438a064
Merge remote-tracking branch 'jotomoremote/carbs-gen-pr' into carbsgen0418
2018-04-18 16:00:00 +02:00
Milos Kozak
3d5203b56f
Merge pull request #887 from MilosKozak/lp-buttons
...
Local Profile Buttons
2018-04-17 22:39:42 +02:00
Johannes Mockenhaupt
5d1c6cd118
Move "show notes ..." pref into Buttons submenu.
2018-04-17 21:03:16 +02:00
AdrianLxM
00a0bf2f1a
local profile icons
2018-04-17 20:41:43 +02:00
AdrianLxM
eb2f628f1f
unify names of same icon with different resolution
2018-04-17 20:41:33 +02:00
Alessya
05a1b35ccb
Rename Icon files
2018-04-17 20:41:21 +02:00
Alessya
8dd589c5fe
New icons added for local profile screen
2018-04-17 20:41:07 +02:00
swissalpine
ca5001e3a4
Update CareportalFragment.java
2018-04-17 14:42:41 +02:00
Milos Kozak
7063f4de8b
Merge pull request #879 from MilosKozak/temptargetfix
...
NewNSTreatment dialog cleanup
2018-04-17 07:45:08 +02:00
Milos Kozak
abadcd4eaa
fix test
2018-04-16 23:29:53 +02:00
swissalpine
7ef5b4fb28
More realistic colored IAGE warnings
...
Normaly Insulin should be stable at least 4-5 days. So I think a warning after two days and a red alarm after three is two early. I changed the default values to 72 hours for the yellow and 86 hours for the red warning.
2018-04-16 20:31:37 +02:00
Johannes Mockenhaupt
c7c90ea919
Proper fix.
2018-04-16 10:11:48 +02:00
Johannes Mockenhaupt
0ef8af262f
NewInsulinDialog: fix botched notes field reference.
2018-04-16 01:40:52 +02:00
Johannes Mockenhaupt
58aa4f1323
Unbreak wizard xml, small fixes.
2018-04-15 19:29:23 +02:00
Johannes Mockenhaupt
447bd9b6a3
Alignments.
...
(cherry picked from commit a63c388)
2018-04-15 00:28:08 +02:00
Johannes Mockenhaupt
9b80221752
Set inputType for notes fields.
...
(cherry picked from commit af0807d)
2018-04-14 10:43:48 +02:00
Johannes Mockenhaupt
5d66ecc767
NewCarbsDialog: use correct 'constraint applied' messages.
...
(cherry picked from commit a9e290e)
2018-04-14 10:43:39 +02:00
Johannes Mockenhaupt
10604299e7
Cleanups.
2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
f420491611
NewCarbsDialog: cleanups.
2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
bf7e9e4bf3
NewInsulinDialog: add notes field, use relative time, align style.
2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
719d3d459b
NumberPicker: apply signed, decimal constraints for keyboard usage.
2018-04-13 21:35:25 +02:00
Johannes Mockenhaupt
efcc02775b
FillDialog: add missed validation, notes field, align style.
2018-04-13 21:35:25 +02:00
AdrianLxM
10b9171afe
Distribute carbs strictly within timeframe
2018-04-13 00:48:57 +02:00
Milos Kozak
d9ac199559
Merge pull request #878 from triplem/fix_objectives
...
Fix Objectives Issue #842
2018-04-12 22:26:51 +02:00
Milos Kozak
54048b29c4
NewNSTreatment dialog cleanup
2018-04-12 21:45:59 +02:00
Johannes Mockenhaupt
bf02edd871
Make visibility of notes field a preference.
2018-04-12 21:43:55 +02:00
Johannes Mockenhaupt
05e07cf943
Align style of labels, i18n.
2018-04-12 21:32:47 +02:00
Johannes Mockenhaupt
4acf0c713a
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr
...
* origin/dev:
Adding notes to carbs and to wizard on overview
2018-04-12 21:23:30 +02:00
Johannes Mockenhaupt
7e19aff121
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr
...
* origin/dev:
Overview: fix rendering zero-temp covering entire displayed range.
cleanup
remove duplicate upload
upload temptargets to NS properly
fix NPE
log profile conditional
adding device name to AndroidAPS started note
show tests in travis
gradle 3.1.1
Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().
added phone Manufacturer and model note to NS
dummy-edit to re-trigger travis
Fix for black number and labels on black background (aaps wear)
Fix re-enabling the loop plugin from overview. Fixes #861 .
int to double in the isOlderThan()
Get thresholds from NS
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
2018-04-12 21:18:04 +02:00
Milos Kozak
7fafd59a5e
Merge pull request #872 from triplem/notes_wizard
...
Notes wizard
2018-04-12 21:17:33 +02:00
Milos Kozak
c573bcc277
Merge pull request #876 from MilosKozak/temptargetfix
...
upload temptargets to NS properly
2018-04-12 21:17:11 +02:00
Milos Kozak
5d81e40f74
Merge pull request #877 from jotomo/zeor-temp-basal
...
Overview: fix rendering zero-temp covering entire displayed range.
2018-04-12 21:16:42 +02:00
Markus M. May
42e36ab818
Fix #842
2018-04-12 21:08:06 +02:00
Johannes Mockenhaupt
b04eee0b52
Overview: fix rendering zero-temp covering entire displayed range.
...
(cherry picked from commit 525eaef)
2018-04-12 21:00:08 +02:00
Johannes Mockenhaupt
a075d87da1
Remove help dialog.
...
(cherry picked from commit b1ef8e1)
2018-04-12 20:59:24 +02:00
Milos Kozak
0a377eb98e
cleanup
2018-04-12 10:32:52 +02:00
Milos Kozak
5eee8054c4
remove duplicate upload
2018-04-12 10:21:38 +02:00
Milos Kozak
dfc869ba2b
upload temptargets to NS properly
2018-04-12 10:17:59 +02:00
Milos Kozak
80e81b1c25
fix NPE
2018-04-12 09:53:14 +02:00
Milos Kozak
613b8a2f30
log profile conditional
2018-04-12 09:40:12 +02:00
Johannes Mockenhaupt
5ef2502b4f
Saner types.
2018-04-12 00:50:28 +02:00
Johannes Mockenhaupt
b1f66d086a
Fix overshoot on last carb record.
2018-04-12 00:42:12 +02:00
