Déplace les formulaires vers des forms.py
Les formulaires de chaque application sont désormais dans un fichier `forms.py`.
This commit is contained in:
parent
9cce1076a9
commit
bf59d91613
8 changed files with 422 additions and 395 deletions
39
bda/forms.py
Normal file
39
bda/forms.py
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
# coding: utf-8
|
||||||
|
|
||||||
|
from django import forms
|
||||||
|
from django.forms.models import inlineformset_factory, BaseInlineFormSet
|
||||||
|
from bda.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
class TokenForm(forms.Form):
|
||||||
|
token = forms.CharField(widget = forms.widgets.Textarea())
|
||||||
|
|
||||||
|
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()
|
||||||
|
|
37
bda/views.py
37
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.contrib.auth.decorators import login_required
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.http import Http404
|
from django.http import Http404
|
||||||
from django import forms
|
|
||||||
from django.forms.models import inlineformset_factory, BaseInlineFormSet
|
|
||||||
from django.core import serializers
|
from django.core import serializers
|
||||||
import hashlib
|
import hashlib
|
||||||
|
|
||||||
|
@ -20,23 +18,7 @@ from gestioncof.shared import send_custom_mail
|
||||||
from bda.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
from bda.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
||||||
from bda.algorithm import Algorithm
|
from bda.algorithm import Algorithm
|
||||||
|
|
||||||
class BaseBdaFormSet(BaseInlineFormSet):
|
from bda.forms import BaseBdaFormSet, TokenForm, ResellForm
|
||||||
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)
|
|
||||||
|
|
||||||
@cof_required
|
@cof_required
|
||||||
def etat_places(request):
|
def etat_places(request):
|
||||||
|
@ -117,7 +99,7 @@ def places_ics(request):
|
||||||
|
|
||||||
@cof_required
|
@cof_required
|
||||||
def inscription(request):
|
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)
|
participant, created = Participant.objects.get_or_create(user = request.user)
|
||||||
choices = participant.choixspectacle_set.order_by("priority").all()
|
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})
|
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:
|
else:
|
||||||
return render(request, "bda-attrib.html", data)
|
return render(request, "bda-attrib.html", data)
|
||||||
|
|
||||||
class TokenForm(forms.Form):
|
|
||||||
token = forms.CharField(widget = forms.widgets.Textarea())
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def tirage(request):
|
def tirage(request):
|
||||||
if request.POST:
|
if request.POST:
|
||||||
|
@ -220,18 +199,6 @@ def tirage(request):
|
||||||
form = TokenForm()
|
form = TokenForm()
|
||||||
return render(request, "bda-token.html", {"form": form})
|
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):
|
def do_resell(request, form):
|
||||||
spectacle = form.cleaned_data["spectacle"]
|
spectacle = form.cleaned_data["spectacle"]
|
||||||
count = form.cleaned_data["count"]
|
count = form.cleaned_data["count"]
|
||||||
|
|
39
bda2/forms.py
Normal file
39
bda2/forms.py
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
# coding: utf-8
|
||||||
|
|
||||||
|
from django import forms
|
||||||
|
from django.forms.models import inlineformset_factory, BaseInlineFormSet
|
||||||
|
from bda2.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
class TokenForm(forms.Form):
|
||||||
|
token = forms.CharField(widget = forms.widgets.Textarea())
|
||||||
|
|
||||||
|
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()
|
||||||
|
|
|
@ -5,8 +5,6 @@ from django.shortcuts import render, get_object_or_404
|
||||||
from django.contrib.auth.decorators import login_required
|
from django.contrib.auth.decorators import login_required
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.http import Http404
|
from django.http import Http404
|
||||||
from django import forms
|
|
||||||
from django.forms.models import inlineformset_factory, BaseInlineFormSet
|
|
||||||
from django.core import serializers
|
from django.core import serializers
|
||||||
import hashlib
|
import hashlib
|
||||||
|
|
||||||
|
@ -18,24 +16,7 @@ import time
|
||||||
from gestioncof.decorators import cof_required, buro_required
|
from gestioncof.decorators import cof_required, buro_required
|
||||||
from bda2.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
from bda2.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
||||||
from bda2.algorithm import Algorithm
|
from bda2.algorithm import Algorithm
|
||||||
|
from bda2.forms import BaseBdaFormSet, TokenForm, ResellForm
|
||||||
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)
|
|
||||||
|
|
||||||
@cof_required
|
@cof_required
|
||||||
def etat_places(request):
|
def etat_places(request):
|
||||||
|
@ -185,9 +166,6 @@ def do_tirage(request):
|
||||||
else:
|
else:
|
||||||
return render(request, "bda-attrib.html", data)
|
return render(request, "bda-attrib.html", data)
|
||||||
|
|
||||||
class TokenForm(forms.Form):
|
|
||||||
token = forms.CharField(widget = forms.widgets.Textarea())
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def tirage(request):
|
def tirage(request):
|
||||||
if request.POST:
|
if request.POST:
|
||||||
|
@ -198,18 +176,6 @@ def tirage(request):
|
||||||
form = TokenForm()
|
form = TokenForm()
|
||||||
return render(request, "bda-token.html", {"form": form})
|
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):
|
def do_resell(request, form):
|
||||||
spectacle = form.cleaned_data["spectacle"]
|
spectacle = form.cleaned_data["spectacle"]
|
||||||
count = form.cleaned_data["count"]
|
count = form.cleaned_data["count"]
|
||||||
|
|
39
bda3/forms.py
Normal file
39
bda3/forms.py
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
# coding: utf-8
|
||||||
|
|
||||||
|
from django import forms
|
||||||
|
from django.forms.models import inlineformset_factory, BaseInlineFormSet
|
||||||
|
from bda3.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
class TokenForm(forms.Form):
|
||||||
|
token = forms.CharField(widget = forms.widgets.Textarea())
|
||||||
|
|
||||||
|
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()
|
||||||
|
|
|
@ -6,8 +6,6 @@ from django.shortcuts import render, get_object_or_404
|
||||||
from django.contrib.auth.decorators import login_required
|
from django.contrib.auth.decorators import login_required
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.http import Http404
|
from django.http import Http404
|
||||||
from django import forms
|
|
||||||
from django.forms.models import inlineformset_factory, BaseInlineFormSet
|
|
||||||
from django.core import serializers
|
from django.core import serializers
|
||||||
import hashlib
|
import hashlib
|
||||||
|
|
||||||
|
@ -19,24 +17,7 @@ import time
|
||||||
from gestioncof.decorators import cof_required, buro_required
|
from gestioncof.decorators import cof_required, buro_required
|
||||||
from bda3.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
from bda3.models import Spectacle, Participant, ChoixSpectacle, Attribution
|
||||||
from bda3.algorithm import Algorithm
|
from bda3.algorithm import Algorithm
|
||||||
|
from bda3.forms import BaseBdaFormSet, TokenForm, ResellForm
|
||||||
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)
|
|
||||||
|
|
||||||
@cof_required
|
@cof_required
|
||||||
def etat_places(request):
|
def etat_places(request):
|
||||||
|
@ -186,9 +167,6 @@ def do_tirage(request):
|
||||||
else:
|
else:
|
||||||
return render(request, "bda-attrib.html", data)
|
return render(request, "bda-attrib.html", data)
|
||||||
|
|
||||||
class TokenForm(forms.Form):
|
|
||||||
token = forms.CharField(widget = forms.widgets.Textarea())
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def tirage(request):
|
def tirage(request):
|
||||||
if request.POST:
|
if request.POST:
|
||||||
|
@ -199,18 +177,6 @@ def tirage(request):
|
||||||
form = TokenForm()
|
form = TokenForm()
|
||||||
return render(request, "bda-token.html", {"form": form})
|
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):
|
def do_resell(request, form):
|
||||||
spectacle = form.cleaned_data["spectacle"]
|
spectacle = form.cleaned_data["spectacle"]
|
||||||
count = form.cleaned_data["count"]
|
count = form.cleaned_data["count"]
|
||||||
|
|
294
gestioncof/forms.py
Normal file
294
gestioncof/forms.py
Normal file
|
@ -0,0 +1,294 @@
|
||||||
|
# coding: utf-8
|
||||||
|
|
||||||
|
from django import forms
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
from django.contrib.auth.models import User
|
||||||
|
from django.forms.widgets import RadioSelect, CheckboxSelectMultiple
|
||||||
|
|
||||||
|
from gestioncof.models import CofProfile, EventCommentValue
|
||||||
|
from gestioncof.widgets import TriStateCheckbox
|
||||||
|
from gestioncof.shared import lock_table, unlock_table, send_custom_mail
|
||||||
|
|
||||||
|
class EventForm(forms.Form):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
event = kwargs.pop("event")
|
||||||
|
self.event = event
|
||||||
|
current_choices = kwargs.pop("current_choices", None)
|
||||||
|
super(EventForm, self).__init__(*args, **kwargs)
|
||||||
|
choices = {}
|
||||||
|
if current_choices:
|
||||||
|
for choice in current_choices.all():
|
||||||
|
if choice.event_option.id not in choices:
|
||||||
|
choices[choice.event_option.id] = [choice.id]
|
||||||
|
else:
|
||||||
|
choices[choice.event_option.id].append(choice.id)
|
||||||
|
all_choices = choices
|
||||||
|
for option in event.options.all():
|
||||||
|
choices = [(choice.id, choice.value) for choice in option.choices.all()]
|
||||||
|
if option.multi_choices:
|
||||||
|
initial = [] if option.id not in all_choices else all_choices[option.id]
|
||||||
|
field = forms.MultipleChoiceField(label = option.name,
|
||||||
|
choices = choices,
|
||||||
|
widget = CheckboxSelectMultiple,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
else:
|
||||||
|
initial = None if option.id not in all_choices else all_choices[option.id][0]
|
||||||
|
field = forms.ChoiceField(label = option.name,
|
||||||
|
choices = choices,
|
||||||
|
widget = RadioSelect,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
field.option_id = option.id
|
||||||
|
self.fields["option_%d" % option.id] = field
|
||||||
|
|
||||||
|
def choices(self):
|
||||||
|
for name, value in self.cleaned_data.items():
|
||||||
|
if name.startswith('option_'):
|
||||||
|
yield (self.fields[name].option_id, value)
|
||||||
|
|
||||||
|
class SurveyForm(forms.Form):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
survey = kwargs.pop("survey")
|
||||||
|
current_answers = kwargs.pop("current_answers", None)
|
||||||
|
super(SurveyForm, self).__init__(*args, **kwargs)
|
||||||
|
answers = {}
|
||||||
|
if current_answers:
|
||||||
|
for answer in current_answers.all():
|
||||||
|
if answer.survey_question.id not in answers:
|
||||||
|
answers[answer.survey_question.id] = [answer.id]
|
||||||
|
else:
|
||||||
|
answers[answer.survey_question.id].append(answer.id)
|
||||||
|
for question in survey.questions.all():
|
||||||
|
choices = [(answer.id, answer.answer) for answer in question.answers.all()]
|
||||||
|
if question.multi_answers:
|
||||||
|
initial = [] if question.id not in answers else answers[question.id]
|
||||||
|
field = forms.MultipleChoiceField(label = question.question,
|
||||||
|
choices = choices,
|
||||||
|
widget = CheckboxSelectMultiple,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
else:
|
||||||
|
initial = None if question.id not in answers else answers[question.id][0]
|
||||||
|
field = forms.ChoiceField(label = question.question,
|
||||||
|
choices = choices,
|
||||||
|
widget = RadioSelect,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
field.question_id = question.id
|
||||||
|
self.fields["question_%d" % question.id] = field
|
||||||
|
|
||||||
|
class SurveyStatusFilterForm(forms.Form):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
survey = kwargs.pop("survey")
|
||||||
|
super(SurveyStatusFilterForm, self).__init__(*args, **kwargs)
|
||||||
|
answers = {}
|
||||||
|
for question in survey.questions.all():
|
||||||
|
for answer in question.answers.all():
|
||||||
|
name = "question_%d_answer_%d" % (question.id, answer.id)
|
||||||
|
if self.is_bound and self.data.get(self.add_prefix(name), None):
|
||||||
|
initial = self.data.get(self.add_prefix(name), None)
|
||||||
|
else:
|
||||||
|
initial = "none"
|
||||||
|
field = forms.ChoiceField(label = "%s : %s" % (question.question, answer.answer),
|
||||||
|
choices = [("yes", "yes"),("no","no"),("none","none")],
|
||||||
|
widget = TriStateCheckbox,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
field.question_id = question.id
|
||||||
|
field.answer_id = answer.id
|
||||||
|
self.fields[name] = field
|
||||||
|
|
||||||
|
def filters(self):
|
||||||
|
for name, value in self.cleaned_data.items():
|
||||||
|
if name.startswith('question_'):
|
||||||
|
yield (self.fields[name].question_id, self.fields[name].answer_id, value)
|
||||||
|
|
||||||
|
class EventStatusFilterForm(forms.Form):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
event = kwargs.pop("event")
|
||||||
|
super(EventStatusFilterForm, self).__init__(*args, **kwargs)
|
||||||
|
for option in event.options.all():
|
||||||
|
for choice in option.choices.all():
|
||||||
|
name = "option_%d_choice_%d" % (option.id, choice.id)
|
||||||
|
if self.is_bound and self.data.get(self.add_prefix(name), None):
|
||||||
|
initial = self.data.get(self.add_prefix(name), None)
|
||||||
|
else:
|
||||||
|
initial = "none"
|
||||||
|
field = forms.ChoiceField(label = "%s : %s" % (option.name, choice.value),
|
||||||
|
choices = [("yes", "yes"),("no","no"),("none","none")],
|
||||||
|
widget = TriStateCheckbox,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
field.option_id = option.id
|
||||||
|
field.choice_id = choice.id
|
||||||
|
self.fields[name] = field
|
||||||
|
# has_paid
|
||||||
|
name = "event_has_paid"
|
||||||
|
if self.is_bound and self.data.get(self.add_prefix(name), None):
|
||||||
|
initial = self.data.get(self.add_prefix(name), None)
|
||||||
|
else:
|
||||||
|
initial = "none"
|
||||||
|
field = forms.ChoiceField(label = "Événement payé",
|
||||||
|
choices = [("yes", "yes"),("no","no"),("none","none")],
|
||||||
|
widget = TriStateCheckbox,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
self.fields[name] = field
|
||||||
|
|
||||||
|
def filters(self):
|
||||||
|
for name, value in self.cleaned_data.items():
|
||||||
|
if name.startswith('option_'):
|
||||||
|
yield (self.fields[name].option_id, self.fields[name].choice_id, value)
|
||||||
|
elif name == "event_has_paid":
|
||||||
|
yield ("has_paid", None, value)
|
||||||
|
|
||||||
|
class UserProfileForm(forms.ModelForm):
|
||||||
|
first_name = forms.CharField(label=_(u'Prénom'), max_length=30)
|
||||||
|
last_name = forms.CharField(label=_(u'Nom'), max_length=30)
|
||||||
|
|
||||||
|
def __init__(self, *args, **kw):
|
||||||
|
super(UserProfileForm, self).__init__(*args, **kw)
|
||||||
|
self.fields['first_name'].initial = self.instance.user.first_name
|
||||||
|
self.fields['last_name'].initial = self.instance.user.last_name
|
||||||
|
|
||||||
|
self.fields.keyOrder = [
|
||||||
|
'first_name',
|
||||||
|
'last_name',
|
||||||
|
'phone',
|
||||||
|
'mailing_cof',
|
||||||
|
'mailing_bda',
|
||||||
|
'mailing_bda_revente',
|
||||||
|
]
|
||||||
|
|
||||||
|
def save(self, *args, **kw):
|
||||||
|
super(UserProfileForm, self).save(*args, **kw)
|
||||||
|
self.instance.user.first_name = self.cleaned_data.get('first_name')
|
||||||
|
self.instance.user.last_name = self.cleaned_data.get('last_name')
|
||||||
|
self.instance.user.save()
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = CofProfile
|
||||||
|
fields = ("phone", "mailing_cof", "mailing_bda", "mailing_bda_revente",)
|
||||||
|
|
||||||
|
class RegistrationUserForm(forms.ModelForm):
|
||||||
|
def __init__(self, *args, **kw):
|
||||||
|
super(RegistrationUserForm, self).__init__(*args, **kw)
|
||||||
|
self.fields['username'].help_text = ""
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = User
|
||||||
|
fields = ("username", "first_name", "last_name", "email")
|
||||||
|
|
||||||
|
class RegistrationProfileForm(forms.ModelForm):
|
||||||
|
def __init__(self, *args, **kw):
|
||||||
|
super(RegistrationProfileForm, self).__init__(*args, **kw)
|
||||||
|
self.fields['mailing_cof'].initial = True
|
||||||
|
self.fields['mailing_bda'].initial = True
|
||||||
|
self.fields['mailing_bda_revente'].initial = True
|
||||||
|
self.fields['num'].widget.attrs['readonly'] = True
|
||||||
|
|
||||||
|
self.fields.keyOrder = [
|
||||||
|
'login_clipper',
|
||||||
|
'phone',
|
||||||
|
'occupation',
|
||||||
|
'departement',
|
||||||
|
'is_cof',
|
||||||
|
'num',
|
||||||
|
'type_cotiz',
|
||||||
|
'mailing_cof',
|
||||||
|
'mailing_bda',
|
||||||
|
'mailing_bda_revente',
|
||||||
|
'comments'
|
||||||
|
]
|
||||||
|
|
||||||
|
def save(self, *args, **kw):
|
||||||
|
instance = super(RegistrationProfileForm, self).save(*args, **kw)
|
||||||
|
if instance.is_cof and not instance.num:
|
||||||
|
# Generate new number
|
||||||
|
try:
|
||||||
|
lock_table(CofProfile)
|
||||||
|
aggregate = CofProfile.objects.aggregate(Max('num'))
|
||||||
|
instance.num = aggregate['num__max'] + 1
|
||||||
|
instance.save()
|
||||||
|
self.cleaned_data['num'] = instance.num
|
||||||
|
self.data['num'] = instance.num
|
||||||
|
finally:
|
||||||
|
unlock_table(CofProfile)
|
||||||
|
return instance
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = CofProfile
|
||||||
|
fields = ("login_clipper", "num", "phone", "occupation", "departement", "is_cof", "type_cotiz", "mailing_cof", "mailing_bda", "mailing_bda_revente", "comments")
|
||||||
|
|
||||||
|
STATUS_CHOICES = (('no','Non'),
|
||||||
|
('wait','Oui mais attente paiement'),
|
||||||
|
('paid','Oui payé'),)
|
||||||
|
|
||||||
|
class AdminEventForm(forms.Form):
|
||||||
|
status = forms.ChoiceField(label = "Inscription", choices = STATUS_CHOICES, widget = RadioSelect)
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
event = kwargs.pop("event")
|
||||||
|
self.event = event
|
||||||
|
registration = kwargs.pop("current_registration", None)
|
||||||
|
current_choices = registration.options.all() if registration is not None else []
|
||||||
|
paid = kwargs.pop("paid", None)
|
||||||
|
if paid == True:
|
||||||
|
kwargs["initial"] = {"status":"paid"}
|
||||||
|
elif paid == False:
|
||||||
|
kwargs["initial"] = {"status":"wait"}
|
||||||
|
else:
|
||||||
|
kwargs["initial"] = {"status":"no"}
|
||||||
|
super(AdminEventForm, self).__init__(*args, **kwargs)
|
||||||
|
choices = {}
|
||||||
|
comments = {}
|
||||||
|
for choice in current_choices:
|
||||||
|
if choice.event_option.id not in choices:
|
||||||
|
choices[choice.event_option.id] = [choice.id]
|
||||||
|
else:
|
||||||
|
choices[choice.event_option.id].append(choice.id)
|
||||||
|
all_choices = choices
|
||||||
|
for option in event.options.all():
|
||||||
|
choices = [(choice.id, choice.value) for choice in option.choices.all()]
|
||||||
|
if option.multi_choices:
|
||||||
|
initial = [] if option.id not in all_choices else all_choices[option.id]
|
||||||
|
field = forms.MultipleChoiceField(label = option.name,
|
||||||
|
choices = choices,
|
||||||
|
widget = CheckboxSelectMultiple,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
else:
|
||||||
|
initial = None if option.id not in all_choices else all_choices[option.id][0]
|
||||||
|
field = forms.ChoiceField(label = option.name,
|
||||||
|
choices = choices,
|
||||||
|
widget = RadioSelect,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
field.option_id = option.id
|
||||||
|
self.fields["option_%d" % option.id] = field
|
||||||
|
for commentfield in event.commentfields.all():
|
||||||
|
initial = commentfield.default
|
||||||
|
if registration is not None:
|
||||||
|
try:
|
||||||
|
initial = registration.comments.get(commentfield = commentfield).content
|
||||||
|
except EventCommentValue.DoesNotExist:
|
||||||
|
pass
|
||||||
|
widget = forms.Textarea if commentfield.fieldtype == "text" else forms.TextInput
|
||||||
|
field = forms.CharField(label = commentfield.name,
|
||||||
|
widget = widget,
|
||||||
|
required = False,
|
||||||
|
initial = initial)
|
||||||
|
field.comment_id = commentfield.id
|
||||||
|
self.fields["comment_%d" % commentfield.id] = field
|
||||||
|
|
||||||
|
def choices(self):
|
||||||
|
for name, value in self.cleaned_data.items():
|
||||||
|
if name.startswith('option_'):
|
||||||
|
yield (self.fields[name].option_id, value)
|
||||||
|
|
||||||
|
def comments(self):
|
||||||
|
for name, value in self.cleaned_data.items():
|
||||||
|
if name.startswith('comment_'):
|
||||||
|
yield (self.fields[name].comment_id, value)
|
||||||
|
|
|
@ -5,21 +5,20 @@ import unicodecsv
|
||||||
from django.shortcuts import redirect, get_object_or_404, render
|
from django.shortcuts import redirect, get_object_or_404, render
|
||||||
from django.http import Http404, HttpResponse
|
from django.http import Http404, HttpResponse
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.contrib.auth.models import User
|
|
||||||
from django.contrib.auth.decorators import login_required
|
from django.contrib.auth.decorators import login_required
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.forms.widgets import RadioSelect, CheckboxSelectMultiple
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
from django.db.models import Max
|
from django.db.models import Max
|
||||||
from django.contrib.auth.views import login as django_login_view
|
from django.contrib.auth.views import login as django_login_view
|
||||||
|
|
||||||
from gestioncof.models import Survey, SurveyQuestion, SurveyQuestionAnswer, SurveyAnswer
|
from gestioncof.models import Survey, SurveyAnswer, SurveyQuestion, SurveyQuestionAnswer
|
||||||
from gestioncof.models import Event, EventOption, EventOptionChoice, EventRegistration
|
from gestioncof.models import Event, EventRegistration, EventOption, EventOptionChoice
|
||||||
from gestioncof.models import EventCommentField, EventCommentValue
|
from gestioncof.models import EventCommentField, EventCommentValue
|
||||||
|
from gestioncof.shared import send_custom_mail
|
||||||
from gestioncof.models import CofProfile, Clipper
|
from gestioncof.models import CofProfile, Clipper
|
||||||
from gestioncof.decorators import buro_required, cof_required
|
from gestioncof.decorators import buro_required, cof_required
|
||||||
from gestioncof.widgets import TriStateCheckbox
|
from gestioncof.forms import UserProfileForm, EventStatusFilterForm, \
|
||||||
from gestioncof.shared import lock_table, unlock_table, send_custom_mail
|
SurveyForm, SurveyStatusFilterForm, RegistrationUserForm, \
|
||||||
|
RegistrationProfileForm, AdminEventForm, EventForm
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
@ -61,37 +60,6 @@ def logout(request):
|
||||||
else:
|
else:
|
||||||
return redirect("django.contrib.auth.views.logout")
|
return redirect("django.contrib.auth.views.logout")
|
||||||
|
|
||||||
class SurveyForm(forms.Form):
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
survey = kwargs.pop("survey")
|
|
||||||
current_answers = kwargs.pop("current_answers", None)
|
|
||||||
super(SurveyForm, self).__init__(*args, **kwargs)
|
|
||||||
answers = {}
|
|
||||||
if current_answers:
|
|
||||||
for answer in current_answers.all():
|
|
||||||
if answer.survey_question.id not in answers:
|
|
||||||
answers[answer.survey_question.id] = [answer.id]
|
|
||||||
else:
|
|
||||||
answers[answer.survey_question.id].append(answer.id)
|
|
||||||
for question in survey.questions.all():
|
|
||||||
choices = [(answer.id, answer.answer) for answer in question.answers.all()]
|
|
||||||
if question.multi_answers:
|
|
||||||
initial = [] if question.id not in answers else answers[question.id]
|
|
||||||
field = forms.MultipleChoiceField(label = question.question,
|
|
||||||
choices = choices,
|
|
||||||
widget = CheckboxSelectMultiple,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
else:
|
|
||||||
initial = None if question.id not in answers else answers[question.id][0]
|
|
||||||
field = forms.ChoiceField(label = question.question,
|
|
||||||
choices = choices,
|
|
||||||
widget = RadioSelect,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
field.question_id = question.id
|
|
||||||
self.fields["question_%d" % question.id] = field
|
|
||||||
|
|
||||||
def answers(self):
|
def answers(self):
|
||||||
for name, value in self.cleaned_data.items():
|
for name, value in self.cleaned_data.items():
|
||||||
if name.startswith('question_'):
|
if name.startswith('question_'):
|
||||||
|
@ -156,44 +124,6 @@ def survey(request, survey_id):
|
||||||
form = SurveyForm(survey = survey)
|
form = SurveyForm(survey = survey)
|
||||||
return render(request, "survey.html", {"survey": survey, "form": form, "success": success, "deleted": deleted, "current_answer": current_answer})
|
return render(request, "survey.html", {"survey": survey, "form": form, "success": success, "deleted": deleted, "current_answer": current_answer})
|
||||||
|
|
||||||
class EventForm(forms.Form):
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
event = kwargs.pop("event")
|
|
||||||
self.event = event
|
|
||||||
current_choices = kwargs.pop("current_choices", None)
|
|
||||||
super(EventForm, self).__init__(*args, **kwargs)
|
|
||||||
choices = {}
|
|
||||||
if current_choices:
|
|
||||||
for choice in current_choices.all():
|
|
||||||
if choice.event_option.id not in choices:
|
|
||||||
choices[choice.event_option.id] = [choice.id]
|
|
||||||
else:
|
|
||||||
choices[choice.event_option.id].append(choice.id)
|
|
||||||
all_choices = choices
|
|
||||||
for option in event.options.all():
|
|
||||||
choices = [(choice.id, choice.value) for choice in option.choices.all()]
|
|
||||||
if option.multi_choices:
|
|
||||||
initial = [] if option.id not in all_choices else all_choices[option.id]
|
|
||||||
field = forms.MultipleChoiceField(label = option.name,
|
|
||||||
choices = choices,
|
|
||||||
widget = CheckboxSelectMultiple,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
else:
|
|
||||||
initial = None if option.id not in all_choices else all_choices[option.id][0]
|
|
||||||
field = forms.ChoiceField(label = option.name,
|
|
||||||
choices = choices,
|
|
||||||
widget = RadioSelect,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
field.option_id = option.id
|
|
||||||
self.fields["option_%d" % option.id] = field
|
|
||||||
|
|
||||||
def choices(self):
|
|
||||||
for name, value in self.cleaned_data.items():
|
|
||||||
if name.startswith('option_'):
|
|
||||||
yield (self.fields[name].option_id, value)
|
|
||||||
|
|
||||||
def get_event_form_choices(event, form):
|
def get_event_form_choices(event, form):
|
||||||
all_choices = []
|
all_choices = []
|
||||||
for option_id, choices_ids in form.choices():
|
for option_id, choices_ids in form.choices():
|
||||||
|
@ -246,71 +176,6 @@ def event(request, event_id):
|
||||||
form = EventForm(event = event)
|
form = EventForm(event = event)
|
||||||
return render(request, "event.html", {"event": event, "form": form, "success": success})
|
return render(request, "event.html", {"event": event, "form": form, "success": success})
|
||||||
|
|
||||||
class SurveyStatusFilterForm(forms.Form):
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
survey = kwargs.pop("survey")
|
|
||||||
super(SurveyStatusFilterForm, self).__init__(*args, **kwargs)
|
|
||||||
answers = {}
|
|
||||||
for question in survey.questions.all():
|
|
||||||
for answer in question.answers.all():
|
|
||||||
name = "question_%d_answer_%d" % (question.id, answer.id)
|
|
||||||
if self.is_bound and self.data.get(self.add_prefix(name), None):
|
|
||||||
initial = self.data.get(self.add_prefix(name), None)
|
|
||||||
else:
|
|
||||||
initial = "none"
|
|
||||||
field = forms.ChoiceField(label = "%s : %s" % (question.question, answer.answer),
|
|
||||||
choices = [("yes", "yes"),("no","no"),("none","none")],
|
|
||||||
widget = TriStateCheckbox,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
field.question_id = question.id
|
|
||||||
field.answer_id = answer.id
|
|
||||||
self.fields[name] = field
|
|
||||||
|
|
||||||
def filters(self):
|
|
||||||
for name, value in self.cleaned_data.items():
|
|
||||||
if name.startswith('question_'):
|
|
||||||
yield (self.fields[name].question_id, self.fields[name].answer_id, value)
|
|
||||||
|
|
||||||
class EventStatusFilterForm(forms.Form):
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
event = kwargs.pop("event")
|
|
||||||
super(EventStatusFilterForm, self).__init__(*args, **kwargs)
|
|
||||||
for option in event.options.all():
|
|
||||||
for choice in option.choices.all():
|
|
||||||
name = "option_%d_choice_%d" % (option.id, choice.id)
|
|
||||||
if self.is_bound and self.data.get(self.add_prefix(name), None):
|
|
||||||
initial = self.data.get(self.add_prefix(name), None)
|
|
||||||
else:
|
|
||||||
initial = "none"
|
|
||||||
field = forms.ChoiceField(label = "%s : %s" % (option.name, choice.value),
|
|
||||||
choices = [("yes", "yes"),("no","no"),("none","none")],
|
|
||||||
widget = TriStateCheckbox,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
field.option_id = option.id
|
|
||||||
field.choice_id = choice.id
|
|
||||||
self.fields[name] = field
|
|
||||||
# has_paid
|
|
||||||
name = "event_has_paid"
|
|
||||||
if self.is_bound and self.data.get(self.add_prefix(name), None):
|
|
||||||
initial = self.data.get(self.add_prefix(name), None)
|
|
||||||
else:
|
|
||||||
initial = "none"
|
|
||||||
field = forms.ChoiceField(label = "Événement payé",
|
|
||||||
choices = [("yes", "yes"),("no","no"),("none","none")],
|
|
||||||
widget = TriStateCheckbox,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
self.fields[name] = field
|
|
||||||
|
|
||||||
def filters(self):
|
|
||||||
for name, value in self.cleaned_data.items():
|
|
||||||
if name.startswith('option_'):
|
|
||||||
yield (self.fields[name].option_id, self.fields[name].choice_id, value)
|
|
||||||
elif name == "event_has_paid":
|
|
||||||
yield ("has_paid", None, value)
|
|
||||||
|
|
||||||
def clean_post_for_status(initial):
|
def clean_post_for_status(initial):
|
||||||
d = initial.copy()
|
d = initial.copy()
|
||||||
for k, v in d.items():
|
for k, v in d.items():
|
||||||
|
@ -377,34 +242,6 @@ def survey_status(request, survey_id):
|
||||||
answers_count[answer.id] += 1
|
answers_count[answer.id] += 1
|
||||||
return render(request, "survey_status.html", {"survey": survey, "user_answers": user_answers, "questions": questions, "answers_count": answers_count, "form": form})
|
return render(request, "survey_status.html", {"survey": survey, "user_answers": user_answers, "questions": questions, "answers_count": answers_count, "form": form})
|
||||||
|
|
||||||
class UserProfileForm(forms.ModelForm):
|
|
||||||
first_name = forms.CharField(label=_(u'Prénom'), max_length=30)
|
|
||||||
last_name = forms.CharField(label=_(u'Nom'), max_length=30)
|
|
||||||
|
|
||||||
def __init__(self, *args, **kw):
|
|
||||||
super(UserProfileForm, self).__init__(*args, **kw)
|
|
||||||
self.fields['first_name'].initial = self.instance.user.first_name
|
|
||||||
self.fields['last_name'].initial = self.instance.user.last_name
|
|
||||||
|
|
||||||
self.fields.keyOrder = [
|
|
||||||
'first_name',
|
|
||||||
'last_name',
|
|
||||||
'phone',
|
|
||||||
'mailing_cof',
|
|
||||||
'mailing_bda',
|
|
||||||
'mailing_bda_revente',
|
|
||||||
]
|
|
||||||
|
|
||||||
def save(self, *args, **kw):
|
|
||||||
super(UserProfileForm, self).save(*args, **kw)
|
|
||||||
self.instance.user.first_name = self.cleaned_data.get('first_name')
|
|
||||||
self.instance.user.last_name = self.cleaned_data.get('last_name')
|
|
||||||
self.instance.user.save()
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
model = CofProfile
|
|
||||||
fields = ("phone", "mailing_cof", "mailing_bda", "mailing_bda_revente",)
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def profile(request):
|
def profile(request):
|
||||||
success = False
|
success = False
|
||||||
|
@ -417,56 +254,6 @@ def profile(request):
|
||||||
form = UserProfileForm(instance = request.user.profile)
|
form = UserProfileForm(instance = request.user.profile)
|
||||||
return render(request, "profile.html", {"form": form, "success": success})
|
return render(request, "profile.html", {"form": form, "success": success})
|
||||||
|
|
||||||
class RegistrationUserForm(forms.ModelForm):
|
|
||||||
def __init__(self, *args, **kw):
|
|
||||||
super(RegistrationUserForm, self).__init__(*args, **kw)
|
|
||||||
self.fields['username'].help_text = ""
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
model = User
|
|
||||||
fields = ("username", "first_name", "last_name", "email")
|
|
||||||
|
|
||||||
class RegistrationProfileForm(forms.ModelForm):
|
|
||||||
def __init__(self, *args, **kw):
|
|
||||||
super(RegistrationProfileForm, self).__init__(*args, **kw)
|
|
||||||
self.fields['mailing_cof'].initial = True
|
|
||||||
self.fields['mailing_bda'].initial = True
|
|
||||||
self.fields['mailing_bda_revente'].initial = True
|
|
||||||
self.fields['num'].widget.attrs['readonly'] = True
|
|
||||||
|
|
||||||
self.fields.keyOrder = [
|
|
||||||
'login_clipper',
|
|
||||||
'phone',
|
|
||||||
'occupation',
|
|
||||||
'departement',
|
|
||||||
'is_cof',
|
|
||||||
'num',
|
|
||||||
'type_cotiz',
|
|
||||||
'mailing_cof',
|
|
||||||
'mailing_bda',
|
|
||||||
'mailing_bda_revente',
|
|
||||||
'comments'
|
|
||||||
]
|
|
||||||
|
|
||||||
def save(self, *args, **kw):
|
|
||||||
instance = super(RegistrationProfileForm, self).save(*args, **kw)
|
|
||||||
if instance.is_cof and not instance.num:
|
|
||||||
# Generate new number
|
|
||||||
try:
|
|
||||||
lock_table(CofProfile)
|
|
||||||
aggregate = CofProfile.objects.aggregate(Max('num'))
|
|
||||||
instance.num = aggregate['num__max'] + 1
|
|
||||||
instance.save()
|
|
||||||
self.cleaned_data['num'] = instance.num
|
|
||||||
self.data['num'] = instance.num
|
|
||||||
finally:
|
|
||||||
unlock_table(CofProfile)
|
|
||||||
return instance
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
model = CofProfile
|
|
||||||
fields = ("login_clipper", "num", "phone", "occupation", "departement", "is_cof", "type_cotiz", "mailing_cof", "mailing_bda", "mailing_bda_revente", "comments")
|
|
||||||
|
|
||||||
def registration_set_ro_fields(user_form, profile_form):
|
def registration_set_ro_fields(user_form, profile_form):
|
||||||
user_form.fields['username'].widget.attrs['readonly'] = True
|
user_form.fields['username'].widget.attrs['readonly'] = True
|
||||||
profile_form.fields['login_clipper'].widget.attrs['readonly'] = True
|
profile_form.fields['login_clipper'].widget.attrs['readonly'] = True
|
||||||
|
@ -506,76 +293,6 @@ def registration_form(request, login_clipper = None, username = None):
|
||||||
profile_form = RegistrationProfileForm()
|
profile_form = RegistrationProfileForm()
|
||||||
return render(request, "registration_form.html", {"user_form": user_form, "profile_form": profile_form, "member": member, "login_clipper": login_clipper})
|
return render(request, "registration_form.html", {"user_form": user_form, "profile_form": profile_form, "member": member, "login_clipper": login_clipper})
|
||||||
|
|
||||||
STATUS_CHOICES = (('no','Non'),
|
|
||||||
('wait','Oui mais attente paiement'),
|
|
||||||
('paid','Oui payé'),)
|
|
||||||
class AdminEventForm(forms.Form):
|
|
||||||
status = forms.ChoiceField(label = "Inscription", choices = STATUS_CHOICES, widget = RadioSelect)
|
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
|
||||||
event = kwargs.pop("event")
|
|
||||||
self.event = event
|
|
||||||
registration = kwargs.pop("current_registration", None)
|
|
||||||
current_choices = registration.options.all() if registration is not None else []
|
|
||||||
paid = kwargs.pop("paid", None)
|
|
||||||
if paid == True:
|
|
||||||
kwargs["initial"] = {"status":"paid"}
|
|
||||||
elif paid == False:
|
|
||||||
kwargs["initial"] = {"status":"wait"}
|
|
||||||
else:
|
|
||||||
kwargs["initial"] = {"status":"no"}
|
|
||||||
super(AdminEventForm, self).__init__(*args, **kwargs)
|
|
||||||
choices = {}
|
|
||||||
comments = {}
|
|
||||||
for choice in current_choices:
|
|
||||||
if choice.event_option.id not in choices:
|
|
||||||
choices[choice.event_option.id] = [choice.id]
|
|
||||||
else:
|
|
||||||
choices[choice.event_option.id].append(choice.id)
|
|
||||||
all_choices = choices
|
|
||||||
for option in event.options.all():
|
|
||||||
choices = [(choice.id, choice.value) for choice in option.choices.all()]
|
|
||||||
if option.multi_choices:
|
|
||||||
initial = [] if option.id not in all_choices else all_choices[option.id]
|
|
||||||
field = forms.MultipleChoiceField(label = option.name,
|
|
||||||
choices = choices,
|
|
||||||
widget = CheckboxSelectMultiple,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
else:
|
|
||||||
initial = None if option.id not in all_choices else all_choices[option.id][0]
|
|
||||||
field = forms.ChoiceField(label = option.name,
|
|
||||||
choices = choices,
|
|
||||||
widget = RadioSelect,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
field.option_id = option.id
|
|
||||||
self.fields["option_%d" % option.id] = field
|
|
||||||
for commentfield in event.commentfields.all():
|
|
||||||
initial = commentfield.default
|
|
||||||
if registration is not None:
|
|
||||||
try:
|
|
||||||
initial = registration.comments.get(commentfield = commentfield).content
|
|
||||||
except EventCommentValue.DoesNotExist:
|
|
||||||
pass
|
|
||||||
widget = forms.Textarea if commentfield.fieldtype == "text" else forms.TextInput
|
|
||||||
field = forms.CharField(label = commentfield.name,
|
|
||||||
widget = widget,
|
|
||||||
required = False,
|
|
||||||
initial = initial)
|
|
||||||
field.comment_id = commentfield.id
|
|
||||||
self.fields["comment_%d" % commentfield.id] = field
|
|
||||||
|
|
||||||
def choices(self):
|
|
||||||
for name, value in self.cleaned_data.items():
|
|
||||||
if name.startswith('option_'):
|
|
||||||
yield (self.fields[name].option_id, value)
|
|
||||||
|
|
||||||
def comments(self):
|
|
||||||
for name, value in self.cleaned_data.items():
|
|
||||||
if name.startswith('comment_'):
|
|
||||||
yield (self.fields[name].comment_id, value)
|
|
||||||
|
|
||||||
@buro_required
|
@buro_required
|
||||||
def registration_form2(request, login_clipper = None, username = None):
|
def registration_form2(request, login_clipper = None, username = None):
|
||||||
events = Event.objects.filter(old = False).all()
|
events = Event.objects.filter(old = False).all()
|
||||||
|
|
Loading…
Reference in a new issue