apps/wei/forms/__init__.py

@@ -1,11 +1,10 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from .registration import WEIForm, WEIRegistrationForm, WEIRegistration1AForm, WEIRegistration2AForm, WEIMembership1AForm, \
+from .registration import WEIForm, WEIRegistrationForm, WEIMembership1AForm, WEIMembershipForm, BusForm, BusTeamForm
-    WEIMembershipForm, BusForm, BusTeamForm
 from .surveys import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, CurrentSurvey
 
 __all__ = [
-    'WEIForm', 'WEIRegistrationForm', 'WEIRegistration1AForm', 'WEIRegistration2AForm', 'WEIMembership1AForm', 'WEIMembershipForm', 'BusForm', 'BusTeamForm',
+    'WEIForm', 'WEIRegistrationForm', 'WEIMembership1AForm', 'WEIMembershipForm', 'BusForm', 'BusTeamForm',
     'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
 ]

apps/wei/forms/registration.py

@@ -43,7 +43,7 @@ class WEIRegistrationForm(forms.ModelForm):
         fields = [
             'user', 'soge_credit', 'birth_date', 'gender', 'clothing_size',
             'health_issues', 'emergency_contact_name', 'emergency_contact_phone',
-            'first_year', 'information_json', 'caution_check'
+            'first_year', 'information_json', 'caution_check', 'caution_type'
         ]
         widgets = {
             "user": Autocomplete(
@@ -61,21 +61,8 @@ class WEIRegistrationForm(forms.ModelForm):
             "caution_check": forms.BooleanField(
                 required=False,
             ),
-        }
-
-
-class WEIRegistration2AForm(WEIRegistrationForm):
-    class Meta(WEIRegistrationForm.Meta):
-        fields = WEIRegistrationForm.Meta.fields + ['caution_type']
-        widgets = WEIRegistrationForm.Meta.widgets.copy()
-        widgets.update({
             "caution_type": forms.RadioSelect(),
-        })
+        }
-
-
-class WEIRegistration1AForm(WEIRegistrationForm):
-    class Meta(WEIRegistrationForm.Meta):
-        fields = WEIRegistrationForm.Meta.fields
 
 
 class WEIChooseBusForm(forms.Form):
@@ -96,7 +83,7 @@ class WEIChooseBusForm(forms.Form):
     )
 
     roles = forms.ModelMultipleChoiceField(
-        queryset=WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")),
+        queryset=WEIRole.objects.filter(~Q(name="1A")),
         label=_("WEI Roles"),
         help_text=_("Select the roles that you are interested in."),
         initial=WEIRole.objects.filter(name="Adhérent⋅e WEI").all(),
@@ -106,7 +93,7 @@ class WEIChooseBusForm(forms.Form):
 
 class WEIMembershipForm(forms.ModelForm):
     roles = forms.ModelMultipleChoiceField(
-        queryset=WEIRole.objects.filter(~Q(name="GC WEI")),
+        queryset=WEIRole.objects,
         label=_("WEI Roles"),
         widget=CheckboxSelectMultiple(),
     )

apps/wei/tests/test_wei_registration.py

@@ -337,7 +337,7 @@ class TestWEIRegistration(TestCase):
             emergency_contact_phone='+33123456789',
             bus=[self.bus.id],
             team=[self.team.id],
-            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")).all()],
+            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A")).all()],
             caution_type='check'
         ))
         qs = WEIRegistration.objects.filter(user_id=user.id)
@@ -632,7 +632,7 @@ class TestWEIRegistration(TestCase):
         second_bus = Bus.objects.create(wei=self.wei, name="Second bus")
         second_team = BusTeam.objects.create(bus=second_bus, name="Second team", color=42)
         response = self.client.post(reverse("wei:validate_registration", kwargs=dict(pk=self.registration.pk)), dict(
-            roles=[WEIRole.objects.get(name="Adhérent⋅e WEI").id],
+            roles=[WEIRole.objects.get(name="GC WEI").id],
             bus=self.bus.pk,
             team=second_team.pk,
             credit_type=4,  # Bank transfer
@@ -647,7 +647,7 @@ class TestWEIRegistration(TestCase):
         self.assertTrue("This team doesn't belong to the given bus." in str(response.context["form"].errors))
 
         response = self.client.post(reverse("wei:validate_registration", kwargs=dict(pk=self.registration.pk)), dict(
-            roles=[WEIRole.objects.get(name="Adhérent⋅e WEI").id],
+            roles=[WEIRole.objects.get(name="GC WEI").id],
             bus=self.bus.pk,
             team=self.team.pk,
             credit_type=4,  # Bank transfer

apps/wei/views.py

@@ -35,7 +35,7 @@ from permission.views import ProtectQuerysetMixin, ProtectedCreateView
 
 from .forms.registration import WEIChooseBusForm
 from .models import WEIClub, WEIRegistration, WEIMembership, Bus, BusTeam, WEIRole
-from .forms import WEIForm, WEIRegistrationForm, WEIRegistration1AForm, WEIRegistration2AForm, BusForm, BusTeamForm, WEIMembership1AForm, \
+from .forms import WEIForm, WEIRegistrationForm, BusForm, BusTeamForm, WEIMembership1AForm, \
     WEIMembershipForm, CurrentSurvey
 from .tables import BusRepartitionTable, BusTable, BusTeamTable, WEITable, WEIRegistrationTable, \
     WEIRegistration1ATable, WEIMembershipTable
@@ -510,7 +510,7 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
     Register a new user to the WEI
     """
     model = WEIRegistration
-    form_class = WEIRegistration1AForm
+    form_class = WEIRegistrationForm
     extra_context = {"title": _("Register first year student to the WEI")}
 
     def get_sample_object(self):
@@ -604,7 +604,7 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
     Register an old user to the WEI
     """
     model = WEIRegistration
-    form_class = WEIRegistration2AForm
+    form_class = WEIRegistrationForm
     extra_context = {"title": _("Register old student to the WEI")}
 
     def get_sample_object(self):