caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Update treatment history when setting/cancelling a TBR.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-07-14 18:20:36 +02:00
parent a27bb28e87
commit e29ef5ffce
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -30,7 +30,10 @@ import info.nightscout.androidaps.R;
import info.nightscout.androidaps.data.DetailedBolusInfo; import info.nightscout.androidaps.data.DetailedBolusInfo;
import info.nightscout.androidaps.data.Profile; import info.nightscout.androidaps.data.Profile;
import info.nightscout.androidaps.data.PumpEnactResult; import info.nightscout.androidaps.data.PumpEnactResult;
import info.nightscout.androidaps.db.Source;
import info.nightscout.androidaps.db.TemporaryBasal;
import info.nightscout.androidaps.events.EventAppExit; import info.nightscout.androidaps.events.EventAppExit;
import info.nightscout.androidaps.events.EventPumpStatusChanged;
import info.nightscout.androidaps.interfaces.PluginBase; import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.interfaces.PumpDescription; import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.interfaces.PumpInterface;
@ -287,7 +290,10 @@ public class ComboPlugin implements PluginBase, PumpInterface {
try { try {
return ruffyScripter.runCommand(command); return ruffyScripter.runCommand(command);
} finally { } finally {
// MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTING));
ruffyScripter.disconnect(); ruffyScripter.disconnect();
// MainApp.bus().post(new EventPumpStatusChanged(EventPumpStatusChanged.DISCONNECTED));
// MainApp.bus().post(new EventComboPumpUpdateGUI());
} }
} }
@ -306,48 +312,53 @@ public class ComboPlugin implements PluginBase, PumpInterface {
@Override @Override
public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) { public PumpEnactResult setTempBasalPercent(Integer percent, Integer durationInMinutes) {
// TODO make each cmd return all the data the main screen displays and cache here ? MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.settingtempbasal)));
try { CommandResult commandResult = runCommand(new SetTbrCommand(percent, durationInMinutes));
Command command = new SetTbrCommand(percent, durationInMinutes); if (commandResult.enacted) {
CommandResult commandResult = ruffyScripter.runCommand(command); TemporaryBasal tempStart = new TemporaryBasal(System.currentTimeMillis());
tempStart.durationInMinutes = durationInMinutes;
PumpEnactResult pumpEnactResult = new PumpEnactResult(); tempStart.percentRate = percent;
pumpEnactResult.success = commandResult.success; tempStart.isAbsolute = false;
pumpEnactResult.enacted = commandResult.enacted; tempStart.source = Source.USER;
pumpEnactResult.comment = commandResult.message; ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder();
pumpEnactResult.isPercent = true; treatmentsInterface.addToHistoryTempBasal(tempStart);
// Combo would have bailed if this wasn't set properly. Maybe we should
// have the command return this anyways ...
pumpEnactResult.percent = percent;
pumpEnactResult.duration = durationInMinutes;
return pumpEnactResult;
} finally {
ruffyScripter.disconnect();
} }
PumpEnactResult pumpEnactResult = new PumpEnactResult();
pumpEnactResult.success = commandResult.success;
pumpEnactResult.enacted = commandResult.enacted;
pumpEnactResult.comment = commandResult.message;
pumpEnactResult.isPercent = true;
// Combo would have bailed if this wasn't set properly. Maybe we should
// have the command return this anyways ...
pumpEnactResult.percent = percent;
pumpEnactResult.duration = durationInMinutes;
return pumpEnactResult;
} }
// TODO
@Override @Override
public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) { public PumpEnactResult setExtendedBolus(Double insulin, Integer durationInMinutes) {
return OPERATION_NOT_SUPPORTED; return OPERATION_NOT_SUPPORTED;
} }
// TODO
@Override @Override
public PumpEnactResult cancelTempBasal() { public PumpEnactResult cancelTempBasal() {
try { MainApp.bus().post(new EventPumpStatusChanged(MainApp.sResources.getString(R.string.stoppingtempbasal)));
Command command = new CancelTbrCommand(); CommandResult commandResult = runCommand(new CancelTbrCommand());
CommandResult commandResult = ruffyScripter.runCommand(command); if(commandResult.enacted) {
TemporaryBasal tempStop = new TemporaryBasal(new Date().getTime());
PumpEnactResult pumpEnactResult = new PumpEnactResult(); tempStop.durationInMinutes = 0; // == ending temp basal
pumpEnactResult.success = commandResult.success; tempStop.source = Source.USER;
pumpEnactResult.enacted = commandResult.enacted; ConfigBuilderPlugin treatmentsInterface = MainApp.getConfigBuilder();
pumpEnactResult.comment = commandResult.message; treatmentsInterface.addToHistoryTempBasal(tempStop);
pumpEnactResult.isTempCancel = true;
return pumpEnactResult;
} finally {
ruffyScripter.disconnect();
} }
PumpEnactResult pumpEnactResult = new PumpEnactResult();
pumpEnactResult.success = commandResult.success;
pumpEnactResult.enacted = commandResult.enacted;
pumpEnactResult.comment = commandResult.message;
pumpEnactResult.isTempCancel = true;
return pumpEnactResult;
} }
// TODO // TODO