From 4f66f161b076f5fa183e8b23f23afdd22465ee27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 6 Jan 2017 18:19:15 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Rend=20la=20page=20=C3=A9tat=20des=20demand?=
 =?UTF-8?q?es/ratios=20coh=C3=A9rente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Le nombre total de demandes affiché est désormais le nombre de places
  demandées et non le nombre de personnes ayant fait des demandes. Ainsi
  ce nombre correspond à la somme des totaux par spectacle affiché

- Au passage, on déplace le template de cette vue dans un dossier plus
  adéquat et on ajoute une docstring sur la vue.
---
 bda/templates/{ => bda}/etat-places.html |  2 +-
 bda/views.py                             | 25 ++++++++++++------------
 2 files changed, 14 insertions(+), 13 deletions(-)
 rename bda/templates/{ => bda}/etat-places.html (95%)

diff --git a/bda/templates/etat-places.html b/bda/templates/bda/etat-places.html
similarity index 95%
rename from bda/templates/etat-places.html
rename to bda/templates/bda/etat-places.html
index 4aa72ba1..7fb579e6 100644
--- a/bda/templates/etat-places.html
+++ b/bda/templates/bda/etat-places.html
@@ -38,7 +38,7 @@
                 {% endfor %}
     </tbody>					     
     </table>
-                <span class="bda-prix">Total : {{ total }} demandes</span>
+                <span class="bda-prix">Total : {{ total }} places demandées</span>
   <script type="text/javascript"
           src="{% static "js/jquery.min.js" %}"></script>
   <script type="text/javascript"
diff --git a/bda/views.py b/bda/views.py
index 99168787..7baf8ea6 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import random
+import hashlib
+import time
+
+from datetime import timedelta
 
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
@@ -15,27 +15,28 @@ from django.forms.models import inlineformset_factory
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.conf import settings
-import hashlib
-
 from django.core.mail import send_mail
 from django.template import loader
 from django.utils import timezone
 from django.views.generic.list import ListView
 
-import time
-from datetime import timedelta
-
 from gestioncof.decorators import cof_required, buro_required
 from bda.models import Spectacle, Participant, ChoixSpectacle, Attribution,\
     Tirage, SpectacleRevente
 from bda.algorithm import Algorithm
-
 from bda.forms import BaseBdaFormSet, TokenForm, ResellForm, AnnulForm,\
         InscriptionReventeForm
 
 
 @cof_required
 def etat_places(request, tirage_id):
+    """
+    Résumé des spectacles d'un tirage avec pour chaque spectacle :
+    - Le nombrede places en jeu
+    - Le nombre de demandes
+    - Le ratio demandes/places
+    Et le total de toutes les demandes
+    """
     tirage = get_object_or_404(Tirage, id=tirage_id)
     spectacles1 = ChoixSpectacle.objects \
         .filter(spectacle__tirage=tirage) \
@@ -67,8 +68,8 @@ def etat_places(request, tirage_id):
         spectacles_dict[spectacle["spectacle"]].ratio = \
             spectacles_dict[spectacle["spectacle"]].total / \
             spectacles_dict[spectacle["spectacle"]].slots
-        total += spectacle["total"]
-    return render(request, "etat-places.html",
+        total += 2*spectacle["total"]
+    return render(request, "bda/etat-places.html",
                   {"spectacles": spectacles, "total": total, 'tirage': tirage})
 
 

From dc33160e0b826320c15ae64fff5415924896b4f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Sat, 7 Jan 2017 13:13:12 +0100
Subject: [PATCH 2/2] Plus d'infos + pluralisation

Sur la page des ratios par spectacle
---
 bda/models.py                      |  5 -----
 bda/templates/bda/etat-places.html |  5 ++++-
 bda/views.py                       | 13 +++++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/bda/models.py b/bda/models.py
index 5b814d3d..d1d4c2fd 100644
--- a/bda/models.py
+++ b/bda/models.py
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import calendar
 import random
 from datetime import timedelta
@@ -53,7 +49,6 @@ class CategorieSpectacle(models.Model):
         verbose_name = "Catégorie"
 
 
-@python_2_unicode_compatible
 class Spectacle(models.Model):
     title = models.CharField("Titre", max_length=300)
     category = models.ForeignKey(CategorieSpectacle, blank=True, null=True)
diff --git a/bda/templates/bda/etat-places.html b/bda/templates/bda/etat-places.html
index 7fb579e6..66958c56 100644
--- a/bda/templates/bda/etat-places.html
+++ b/bda/templates/bda/etat-places.html
@@ -38,7 +38,10 @@
                 {% endfor %}
     </tbody>					     
     </table>
-                <span class="bda-prix">Total : {{ total }} places demandées</span>
+    <span class="bda-prix">
+      Total&nbsp;: {{ total }} place{{ total|pluralize }} demandée{{ total|pluralize }}
+      sur {{ proposed }} place{{ proposed|pluralize }} proposée{{ proposed|pluralize }}
+    </span>
   <script type="text/javascript"
           src="{% static "js/jquery.min.js" %}"></script>
   <script type="text/javascript"
diff --git a/bda/views.py b/bda/views.py
index 7baf8ea6..6ae2b7cc 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -9,7 +9,7 @@ from datetime import timedelta
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.db import models, transaction
-from django.db.models import Count, Q
+from django.db.models import Count, Q, Sum
 from django.core import serializers, mail
 from django.forms.models import inlineformset_factory
 from django.http import HttpResponseBadRequest, HttpResponseRedirect
@@ -32,7 +32,7 @@ from bda.forms import BaseBdaFormSet, TokenForm, ResellForm, AnnulForm,\
 def etat_places(request, tirage_id):
     """
     Résumé des spectacles d'un tirage avec pour chaque spectacle :
-    - Le nombrede places en jeu
+    - Le nombre de places en jeu
     - Le nombre de demandes
     - Le ratio demandes/places
     Et le total de toutes les demandes
@@ -69,8 +69,13 @@ def etat_places(request, tirage_id):
             spectacles_dict[spectacle["spectacle"]].total / \
             spectacles_dict[spectacle["spectacle"]].slots
         total += 2*spectacle["total"]
-    return render(request, "bda/etat-places.html",
-                  {"spectacles": spectacles, "total": total, 'tirage': tirage})
+    context = {
+        "proposed": tirage.spectacle_set.aggregate(Sum('slots'))['slots__sum'],
+        "spectacles": spectacles,
+        "total": total,
+        'tirage': tirage
+    }
+    return render(request, "bda/etat-places.html", context)
 
 
 def _hash_queryset(queryset):