From e623813312e0b93a3e32c90de012d3a3a6cfb98c Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Wed, 11 Jul 2018 01:37:08 +0200
Subject: [PATCH] Gestion automatique des switchs, affichage plus clair

---
 preferences/models.py                         |  8 +++++++-
 .../preferences/display_preferences.html      | 20 ++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/preferences/models.py b/preferences/models.py
index d08f761e..a6905d73 100644
--- a/preferences/models.py
+++ b/preferences/models.py
@@ -236,12 +236,18 @@ class OptionalTopologie(AclMixin, PreferencesModel):
         help_text="Plage d'ip de management des switchs"
     )
 
-
     @cached_property
     def provisioned_switchs(self):
+        """Liste des switches provisionnés"""
         from topologie.models import Switch
         return Switch.objects.filter(automatic_provision=True)
 
+    @cached_property
+    def provision_switchs_enabled(self):
+        """Return true if all settings are ok : switchs on automatic provision,
+        ip_type"""
+        return bool(self.provisioned_switchs and self.switchs_ip_type)
+
     class Meta:
         permissions = (
             ("view_optionaltopologie", "Peut voir les options de topologie"),
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 76b144c0..36f4a001 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -123,9 +123,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	    <th>Rest management, activé si provision auto</th>
 	    <td>{{ topologieoptions.switchs_rest_management }}</td>
         </tr>
+    </table>
+
+
+
+    <h5>{% if topologieoptions.provision_switchs_enabled %}<span class="label label-success">Provision de la config des switchs{% else %}<span class="label label-danger">Provision de la config des switchs{% endif%}</span></h5>
+    <table class="table table-striped">
+	<tr>
+	    <th>Switchs configurés automatiquement</th>
+	    <td>{{ topologieoptions.provisioned_switchs|join:", "  }} {% if topologieoptions.provisioned_switchs %}<span class="label label-success"> OK{% else %}<span class="label label-danger">Manquant{% endif %}</span></td>
+	</tr>
 	<tr>	
 	    <th>Plage d'ip de management des switchs</th>
-	    <td>{{ topologieoptions.switchs_ip_type }}</td>
+	    <td>{{ topologieoptions.switchs_ip_type }} {% if topologieoptions.switchs_ip_type %}<span class="label label-success"> OK{% else %}<span class="label label-danger">Manquant{% endif %}</span></td>
 	</tr>
     </table>
 
@@ -135,14 +145,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	  {% acl_end %}
 	  {%  include "preferences/aff_radiuskey.html" with  radiuskey_list=radiuskey_list %}
 
-    <h5>{% if topologieoptions.provisioned_switchs %}<span class="label label-success">Provision de la config des switchs{% else %}<span class="label label-danger">Provision de la config des switchs{% endif%}</span></h5>
-    <table class="table table-striped">
-	<tr>
-		<th>Switchs configurés automatiquement</th>
-		<td>{{ topologieoptions.provisioned_switchs|join:", "  }}</td>
-	</tr>
-    </table>
-
     <h4>Préférences generales</h4>
         <a class="btn btn-primary btn-sm" role="button" href="{% url 'preferences:edit-options' 'GeneralOption' %}">
             <i class="fa fa-edit"></i>