caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' into newautosens

Browse source
This commit is contained in:
Milos Kozak 2017-06-19 15:03:35 +02:00
commit 150ef1a8bc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/data/Profile.java
View file

@ -247,7 +247,7 @@ public class Profile {
} }
public String getIcList() { public String getIcList() {
return getValuesList(ic, null, new DecimalFormat("0.0"), getUnits() + "/U"); return getValuesList(ic, null, new DecimalFormat("0.0"), " g/U");
} }
public Double getBasal() { public Double getBasal() {

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/activities/DanaRHistoryActivity.java
View file

@ -162,7 +162,7 @@ public class DanaRHistoryActivity extends Activity {
} }
}); });
clearCardView(); clearCardView();
((DanaRInterface)pump).loadHistory(RecordTypes.RECORD_TYPE_DAILY); ((DanaRInterface)pump).loadHistory(selected.type);
loadDataFromDB(selected.type); loadDataFromDB(selected.type);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override