caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix add bolus record from pump history when bolus was cancelled.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2017-12-05 23:35:25 +01:00
parent 0f034dd662
commit 5caec45760
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -480,14 +480,16 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
.carbsDelivered(detailedBolusInfo.carbs); .carbsDelivered(detailedBolusInfo.carbs);
} }
// in case of error check what was actually delivered // the remainder of this method checks what was actually delivered based on pump history
// in case of error or cancellation
CommandResult historyResult = runCommand(null, 1, CommandResult historyResult = runCommand(null, 1,
() -> ruffyScripter.readHistory(new PumpHistoryRequest().bolusHistory(PumpHistoryRequest.LAST))); () -> ruffyScripter.readHistory(new PumpHistoryRequest().bolusHistory(PumpHistoryRequest.LAST)));
if (!historyResult.success) { if (!historyResult.success || historyResult.history == null || historyResult.history.bolusHistory.isEmpty()) {
return new PumpEnactResult().success(false).enacted(false) return new PumpEnactResult().success(false).enacted(false)
.comment(MainApp.sResources.getString(R.string.combo_bolus_bolus_delivery_failed)); .comment(MainApp.sResources.getString(R.string.combo_bolus_bolus_delivery_failed));
} }
Bolus lastPumpBolus = historyResult.lastBolus; Bolus lastPumpBolus = historyResult.history.bolusHistory.get(0);
if (cancelBolus) { if (cancelBolus) {
// if cancellation was requested, the delivered bolus is allowed to differ from requested // if cancellation was requested, the delivered bolus is allowed to differ from requested
} else if (lastPumpBolus == null || Math.abs(lastPumpBolus.amount - detailedBolusInfo.insulin) > 0.01 } else if (lastPumpBolus == null || Math.abs(lastPumpBolus.amount - detailedBolusInfo.insulin) > 0.01
@ -496,11 +498,8 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
comment(MainApp.sResources.getString(R.string.combo_bolus_bolus_delivery_failed)); comment(MainApp.sResources.getString(R.string.combo_bolus_bolus_delivery_failed));
} }
// add treatment record to DB (if it wasn't cancelled)
if (lastPumpBolus != null && (lastPumpBolus.amount > 0)) { if (lastPumpBolus != null && (lastPumpBolus.amount > 0)) {
detailedBolusInfo.date = lastPumpBolus.timestamp;
detailedBolusInfo.insulin = lastPumpBolus.amount; detailedBolusInfo.insulin = lastPumpBolus.amount;
detailedBolusInfo.date = lastPumpBolus.timestamp;
detailedBolusInfo.source = Source.USER; detailedBolusInfo.source = Source.USER;
MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo); MainApp.getConfigBuilder().addToHistoryTreatment(detailedBolusInfo);
return new PumpEnactResult().success(true).enacted(true) return new PumpEnactResult().success(true).enacted(true)