Merge branch 'Aufinal/annul_reventes' into 'master'

Annulation des reventes

Closes #191

See merge request cof-geek/gestioCOF!297

bda/forms.py

@@ -52,12 +52,16 @@ class ReventeModelMultipleChoiceField(forms.ModelMultipleChoiceField):
         label = "{show}{suffix}"
         suffix = ""
         if self.own:
-            # C'est notre propre revente : pas besoin de spécifier le vendeur
+            # C'est notre propre revente : informations sur le statut
             if obj.soldTo is not None:
                 suffix = " -- Vendue à {firstname} {lastname}".format(
                     firstname=obj.soldTo.user.first_name,
                     lastname=obj.soldTo.user.last_name,
                 )
+            elif obj.shotgun:
+                suffix = " -- Tirage infructueux"
+            elif obj.notif_sent:
+                suffix = " -- Inscriptions au tirage en cours"
         else:
             # Ce n'est pas à nous : on ne voit jamais l'acheteur
             suffix = " -- Vendue par {firstname} {lastname}".format(
@@ -95,11 +99,15 @@ class AnnulForm(forms.Form):
 
     def __init__(self, participant, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields["reventes"].queryset = participant.original_shows.filter(
+        self.fields["reventes"].queryset = (
-            attribution__spectacle__date__gte=timezone.now(),
+            participant.original_shows.filter(
-            notif_sent=False,
+                attribution__spectacle__date__gte=timezone.now(), soldTo__isnull=True
-            soldTo__isnull=True,
+            )
-        ).select_related("attribution__spectacle", "attribution__spectacle__location")
+            .select_related(
+                "attribution__spectacle", "attribution__spectacle__location"
+            )
+            .order_by("-date")
+        )
 
 
 class InscriptionReventeForm(forms.Form):

bda/templates/bda/revente/manage.html

@@ -6,7 +6,7 @@
 <h2>Gestion des places que je revends</h2>
 {% with resell_attributions=resellform.attributions annul_reventes=annulform.reventes sold_reventes=soldform.reventes %}
 
-{% if resellform.attributions %}
+{% if resell_attributions %}
 <br />
 
 <h3>Places non revendues</h3>
@@ -29,34 +29,24 @@
 <hr />
 {% endif %}
 
-{% if annul_reventes or overdue %}
+{% if annul_reventes %}
 <h3>Places en cours de revente</h3>
 <form action="" method="post">
-    {% if annul_reventes %}
+  <div class="bg-info text-info center-block">
-        <div class="bg-info text-info center-block">
+    <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-            <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
+    Vous pouvez annuler les reventes qui n'ont pas encore trouvé preneur·se.
-            Vous pouvez annuler les places mises en vente il y a moins d'une heure.
+  </div>
-        </div>
+  {% csrf_token %}
-    {% endif %}
+  <div class='form-group'>
-    {% csrf_token %}
+      <div class='multiple-checkbox'>
-    <div class='form-group'>
+          <ul>
-        <div class='multiple-checkbox'>
+              {% for revente in annul_reventes %}
-            <ul>
+                  <li>{{ revente.tag }} {{ revente.choice_label }}</li>
-                {% for revente in annul_reventes %}
+              {% endfor %}
-                    <li>{{ revente.tag }} {{ revente.choice_label }}</li>
+          </ul>
-                {% endfor %}
+      </div>
-                {% for attrib in overdue %}
+  </div>
-                    <li>
+  <input type="submit" class="btn btn-primary" name="annul" value="Annuler les reventes sélectionnées">
-                        <input type="checkbox" style="visibility:hidden">
-                        {{ attrib.spectacle }}
-                    </li>
-                {% endfor %}
-            </ul>
-        </div>
-    </div>
-    {% if annul_reventes %}
-    <input type="submit" class="btn btn-primary" name="annul" value="Annuler les reventes sélectionnées">
-    {% endif %}
 </form>
 
 <hr />
@@ -82,7 +72,7 @@
     <button type="submit" class="btn btn-primary" name="reinit">Réinitialiser</button>
 </form>
 {% endif %}
-{% if not resell_attributions and not annul_attributions and not overdue and not sold_reventes %}
+{% if not resell_attributions and not annul_reventes and not sold_reventes %}
 <p>Plus de reventes possibles !</p>
 {% endif %}
 

bda/views.py

@@ -12,7 +12,7 @@ from django.contrib.auth.decorators import login_required
 from django.core import serializers
 from django.core.urlresolvers import reverse
 from django.db import transaction
-from django.db.models import Count, Prefetch, Q
+from django.db.models import Count, Prefetch
 from django.forms.models import inlineformset_factory
 from django.http import HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
 from django.shortcuts import get_object_or_404, render
@@ -445,19 +445,11 @@ def revente_manage(request, tirage_id):
                         new_date = timezone.now() - SpectacleRevente.remorse_time
                         revente.reset(new_date=new_date)
 
-    overdue = participant.attribution_set.filter(
-        spectacle__date__gte=timezone.now(),
-        revente__isnull=False,
-        revente__seller=participant,
-        revente__notif_sent=True,
-    ).filter(Q(revente__soldTo__isnull=True) | Q(revente__soldTo=participant))
-
     return render(
         request,
         "bda/revente/manage.html",
         {
             "tirage": tirage,
-            "overdue": overdue,
             "soldform": soldform,
             "annulform": annulform,
             "resellform": resellform,