caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

refactor MealData

Browse source
This commit is contained in:
Milos Kozak 2017-01-04 23:03:13 +01:00
parent ebb3e90587
commit 26102848f5
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/info/nightscout/androidaps/data/MealData.java
View file

@ -1,5 +1,11 @@
package info.nightscout.androidaps.data; package info.nightscout.androidaps.data;
import java.util.Date;
import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.db.Treatment;
import info.nightscout.client.data.NSProfile;
/** /**
* Created by mike on 04.01.2017. * Created by mike on 04.01.2017.
*/ */
@ -7,4 +13,21 @@ public class MealData {
public double boluses = 0d; public double boluses = 0d;
public double carbs = 0d; public double carbs = 0d;
public double mealCOB = 0.0d; // TODO: add calculation for AMA public double mealCOB = 0.0d; // TODO: add calculation for AMA
public void addTreatment(Treatment treatment) {
NSProfile profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
if (profile == null) return;
long now = new Date().getTime();
long dia_ago = now - (new Double(profile.getDia() * 60 * 60 * 1000l)).longValue();
long t = treatment.created_at.getTime();
if (t > dia_ago && t <= now) {
if (treatment.carbs >= 1) {
carbs += treatment.carbs;
}
if (treatment.insulin > 0 && treatment.mealBolus) {
boluses += treatment.insulin;
}
}
}
} }

15
app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java
View file

@ -142,22 +142,9 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface {
@Override @Override
public MealData getMealData() { public MealData getMealData() {
MealData result = new MealData(); MealData result = new MealData();
NSProfile profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
if (profile == null)
return result;
for (Treatment treatment : treatments) { for (Treatment treatment : treatments) {
long now = new Date().getTime(); result.addTreatment(treatment);
long dia_ago = now - (new Double(profile.getDia() * 60 * 60 * 1000l)).longValue();
long t = treatment.created_at.getTime();
if (t > dia_ago && t <= now) {
if (treatment.carbs >= 1) {
result.carbs += treatment.carbs;
}
if (treatment.insulin >= 0.1 && treatment.mealBolus) {
result.boluses += treatment.insulin;
}
}
} }
return result; return result;
} }