From 0e03fc85ee2528d67957c6fa298f232ee2391410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 2 Jun 2017 17:25:04 +0100
Subject: [PATCH 01/10] The BdA receives the reminder emails

---
 bda/__init__.py | 10 ++++++++++
 bda/models.py   | 10 +++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bda/__init__.py b/bda/__init__.py
index e69de29b..a5eecc65 100644
--- a/bda/__init__.py
+++ b/bda/__init__.py
@@ -0,0 +1,10 @@
+from django.contrib.auth.models import User
+
+
+def get_generic_user():
+    generic, created = User.objects.get_or_create(username="bda_generic")
+    if created:
+        generic.email = "bda@ens.fr"
+        generic.first_name = "Bureau des Arts"
+        generic.save()
+    return generic
diff --git a/bda/models.py b/bda/models.py
index 0228b4c0..42090374 100644
--- a/bda/models.py
+++ b/bda/models.py
@@ -11,6 +11,8 @@ from django.contrib.auth.models import User
 from django.conf import settings
 from django.utils import timezone, formats
 
+from . import get_generic_user
+
 
 class Tirage(models.Model):
     title = models.CharField("Titre", max_length=300)
@@ -104,11 +106,9 @@ class Spectacle(models.Model):
                 members[member.id][1] = 2
             else:
                 members[member.id] = [member, 1]
-        # FIXME : faire quelque chose de ça, un utilisateur bda_generic ?
-        # # Pour le BdA
-        # members[0] = ['BdA', 1, 'bda@ens.fr']
-        # members[-1] = ['BdA', 2, 'bda@ens.fr']
         # On écrit un mail personnalisé à chaque participant
+        bda_generic = get_generic_user()
+        members[-1] = [bda_generic, 1]
         datatuple = [(
             'bda-rappel',
             {'member': member[0], 'nb_attr': member[1], 'show': self},
@@ -121,7 +121,7 @@ class Spectacle(models.Model):
         self.rappel_sent = timezone.now()
         self.save()
         # On renvoie la liste des destinataires
-        return members.values()
+        return map(lambda t: t[0], members.values())
 
     @property
     def is_past(self):

From 2a3614540fc143e7e62f091991c4bd9106692724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 2 Jun 2017 17:32:23 +0100
Subject: [PATCH 02/10] minor PEP8 changes

---
 bda/views.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bda/views.py b/bda/views.py
index 00a1b300..406ca81c 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 from collections import defaultdict
-from functools import partial
 import random
 import hashlib
 import time
@@ -27,7 +26,7 @@ from django.views.generic.list import ListView
 from gestioncof.decorators import cof_required, buro_required
 from bda.models import (
     Spectacle, Participant, ChoixSpectacle, Attribution, Tirage,
-    SpectacleRevente, Salle, Quote, CategorieSpectacle
+    SpectacleRevente, Salle, CategorieSpectacle
 )
 from bda.algorithm import Algorithm
 from bda.forms import (
@@ -305,7 +304,8 @@ def do_tirage(tirage_elt, token):
     # On inscrit à BdA-Revente ceux qui n'ont pas eu les places voulues
     ChoixRevente = Participant.choicesrevente.through
 
-    # Suppression des reventes demandées/enregistrées (si le tirage est relancé)
+    # Suppression des reventes demandées/enregistrées
+    # (si le tirage est relancé)
     (
         ChoixRevente.objects
         .filter(spectacle__tirage=tirage_elt)

From 31c034a96ae2cf4072d6607df45038ce98657d47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 2 Jun 2017 18:01:27 +0100
Subject: [PATCH 03/10] send_rappel: use django messages + css tweaks

---
 bda/templates/bda/mails-rappel.html | 47 +++++++++++++----------------
 bda/views.py                        |  8 +++++
 gestioncof/static/css/cof.css       |  7 +++--
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/bda/templates/bda/mails-rappel.html b/bda/templates/bda/mails-rappel.html
index 73625d1c..21fcc407 100644
--- a/bda/templates/bda/mails-rappel.html
+++ b/bda/templates/bda/mails-rappel.html
@@ -3,41 +3,36 @@
 {% block realcontent %}
     <h2>Mails de rappels</h2>
     {% if sent %}
-    <h3>Les mails de rappel pour le spectacle {{ show.title }} ont bien été envoyés aux personnes suivantes</h3>
-    <ul>
-    {% for member in members %}
-    <li>{{ member.get_full_name }} ({{ member.email }})</li>
-    {% endfor %}
-    </ul>
+      <h3>Les mails de rappel pour le spectacle {{ show.title }} ont bien été envoyés aux personnes suivantes</h3>
+      <ul>
+        {% for member in members %}
+          <li>{{ member.get_full_name }} ({{ member.email }})</li>
+        {% endfor %}
+      </ul>
     {% else %}
-    <h3>Voulez vous envoyer les mails de rappel pour le spectacle
-            {{ show.title }}&nbsp;?</h3>
-            {% if show.rappel_sent %}
-            <p class="error">Attention, les mails ont déjà été envoyés le
-            {{ show.rappel_sent }}</p>
-            {% endif %}
+      <h3>Voulez vous envoyer les mails de rappel pour le spectacle {{ show.title }}&nbsp;?</h3>
     {% endif %}
 
-    {% if not sent %}
-    <form action="" method="post">
-            {% csrf_token %}
-            <div class="pull-right">
-                <input class="btn btn-primary" type="submit" value="Envoyer" />
-            </div>
-    </form>
-    {% endif %}
+    <div class="empty-form">
+      {% if not sent %}
+      <form action="" method="post">
+        {% csrf_token %}
+        <div class="pull-right">
+          <input class="btn btn-primary" type="submit" value="Envoyer" />
+        </div>
+      </form>
+      {% endif %}
+    </div>
 
-    <br/>
-    <hr/>
     <h3>Forme des mails</h3>
 
     <h4>Une seule place</h4>
-    {% for part in exemple_mail_1place %}
-    <pre>{{ part }}</pre>
-    {% endfor %}
+      {% for part in exemple_mail_1place %}
+        <pre>{{ part }}</pre>
+      {% endfor %}
 
     <h4>Deux places</h4>
     {% for part in exemple_mail_2places %}
-    <pre>{{ part }}</pre>
+      <pre>{{ part }}</pre>
     {% endfor %}
 {% endblock %}
diff --git a/bda/views.py b/bda/views.py
index 406ca81c..602e5025 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -673,6 +673,14 @@ def send_rappel(request, spectacle_id):
     # Demande de confirmation
     else:
         ctxt['sent'] = False
+        if show.rappel_sent:
+            messages.warning(
+                request,
+                "Attention, un mail de rappel pour ce spectale a déjà été "
+                "envoyé le {}".format(formats.localize(
+                    timezone.template_localtime(show.rappel_sent)
+                ))
+            )
     return render(request, "bda/mails-rappel.html", ctxt)
 
 
diff --git a/gestioncof/static/css/cof.css b/gestioncof/static/css/cof.css
index e1cdd763..91cf726a 100644
--- a/gestioncof/static/css/cof.css
+++ b/gestioncof/static/css/cof.css
@@ -40,8 +40,9 @@ a {
  background: transparent;
 }
 
-
-
+div.empty-form {
+  padding-bottom: 2em;
+}
 
 a:hover {
  color: #444;
@@ -341,10 +342,12 @@ fieldset legend {
     font-weight: 700;
     font-size: large;
     color:#DE826B;
+    padding-bottom: .5em;
 }
 
 #main-content h4 {
     color:#DE826B;
+    padding-bottom: .5em;
 }
 
 #main-content h2,

From fbdfdeef46f725e49ee73f88643ad5fe70a57c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 2 Jun 2017 18:30:02 +0100
Subject: [PATCH 04/10] Add a link to the reminder emails sending page

---
 bda/templates/bda-participants.html | 27 ++++++++++++++++++---------
 bda/urls.py                         |  5 ++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/bda/templates/bda-participants.html b/bda/templates/bda-participants.html
index 289d1761..85af4a2e 100644
--- a/bda/templates/bda-participants.html
+++ b/bda/templates/bda-participants.html
@@ -36,17 +36,26 @@
         </tbody>
       </table>
     <h3><a href="{% url "admin:bda_attribution_add" %}?spectacle={{spectacle.id}}"><span class="glyphicon glyphicon-plus-sign"></span> Ajouter une attribution</a></h3>
-      <br>
-     <button class="btn btn-default" type="button" onclick="toggle('export-mails')">Afficher/Cacher mails participants</button>
-      <pre id="export-mails" style="display:none">
-{%for participant in participants %}{{participant.email}}, {%endfor%}
-      </pre>
-      <br>
-      <button class="btn btn-default" type="button" onclick="toggle('export-salle')">Afficher/Cacher liste noms</button>
-      <pre id="export-salle" style="display:none">
+    <div>
+      <div>
+        <button class="btn btn-default" type="button" onclick="toggle('export-mails')">Afficher/Cacher mails participants</button>
+	<pre id="export-mails" style="display:none">{% spaceless %}
+          {% for participant in participants %}{{ participant.email }}, {% endfor %}
+	{% endspaceless %}</pre>
+      </div>
+
+      <div>
+        <button class="btn btn-default" type="button" onclick="toggle('export-salle')">Afficher/Cacher liste noms</button>
+	<pre id="export-salle" style="display:none">{% spaceless %}
 {% for participant in participants %}{{participant.name}} : {{participant.nb_places}} places
 {% endfor %}
-      </pre>
+	{% endspaceless %}</pre>
+      </div>
+    
+      <div>
+        <a href="{% url 'bda-rappels' spectacle.id %}">Page d'envoi manuel des mails de rappel</a>
+      </div>
+
     <script type="text/javascript"
             src="{% static "js/joequery-Stupid-Table-Plugin/stupidtable.js" %}"></script>
     <script>
diff --git a/bda/urls.py b/bda/urls.py
index df660740..876c84ea 100644
--- a/bda/urls.py
+++ b/bda/urls.py
@@ -44,7 +44,10 @@ urlpatterns = [
     url(r'^revente-immediat/(?P<tirage_id>\d+)$',
         views.revente_shotgun,
         name="bda-shotgun"),
-    url(r'^mails-rappel/(?P<spectacle_id>\d+)$', views.send_rappel),
+    url(r'^mails-rappel/(?P<spectacle_id>\d+)$',
+        views.send_rappel,
+        name="bda-rappels"
+        ),
     url(r'^descriptions/(?P<tirage_id>\d+)$', views.descriptions_spectacles,
         name='bda-descriptions'),
     url(r'^catalogue/(?P<request_type>[a-z]+)$', views.catalogue,

From 76c75d5ccd1c18645e7a26b3526007300d8cb44d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 2 Jun 2017 18:35:04 +0100
Subject: [PATCH 05/10] Move bda-participant template -> bda/ folder

---
 bda/templates/{bda-participants.html => bda/participants.html} | 0
 bda/views.py                                                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename bda/templates/{bda-participants.html => bda/participants.html} (100%)

diff --git a/bda/templates/bda-participants.html b/bda/templates/bda/participants.html
similarity index 100%
rename from bda/templates/bda-participants.html
rename to bda/templates/bda/participants.html
diff --git a/bda/views.py b/bda/views.py
index 602e5025..75716ba5 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -612,7 +612,7 @@ def spectacle(request, tirage_id, spectacle_id):
 
     participants_info = sorted(participants.values(),
                                key=lambda part: part['lastname'])
-    return render(request, "bda-participants.html",
+    return render(request, "bda/participants.html",
                   {"spectacle": spectacle, "participants": participants_info})
 
 

From ffb777a4cdb5f2a073c3015b6fa0e19cb2ce7c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 2 Jun 2017 18:53:09 +0100
Subject: [PATCH 06/10] Test the "participants" views

---
 bda/tests.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/bda/tests.py b/bda/tests.py
index 2741084f..b85c2f2c 100644
--- a/bda/tests.py
+++ b/bda/tests.py
@@ -1,5 +1,6 @@
 import json
 
+from django.contrib.auth.models import User
 from django.test import TestCase, Client
 from django.utils import timezone
 
@@ -34,6 +35,31 @@ class TestBdAViews(TestCase):
             ),
         ])
 
+        self.bda_user = User.objects.create_user(
+            username="bda_user", password="bda4ever"
+        )
+        self.bda_user.profile.is_cof = True
+        self.bda_user.profile.is_buro = True
+        self.bda_user.profile.save()
+
+    def bda_participants(self):
+        """The BdA participants views can be queried"""
+        client = Client()
+        show = self.tirage.spectacle_set.first()
+
+        client.login(self.bda_user.username, "bda4ever")
+        tirage_resp = client.get("/bda/spectacles/{}".format(self.tirage.id))
+        show_resp = client.get(
+            "/bda/spectacles/{}/{}".format(self.tirage.id, show.id)
+        )
+        reminder_url = "/bda/mails-rappel/{}".format(show.id)
+        reminder_get_resp = client.get(reminder_url)
+        reminder_post_resp = client.post(reminder_url)
+        self.assertEqual(200, tirage_resp.status_code)
+        self.assertEqual(200, show_resp.status_code)
+        self.assertEqual(200, reminder_get_resp.status_code)
+        self.assertEqual(200, reminder_post_resp.status_code)
+
     def test_catalogue(self):
         """Test the catalogue JSON API"""
         client = Client()

From 4fce1e8afc366b2c5073b7837d2d8f5f5ad72ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 2 Jun 2017 18:53:58 +0100
Subject: [PATCH 07/10] typo

---
 bda/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bda/tests.py b/bda/tests.py
index b85c2f2c..97a220c9 100644
--- a/bda/tests.py
+++ b/bda/tests.py
@@ -64,7 +64,7 @@ class TestBdAViews(TestCase):
         """Test the catalogue JSON API"""
         client = Client()
 
-        # The `list` hooh
+        # The `list` hook
         resp = client.get("/bda/catalogue/list")
         self.assertJSONEqual(
             resp.content.decode("utf-8"),

From 5c11893059a664c34ef34b51c9233d7504b5c9ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Fri, 2 Jun 2017 19:33:23 +0100
Subject: [PATCH 08/10] Add a link to the "bda-rappel" mail edition page

---
 bda/templates/bda/mails-rappel.html | 10 ++++++++++
 bda/views.py                        | 16 +++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/bda/templates/bda/mails-rappel.html b/bda/templates/bda/mails-rappel.html
index 21fcc407..342b24a6 100644
--- a/bda/templates/bda/mails-rappel.html
+++ b/bda/templates/bda/mails-rappel.html
@@ -23,6 +23,15 @@
       </form>
       {% endif %}
     </div>
+    
+    <hr \>
+
+    <p>
+      <em>Note :</em> le template de ce mail peut être modifié à
+      <a href="{% url 'admin:custommail_custommail_change' custommail_id %}">cette adresse</a>
+    </p>
+
+    <hr \>
 
     <h3>Forme des mails</h3>
 
@@ -35,4 +44,5 @@
     {% for part in exemple_mail_2places %}
       <pre>{{ part }}</pre>
     {% endfor %}
+
 {% endblock %}
diff --git a/bda/views.py b/bda/views.py
index 75716ba5..2149594a 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -9,6 +9,7 @@ from datetime import timedelta
 from custommail.shortcuts import (
     send_mass_custom_mail, send_custom_mail, render_custom_mail
 )
+from custommail.models import CustomMail
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
@@ -662,9 +663,18 @@ def send_rappel(request, spectacle_id):
         'nb_attr': 2
     })
     # Contexte
-    ctxt = {'show': show,
-            'exemple_mail_1place': exemple_mail_1place,
-            'exemple_mail_2places': exemple_mail_2places}
+    custommail_id = (
+        CustomMail.objects
+        .filter(shortname="bda-rappel")
+        .values_list("id", flat=True)
+        [0]
+    )
+    ctxt = {
+        'show': show,
+        'exemple_mail_1place': exemple_mail_1place,
+        'exemple_mail_2places': exemple_mail_2places,
+        'custommail_id': custommail_id,
+    }
     # Envoi confirmé
     if request.method == 'POST':
         members = show.send_rappel()

From 69aee6b8ac71eef0e5308b67bb55ff14bcdc9b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Sun, 18 Jun 2017 16:52:53 +0100
Subject: [PATCH 09/10] Move bda.get_generic_user + optimize send_rappels

---
 bda/__init__.py |  9 ---------
 bda/models.py   | 36 +++++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/bda/__init__.py b/bda/__init__.py
index a5eecc65..8b137891 100644
--- a/bda/__init__.py
+++ b/bda/__init__.py
@@ -1,10 +1 @@
-from django.contrib.auth.models import User
 
-
-def get_generic_user():
-    generic, created = User.objects.get_or_create(username="bda_generic")
-    if created:
-        generic.email = "bda@ens.fr"
-        generic.first_name = "Bureau des Arts"
-        generic.save()
-    return generic
diff --git a/bda/models.py b/bda/models.py
index 42090374..41462d70 100644
--- a/bda/models.py
+++ b/bda/models.py
@@ -7,11 +7,18 @@ from custommail.shortcuts import send_mass_custom_mail
 
 from django.contrib.sites.models import Site
 from django.db import models
+from django.db.models import Count
 from django.contrib.auth.models import User
 from django.conf import settings
 from django.utils import timezone, formats
 
-from . import get_generic_user
+
+def get_generic_user():
+    generic, _ = User.objects.get_or_create(
+        username="bda_generic",
+        defaults={"email": "bda@ens.fr", "first_name": "Bureau des arts"}
+    )
+    return generic
 
 
 class Tirage(models.Model):
@@ -98,30 +105,29 @@ class Spectacle(models.Model):
         Envoie un mail de rappel à toutes les personnes qui ont une place pour
         ce spectacle.
         """
-        # On récupère la liste des participants
-        members = {}
-        for attr in Attribution.objects.filter(spectacle=self).all():
-            member = attr.participant.user
-            if member.id in members:
-                members[member.id][1] = 2
-            else:
-                members[member.id] = [member, 1]
-        # On écrit un mail personnalisé à chaque participant
+        # On récupère la liste des participants + le BdA
+        members = list(
+            User.objects
+            .filter(participant__attributions=self)
+            .annotate(nb_attr=Count("id")).order_by()
+        )
         bda_generic = get_generic_user()
-        members[-1] = [bda_generic, 1]
+        bda_generic.nb_attr = 1
+        members.append(bda_generic)
+        # On écrit un mail personnalisé à chaque participant
         datatuple = [(
             'bda-rappel',
-            {'member': member[0], 'nb_attr': member[1], 'show': self},
+            {'member': member, "nb_attr": member.nb_attr, 'show': self},
             settings.MAIL_DATA['rappels']['FROM'],
-            [member[0].email])
-            for member in members.values()
+            [member.email])
+            for member in members
         ]
         send_mass_custom_mail(datatuple)
         # On enregistre le fait que l'envoi a bien eu lieu
         self.rappel_sent = timezone.now()
         self.save()
         # On renvoie la liste des destinataires
-        return map(lambda t: t[0], members.values())
+        return members
 
     @property
     def is_past(self):

From 80f6a808dcddba03dec43b67b625f6c698b158e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20P=C3=A9pin?= <martin.pepin@ens.fr>
Date: Sun, 18 Jun 2017 17:03:50 +0100
Subject: [PATCH 10/10] Simplify the mails-rappel view

---
 bda/templates/bda/mails-rappel.html |  2 +-
 bda/views.py                        | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/bda/templates/bda/mails-rappel.html b/bda/templates/bda/mails-rappel.html
index 342b24a6..c10503b0 100644
--- a/bda/templates/bda/mails-rappel.html
+++ b/bda/templates/bda/mails-rappel.html
@@ -28,7 +28,7 @@
 
     <p>
       <em>Note :</em> le template de ce mail peut être modifié à
-      <a href="{% url 'admin:custommail_custommail_change' custommail_id %}">cette adresse</a>
+      <a href="{% url 'admin:custommail_custommail_change' custommail.pk %}">cette adresse</a>
     </p>
 
     <hr \>
diff --git a/bda/views.py b/bda/views.py
index 2149594a..d6da2e9f 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -6,9 +6,7 @@ import hashlib
 import time
 import json
 from datetime import timedelta
-from custommail.shortcuts import (
-    send_mass_custom_mail, send_custom_mail, render_custom_mail
-)
+from custommail.shortcuts import send_mass_custom_mail, send_custom_mail
 from custommail.models import CustomMail
 from django.shortcuts import render, get_object_or_404
 from django.contrib.auth.decorators import login_required
@@ -652,28 +650,23 @@ def unpaid(request, tirage_id):
 def send_rappel(request, spectacle_id):
     show = get_object_or_404(Spectacle, id=spectacle_id)
     # Mails d'exemples
-    exemple_mail_1place = render_custom_mail('bda-rappel', {
+    custommail = CustomMail.objects.get(shortname="bda-rappel")
+    exemple_mail_1place = custommail.render({
         'member': request.user,
         'show': show,
         'nb_attr': 1
     })
-    exemple_mail_2places = render_custom_mail('bda-rappel', {
+    exemple_mail_2places = custommail.render({
         'member': request.user,
         'show': show,
         'nb_attr': 2
     })
     # Contexte
-    custommail_id = (
-        CustomMail.objects
-        .filter(shortname="bda-rappel")
-        .values_list("id", flat=True)
-        [0]
-    )
     ctxt = {
         'show': show,
         'exemple_mail_1place': exemple_mail_1place,
         'exemple_mail_2places': exemple_mail_2places,
-        'custommail_id': custommail_id,
+        'custommail': custommail,
     }
     # Envoi confirmé
     if request.method == 'POST':