From 82802de47706ed66299168d4e42d77f8bae02456 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sun, 30 Dec 2018 18:45:18 +0100
Subject: [PATCH] More clear front of all switchs modular

---
 .../templates/topologie/aff_modules.html      | 25 +++++++++++++++++++
 .../templates/topologie/index_module.html     |  2 +-
 topologie/views.py                            |  4 ++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/topologie/templates/topologie/aff_modules.html b/topologie/templates/topologie/aff_modules.html
index d73fffeb..0c7a3207 100644
--- a/topologie/templates/topologie/aff_modules.html
+++ b/topologie/templates/topologie/aff_modules.html
@@ -83,3 +83,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% include "pagination.html" with list=module_list %}
 {% endif %}
 
+<h4>{% trans "All modular switchs" %}</h4>
+
+<table class="table table-striped">
+    <thead>
+        <th>{% trans "Switch" %}</th>
+        <th>{% trans "Reference" %}</th>
+        <th>{% trans "Slot" %}</th>
+        <tbody>
+             {% for switch in modular_switchs %}
+             {% if switch.list_modules %}
+             <tr class="info">
+                 <td colspan="4">
+            	    {{ switch }}
+                 </td>
+             </tr>
+    {% for module in switch.list_modules %}
+    <tr>
+	<td></td>
+        <td>{{ module.1 }}</td>
+        <td>{{ module.0 }}</td>
+    </tr>
+    {% endfor %}
+{% endif %}
+{% endfor %}
+</table>
diff --git a/topologie/templates/topologie/index_module.html b/topologie/templates/topologie/index_module.html
index 5c4c5c7c..d9cc2925 100644
--- a/topologie/templates/topologie/index_module.html
+++ b/topologie/templates/topologie/index_module.html
@@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <a class="btn btn-primary btn-sm" role="button" href="{% url 'topologie:add-module' %}"><i class="fa fa-plus"></i>{% trans " Add a module" %}</a>
 <hr>
 {% acl_end %}
-    {% include "topologie/aff_modules.html" with module_list=module_list %}
+    {% include "topologie/aff_modules.html" with module_list=module_list modular_switchs=modular_switchs %}
     <br />
     <br />
     <br />
diff --git a/topologie/views.py b/topologie/views.py
index 5174f05d..55f0a060 100644
--- a/topologie/views.py
+++ b/topologie/views.py
@@ -325,12 +325,14 @@ def index_model_switch(request):
 def index_module(request):
     """Display all modules of switchs"""
     module_list = ModuleSwitch.objects.all()
+    modular_switchs = Switch.objects.filter(model__is_modular=True)
     pagination_number = GeneralOption.get_cached_value('pagination_number')
     module_list = re2o_paginator(request, module_list, pagination_number)
     return render(
         request,
         'topologie/index_module.html',
-        {'module_list': module_list}
+        {'module_list': module_list,
+         'modular_switchs': modular_switchs}
     )