1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-26 18:37:12 +00:00

Compare commits

..

2 Commits

Author SHA1 Message Date
korenstin
2a288ba474 Add caution_check in the validation form, #96 2024-08-05 11:52:47 +02:00
korenstin
34646b8ddb test wei 2024, linters 2024-08-05 00:38:15 +02:00
4 changed files with 14 additions and 1 deletions

View File

@ -80,6 +80,11 @@ class WEIChooseBusForm(forms.Form):
class WEIMembershipForm(forms.ModelForm): class WEIMembershipForm(forms.ModelForm):
caution_check = forms.BooleanField(
required=False,
label=_("Caution check given"),
)
roles = forms.ModelMultipleChoiceField( roles = forms.ModelMultipleChoiceField(
queryset=WEIRole.objects, queryset=WEIRole.objects,
label=_("WEI Roles"), label=_("WEI Roles"),
@ -148,6 +153,7 @@ class WEIMembership1AForm(WEIMembershipForm):
""" """
Used to confirm registrations of first year members without choosing a bus now. Used to confirm registrations of first year members without choosing a bus now.
""" """
caution_check = None
roles = None roles = None
def clean(self): def clean(self):

View File

@ -90,7 +90,7 @@ WORDS = {
Prends ton temps, observe les bien et quand tu te sens prête, appuye sur le bouton 'Noter les bus' pour continuer Prends ton temps, observe les bien et quand tu te sens prête, appuye sur le bouton 'Noter les bus' pour continuer
(pas besoin d'apprendre par cœur les bus, la description du bus te sera rappeler avant de le noter !) <br><br><br>""" + print_all_buses(), (pas besoin d'apprendre par cœur les bus, la description du bus te sera rappeler avant de le noter !) <br><br><br>""" + print_all_buses(),
{ {
1: "Noter les bus :", "1": "Noter les bus :",
} }
] ]
} }

View File

@ -888,6 +888,9 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
form.fields["last_name"].initial = registration.user.last_name form.fields["last_name"].initial = registration.user.last_name
form.fields["first_name"].initial = registration.user.first_name form.fields["first_name"].initial = registration.user.first_name
if "caution_check" in form.fields:
form.fields["caution_check"].initial = registration.caution_check
if registration.soge_credit: if registration.soge_credit:
form.fields["credit_type"].disabled = True form.fields["credit_type"].disabled = True
form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire") form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire")
@ -929,6 +932,9 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
club = registration.wei club = registration.wei
user = registration.user user = registration.user
if "caution_check" in form.data:
registration.caution_check = form.data["caution_check"] == "on"
registration.save()
membership = form.instance membership = form.instance
membership.user = user membership.user = user
membership.club = club membership.club = club

View File

@ -2726,6 +2726,7 @@ msgid "Credit from Société générale"
msgstr "Crédit de la Société générale" msgstr "Crédit de la Société générale"
#: apps/wei/models.py:188 #: apps/wei/models.py:188
#: apps/wei/forms/registration.py:84
msgid "Caution check given" msgid "Caution check given"
msgstr "Chèque de caution donné" msgstr "Chèque de caution donné"