Merge pull request #51 from AdrianLxM/patch-8

Add base basal rate to Overview when temp is running
This commit is contained in:
Milos Kozak 2016-11-07 10:19:44 +01:00 committed by GitHub
commit 48388496f5

View file

@ -462,7 +462,7 @@ public class OverviewFragment extends Fragment {
TempBasal activeTemp = pump.getTempBasal(); TempBasal activeTemp = pump.getTempBasal();
cancelTempLayout.setVisibility(View.VISIBLE); cancelTempLayout.setVisibility(View.VISIBLE);
cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + ": " + activeTemp.toString()); cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + ": " + activeTemp.toString());
runningTempView.setText(activeTemp.toString()); runningTempView.setText(activeTemp.toString() + "\n(" + DecimalFormatter.to2Decimal(pump.getBaseBasalRate()) + " U/h" + ")");
} else { } else {
cancelTempLayout.setVisibility(View.GONE); cancelTempLayout.setVisibility(View.GONE);
Double currentBasal = pump.getBaseBasalRate(); Double currentBasal = pump.getBaseBasalRate();