diff --git a/bda/models.py b/bda/models.py index 9fc66075..2926bb80 100644 --- a/bda/models.py +++ b/bda/models.py @@ -12,6 +12,7 @@ class Tirage(models.Model): ouverture = models.DateTimeField("Date et heure d'ouverture du tirage") fermeture = models.DateTimeField("Date et heure de fermerture du tirage") token = models.TextField("Graine du tirage", blank=True) + active = models.BooleanField("Tirage actif", default=True) def date_no_seconds(self): return self.fermeture.strftime('%d %b %Y %H:%M') diff --git a/bda/views.py b/bda/views.py index a14380d8..9a901cfb 100644 --- a/bda/views.py +++ b/bda/views.py @@ -133,10 +133,16 @@ def inscription(request, tirage_id): { "error_title": "C'est fini !", "error_description": u"Tirage au sort dans la journée !", "choices": choices}) - BdaFormSet = inlineformset_factory(Participant, + def formfield_callback(f, **kwargs): + if f.name == "spectacle": + kwargs['queryset'] = Spectacle.objects.filter(tirage=tirage) + return f.formfield(**kwargs) + BdaFormSet = inlineformset_factory( + Participant, ChoixSpectacle, fields=("spectacle","double_choice","priority"), - formset=BaseBdaFormSet) + formset=BaseBdaFormSet, + formfield_callback=formfield_callback) participant, created = Participant.objects.get_or_create( user=request.user, tirage=tirage) success = False diff --git a/gestioncof/templates/home.html b/gestioncof/templates/home.html index fe713f61..f0aecebc 100644 --- a/gestioncof/templates/home.html +++ b/gestioncof/templates/home.html @@ -24,17 +24,19 @@ {% if user.profile.is_cof %} -