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] =?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 %}