Merge remote-tracking branch 'origin/master' into Aufinal/change_shotgun

bda/admin.py

@@ -219,10 +219,10 @@ class SpectacleReventeAdmin(admin.ModelAdmin):
     list_display = ("spectacle", "seller", "date", "soldTo")
     raw_id_fields = ("attribution",)
     readonly_fields = ("expiration_time",)
-    search_fields = ("spectacle__title",
-                     "seller__user__username",
-                     "seller__user__firstname",
-                     "seller__user__lastname",)
+    search_fields = ['attribution__spectacle__title',
+                     'seller__user__username',
+                     'seller__user__first_name',
+                     'seller__user__last_name']
 
 
 admin.site.register(CategorieSpectacle)

bda/models.py

@@ -254,7 +254,7 @@ class SpectacleRevente(models.Model):
     def expiration_time_str(self):
         return self.expiration_time \
                    .astimezone(timezone.get_current_timezone()) \
-                   .strftime('%D à %H:%M')
+                   .strftime('%d/%m/%y à %H:%M')
 
     def __str__(self):
         return "%s -- %s" % (self.seller,

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 %}

bda/templates/liste-reventes.html

@@ -11,16 +11,29 @@
   {% endif %}
   <form action="" class="form-horizontal" method="post">
     {% csrf_token %}
-    {{form | bootstrap}}
+    <div class="form-group">
+        <h3>Spectacles</h3>
+        <br/>
+      <button type="button" class="btn btn-primary" onClick="select(true)">Tout sélectionner</button>
+      <button type="button" class="btn btn-primary" onClick="select(false)">Tout désélectionner</button>
+
+        <div class="multiple-checkbox">
+            <ul>
+                {% for checkbox in form.spectacles %}
+                <li>{{checkbox}}</li>
+                {%endfor%}
+            </ul>
+        </div>
+    </div>
   <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");
+    for(var i=0, n=checkboxes.length;i<n;i++) {
+        checkboxes[i].checked = check;
+    }
+}
+</script>
 {% endblock %}

bda/urls.py

@@ -33,14 +33,17 @@ 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+)$',
+        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'),

bda/views.py

@@ -435,7 +435,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-shotgun",
                                             args=[tirage.id]))
     reventes_shotgun = reventes.filter(shotgun=True)
 
@@ -467,6 +467,27 @@ 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:
+            shotgun.append(spectacle)
+
+    return render(request, "bda-shotgun.html",
+                  {"shotgun": shotgun})
+
+
 @buro_required
 def spectacle(request, tirage_id, spectacle_id):
     tirage = get_object_or_404(Tirage, id=tirage_id)

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 %}