Merge branch 'master' into Kerl/fusion_bda

Résolution des conflits :

* Suppression des applis `bda2` et `bda3`
* Choix d'une date arbitraire pour le début du tirage

bda/views.py

@@ -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, tirage):
@@ -211,9 +193,6 @@ def do_tirage(request, tirage):
     else:
         return render(request, "bda-attrib.html", data)
 
-class TokenForm(forms.Form):
-    token = forms.CharField(widget = forms.widgets.Textarea())
-
 @login_required
 def tirage(request, tirage):
     if request.POST:
@@ -224,18 +203,6 @@ def tirage(request, tirage):
         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"]