diff --git a/logs/templates/logs/aff_stats_rooms.html b/logs/templates/logs/aff_stats_rooms.html new file mode 100644 index 00000000..63842b84 --- /dev/null +++ b/logs/templates/logs/aff_stats_rooms.html @@ -0,0 +1,45 @@ +{% 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 %} + + {% for key_dict, stats_dict in stats_list.items %} + {% for key, stats in stats_dict.items %} + + +

on met un {{ key_dict }} de {{ key }}

+ + + + + + + {% for stat in stats %} + + + + + + {% endfor %} +
{{ key_dict }}Nombre de {{ key }} par {{ key_dict }}Rang
{{ stat|truncatechars:25 }}{{ stat.num }}{{ forloop.counter }}
+ {% endfor %} + {% endfor %} diff --git a/logs/templates/logs/stats_rooms.html b/logs/templates/logs/stats_rooms.html new file mode 100644 index 00000000..49284096 --- /dev/null +++ b/logs/templates/logs/stats_rooms.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 %}Chambres innocupées{% endblock %} + +{% block content %} +

Chambres innocupées

+ {% include "logs/aff_stats_rooms.html" with stats_list=stats_list %} +
+
+
+ {% endblock %} diff --git a/logs/views.py b/logs/views.py index a9fe5418..aba70c5c 100644 --- a/logs/views.py +++ b/logs/views.py @@ -522,3 +522,20 @@ def history(request, application, object_name, object_id): {'reversions': reversions, 'object': instance} ) + +@login_required +@permission_required('cableur') +def stats_unoccupuied_rooms(request): + """Vue qui affiche les chambres inoccupées + pour des fins de contrôle des cotisations""" + stats = { + 'Nombre de chambres Innocupées': { + 'Action': Room.objects.filter(adherent__isnull=True).count() + }, + 'Chambres Innocupées': { + 'Action': Room.objects.filter( + adherent__isnull=True + ).order_by('-num')[:40], + }, + } + return render(request, 'logs/stats_rooms.html', {'stats_list': stats})