caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Fix cancel TBR type in Pod history

Browse source
This commit is contained in:
Bart Sopers 2020-01-06 22:35:24 +01:00
parent a2255a83cc
commit ceca00ca50
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java
View file

@ -397,10 +397,10 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
try { try {
delegate.cancelTemporaryBasal(isTempBasalBeepsEnabled()); delegate.cancelTemporaryBasal(isTempBasalBeepsEnabled());
addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasal, null); addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasalForce, null);
} catch (Exception ex) { } catch (Exception ex) {
String comment = handleAndTranslateException(ex); String comment = handleAndTranslateException(ex);
addFailureToHistory(time, PodHistoryEntryType.CancelTemporaryBasal, comment); addFailureToHistory(time, PodHistoryEntryType.CancelTemporaryBasalForce, comment);
return new PumpEnactResult().success(false).enacted(false).comment(comment); return new PumpEnactResult().success(false).enacted(false).comment(comment);
} }
@ -521,7 +521,7 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasalForce, null); addSuccessToHistory(time, PodHistoryEntryType.CancelTemporaryBasal, null);
TemporaryBasal temporaryBasal = new TemporaryBasal() // TemporaryBasal temporaryBasal = new TemporaryBasal() //
.date(time) // .date(time) //

4
app/src/main/res/values/strings.xml
View file

@ -1703,8 +1703,8 @@
<string name="omnipod_cmd_set_bolus">Set Bolus</string> <string name="omnipod_cmd_set_bolus">Set Bolus</string>
<string name="omnipod_cmd_cancel_bolus">Cancel Bolus</string> <string name="omnipod_cmd_cancel_bolus">Cancel Bolus</string>
<string name="omnipod_cmd_set_tbr">Set Temporary Basal</string> <string name="omnipod_cmd_set_tbr">Set Temporary Basal</string>
<string name="omnipod_cmd_cancel_tbr">Cancel Temporary Basal</string> <string name="omnipod_cmd_cancel_tbr">Cancel Temporary Basal (Internally by driver)</string>
<string name="omnipod_cmd_cancel_tbr_forced">Cancel Temporary Basal (Forced)</string> <string name="omnipod_cmd_cancel_tbr_forced">Cancel Temporary Basal (Forced by user)</string>
<string name="omnipod_cmd_set_basal_schedule">Set Basal Schedule</string> <string name="omnipod_cmd_set_basal_schedule">Set Basal Schedule</string>
<string name="omnipod_cmd_get_pod_status">Get Pod Status</string> <string name="omnipod_cmd_get_pod_status">Get Pod Status</string>
<string name="omnipod_cmd_get_pod_info">Get Pod Info</string> <string name="omnipod_cmd_get_pod_info">Get Pod Info</string>