caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

ns upload entered by fix

Browse source
This commit is contained in:
Milos Kozak 2016-07-03 17:42:17 +02:00
parent 3db7d55e54
commit 08d677b806
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml
View file

@ -37,7 +37,7 @@
<ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" /> <ConfirmationsSetting value="0" id="Remove" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

2
app/src/main/java/info/nightscout/androidaps/plugins/Careportal/Dialogs/NewNSTreatmentDialog.java
View file

@ -524,7 +524,7 @@ public class NewNSTreatmentDialog extends DialogFragment implements View.OnClick
prebolus.put("carbs", data.get("carbs")); prebolus.put("carbs", data.get("carbs"));
data.remove("carbs"); data.remove("carbs");
prebolus.put("eventType", data.get("eventType")); prebolus.put("eventType", data.get("eventType"));
prebolus.put("enteredBy", data.get("enteredBy")); if (data.has("enteredBy")) prebolus.put("enteredBy", data.get("enteredBy"));
if (data.has("notes")) prebolus.put("notes", data.get("notes")); if (data.has("notes")) prebolus.put("notes", data.get("notes"));
long mills = DateUtil.fromISODateString(data.getString("created_at")).getTime(); long mills = DateUtil.fromISODateString(data.getString("created_at")).getTime();
Date preBolusDate = new Date(mills + data.getInt("preBolus") * 60000L); Date preBolusDate = new Date(mills + data.getInt("preBolus") * 60000L);