From d1456d7c683702fb672b90d859cfcaa00df423e0 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Thu, 6 Oct 2016 13:46:18 +0200
Subject: [PATCH 1/6] =?UTF-8?q?d=C3=A9placement=20shotgun?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bda/templates/bda-shotgun.html    | 14 ++++++++++++++
 bda/templates/liste-reventes.html |  9 ---------
 bda/urls.py                       |  3 +++
 bda/views.py                      | 22 ++++++++++++++++++++++
 gestioncof/templates/home.html    |  1 +
 5 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 bda/templates/bda-shotgun.html

diff --git a/bda/templates/bda-shotgun.html b/bda/templates/bda-shotgun.html
new file mode 100644
index 00000000..e10fae00
--- /dev/null
+++ b/bda/templates/bda-shotgun.html
@@ -0,0 +1,14 @@
+{% extends "base_title.html" %}
+
+{% block realcontent %}
+  <h2>Places disponibles immédiatement</h2>
+  {% if shotgun %}
+    <ul class="list-unstyled">
+    {% for spectacle in shotgun %}
+    <li><a href="{% url "bda-buy-revente" spectacle.id %}">{{spectacle}}</a></li>
+    {% endfor %}
+  {% else %}
+    <p> Pas de places disponibles immédiatement, désolé !</p>
+  {% endif %}
+
+{% endblock %}
diff --git a/bda/templates/liste-reventes.html b/bda/templates/liste-reventes.html
index a619ed4c..d08d4010 100644
--- a/bda/templates/liste-reventes.html
+++ b/bda/templates/liste-reventes.html
@@ -28,15 +28,6 @@
   <input type="submit" class="btn btn-primary" value="S'inscrire pour les places sélectionnées">
   </form>
 
-  {% if shotgun %}
-  <br>
-  <h3>Places disponibles immédiatement</h3>
-    <ul class="list-unstyled">
-    {% for spectacle in shotgun %}
-    <li><a href="{% url "bda-buy-revente" spectacle.id %}">{{spectacle}}</a></li>
-    {% endfor %}
-  {% endif %}
-
 <script language="JavaScript">
 function select(check) {
     checkboxes = document.getElementsByName("spectacles");
diff --git a/bda/urls.py b/bda/urls.py
index 94b797fa..4f3aa67e 100644
--- a/bda/urls.py
+++ b/bda/urls.py
@@ -41,6 +41,9 @@ urlpatterns = [
     url(r'^revente-interested/(?P<revente_id>\d+)$',
         "bda.views.revente_interested",
         name='bda-revente-interested'),
+    url(r'^revente-immediat/(?P<tirage_id>\d+)$',
+        "bda.views.revente_shotgun",
+        name="bda-shotgun"),
     url(r'^mails-rappel/(?P<spectacle_id>\d+)$', views.send_rappel),
     url(r'^descriptions/(?P<tirage_id>\d+)$', views.descriptions_spectacles,
         name='bda-descriptions'),
diff --git a/bda/views.py b/bda/views.py
index 4f1ba977..0f183421 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -471,6 +471,28 @@ Contacte-moi si tu es toujours intéressé·e !
                    "user": request.user})
 
 
+@login_required
+def revente_shotgun(request, tirage_id):
+    tirage = get_object_or_404(Tirage, id=tirage_id)
+    spectacles = tirage.spectacle_set.filter(
+            date__gte=timezone.now())
+    shotgun = []
+    for spectacle in spectacles:
+        revente_objects = SpectacleRevente.objects.filter(
+                attribution__spectacle=spectacle,
+                soldTo__isnull=True)
+        revente_count = 0
+        for revente in revente_objects:
+            if revente.shotgun:
+                revente_count += 1
+        if revente_count:
+            spectacle.revente_count = revente_count
+            shotgun.append(spectacle)
+
+    return render(request, "revente-shotgun.html",
+                  {"shotgun": shotgun})
+
+
 @buro_required
 def spectacle(request, tirage_id, spectacle_id):
     tirage = get_object_or_404(Tirage, id=tirage_id)
diff --git a/gestioncof/templates/home.html b/gestioncof/templates/home.html
index 35a6bc06..c85cbbe1 100644
--- a/gestioncof/templates/home.html
+++ b/gestioncof/templates/home.html
@@ -44,6 +44,7 @@
                             <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-shotgun" tirage.id %}">Places disponibles immédiatement</a></li>
                         {% endif %}
                     </ul> 
                 {% endfor %}

From 173c5a840b253ce838471e48dc85be85f94950bf Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Thu, 6 Oct 2016 18:51:19 +0200
Subject: [PATCH 2/6] fix links

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

diff --git a/bda/views.py b/bda/views.py
index 0f183421..01758e18 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -436,7 +436,7 @@ def buy_revente(request, spectacle_id):
     if reventes.filter(seller=participant).exists():
         revente = reventes.filter(seller=participant)[0]
         revente.delete()
-        return HttpResponseRedirect(reverse("bda-liste-revente",
+        return HttpResponseRedirect(reverse("bda-revente-shotgun",
                                             args=[tirage.id]))
     reventes_shotgun = []
     for revente in reventes.all():
@@ -489,7 +489,7 @@ def revente_shotgun(request, tirage_id):
             spectacle.revente_count = revente_count
             shotgun.append(spectacle)
 
-    return render(request, "revente-shotgun.html",
+    return render(request, "bda-shotgun.html",
                   {"shotgun": shotgun})
 
 

From db65799f3ded0e629a11aa44ea1252b6563fc601 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Sat, 8 Oct 2016 20:00:58 +0200
Subject: [PATCH 3/6] does not belong here

---
 bda/templates/liste-reventes.html | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/bda/templates/liste-reventes.html b/bda/templates/liste-reventes.html
index 5eac7100..b9987497 100644
--- a/bda/templates/liste-reventes.html
+++ b/bda/templates/liste-reventes.html
@@ -14,13 +14,4 @@
     {{form | bootstrap}}
   <input type="submit" class="btn btn-primary" value="S'inscrire pour les places sélectionnées">
   </form>
-
-<script language="JavaScript">
-function select(check) {
-    checkboxes = document.getElementsByName("spectacles");
-    for(var i=0, n=checkboxes.length;i<n;i++) {
-        checkboxes[i].checked = check;
-    }
-}
-</script>
 {% endblock %}

From 6c5a2124c46894c4ddc211caebc4adb4e8be3a1b Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Thu, 13 Oct 2016 15:30:59 +0200
Subject: [PATCH 4/6] scrap aborted modif

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

diff --git a/bda/views.py b/bda/views.py
index 494b0f36..3776385d 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -488,7 +488,6 @@ def revente_shotgun(request, tirage_id):
             if revente.shotgun:
                 revente_count += 1
         if revente_count:
-            spectacle.revente_count = revente_count
             shotgun.append(spectacle)
 
     return render(request, "bda-shotgun.html",

From cde83025eed9092db47bc764d492a9ae7906a843 Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Thu, 13 Oct 2016 16:01:30 +0200
Subject: [PATCH 5/6] change urls for 1.10

---
 bda/urls.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bda/urls.py b/bda/urls.py
index 4f3aa67e..bbbf8e39 100644
--- a/bda/urls.py
+++ b/bda/urls.py
@@ -33,16 +33,16 @@ urlpatterns = [
         views.unpaid,
         name="bda-unpaid"),
     url(r'^liste-revente/(?P<tirage_id>\d+)$',
-        "bda.views.list_revente",
+        views.list_revente,
         name="bda-liste-revente"),
     url(r'^buy-revente/(?P<spectacle_id>\d+)$',
-        "bda.views.buy_revente",
+        views.buy_revente,
         name="bda-buy-revente"),
     url(r'^revente-interested/(?P<revente_id>\d+)$',
-        "bda.views.revente_interested",
+        views.revente_interested,
         name='bda-revente-interested'),
     url(r'^revente-immediat/(?P<tirage_id>\d+)$',
-        "bda.views.revente_shotgun",
+        views.revente_shotgun,
         name="bda-shotgun"),
     url(r'^mails-rappel/(?P<spectacle_id>\d+)$', views.send_rappel),
     url(r'^descriptions/(?P<tirage_id>\d+)$', views.descriptions_spectacles,

From cf68abc789a6f5e6a646616e4df64dc111b63b4d Mon Sep 17 00:00:00 2001
From: Ludovic Stephan <lstephan@clipper.ens.fr>
Date: Thu, 13 Oct 2016 16:02:52 +0200
Subject: [PATCH 6/6] wrong url

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

diff --git a/bda/views.py b/bda/views.py
index 3776385d..b9ce0825 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -438,7 +438,7 @@ def buy_revente(request, spectacle_id):
     if reventes.filter(seller=participant).exists():
         revente = reventes.filter(seller=participant)[0]
         revente.delete()
-        return HttpResponseRedirect(reverse("bda-revente-shotgun",
+        return HttpResponseRedirect(reverse("bda-shotgun",
                                             args=[tirage.id]))
     reventes_shotgun = []
     for revente in reventes.all():