From e9c7bdc7f43bb2df1c88a5ec8821b0c013f360c7 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 31 Mar 2018 22:30:42 +0200
Subject: [PATCH] add necessity of profile switch to objectives

---
 .../ConstraintsObjectives/ObjectivesPlugin.java       |  6 +++++-
 app/src/main/res/layout/nsprofile_fragment.xml        | 11 ++++++-----
 app/src/main/res/values-cs/strings.xml                |  2 +-
 app/src/main/res/values-de/strings.xml                |  2 +-
 app/src/main/res/values/strings.xml                   |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
index 8973ba3ac8..291b06372f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/ConstraintsObjectives/ObjectivesPlugin.java
@@ -26,6 +26,7 @@ import info.nightscout.androidaps.plugins.ConstraintsSafety.SafetyPlugin;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
 import info.nightscout.androidaps.plugins.NSClientInternal.NSClientPlugin;
 import info.nightscout.androidaps.plugins.PumpVirtual.VirtualPumpPlugin;
+import info.nightscout.utils.DateUtil;
 import info.nightscout.utils.SP;
 
 /**
@@ -129,7 +130,9 @@ public class ObjectivesPlugin extends PluginBase implements ConstraintsInterface
                 if (usedAPS != null && ((PluginBase) usedAPS).isEnabled(PluginType.APS))
                     apsEnabled = true;
 
-                return new RequirementResult(hasBGData && bgIsAvailableInNS && pumpStatusIsAvailableInNS && NSClientPlugin.getPlugin().hasWritePermission() && LoopPlugin.getPlugin().isEnabled(PluginType.LOOP) && apsEnabled && vpUploadNeeded,
+                boolean profileSwitchExists = MainApp.getConfigBuilder().getProfileSwitchFromHistory(DateUtil.now()) != null;
+
+                return new RequirementResult(hasBGData && bgIsAvailableInNS && pumpStatusIsAvailableInNS && NSClientPlugin.getPlugin().hasWritePermission() && LoopPlugin.getPlugin().isEnabled(PluginType.LOOP) && apsEnabled && vpUploadNeeded && profileSwitchExists,
                         MainApp.gs(R.string.objectives_bgavailableinns) + ": " + yesOrNo(bgIsAvailableInNS)
                                 + "\n" + MainApp.gs(R.string.nsclienthaswritepermission) + ": " + yesOrNo(NSClientPlugin.getPlugin().hasWritePermission())
                                 + (isVirtualPump ? "\n" + MainApp.gs(R.string.virtualpump_uploadstatus_title) + ": " + yesOrNo(vpUploadEnabled) : "")
@@ -137,6 +140,7 @@ public class ObjectivesPlugin extends PluginBase implements ConstraintsInterface
                                 + "\n" + MainApp.gs(R.string.hasbgdata) + ": " + yesOrNo(hasBGData)
                                 + "\n" + MainApp.gs(R.string.loopenabled) + ": " + yesOrNo(LoopPlugin.getPlugin().isEnabled(PluginType.LOOP))
                                 + "\n" + MainApp.gs(R.string.apsselected) + ": " + yesOrNo(apsEnabled)
+                                + "\n" + MainApp.gs(R.string.activate_profile) + ": " + yesOrNo(profileSwitchExists)
                 );
             case 1:
                 return new RequirementResult(manualEnacts >= manualEnactsNeeded,
diff --git a/app/src/main/res/layout/nsprofile_fragment.xml b/app/src/main/res/layout/nsprofile_fragment.xml
index 0c1c40d1e4..6e9ca472d8 100644
--- a/app/src/main/res/layout/nsprofile_fragment.xml
+++ b/app/src/main/res/layout/nsprofile_fragment.xml
@@ -10,11 +10,6 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginBottom="5dp" />
 
-    <include
-        layout="@layout/profileviewer_fragment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
     <Button
         android:id="@+id/nsprofile_profileswitch"
         style="?android:attr/buttonStyle"
@@ -24,4 +19,10 @@
         android:text="@string/activate_profile"
         android:textColor="@color/colorProfileSwitchButton" />
 
+    <include
+        layout="@layout/profileviewer_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c2014a9082..71e1000cbb 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -570,7 +570,7 @@
     <string name="unsupportednsversion">Nepodporovaná verze Nightscoutu</string>
     <string name="uploader">Uploader</string>
     <string name="uploader_short">UPLD</string>
-    <string name="activate_profile">AKTIVOVAT PROFIL</string>
+    <string name="activate_profile">Aktivovat profil</string>
     <string name="danar_visualizeextendedaspercentage_title">Zobrazovat prodloužený bolus v %</string>
     <string name="date">Datum</string>
     <string name="dia_too_short" formatted="false">DIA %f je příliž krátké - použito %f !</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 90cf07d5fd..01de36c6f5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -567,7 +567,7 @@
     <string formatted="false" name="dia_too_short">DIA von %f ist zu kurz - AAPS nutzt stattdessen %f!</string>
     <string name="danar_stats_warning_Message">Möglicherweise ungenau, wenn zum Befüllen ein Bolus verwendet wurde!</string>
     <string name="danar_stats_ratio">Verhältnis</string>
-    <string name="activate_profile">AKTIVIERE PROFIL</string>
+    <string name="activate_profile">Aktiviere profil</string>
     <string name="activity_duration">Aktivitätsdauer</string>
     <string name="activity_target">Aktivitätsziel</string>
     <string name="bloodsugarmeasurementalert">BZ-Messung</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3475ee7432..6da4c26248 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -664,7 +664,7 @@
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
     <string name="ultrarapid_oref">Ultra-Rapid Oref</string>
     <string name="dia_too_short" formatted="false">DIA of %f too short - using %f instead!</string>
-    <string name="activate_profile">ACTIVATE PROFILE</string>
+    <string name="activate_profile">Activate profile</string>
     <string name="date">Date</string>
     <string name="invalid">INVALID</string>
     <string name="waitingforpairing">Waiting for pairing on pump</string>