From 1186360df4e66de723186bd90337377d5e6fb43c Mon Sep 17 00:00:00 2001
From: osodebailar <andreas.eggen@gmail.com>
Date: Wed, 25 Dec 2019 17:01:38 +0100
Subject: [PATCH] reactivate bad tuerkis and format basal

---
 .../info/nightscout/androidaps/db/TemporaryBasal.java |  4 ++++
 .../plugins/general/overview/OverviewFragment.java    | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
index cf0eeab462..b18d40d158 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/TemporaryBasal.java
@@ -108,6 +108,10 @@ public class TemporaryBasal implements Interval, DbObjectBase {
         this.pumpId = extendedBolus.pumpId;
     }
 
+    public String toDuration() {
+        return "(" + getRealDuration() + "/" + durationInMinutes + "')";
+    }
+
     public TemporaryBasal clone() {
         TemporaryBasal t = new TemporaryBasal();
         t.date = date;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index f317310500..2d46091d93 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -1151,7 +1151,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         String basalText = "";
         if (shorttextmode) {
             if (activeTemp != null) {
-                basalText = "T: " + activeTemp.toStringVeryShort();
+                basalText = activeTemp.percentRate + "% " + activeTemp.toDuration() + " " + DecimalFormatter.to2Decimal(profile.getBasal()) + "U/h";
             } else {
                 basalText = DecimalFormatter.to2Decimal(profile.getBasal()) + "U/h";
             }
@@ -1160,8 +1160,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 if (activeTemp != null) {
                     fullText += MainApp.gs(R.string.pump_tempbasal_label) + ": " + activeTemp.toStringFull();
                 }
-                OKDialog.show(getActivity(), MainApp.gs(R.string.basal), fullText, null);
+                OKDialog.show(getActivity(), MainApp.gs(R.string.basal), fullText);
             });
+
         } else {
             if (activeTemp != null) {
                 basalText = activeTemp.toStringFull() + " ";
@@ -1172,6 +1173,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                 basalText += "(" + DecimalFormatter.to2Decimal(pump.getBaseBasalRate()) + "U/h)";
             }
         }
+        if (activeTemp != null) {
+            baseBasalView.setTextColor(MainApp.gc(R.color.basal));
+        } else {
+            baseBasalView.setTextColor(android.R.attr.textColor);
+
+        }
 
         baseBasalView.setText(basalText);