Duplique l'affichage des évenement dans une nouvelle page "logs"

Permet de laisser la place à un résumé dans le /index.html de stats

logs/templates/logs/aff_summary.html

@@ -0,0 +1,61 @@
+{% comment %}
+Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+
+Copyright © 2017  Gabriel Détraz
+Copyright © 2017  Goulven Kermarec
+Copyright © 2017  Augustin Lemesle
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+{% endcomment %}
+
+{% if revisions_list.paginator %}
+{% include "pagination.html" with list=revisions_list %}
+{% endif %}
+
+{% load logs_extra %}
+
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <th>Objet modifié</th>
+                <th>Type de l'objet</th>
+                <th>Modification par</th>
+                <th>Date de modification</th>
+                <th>Commentaire</th>
+                <th></th>
+            </tr>
+        </thead>
+        {% for revision in revisions_list %}
+        	{% for reversion in revision.version_set.all %}
+		<tr>
+            	    <td>{{ reversion.object|truncatechars:20 }}</td>
+                    <td>{{ reversion.object|classname }}</td>
+                    <td>{{ revision.user }}</td>
+                    <td>{{ revision.date_created }}</td>
+                    <td>{{ revision.comment }}</td>
+                    {% if is_bureau %}
+                    <td>
+                	<a class="btn btn-danger btn-sm" role="button" href="{% url 'logs:revert-action' revision.id %}">
+                    	<i class="glyphicon glyphicon-remove"></i>
+                    	Annuler
+                	</a>
+            	    </td>
+            	    {% endif %}
+        	</tr>
+		{% endfor %}
+        {% endfor %}
+    </table>

logs/templates/logs/index.html

@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 {% block content %}
   <h2>Actions effectuées</h2>
-  {%  include "logs/aff_actions.html" with  revisions_list=revisions_list %}
+  {%  include "logs/aff_summary.html" with  revisions_list=revisions_list %}
   <br />
   <br />
   <br />

logs/templates/logs/sidebar.html

@@ -27,6 +27,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 {% block sidebar %}
     {% if is_cableur %}
     <a class="list-group-item list-group-item-info" href="{% url "logs:index" %}">
+        <i class="glyphicon glyphicon-stats"></i>
+        Résumé
+    </a>
+    <a class="list-group-item list-group-item-info" href="{% url "logs:stats-logs" %}">
         <i class="glyphicon glyphicon-stats"></i>
         Évènements
     </a>

logs/templates/logs/stats_logs.html

@@ -0,0 +1,36 @@
+{% extends "logs/sidebar.html" %}
+{% comment %}
+Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+
+Copyright © 2017  Gabriel Détraz
+Copyright © 2017  Goulven Kermarec
+Copyright © 2017  Augustin Lemesle
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+{% endcomment %}
+
+{% load bootstrap3 %}
+
+{% block title %}Statistiques{% endblock %}
+
+{% block content %}
+  <h2>Actions effectuées</h2>
+  {%  include "logs/aff_stats_logs.html" with  revisions_list=revisions_list %}
+  <br />
+  <br />
+  <br />
+ {% endblock %}

logs/urls.py

@@ -26,6 +26,7 @@ from . import views
 
 urlpatterns = [
     url(r'^$', views.index, name='index'),
+    url(r'^stats_logs$', views.stats_logs, name='stats-logs'),
     url(r'^revert_action/(?P<revision_id>[0-9]+)$', views.revert_action, name='revert-action'),
     url(r'^stats_general/$', views.stats_general, name='stats-general'),
     url(r'^stats_models/$', views.stats_models, name='stats-models'),

logs/views.py

@@ -82,6 +82,24 @@ def index(request):
         revisions = paginator.page(paginator.num_pages)
     return render(request, 'logs/index.html', {'revisions_list': revisions})
 
+@login_required
+@permission_required('cableur')
+def stats_logs(request):
+    options, created = GeneralOption.objects.get_or_create()
+    pagination_number = options.pagination_number
+    revisions = Revision.objects.all().order_by('date_created').reverse().select_related('user').prefetch_related('version_set__object')
+    paginator = Paginator(revisions, pagination_number)
+    page = request.GET.get('page')
+    try:
+        revisions = paginator.page(page)
+    except PageNotAnInteger:
+        # If page is not an integer, deliver first page.
+        revisions = paginator.page(1)
+    except EmptyPage:
+     # If page is out of range (e.g. 9999), deliver last page of results.
+        revisions = paginator.page(paginator.num_pages)
+    return render(request, 'logs/stats_logs.html', {'revisions_list': revisions})
+
 @login_required
 @permission_required('bureau')
 def revert_action(request, revision_id):