From 103b2880f751375a66e845f2ee36f8f69bdd9637 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Tue, 27 Sep 2016 16:57:39 +0200
Subject: [PATCH 1/3] BdA

---
 bda/templates/liste-reventes.html | 2 +-
 cof/settings_dev.py               | 2 +-
 gestioncof/admin.py               | 4 ++--
 gestioncof/templates/home.html    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bda/templates/liste-reventes.html b/bda/templates/liste-reventes.html
index 2a5ddc95..2a236176 100644
--- a/bda/templates/liste-reventes.html
+++ b/bda/templates/liste-reventes.html
@@ -2,7 +2,7 @@
 {% load bootstrap %}
 
 {% block realcontent %}
-  <h2>Inscriptions pour BDA-Revente</h2>
+  <h2>Inscriptions pour BdA-Revente</h2>
   {% if deja_revente %}
     <p class="success">Des reventes existent déjà pour certains de ces spectacles ; vérifie les places disponibles sans tirage !</p>
   {% endif %}
diff --git a/cof/settings_dev.py b/cof/settings_dev.py
index 7d270648..0ed4a618 100644
--- a/cof/settings_dev.py
+++ b/cof/settings_dev.py
@@ -152,7 +152,7 @@ PETITS_COURS_REPLYTO = "cof@ens.fr"
 RAPPEL_FROM = 'Le BdA <bda@ens.fr>'
 RAPPEL_REPLY_TO = RAPPEL_FROM
 
-REVENTE_FROM = 'BDA-Revente <bda-revente@ens.fr>'
+REVENTE_FROM = 'BdA-Revente <bda-revente@ens.fr>'
 REVENTE_REPLY_TO = REVENTE_FROM
 
 LOGIN_URL = "/gestion/login"
diff --git a/gestioncof/admin.py b/gestioncof/admin.py
index 58b37115..eb8ad6c0 100644
--- a/gestioncof/admin.py
+++ b/gestioncof/admin.py
@@ -144,9 +144,9 @@ User.profile_phone = ProfileInfo("phone", "Téléphone")
 User.profile_occupation = ProfileInfo("occupation", "Occupation")
 User.profile_departement = ProfileInfo("departement", "Departement")
 User.profile_mailing_cof = ProfileInfo("mailing_cof", "ML COF", True)
-User.profile_mailing_bda = ProfileInfo("mailing_bda", "ML BDA", True)
+User.profile_mailing_bda = ProfileInfo("mailing_bda", "ML BdA", True)
 User.profile_mailing_bda_revente = ProfileInfo("mailing_bda_revente",
-                                               "ML BDA-R", True)
+                                               "ML BdA-R", True)
 
 
 class UserProfileAdmin(UserAdmin):
diff --git a/gestioncof/templates/home.html b/gestioncof/templates/home.html
index 0cd32ebf..35a6bc06 100644
--- a/gestioncof/templates/home.html
+++ b/gestioncof/templates/home.html
@@ -43,7 +43,7 @@
                         {% else %}
                             <li><a href="{% url "bda-places-attribuees" tirage.id %}">Mes places</a></li> 
                             <li><a href="{% url "bda-revente" tirage.id %}">Revendre une place</a></li> 
-                        <li><a href="{% url "bda-liste-revente" tirage.id %}">S'inscrire à BDA-Revente</a></li>
+                        <li><a href="{% url "bda-liste-revente" tirage.id %}">S'inscrire à BdA-Revente</a></li>
                         {% endif %}
                     </ul> 
                 {% endfor %}
@@ -83,7 +83,7 @@
                     {% endfor %}
                     </ul>
             </div>
-            <h3 class="block-title">Gestion tirages BDA<span class="pull-right glyphicon glyphicon-list"></span></h3>
+            <h3 class="block-title">Gestion tirages BdA<span class="pull-right glyphicon glyphicon-list"></span></h3>
             <div class="hm-block">
                 {% if active_tirages %}
                     {% for tirage in active_tirages %}

From 284dc12b7c1a9b212ec2bbad47e51ea0e9e61d34 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Tue, 27 Sep 2016 17:35:29 +0200
Subject: [PATCH 2/3] success message

---
 bda/templates/liste-reventes.html | 3 +++
 bda/views.py                      | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bda/templates/liste-reventes.html b/bda/templates/liste-reventes.html
index 2a236176..78f3ac08 100644
--- a/bda/templates/liste-reventes.html
+++ b/bda/templates/liste-reventes.html
@@ -3,6 +3,9 @@
 
 {% block realcontent %}
   <h2>Inscriptions pour BdA-Revente</h2>
+  {% if success %}
+    <p class="success">Ton inscription a bien été prise en compte !</p>
+  {% endif %}
   {% if deja_revente %}
     <p class="success">Des reventes existent déjà pour certains de ces spectacles ; vérifie les places disponibles sans tirage !</p>
   {% endif %}
diff --git a/bda/views.py b/bda/views.py
index e9a000cb..c72e5b1d 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -382,6 +382,7 @@ def list_revente(request, tirage_id):
             date__gte=timezone.now())
     shotgun = []
     deja_revente = False
+    success = False
     for spectacle in spectacles:
         revente_objects = SpectacleRevente.objects.filter(
                 attribution__spectacle=spectacle,
@@ -410,7 +411,9 @@ def list_revente(request, tirage_id):
                             deja_revente = True
                         else:
                             revente.answered_mail.add(participant)
+                            revente.save()
                             break
+            success = True
     else:
         form = InscriptionReventeForm(
                 tirage,
@@ -418,7 +421,7 @@ def list_revente(request, tirage_id):
 
     return render(request, "liste-reventes.html",
                   {"form": form, 'shotgun': shotgun,
-                   "deja_revente": deja_revente})
+                      "deja_revente": deja_revente, "success": success})
 
 
 @login_required

From ad0c398292d552e2c3a04be2e49726da2583812d Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Wed, 28 Sep 2016 16:47:46 +0200
Subject: [PATCH 3/3] fix error 500 shotgun

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

diff --git a/bda/views.py b/bda/views.py
index c72e5b1d..4f1ba977 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -443,7 +443,7 @@ def buy_revente(request, spectacle_id):
         if revente.shotgun:
             reventes_shotgun.append(revente)
 
-    if reventes_shotgun.empty():
+    if not reventes_shotgun:
         return render(request, "bda-no-revente.html", {})
 
     if request.POST: