From 3bceeb368a254daf2a9737b0429fb4577d8ad00a Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 12 Jul 2016 00:30:43 +0200 Subject: [PATCH] fix requesting cancel temp --- .../plugins/ConfigBuilder/ConfigBuilderFragment.java | 2 +- .../plugins/LowSuspend/LowSuspendFragment.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java index 3de9859ec7..6890d88329 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java @@ -374,7 +374,7 @@ public class ConfigBuilderFragment extends Fragment implements PluginBase, PumpI request.rate = applyBasalConstraints(request.rate); PumpEnactResult result; - if (Math.abs(request.rate - getBaseBasalRate()) < 0.1) { + if ((request.rate == 0 && request.duration == 0) || Math.abs(request.rate - getBaseBasalRate()) < 0.1) { if (isTempBasalInProgress()) { result = cancelTempBasal(); } else { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/LowSuspend/LowSuspendFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/LowSuspend/LowSuspendFragment.java index 6b11d3db4a..b7dae4ad4b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/LowSuspend/LowSuspendFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/LowSuspend/LowSuspendFragment.java @@ -17,17 +17,18 @@ import android.widget.TextView; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.text.DecimalFormat; import java.util.Date; import info.nightscout.androidaps.Config; import info.nightscout.androidaps.Constants; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; +import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.db.DatabaseHelper; import info.nightscout.androidaps.interfaces.APSInterface; -import info.nightscout.androidaps.interfaces.PluginBase; -import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.plugins.Loop.APSResult; +import info.nightscout.androidaps.interfaces.PluginBase; import info.nightscout.client.data.NSProfile; import info.nightscout.utils.DecimalFormatter; import info.nightscout.utils.SafeParse; @@ -282,8 +283,8 @@ public class LowSuspendFragment extends Fragment implements View.OnClickListener } } else if (isTempBasalInProgress && tempBasalRate == 0d) { request.changeRequested = true; - request.rate = baseBasalRate; - request.duration = 30; + request.rate = 0; + request.duration = 0; request.reason = MainApp.instance().getString(R.string.lowsuspend_cancelmessage); } else { request.changeRequested = false; @@ -309,7 +310,7 @@ public class LowSuspendFragment extends Fragment implements View.OnClickListener if (lastRun != null) { glucoseStatusView.setText(lastRun.lastGlucoseStatus.toSpanned()); minBgView.setText(DecimalFormatter.to1Decimal(lastRun.lastMinBg) + " mgdl"); - resultView.setText(Html.fromHtml("" + getString(R.string.lowsuspend_low) + ": " + lastRun.lastLow + "
" + getString(R.string.lowsuspend_lowprojected) + ": " + lastRun.lastLowProjected)); + resultView.setText(Html.fromHtml("" + getString(R.string.lowsuspend_low) + ": " + lastRun.lastLow + "
" + getString(R.string.lowsuspend_lowprojected) + ": " + lastRun.lastLowProjected)); requestView.setText(lastRun.lastAPSResult.toSpanned()); lastRunView.setText(lastRun.lastAPSRun.toLocaleString()); }