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

Déplace les formulaires vers des forms.py

Browse source 
Les formulaires de chaque application sont désormais dans un fichier `forms.py`.
This commit is contained in:
Martin Pépin 2016-05-27 17:52:02 +02:00 • committed by Basile Clement
parent dee6310465
commit 65667f6652
8 changed files with 422 additions and 395 deletions
Download patch file Download diff file Expand all files Collapse all files

39
bda/views.py
View file

@ -5,8 +5,6 @@ from django.shortcuts import render, get_object_or_404
from django.contrib.auth.decorators import login_required
from django.db import models
from django.http import Http404
from django import forms
from django.forms.models import inlineformset_factory, BaseInlineFormSet
from django.core import serializers
import hashlib
@ -20,23 +18,7 @@ from gestioncof.shared import send_custom_mail
from bda.models import Spectacle, Participant, ChoixSpectacle, Attribution
from bda.algorithm import Algorithm
class BaseBdaFormSet(BaseInlineFormSet):
def clean(self):
"""Checks that no two articles have the same title."""
super(BaseBdaFormSet, self).clean()
if any(self.errors):
# Don't bother validating the formset unless each form is valid on its own
return
spectacles = []
for i in range(0, self.total_form_count()):
form = self.forms[i]
if not form.cleaned_data:
continue
spectacle = form.cleaned_data['spectacle']
delete = form.cleaned_data['DELETE']
if not delete and spectacle in spectacles:
raise forms.ValidationError("Vous ne pouvez pas vous inscrire deux fois pour le même spectacle.")
spectacles.append(spectacle)
from bda.forms import BaseBdaFormSet, TokenForm, ResellForm
@cof_required
def etat_places(request):
@ -117,7 +99,7 @@ def places_ics(request):
@cof_required
def inscription(request):
if datetime.now() > datetime(2015, 10, 4, 12, 00) and request.user.username != "seguin":
if datetime.now() > datetime(2015, 10, 4, 12, 00):
participant, created = Participant.objects.get_or_create(user = request.user)
choices = participant.choixspectacle_set.order_by("priority").all()
return render(request, "resume_inscription.html", {"error_title": "C'est fini !", "error_description": u"Tirage au sort dans la journée !", "choices": choices})
@ -207,9 +189,6 @@ def do_tirage(request):
else:
return render(request, "bda-attrib.html", data)
class TokenForm(forms.Form):
token = forms.CharField(widget = forms.widgets.Textarea())
@login_required
def tirage(request):
if request.POST:
@ -220,18 +199,6 @@ def tirage(request):
form = TokenForm()
return render(request, "bda-token.html", {"form": form})
class SpectacleModelChoiceField(forms.ModelChoiceField):
def label_from_instance(self, obj):
return u"%s le %s (%s) à %.02f€" % (obj.title, obj.date_no_seconds(), obj.location, obj.price)
class ResellForm(forms.Form):
count = forms.ChoiceField(choices = (("1","1"),("2","2"),))
spectacle = SpectacleModelChoiceField(queryset = Spectacle.objects.none())
def __init__(self, participant, *args, **kwargs):
super(ResellForm, self).__init__(*args, **kwargs)
self.fields['spectacle'].queryset = participant.attributions.all().distinct()
def do_resell(request, form):
spectacle = form.cleaned_data["spectacle"]
count = form.cleaned_data["count"]
@ -287,4 +254,4 @@ def liste_spectacles_ics(request):
for spectacle in spectacles:
spectacle.dtend = spectacle.date + timedelta(seconds=7200)
return render(request, "liste_spectacles.ics",
{"spectacles": spectacles}, content_type="text/calendar")
{"spectacles": spectacles}, content_type="text/calendar")