cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'Aufinal/clean_code' into Kerl/clean_code_amend

Browse source
This commit is contained in:
Martin Pépin 2016-12-21 11:31:07 +01:00
commit 847345bb63
5 changed files with 45 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bda/views.py
View file

@ -287,6 +287,7 @@ def revente(request, tirage_id):
if not created:
revente.seller = participant
revente.date = timezone.now()
revente.soldTo = None
revente.notif_sent = False
revente.tirage_done = False
revente.shotgun = False
@ -346,6 +347,7 @@ def revente(request, tirage_id):
revente.soldTo = None
revente.notif_sent = False
revente.tirage_done = False
revente.shotgun = False
if revente.answered_mail:
revente.answered_mail.clear()
revente.save()
@ -366,8 +368,7 @@ def revente(request, tirage_id):
sold = participant.attribution_set.filter(
spectacle__date__gte=timezone.now(),
revente__isnull=False,
revente__soldTo__isnull=False).exclude(
revente__soldTo=participant)
revente__soldTo__isnull=False)
return render(request, "bda-revente.html",
{'tirage': tirage, 'overdue': overdue, "sold": sold,
@ -396,6 +397,7 @@ def list_revente(request, tirage_id):
user=request.user, tirage=tirage)
deja_revente = False
success = False
inscrit_revente = False
if request.method == 'POST':
form = InscriptionReventeForm(tirage, request.POST)
if form.is_valid():
@ -422,6 +424,7 @@ def list_revente(request, tirage_id):
if min_resell is not None:
min_resell.answered_mail.add(participant)
min_resell.save()
inscrit_revente = True
success = True
else:
form = InscriptionReventeForm(
@ -430,7 +433,8 @@ def list_revente(request, tirage_id):
return render(request, "liste-reventes.html",
{"form": form,
"deja_revente": deja_revente, "success": success})
"deja_revente": deja_revente, "success": success,
"inscrit_revente": inscrit_revente})
@login_required
@ -485,14 +489,11 @@ def revente_shotgun(request, tirage_id):
date__gte=timezone.now())
shotgun = []
for spectacle in spectacles:
revente_objects = SpectacleRevente.objects.filter(
reventes = SpectacleRevente.objects.filter(
attribution__spectacle=spectacle,
shotgun=True,
soldTo__isnull=True)
revente_count = 0
for revente in revente_objects:
if revente.shotgun:
revente_count += 1
if revente_count:
if reventes.exists():
shotgun.append(spectacle)
return render(request, "bda-shotgun.html",