-
-{% endif %}
-{% if not resell_attributions and not annul_attributions and not overdue and not sold_attributions %}
-
Plus de reventes possibles !
-{% endif %}
-
-{% endwith %}
-{% endblock %}
diff --git a/bda/tests/test_models.py b/bda/tests/test_models.py
index d9242b3f..95ce8646 100644
--- a/bda/tests/test_models.py
+++ b/bda/tests/test_models.py
@@ -67,7 +67,7 @@ class SpectacleReventeTests(TestCase):
revente = self.rev
wanted_by = [self.p1, self.p2, self.p3]
- revente.answered_mail = wanted_by
+ revente.confirmed_entry = wanted_by
with mock.patch('bda.models.random.choice') as mc:
# Set winner to self.p1.
diff --git a/bda/tests/test_revente.py b/bda/tests/test_revente.py
new file mode 100644
index 00000000..8ef7be19
--- /dev/null
+++ b/bda/tests/test_revente.py
@@ -0,0 +1,69 @@
+from django.contrib.auth.models import User
+from django.test import TestCase, Client
+from django.utils import timezone
+
+from datetime import timedelta
+
+from bda.models import (Tirage, Spectacle, Salle, CategorieSpectacle,
+ SpectacleRevente, Attribution, Participant)
+
+
+class TestModels(TestCase):
+ def setUp(self):
+ self.tirage = Tirage.objects.create(
+ title="Tirage test",
+ appear_catalogue=True,
+ ouverture=timezone.now(),
+ fermeture=timezone.now()
+ )
+ self.category = CategorieSpectacle.objects.create(name="Category")
+ self.location = Salle.objects.create(name="here")
+ self.spectacle_soon = Spectacle.objects.create(
+ title="foo", date=timezone.now()+timedelta(days=1),
+ location=self.location, price=0, slots=42,
+ tirage=self.tirage, listing=False, category=self.category
+ )
+ self.spectacle_later = Spectacle.objects.create(
+ title="bar", date=timezone.now()+timedelta(days=30),
+ location=self.location, price=0, slots=42,
+ tirage=self.tirage, listing=False, category=self.category
+ )
+
+ user_buyer = User.objects.create_user(
+ username="bda_buyer", password="testbuyer"
+ )
+ user_seller = User.objects.create_user(
+ username="bda_seller", password="testseller"
+ )
+ self.buyer = Participant.objects.create(
+ user=user_buyer, tirage=self.tirage
+ )
+ self.seller = Participant.objects.create(
+ user=user_seller, tirage=self.tirage
+ )
+
+ self.attr_soon = Attribution.objects.create(
+ participant=self.seller, spectacle=self.spectacle_soon
+ )
+ self.attr_later = Attribution.objects.create(
+ participant=self.seller, spectacle=self.spectacle_later
+ )
+ self.revente_soon = SpectacleRevente.objects.create(
+ seller=self.seller,
+ attribution=self.attr_soon
+ )
+ self.revente_later = SpectacleRevente.objects.create(
+ seller=self.seller,
+ attribution=self.attr_later
+ )
+
+ def test_urgent(self):
+ self.assertTrue(self.revente_soon.is_urgent)
+ self.assertFalse(self.revente_later.is_urgent)
+
+ def test_tirage(self):
+ self.revente_soon.confirmed_entry.add(self.buyer)
+
+ self.assertEqual(self.revente_soon.tirage(send_mails=False),
+ self.buyer)
+ self.assertIsNone(self.revente_later.tirage(send_mails=False))
diff --git a/bda/urls.py b/bda/urls.py
index 6acc1746..a42a415d 100644
--- a/bda/urls.py
+++ b/bda/urls.py
@@ -16,9 +16,6 @@ urlpatterns = [
url(r'^places/(?P
\d+)$',
views.places,
name="bda-places-attribuees"),
- url(r'^revente/(?P\d+)$',
- views.revente,
- name='bda-revente'),
url(r'^etat-places/(?P\d+)$',
views.etat_places,
name='bda-etat-places'),
@@ -38,18 +35,28 @@ urlpatterns = [
url(r'^participants/autocomplete$',
views.participant_autocomplete,
name="bda-participant-autocomplete"),
- url(r'^liste-revente/(?P\d+)$',
- views.list_revente,
- name="bda-liste-revente"),
- url(r'^buy-revente/(?P\d+)$',
- views.buy_revente,
- name="bda-buy-revente"),
- url(r'^revente-interested/(?P\d+)$',
- views.revente_interested,
- name='bda-revente-interested'),
- url(r'^revente-immediat/(?P\d+)$',
+
+ # Urls BdA-Revente
+
+ url(r'^revente/(?P\d+)/manage$',
+ views.revente_manage,
+ name='bda-revente-manage'),
+ url(r'^revente/(?P\d+)/subscribe$',
+ views.revente_subscribe,
+ name="bda-revente-subscribe"),
+ url(r'^revente/(?P\d+)/tirages$',
+ views.revente_tirages,
+ name="bda-revente-tirages"),
+ url(r'^revente/(?P\d+)/buy$',
+ views.revente_buy,
+ name="bda-revente-buy"),
+ url(r'^revente/(?P\d+)/confirm$',
+ views.revente_confirm,
+ name='bda-revente-confirm'),
+ url(r'^revente/(?P\d+)/shotgun$',
views.revente_shotgun,
- name="bda-shotgun"),
+ name="bda-revente-shotgun"),
+
url(r'^mails-rappel/(?P\d+)$',
views.send_rappel,
name="bda-rappels"
diff --git a/bda/views.py b/bda/views.py
index 6c4edff8..e88e5955 100644
--- a/bda/views.py
+++ b/bda/views.py
@@ -5,7 +5,6 @@ import random
import hashlib
import time
import json
-from datetime import timedelta
from custommail.shortcuts import send_mass_custom_mail, send_custom_mail
from custommail.models import CustomMail
from django.shortcuts import render, get_object_or_404
@@ -14,6 +13,7 @@ from django.contrib import messages
from django.db import transaction
from django.core import serializers
from django.db.models import Count, Q, Prefetch
+from django.template.defaultfilters import pluralize
from django.forms.models import inlineformset_factory
from django.http import (
HttpResponseBadRequest, HttpResponseRedirect, JsonResponse
@@ -30,7 +30,7 @@ from bda.models import (
from bda.algorithm import Algorithm
from bda.forms import (
TokenForm, ResellForm, AnnulForm, InscriptionReventeForm, SoldForm,
- InscriptionInlineFormSet,
+ InscriptionInlineFormSet, ReventeTirageForm, ReventeTirageAnnulForm
)
from utils.views.autocomplete import Select2QuerySetView
@@ -351,13 +351,21 @@ def tirage(request, tirage_id):
@login_required
-def revente(request, tirage_id):
+def revente_manage(request, tirage_id):
+ """
+ Gestion de ses propres reventes :
+ - Création d'une revente
+ - Annulation d'une revente
+ - Confirmation d'une revente = transfert de la place à la personne qui
+ rachète
+ - Annulation d'une revente après que le tirage a eu lieu
+ """
tirage = get_object_or_404(Tirage, id=tirage_id)
participant, created = Participant.objects.get_or_create(
user=request.user, tirage=tirage)
if not participant.paid:
- return render(request, "bda-notpaid.html", {})
+ return render(request, "bda/revente/notpaid.html", {})
resellform = ResellForm(participant, prefix='resell')
annulform = AnnulForm(participant, prefix='annul')
@@ -377,12 +385,8 @@ def revente(request, tirage_id):
attribution=attribution,
defaults={'seller': participant})
if not created:
- revente.seller = participant
- revente.date = timezone.now()
- revente.soldTo = None
- revente.notif_sent = False
- revente.tirage_done = False
- revente.shotgun = False
+ revente.reset()
+
context = {
'vendeur': participant.user,
'show': attribution.spectacle,
@@ -399,18 +403,18 @@ def revente(request, tirage_id):
elif 'annul' in request.POST:
annulform = AnnulForm(participant, request.POST, prefix='annul')
if annulform.is_valid():
- attributions = annulform.cleaned_data["attributions"]
- for attribution in attributions:
- attribution.revente.delete()
+ reventes = annulform.cleaned_data["reventes"]
+ for revente in reventes:
+ revente.delete()
# On confirme une vente en transférant la place à la personne qui a
# gagné le tirage
elif 'transfer' in request.POST:
soldform = SoldForm(participant, request.POST, prefix='sold')
if soldform.is_valid():
- attributions = soldform.cleaned_data['attributions']
- for attribution in attributions:
- attribution.participant = attribution.revente.soldTo
- attribution.save()
+ reventes = soldform.cleaned_data['reventes']
+ for reventes in reventes:
+ revente.attribution.participant = revente.soldTo
+ revente.attribution.save()
# On annule la revente après le tirage au sort (par exemple si
# la personne qui a gagné le tirage ne se manifeste pas). La place est
@@ -418,18 +422,13 @@ def revente(request, tirage_id):
elif 'reinit' in request.POST:
soldform = SoldForm(participant, request.POST, prefix='sold')
if soldform.is_valid():
- attributions = soldform.cleaned_data['attributions']
- for attribution in attributions:
- if attribution.spectacle.date > timezone.now():
- revente = attribution.revente
- revente.date = timezone.now() - timedelta(minutes=65)
- revente.soldTo = None
- revente.notif_sent = False
- revente.tirage_done = False
- revente.shotgun = False
- if revente.answered_mail:
- revente.answered_mail.clear()
- revente.save()
+ reventes = soldform.cleaned_data['reventes']
+ for revente in reventes:
+ if revente.attribution.spectacle.date > timezone.now():
+ # On antidate pour envoyer le mail plus vite
+ new_date = (timezone.now()
+ - SpectacleRevente.remorse_time)
+ revente.reset(new_date=new_date)
overdue = participant.attribution_set.filter(
spectacle__date__gte=timezone.now(),
@@ -439,28 +438,80 @@ def revente(request, tirage_id):
.filter(
Q(revente__soldTo__isnull=True) | Q(revente__soldTo=participant))
- return render(request, "bda/reventes.html",
+ return render(request, "bda/revente/manage.html",
{'tirage': tirage, 'overdue': overdue, "soldform": soldform,
"annulform": annulform, "resellform": resellform})
@login_required
-def revente_interested(request, revente_id):
+def revente_tirages(request, tirage_id):
+ """
+ Affiche à un participant la liste de toutes les reventes en cours (pour un
+ tirage donné) et lui permet de s'inscrire et se désinscrire à ces reventes.
+ """
+ tirage = get_object_or_404(Tirage, id=tirage_id)
+ participant, _ = Participant.objects.get_or_create(
+ user=request.user, tirage=tirage)
+ subform = ReventeTirageForm(participant, prefix="subscribe")
+ annulform = ReventeTirageAnnulForm(participant, prefix="annul")
+
+ if request.method == 'POST':
+ if "subscribe" in request.POST:
+ subform = ReventeTirageForm(participant, request.POST,
+ prefix="subscribe")
+ if subform.is_valid():
+ reventes = subform.cleaned_data['reventes']
+ count = reventes.count()
+ for revente in reventes:
+ revente.confirmed_entry.add(participant)
+ if count > 0:
+ messages.success(
+ request,
+ "Tu as bien été inscrit à {} revente{}"
+ .format(count, pluralize(count))
+ )
+ elif "annul" in request.POST:
+ annulform = ReventeTirageAnnulForm(participant, request.POST,
+ prefix="annul")
+ if annulform.is_valid():
+ reventes = annulform.cleaned_data['reventes']
+ count = reventes.count()
+ for revente in reventes:
+ revente.confirmed_entry.remove(participant)
+ if count > 0:
+ messages.success(
+ request,
+ "Tu as bien été désinscrit de {} revente{}"
+ .format(count, pluralize(count))
+ )
+
+ return render(request, "bda/revente/tirages.html",
+ {"annulform": annulform, "subform": subform})
+
+
+@login_required
+def revente_confirm(request, revente_id):
revente = get_object_or_404(SpectacleRevente, id=revente_id)
participant, _ = Participant.objects.get_or_create(
user=request.user, tirage=revente.attribution.spectacle.tirage)
- if (timezone.now() < revente.date + timedelta(hours=1)) or revente.shotgun:
- return render(request, "bda-wrongtime.html",
+ if not revente.notif_sent or revente.shotgun:
+ return render(request, "bda/revente/wrongtime.html",
{"revente": revente})
- revente.answered_mail.add(participant)
- return render(request, "bda-interested.html",
+ revente.confirmed_entry.add(participant)
+ return render(request, "bda/revente/confirmed.html",
{"spectacle": revente.attribution.spectacle,
"date": revente.date_tirage})
@login_required
-def list_revente(request, tirage_id):
+def revente_subscribe(request, tirage_id):
+ """
+ Permet à un participant de sélectionner ses préférences pour les reventes.
+ Il recevra des notifications pour les spectacles qui l'intéressent et il
+ est automatiquement inscrit aux reventes en cours au moment où il ajoute un
+ spectacle à la liste des spectacles qui l'intéressent.
+ """
tirage = get_object_or_404(Tirage, id=tirage_id)
participant, _ = Participant.objects.get_or_create(
user=request.user, tirage=tirage)
@@ -486,12 +537,12 @@ def list_revente(request, tirage_id):
# la revente ayant le moins d'inscrits
min_resell = (
qset.filter(shotgun=False)
- .annotate(nb_subscribers=Count('answered_mail'))
+ .annotate(nb_subscribers=Count('confirmed_entry'))
.order_by('nb_subscribers')
.first()
)
if min_resell is not None:
- min_resell.answered_mail.add(participant)
+ min_resell.confirmed_entry.add(participant)
inscrit_revente.append(spectacle)
success = True
else:
@@ -514,11 +565,11 @@ def list_revente(request, tirage_id):
)
messages.info(request, msg, extra_tags="safe")
- return render(request, "bda/liste-reventes.html", {"form": form})
+ return render(request, "bda/revente/subscribe.html", {"form": form})
@login_required
-def buy_revente(request, spectacle_id):
+def revente_buy(request, spectacle_id):
spectacle = get_object_or_404(Spectacle, id=spectacle_id)
tirage = spectacle.tirage
participant, _ = Participant.objects.get_or_create(
@@ -532,13 +583,13 @@ def buy_revente(request, spectacle_id):
own_reventes = reventes.filter(seller=participant)
if len(own_reventes) > 0:
own_reventes[0].delete()
- return HttpResponseRedirect(reverse("bda-shotgun",
+ return HttpResponseRedirect(reverse("bda-revente-shotgun",
args=[tirage.id]))
reventes_shotgun = reventes.filter(shotgun=True)
if not reventes_shotgun:
- return render(request, "bda-no-revente.html", {})
+ return render(request, "bda/revente/none.html", {})
if request.POST:
revente = random.choice(reventes_shotgun)
@@ -555,11 +606,11 @@ def buy_revente(request, spectacle_id):
[revente.seller.user.email],
context=context,
)
- return render(request, "bda-success.html",
+ return render(request, "bda/revente/mail-success.html",
{"seller": revente.attribution.participant.user,
"spectacle": spectacle})
- return render(request, "revente-confirm.html",
+ return render(request, "bda/revente/confirm-shotgun.html",
{"spectacle": spectacle,
"user": request.user})
@@ -583,7 +634,7 @@ def revente_shotgun(request, tirage_id):
)
shotgun = [sp for sp in spectacles if len(sp.shotguns) > 0]
- return render(request, "bda-shotgun.html",
+ return render(request, "bda/revente/shotgun.html",
{"shotgun": shotgun})
diff --git a/gestioncof/management/data/custommail.json b/gestioncof/management/data/custommail.json
index 590ebf18..691043e9 100644
--- a/gestioncof/management/data/custommail.json
+++ b/gestioncof/management/data/custommail.json
@@ -159,23 +159,23 @@
},
{
"model": "custommail.custommail",
+ "pk": 3,
"fields": {
"shortname": "bda-revente",
"subject": "{{ show }}",
- "body": "Bonjour {{ member.first_name }}\r\n\r\nUne place pour le spectacle {{ show.title }} ({{ show.date }})\r\na \u00e9t\u00e9 post\u00e9e sur BdA-Revente.\r\n\r\nSi ce spectacle t'int\u00e9resse toujours, merci de nous le signaler en cliquant\r\nsur ce lien : http://{{ site }}{% url \"bda-revente-interested\" revente.id %}.\r\nDans le cas o\u00f9 plusieurs personnes seraient int\u00e9ress\u00e9es, nous proc\u00e8derons \u00e0\r\nun tirage au sort le {{ revente.date_tirage|date:\"DATE_FORMAT\" }}.\r\n\r\nChaleureusement,\r\nLe BdA",
- "description": "Notification envoy\u00e9e \u00e0 toutes les personnes int\u00e9ress\u00e9es par un spectacle pour le signaler qu'une place vient d'\u00eatre mise en vente."
- },
- "pk": 3
+ "description": "Notification envoy\u00e9e \u00e0 toutes les personnes int\u00e9ress\u00e9es par un spectacle pour leur signaler qu'une place vient d'\u00eatre mise en vente.",
+ "body": "Bonjour {{ member.first_name }}\r\n\r\nUne place pour le spectacle {{ show.title }} ({{ show.date }})\r\na \u00e9t\u00e9 post\u00e9e sur BdA-Revente.\r\n\r\nSi ce spectacle t'int\u00e9resse toujours, merci de nous le signaler en cliquant\r\nsur ce lien : http://{{ site }}{% url \"bda-revente-confirm\" revente.id %}.\r\nDans le cas o\u00f9 plusieurs personnes seraient int\u00e9ress\u00e9es, nous proc\u00e8derons \u00e0\r\nun tirage au sort le {{ revente.date_tirage|date:\"DATE_FORMAT\" }}.\r\n\r\nChaleureusement,\r\nLe BdA"
+ }
},
{
"model": "custommail.custommail",
+ "pk": 4,
"fields": {
"shortname": "bda-shotgun",
"subject": "{{ show }}",
- "body": "Bonjour {{ member.first_name }}\r\n\r\nUne place pour le spectacle {{ show.title }} ({{ show.date }})\r\na \u00e9t\u00e9 post\u00e9e sur BdA-Revente.\r\n\r\nPuisque ce spectacle a lieu dans moins de 24h, il n'y a pas de tirage au sort pour\r\ncette place : elle est disponible imm\u00e9diatement \u00e0 l'adresse\r\nhttp://{{ site }}{% url \"bda-buy-revente\" show.id %}, \u00e0 la disposition de tous.\r\n\r\nChaleureusement,\r\nLe BdA",
- "description": "Notification signalant qu'une place est au shotgun aux personnes int\u00e9ress\u00e9es."
- },
- "pk": 4
+ "description": "Notification signalant qu'une place est au shotgun aux personnes int\u00e9ress\u00e9es.",
+ "body": "Bonjour {{ member.first_name }}\r\n\r\nUne place pour le spectacle {{ show.title }} ({{ show.date }})\r\na \u00e9t\u00e9 post\u00e9e sur BdA-Revente.\r\n\r\nPuisque ce spectacle a lieu dans moins de 24h, il n'y a pas de tirage au sort pour\r\ncette place : elle est disponible imm\u00e9diatement \u00e0 l'adresse\r\nhttp://{{ site }}{% url \"bda-revente-buy\" show.id %}, \u00e0 la disposition de tous.\r\n\r\nChaleureusement,\r\nLe BdA"
+ }
},
{
"model": "custommail.custommail",
diff --git a/gestioncof/static/css/cof.css b/gestioncof/static/css/cof.css
index 91cf726a..84c81d60 100644
--- a/gestioncof/static/css/cof.css
+++ b/gestioncof/static/css/cof.css
@@ -1140,3 +1140,14 @@ p.help-block {
margin: 5px auto;
width: 90%;
}
+
+div.bg-info {
+ border-radius: 3px;
+ padding: 0.3em 1em;
+ margin-left: 1em;
+ margin-right: 1em;
+}
+
+.bootstrap-form-reduce > .form-group {
+ margin-top: -16px;
+}
diff --git a/gestioncof/templates/home.html b/gestioncof/templates/home.html
index 65c4ba5e..b14c0a82 100644
--- a/gestioncof/templates/home.html
+++ b/gestioncof/templates/home.html
@@ -43,9 +43,10 @@
État des demandes
{% else %}
Mes places
- Revendre une place
- S'inscrire à BdA-Revente
- Places disponibles immédiatement
+ Gérer les places que je revends
+ Voir les reventes en cours
+ Indiquer les spectacles qui m'intéressent
+ Places disponibles immédiatement
{% endif %}
{% endfor %}