Merge branch 'non-BDE-members' into 'main'

Draft: Allow non-BDE members to use the note

See merge request bde/nk20!268

apps/permission/fixtures/initial.json

@@ -3751,7 +3751,8 @@
 			"permanent": false,
 			"description": "Modifier bouffe"
 		}
-	},	{
+	},
+	{
 		"model": "permission.permission",
 		"pk": 239,
 		"fields": {
@@ -3759,12 +3760,12 @@
 				"note",
 				"alias"
 			],
-			"query": "[\"AND\", [\"OR\", {\"note__noteuser__user__memberships__club\": \"club\", \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__noteclub__isnull\": false}], {\"note__is_active\": true}]",
+			"query": "[\"AND\", [\"OR\", {\"note__noteuser__user__memberships__club\": [\"club\"], \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__noteclub__isnull\": false}], {\"note__is_active\": true}]",
 			"type": "view",
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Voir les alias des notes des clubs et des adhérent⋅es du club BDE"
+			"description": "Voir les alias des notes des clubs et des adhérent⋅es du club"
 		}
 	},
 	{

apps/registration/views.py

@@ -306,7 +306,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
             return super().form_invalid(form)
         
         if join_kfet and not join_bde:
-            forl.add_error('join_bde', _("You must also join the parent club BDE."))
+            form.add_error('join_bde', _("You must also join the parent club BDE."))
+            return super().form_invalid(form)
 
         # Calculate required registration fee
         fee = 0

apps/wei/forms/surveys/wei2024.py

@@ -55,7 +55,7 @@ buses_descr = [
         pour les plus calmes, vous trouverez au bus Aspique-Kyottes les 2A+ qui vous feront kiffer votre WEI.""",
     ],
     [
-        "Zanzo[Bus] 🤩👽🐔", "#FFFF", 3,
+        "Zanzo[Bus] 🤯🚸🐒", "#FFFF", 3,
         """Dans un entre-trois bien senti entre zinzinerie, enfance et vieillerie, le Zanzo[BUS] est un concentré de fun mêlé à
         de la dinguerie à gogo. N'hésitez plus et rejoignez-nous pour un WEI toujours plus déjanté !""",
     ],

apps/wei/migrations/0010_remove_weiregistration_specific_diet.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.15 on 2024-08-29 20:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0009_weiregistration_specific_diet'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='weiregistration',
+            name='specific_diet',
+        ),
+    ]

apps/wei/models.py

@@ -232,12 +232,6 @@ class WEIRegistration(models.Model):
         verbose_name=_("health issues"),
     )
 
-    specific_diet = models.TextField(
-        blank=True,
-        default="",
-        verbose_name=_("specific diet"),
-    )
-
     emergency_contact_name = models.CharField(
         max_length=255,
         verbose_name=_("emergency contact name"),

apps/wei/templates/wei/attribute_bus_1A.html

@@ -25,12 +25,9 @@
                 <dt class="col-xl-6">{% trans 'department'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ object.user.profile.get_department_display }}</dd>
 
-                <dt class="col-xl-6">{% trans 'health issues'|capfirst %}</dt>
+                <dt class="col-xl-6">{% trans 'health issues or specific diet'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ object.health_issues|default:"—" }}</dd>
 
-                <dt class="col-xl-6">{% trans 'specific diet'|capfirst %}</dt>
-                <dd class="col-xl-6">{{ object.specific_diet|default:"—" }}</dd>
-
                 <dt class="col-xl-6">{% trans 'suggested bus'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ survey.information.selected_bus_name }}</dd>
             </dl>

apps/wei/templates/wei/weimembership_form.html

@@ -64,12 +64,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <dt class="col-xl-6">{% trans 'birth date'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.birth_date }}</dd>
 
-                <dt class="col-xl-6">{% trans 'health issues'|capfirst %}</dt>
+                <dt class="col-xl-6">{% trans 'health issues or specific diet'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.health_issues }}</dd>
 
-                <dt class="col-xl-6">{% trans 'specific diet'|capfirst %}</dt>
-                <dd class="col-xl-6">{{ registration.specific_diet }}</dd>
-
                 <dt class="col-xl-6">{% trans 'emergency contact name'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.emergency_contact_name }}</dd>