Merge branch 'qrcode' into 'main'

Draft: Qrcode

See merge request bde/nk20!196

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 # Ubuntu 22.04
-py310-django42:
+py310-django52:
   stage: test
   image: ubuntu:22.04
   before_script:
@@ -22,10 +22,10 @@ py310-django42:
         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
         python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py310-django42
+  script: tox -e py310-django52
 
 # Debian Bookworm
-py311-django42:
+py311-django52:
   stage: test
   image: debian:bookworm
   before_script:
@@ -37,7 +37,7 @@ py311-django42:
         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
         python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py311-django42
+  script: tox -e py311-django52
 
 linters:
   stage: quality-assurance

apps/activity/forms.py

@@ -32,7 +32,7 @@ class ActivityForm(forms.ModelForm):
     def clean_organizer(self):
         organizer = self.cleaned_data['organizer']
         if not organizer.note.is_active:
-            self.add_error('organiser', _('The note of this club is inactive.'))
+            self.add_error('organizer', _('The note of this club is inactive.'))
         return organizer
 
     def clean_date_end(self):

apps/activity/migrations/0007_alter_guest_activity.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.20 on 2025-05-08 19:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('activity', '0006_guest_school'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='guest',
+            name='activity',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='activity.activity'),
+        ),
+    ]

apps/activity/models.py

@@ -234,7 +234,7 @@ class Guest(models.Model):
     """
     activity = models.ForeignKey(
         Activity,
-        on_delete=models.PROTECT,
+        on_delete=models.CASCADE,
         related_name='+',
     )
 

apps/activity/templates/activity/activity_detail.html

@@ -95,5 +95,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
             errMsg(xhr.responseJSON);
         });
     });
+    $("#delete_activity").click(function () {
+        if (!confirm("{% trans 'Are you sure you want to delete this activity?' %}")) {
+            return;
+        }
+
+        $.ajax({
+            url: "/api/activity/activity/{{ activity.pk }}/",
+            type: "DELETE",
+            headers: {
+                "X-CSRFTOKEN": CSRF_TOKEN
+            }
+        }).done(function () {
+            addMsg("{% trans 'Activity deleted' %}", "success");
+            window.location.href = "/activity/";  // Redirige vers la liste des activités
+        }).fail(function (xhr) {
+            errMsg(xhr.responseJSON);
+        });
+    });
 </script>
 {% endblock %}

apps/activity/templates/activity/activity_entry.html

@@ -38,6 +38,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </a>
 
 <input id="alias" type="text" class="form-control" placeholder="Nom/note ...">
+<button id="trigger" class="btn btn-secondary">Click me !</button>
 
 <hr>
 
@@ -63,15 +64,46 @@ SPDX-License-Identifier: GPL-3.0-or-later
         refreshBalance();
     }
 
+    function process_qrcode() {
+        let name = alias_obj.val();
+        $.get("/api/note/note?search=" + name + "&format=json").done(
+            function (res) {
+                let note = res.results[0];
+                $.post("/api/activity/entry/?format=json", {
+                    csrfmiddlewaretoken: CSRF_TOKEN,
+                    activity: {{ activity.id }},
+                    note: note.id,
+                    guest: null
+                }).done(function () {
+                    addMsg(interpolate(gettext(
+                        "Entry made for %s whose balance is %s €"),
+                        [note.name, note.balance / 100]), "success", 4000);
+                    reloadTable(true);
+                }).fail(function (xhr) {
+                    errMsg(xhr.responseJSON, 4000);
+                });
+            }).fail(function (xhr) {
+                errMsg(xhr.responseJSON, 4000);
+            });
+    }
+
     alias_obj.keyup(function(event) {
         let code = event.originalEvent.keyCode
         if (65 <= code <= 122 || code === 13) {
             debounce(reloadTable)()
         }
+        if (code === 0)
+            process_qrcode();
     });
 
     $(document).ready(init);
 
+    alias_obj2 = document.getElementById("alias");
+    $("#trigger").click(function (e) {
+        addMsg("Clicked", "success", 1000);
+        alias_obj.val(alias_obj.val() + "\0");
+        alias_obj2.dispatchEvent(new KeyboardEvent('keyup'));
+    })
     function init() {
         $(".table-row").click(function (e) {
             let target = e.target.parentElement;
@@ -168,4 +200,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
         });
     }
 </script>
-{% endblock %}
+{% endblock %}

apps/activity/templates/activity/includes/activity_info.html

@@ -70,7 +70,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
             {% if ".change_"|has_perm:activity %}
                 <a class="btn btn-primary btn-sm my-1" href="{% url 'activity:activity_update' pk=activity.pk %}" data-turbolinks="false"> {% trans "edit"|capfirst %}</a>
             {% endif %}
-            {% if activity.activity_type.can_invite and not activity_started %}
+            {% if not activity.valid and ".delete_"|has_perm:activity %}
+                <a class="btn btn-danger btn-sm my-1" id="delete_activity"> {% trans "delete"|capfirst %} </a>
+            {% endif %}
+            {% if activity.activity_type.can_invite and not activity_started and activity.valid %}
                 <a class="btn btn-primary btn-sm my-1" href="{% url 'activity:activity_invite' pk=activity.pk %}" data-turbolinks="false"> {% trans "Invite" %}</a>
             {% endif %}
         {% endif %}

apps/activity/urls.py

@@ -15,4 +15,5 @@ urlpatterns = [
     path('<int:pk>/update/', views.ActivityUpdateView.as_view(), name='activity_update'),
     path('new/', views.ActivityCreateView.as_view(), name='activity_create'),
     path('calendar.ics', views.CalendarView.as_view(), name='calendar_ics'),
+    path('<int:pk>/delete', views.ActivityDeleteView.as_view(), name='delete_activity'),
 ]

apps/activity/views.py

@@ -9,7 +9,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
 from django.db.models import F, Q
-from django.http import HttpResponse
+from django.http import HttpResponse, JsonResponse
 from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -153,6 +153,34 @@ class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
 
 
+class ActivityDeleteView(View):
+    """
+    Deletes an Activity
+    """
+    def delete(self, request, pk):
+        try:
+            activity = Activity.objects.get(pk=pk)
+            activity.delete()
+            return JsonResponse({"message": "Activity deleted"})
+        except Activity.DoesNotExist:
+            return JsonResponse({"error": "Activity not found"}, status=404)
+
+    def dispatch(self, *args, **kwargs):
+        """
+        Don't display the delete button if the user has no right to delete.
+        """
+        if not self.request.user.is_authenticated:
+            return self.handle_no_permission()
+
+        activity = Activity.objects.get(pk=self.kwargs["pk"])
+        if not PermissionBackend.check_perm(self.request, "activity.delete_activity", activity):
+            raise PermissionDenied(_("You are not allowed to delete this activity."))
+
+        if activity.valid:
+            raise PermissionDenied(_("This activity is valid."))
+        return super().dispatch(*args, **kwargs)
+
+
 class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
     """
     Invite a Guest, The rules to invites someone are defined in `forms:activity.GuestForm`

apps/api/urls.py

@@ -19,6 +19,10 @@ if "activity" in settings.INSTALLED_APPS:
     from activity.api.urls import register_activity_urls
     register_activity_urls(router, 'activity')
 
+if "family" in settings.INSTALLED_APPS:
+    from family.api.urls import register_family_urls
+    register_family_urls(router, 'family')
+
 if "food" in settings.INSTALLED_APPS:
     from food.api.urls import register_food_urls
     register_food_urls(router, 'food')

apps/family/api/serializers.py

@@ -0,0 +1,46 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from rest_framework import serializers
+
+from ..models import Family, FamilyMembership, Challenge, Achievement
+
+
+class FamilySerializer(serializers.ModelSerializer):
+    """
+    REST API Serializer for Family.
+    The djangorestframework plugin will analyse the model `Family` and parse all fields in the API.
+    """
+    class Meta:
+        model = Family
+        fields = '__all__'
+
+
+class FamilyMembershipSerializer(serializers.ModelSerializer):
+    """
+    REST API Serializer for FamilyMembership.
+    The djangorestframework plugin will analyse the model `FamilyMembership` and parse all fields in the API.
+    """
+    class Meta:
+        model = FamilyMembership
+        fields = '__all__'
+
+
+class ChallengeSerializer(serializers.ModelSerializer):
+    """
+    REST API Serializer for Challenge.
+    The djangorestframework plugin will analyse the model `Challenge` and parse all fields in the API.
+    """
+    class Meta:
+        model = Challenge
+        fields = '__all__'
+
+
+class AchievementSerializer(serializers.ModelSerializer):
+    """
+    REST API Serializer for Achievement.
+    The djangorestframework plugin will analyse the model `Achievement` and parse all fields in the API.
+    """
+    class Meta:
+        model = Achievement
+        fields = '__all__'

apps/family/api/urls.py

@@ -0,0 +1,20 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+from django.urls import path
+
+from .views import FamilyViewSet, FamilyMembershipViewSet, ChallengeViewSet, AchievementViewSet, BatchAchievementsAPIView
+
+
+def register_family_urls(router, path):
+    """
+    Configure router for Family REST API
+    """
+    router.register(path + '/family', FamilyViewSet)
+    router.register(path + '/familymembership', FamilyMembershipViewSet)
+    router.register(path + '/challenge', ChallengeViewSet)
+    router.register(path + '/achievement', AchievementViewSet)
+
+
+urlpatterns = [
+    path('achievements/batch/', BatchAchievementsAPIView.as_view(), name='batch_achievements')
+]

apps/family/api/views.py

@@ -0,0 +1,98 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from api.viewsets import ReadProtectedModelViewSet
+from django_filters.rest_framework import DjangoFilterBackend
+from api.filters import RegexSafeSearchFilter
+from rest_framework.views import APIView
+from rest_framework.permissions import IsAuthenticated
+from rest_framework.response import Response
+from rest_framework import status
+
+from .serializers import FamilySerializer, FamilyMembershipSerializer, ChallengeSerializer, AchievementSerializer
+from ..models import Family, FamilyMembership, Challenge, Achievement
+
+
+class FamilyViewSet(ReadProtectedModelViewSet):
+    """
+    REST API View set.
+    The djangorestframework plugin will get all `Family` objects, serialize it to JSON with the given serializer,
+    then render it on /api/family/family/
+    """
+    queryset = Family.objects.order_by('id')
+    serializer_class = FamilySerializer
+    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filterset_fields = ['name', 'description', 'score', 'rank', ]
+    search_fields = ['$name', '$description', ]
+
+
+class FamilyMembershipViewSet(ReadProtectedModelViewSet):
+    """
+    REST API View set.
+    The djangorestframework plugin will get all `FamilyMembership` objects, serialize it to JSON with the given serializer,
+    then render it on /api/family/familymembership/
+    """
+    queryset = FamilyMembership.objects.order_by('id')
+    serializer_class = FamilyMembershipSerializer
+    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filterset_fields = ['user__username', 'user__first_name', 'user__last_name', 'user__email', 'user__note__alias__name',
+                        'user__note__alias__normalized_name', 'family__name', 'family__description', 'year', ]
+    search_fields = ['$user__username', '$user__first_name', '$user__last_name', '$user__email', '$user__note__alias__name',
+                     '$user__note__alias__normalized_name', '$family__name', '$family__description', '$year', ]
+
+
+class ChallengeViewSet(ReadProtectedModelViewSet):
+    """
+    REST API View set.
+    The djangorestframework plugin will get all `Challenge` objects, serialize it to JSON with the given serializer,
+    then render it on /api/family/challenge/
+    """
+    queryset = Challenge.objects.order_by('id')
+    serializer_class = ChallengeSerializer
+    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filterset_fields = ['name', 'description', 'points', ]
+    search_fields = ['$name', '$description', '$points', ]
+
+
+class AchievementViewSet(ReadProtectedModelViewSet):
+    """
+    REST API View set.
+    The djangorestframework plugin will get all `Achievement` objects, serialize it to JSON with the given serializer,
+    then render it on /api/family/achievement/
+    """
+    queryset = Achievement.objects.order_by('id')
+    serializer_class = AchievementSerializer
+    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filterset_fields = ['family__name', 'family__description', 'challenge__name', 'challenge__description', 'obtained_at', 'valid', ]
+    search_fields = ['$family__name', '$family__description', '$challenge__name', '$challenge__description', ]
+
+
+class BatchAchievementsAPIView(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request, format=None):
+        family_ids = request.data.get('families')
+        challenge_ids = request.data.get('challenges')
+        families = Family.objects.filter(id__in=family_ids)
+        challenges = Challenge.objects.filter(id__in=challenge_ids)
+        results = []
+        for family in families:
+            for challenge in challenges:
+                a, created = Achievement.objects.get_or_create(family=family, challenge=challenge)
+                if created:
+                    results.append({
+                        'family': family.name,
+                        'challenge': challenge.name,
+                        'status': 'created'
+                    })
+                else:
+                    results.append({
+                        'family': family.name,
+                        'challenge': challenge.name,
+                        'status': 'existed',
+                    })
+        for family in families:
+            family.update_score()
+        Family.update_ranking()
+
+        return Response({'results': results}, status=status.HTTP_201_CREATED)

apps/family/apps.py

@@ -0,0 +1,11 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+
+from django.utils.translation import gettext_lazy as _
+from django.apps import AppConfig
+
+
+class FamilyConfig(AppConfig):
+    name = 'family'
+    verbose_name = _('family')

apps/family/forms.py

@@ -0,0 +1,44 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django import forms
+from django.forms.widgets import NumberInput
+from note_kfet.inputs import Autocomplete
+
+from .models import Challenge, FamilyMembership, User, Family
+
+
+class ChallengeForm(forms.ModelForm):
+    """
+    To update a challenge
+    """
+    class Meta:
+        model = Challenge
+        fields = ('name', 'description', 'points',)
+        widgets = {
+            "points": NumberInput()
+        }
+
+
+class FamilyForm(forms.ModelForm):
+    class Meta:
+        model = Family
+        fields = ('name', 'description', )
+
+
+class FamilyMembershipForm(forms.ModelForm):
+    class Meta:
+        model = FamilyMembership
+        fields = ('user', )
+
+        widgets = {
+            "user":
+                Autocomplete(
+                    User,
+                    attrs={
+                        'api_url': '/api/user/',
+                        'name_field': 'username',
+                        'placeholder': 'Nom ...',
+                    },
+                )
+        }

apps/family/migrations/0001_initial.py

@@ -0,0 +1,73 @@
+# Generated by Django 4.2.21 on 2025-07-06 16:07
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Challenge',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, verbose_name='name')),
+                ('description', models.CharField(max_length=255, verbose_name='description')),
+                ('points', models.PositiveIntegerField(verbose_name='points')),
+                ('obtained', models.PositiveIntegerField(default=0, verbose_name='obtained')),
+            ],
+            options={
+                'verbose_name': 'challenge',
+                'verbose_name_plural': 'challenges',
+            },
+        ),
+        migrations.CreateModel(
+            name='Family',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, unique=True, verbose_name='name')),
+                ('description', models.CharField(max_length=255, verbose_name='description')),
+                ('score', models.PositiveIntegerField(default=0, verbose_name='score')),
+                ('rank', models.PositiveIntegerField(verbose_name='rank')),
+            ],
+            options={
+                'verbose_name': 'Family',
+                'verbose_name_plural': 'Families',
+            },
+        ),
+        migrations.CreateModel(
+            name='Achievement',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('obtained_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='obtained at')),
+                ('challenge', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='family.challenge')),
+                ('family', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='family.family', verbose_name='family')),
+            ],
+            options={
+                'verbose_name': 'achievement',
+                'verbose_name_plural': 'achievements',
+            },
+        ),
+        migrations.CreateModel(
+            name='FamilyMembership',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('year', models.PositiveIntegerField(default=2025, verbose_name='year')),
+                ('family', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='members', to='family.family', verbose_name='family')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='family_memberships', to=settings.AUTH_USER_MODEL, verbose_name='user')),
+            ],
+            options={
+                'verbose_name': 'family membership',
+                'verbose_name_plural': 'family memberships',
+                'unique_together': {('user', 'year')},
+            },
+        ),
+    ]

apps/family/migrations/0002_family_display_image.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.23 on 2025-07-17 15:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('family', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='family',
+            name='display_image',
+            field=models.ImageField(default='pic/default.png', max_length=255, upload_to='pic/', verbose_name='display image'),
+        ),
+    ]

apps/family/migrations/0003_achievement_valid_alter_familymembership_family.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.4 on 2025-07-21 21:02
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('family', '0002_family_display_image'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='achievement',
+            name='valid',
+            field=models.BooleanField(default=False, verbose_name='valid'),
+        ),
+        migrations.AlterField(
+            model_name='familymembership',
+            name='family',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to='family.family', verbose_name='family'),
+        ),
+    ]

apps/family/migrations/0004_remove_challenge_obtained.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.4 on 2025-07-22 14:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('family', '0003_achievement_valid_alter_familymembership_family'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='challenge',
+            name='obtained',
+        ),
+    ]

apps/family/migrations/0005_alter_achievement_unique_together.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.4 on 2025-08-13 20:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('family', '0004_remove_challenge_obtained'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='achievement',
+            unique_together={('challenge', 'family')},
+        ),
+    ]

apps/family/models.py

@@ -0,0 +1,207 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.db import models, transaction
+from django.utils import timezone
+from django.contrib.auth.models import User
+from django.urls import reverse_lazy
+from django.utils.translation import gettext_lazy as _
+
+
+class Family(models.Model):
+    name = models.CharField(
+        max_length=255,
+        verbose_name=_('name'),
+        unique=True,
+    )
+
+    description = models.CharField(
+        max_length=255,
+        verbose_name=_('description'),
+    )
+
+    score = models.PositiveIntegerField(
+        verbose_name=_('score'),
+        default=0,
+    )
+
+    rank = models.PositiveIntegerField(
+        verbose_name=_('rank'),
+    )
+
+    display_image = models.ImageField(
+        verbose_name=_('display image'),
+        max_length=255,
+        blank=False,
+        null=False,
+        upload_to='pic/',
+        default='pic/default.png'
+    )
+
+    class Meta:
+        verbose_name = _('Family')
+        verbose_name_plural = _('Families')
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse_lazy('family:family_detail', args=(self.pk,))
+
+    def update_score(self, *args, **kwargs):
+        challenge_set = Challenge.objects.select_for_update().filter(achievement__family=self, achievement__valid=True)
+        points_sum = challenge_set.aggregate(models.Sum("points"))
+        self.score = points_sum["points__sum"] if points_sum["points__sum"] else 0
+        self.save()
+        self.update_ranking()
+
+    @staticmethod
+    def update_ranking(*args, **kwargs):
+        """
+        Update ranking when adding or removing points
+        """
+        family_set = Family.objects.select_for_update().all().order_by("-score")
+        for i in range(family_set.count()):
+            if i == 0 or family_set[i].score != family_set[i - 1].score:
+                new_rank = i + 1
+            family = family_set[i]
+            family.rank = new_rank
+            family._force_save = True
+            family.save()
+
+    def save(self, *args, **kwargs):
+        if self.rank is None:
+            last_family = Family.objects.order_by("rank").last()
+            if last_family is None or last_family.score > self.score:
+                self.rank = Family.objects.count() + 1
+            else:
+                self.rank = last_family.rank
+        super().save(*args, **kwargs)
+
+
+class FamilyMembership(models.Model):
+    user = models.OneToOneField(
+        User,
+        on_delete=models.PROTECT,
+        related_name=_('family_memberships'),
+        verbose_name=_('user'),
+    )
+
+    family = models.ForeignKey(
+        Family,
+        on_delete=models.PROTECT,
+        related_name=_('memberships'),
+        verbose_name=_('family'),
+    )
+
+    year = models.PositiveIntegerField(
+        verbose_name=_('year'),
+        default=timezone.now().year,
+    )
+
+    class Meta:
+        unique_together = ('user', 'year',)
+        verbose_name = _('family membership')
+        verbose_name_plural = _('family memberships')
+
+    def __str__(self):
+        return _('Family membership of {user} to {family}').format(user=self.user.username, family=self.family.name, )
+
+
+class Challenge(models.Model):
+    name = models.CharField(
+        max_length=255,
+        verbose_name=_('name'),
+    )
+
+    description = models.CharField(
+        max_length=255,
+        verbose_name=_('description'),
+    )
+
+    points = models.PositiveIntegerField(
+        verbose_name=_('points'),
+    )
+
+    @property
+    def obtained(self):
+        achievements = Achievement.objects.filter(challenge=self, valid=True)
+        return achievements.count()
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse_lazy('family:challenge_detail', args=(self.pk,))
+
+    @transaction.atomic
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        # Update families who already obtained this challenge
+        achievements = Achievement.objects.filter(challenge=self)
+        for achievement in achievements:
+            achievement.save()
+
+    class Meta:
+        verbose_name = _('challenge')
+        verbose_name_plural = _('challenges')
+
+
+class Achievement(models.Model):
+    challenge = models.ForeignKey(
+        Challenge,
+        on_delete=models.PROTECT,
+
+    )
+    family = models.ForeignKey(
+        Family,
+        on_delete=models.PROTECT,
+        verbose_name=_('family'),
+    )
+
+    obtained_at = models.DateTimeField(
+        verbose_name=_('obtained at'),
+        default=timezone.now,
+    )
+
+    valid = models.BooleanField(
+        verbose_name=_('valid'),
+        default=False,
+    )
+
+    class Meta:
+        unique_together = ('challenge', 'family',)
+        verbose_name = _('achievement')
+        verbose_name_plural = _('achievements')
+
+    def __str__(self):
+        return _('Challenge {challenge} carried out by Family {family}').format(challenge=self.challenge.name, family=self.family.name, )
+
+    @transaction.atomic
+    def save(self, *args, update_score=True, **kwargs):
+        """
+        When saving, also grants points to the family
+        """
+        self.family = Family.objects.select_for_update().get(pk=self.family_id)
+        self.challenge = Challenge.objects.select_for_update().get(pk=self.challenge_id)
+
+        super().save(*args, **kwargs)
+
+        if update_score:
+            self.family.refresh_from_db()
+            self.family.update_score()
+
+    @transaction.atomic
+    def delete(self, *args, **kwargs):
+        """
+        When deleting, also removes points from the family
+        """
+        # Get the family and challenge before deletion
+        self.family = Family.objects.select_for_update().get(pk=self.family_id)
+
+        # Delete the achievement
+        super().delete(*args, **kwargs)
+
+        # Remove points from the family
+        self.family.refresh_from_db()
+        self.family.update_score()

apps/family/static/family/js/achievements.js

@@ -0,0 +1,411 @@
+// Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+// When a transaction is performed, lock the interface to prevent spam clicks.
+var LOCK = false
+
+/**
+ * Refresh the history table on the consumptions page.
+ */
+function refreshHistory () {
+  $('#history').load('/family/manage/ #history')
+}
+
+$(document).ready(function () {
+  // If hash of a category in the URL, then select this category
+  // else select the first one
+  if (location.hash) {
+    $("a[href='" + location.hash + "']").tab('show')
+  } else {
+    $("a[data-toggle='tab']").first().tab('show')
+  }
+
+  // When selecting a category, change URL
+  $(document.body).on('click', "a[data-toggle='tab']", function () {
+    location.hash = this.getAttribute('href')
+  })
+
+})
+
+notes = []
+notes_display = []
+buttons = []
+
+// When the user searches an alias, we update the auto-completion
+autoCompleteFamily('note', 'note_list', notes, notes_display,
+  'note', 'user_note', 'profile_pic', function () {
+    return true
+  })
+
+/**
+ * Add a transaction from a button.
+ * @param fam Where the money goes
+ * @param amount The price of the item
+ * @param type The type of the transaction (content type id for RecurrentTransaction)
+ * @param category_id The category identifier
+ * @param category_name The category name
+ * @param template_id The identifier of the button
+ * @param template_name The name of  the button
+ */
+function addChallenge (id, name, amount) {
+  var challenge = null
+  /** Ajout de 1 à chaque clic d'un bouton déjà choisi  */
+  buttons.forEach(function (b) {
+    if (b.id === id) {
+      challenge = b
+    }
+  })
+  if (challenge == null) {
+    challenge = {
+      id: id,
+      name: name,
+    }
+    buttons.push(challenge)
+  }
+
+  const dc_obj = true
+  
+    const list = 'consos_list'
+    let html = ''
+    buttons.forEach(function (challenge) {
+      html += li('conso_button_' + challenge.id, challenge.name)
+    })
+    document.getElementById(list).innerHTML = html
+
+    buttons.forEach((button) => {
+      document.getElementById(`conso_button_${button.id}`).addEventListener('click', () => {
+        if (LOCK) { return }
+        removeNote(button, 'conso_button', buttons, list)()
+      })
+    })
+
+}
+
+/**
+ * Reset the page as its initial state.
+ */
+function reset () {
+  notes_display.length = 0
+  notes.length = 0
+  buttons.length = 0
+  document.getElementById('note_list').innerHTML = ''
+  document.getElementById('consos_list').innerHTML = ''
+  document.getElementById('note').value = ''
+  document.getElementById('note').dataset.originTitle = ''
+  $('#note').tooltip('hide')
+  document.getElementById('profile_pic').src = '/static/member/img/default_picture.png'
+  document.getElementById('profile_pic_link').href = '#'
+  refreshHistory()
+  LOCK = false
+}
+
+/**
+ * Apply all transactions: all notes in `notes` buy each item in `buttons`
+ */
+function consumeAll () {
+  if (LOCK) { return }
+  LOCK = true
+
+  let error = false
+
+  if (notes_display.length === 0) {
+    // ... gestion erreur ...
+    error = true
+  }
+  if (buttons.length === 0) {
+    // ... gestion erreur ...
+    error = true
+  }
+  if (error) {
+    LOCK = false
+    return
+  }
+  // Récupérer les IDs des familles et des challenges
+  const family_ids = notes_display.map(fam => fam.id)
+  const challenge_ids = buttons.map(chal => chal.id)
+
+  $.ajax({
+    url: '/family/api/family/achievements/batch/',
+    type: 'POST',
+    data: JSON.stringify({
+      families: family_ids,
+      challenges: challenge_ids
+    }),
+    contentType: 'application/json',
+    headers: {
+      'X-CSRFToken': CSRF_TOKEN
+    },
+    success: function (data) {
+      reset()
+      data.results.forEach(function (result) {
+        if (result.status === 'created') {
+          addMsg(
+            interpolate(gettext('Invalid achievement for challenge %s ' +
+            'and family %s created.'), [result.challenge, result.family]),
+            'success',
+            5000
+          )
+        } else {
+          addMsg(
+            interpolate(gettext('An achievement for challenge %s ' +
+            'and family %s already exists.'), [result.challenge, result.family]),
+            'danger',
+            8000
+          )
+        }
+      })
+    }
+  })
+}
+
+
+var searchbar = document.getElementById("search-input")
+var search_results = document.getElementById("search-results")
+
+var old_pattern = null;
+var firstMatch = null;
+/**
+ * Updates the button search tab
+ * @param force Forces the update even if the pattern didn't change
+ */
+function updateSearch(force = false) {
+  let pattern = searchbar.value
+  if (pattern === "")
+    firstMatch = null;
+  if ((pattern === old_pattern || pattern === "") && !force)
+    return;
+  firstMatch = null;
+  const re = new RegExp(pattern, "i");
+  Array.from(search_results.children).forEach(function(b) {
+    if (re.test(b.innerText)) {
+      b.hidden = false;
+      if (firstMatch === null) {
+        firstMatch = b;
+      }
+    } else
+      b.hidden = true;
+  });
+}
+
+searchbar.addEventListener("input", function (e) {
+  debounce(updateSearch)()
+});
+searchbar.addEventListener("keyup", function (e) {
+  if (firstMatch && e.key === "Enter")
+    firstMatch.click()
+});
+
+function createshiny() {
+  const list_btn = document.querySelectorAll('.btn-outline-dark')
+  const shiny_class = list_btn[Math.floor(Math.random() * list_btn.length)].classList
+  shiny_class.replace('btn-outline-dark', 'btn-outline-dark-shiny')
+}
+createshiny()
+
+
+
+
+
+/**
+ * Query the 20 first matched notes with a given pattern
+ * @param pattern The pattern that is queried
+ * @param fun For each found note with the matched alias `alias`, fun(note, alias) is called.
+ */
+function getMatchedFamilies (pattern, fun) {
+  $.getJSON('/api/family/family/?format=json&alias=' + pattern + '&search=family', fun)
+}
+
+/**
+ * Generate a <li> entry with a given id and text
+ */
+function li (id, text, extra_css) {
+  return '<li class="list-group-item py-1 px-2 d-flex justify-content-between align-items-center text-truncate ' +
+        (extra_css || '') + '"' + ' id="' + id + '">' + text + '</li>\n'
+}
+
+
+/**
+ * Génère un champ d'auto-complétion pour rechercher une famille par son nom (version simplifiée sans alias)
+ * @param field_id L'identifiant du champ texte où le nom est saisi
+ * @param family_list_id L'identifiant du bloc div où les familles sélectionnées sont affichées
+ * @param families Un tableau contenant les objets famille sélectionnés
+ * @param families_display Un tableau contenant les infos des familles sélectionnées : [nom, id, objet famille, quantité]
+ * @param family_prefix Le préfixe des <li> pour les familles sélectionnées
+ * @param user_family_field L'identifiant du champ qui affiche la famille survolée (optionnel)
+ * @param profile_pic_field L'identifiant du champ qui affiche la photo de la famille survolée (optionnel)
+ * @param family_click Fonction appelée lors du clic sur un nom. Si elle existe et ne retourne pas true, la famille n'est pas affichée.
+ */
+function autoCompleteFamily(field_id, family_list_id, families, families_display, family_prefix = 'family', user_family_field = null, profile_pic_field = null, family_click = null) {
+  const field = $('#' + field_id)
+  // Configuration du tooltip
+  field.tooltip({
+    html: true,
+    placement: 'bottom',
+    title: 'Chargement...',
+    trigger: 'manual',
+    container: field.parent(),
+    fallbackPlacement: 'clockwise'
+  })
+
+  // Masquer le tooltip lors d'un clic ailleurs
+  $(document).click(function (e) {
+    if (!e.target.id.startsWith(family_prefix)) {
+      field.tooltip('hide')
+    }
+  })
+
+  let old_pattern = null
+
+  // Réinitialiser la recherche au clic
+  field.click(function () {
+    field.tooltip('hide')
+    field.removeClass('is-invalid')
+    field.val('')
+    old_pattern = ''
+  })
+
+  // Sur "Entrée", sélectionner la première famille
+  field.keypress(function (event) {
+    if (event.originalEvent.charCode === 13 && families.length > 0) {
+      const li_obj = field.parent().find('ul li').first()
+      displayFamily(families[0], families[0].name, user_family_field, profile_pic_field)
+      li_obj.trigger('click')
+    }
+  })
+
+  // Mise à jour des suggestions lors de la saisie
+  field.keyup(function (e) {
+    field.removeClass('is-invalid')
+
+    if (e.originalEvent.charCode === 13) { return }
+
+    const pattern = field.val()
+
+    if (pattern === old_pattern) { return }
+    old_pattern = pattern
+    families.length = 0
+
+    if (pattern === '') {
+      field.tooltip('hide')
+      families.length = 0
+      return
+    }
+
+    // Appel à l'API pour récupérer les familles correspondantes
+    $.getJSON('/api/family/family/?format=json&search=' + pattern,
+      function (results) {
+        if (pattern !== $('#' + field_id).val()) { return }
+
+        let matched_html = '<ul class="list-group list-group-flush">'
+        results.results.forEach(function (family) {
+          matched_html += li(family_prefix + '_' + family.id,
+            family.name,
+            '')
+          families.push(family)
+        })
+        matched_html += '</ul>'
+
+        field.attr('data-original-title', matched_html).tooltip('show')
+
+        results.results.forEach(function (family) {
+          const family_obj = $('#' + family_prefix + '_' + family.id)
+          family_obj.hover(function () {
+            displayFamily(family, family.name, user_family_field, profile_pic_field)
+          })
+          family_obj.click(function () {
+            var disp = null
+            families_display.forEach(function (d) {
+              if (d.id === family.id) {
+                disp = d
+              }
+            })
+            if (disp == null) {
+              disp = {
+                name: family.name,
+                id: family.id,
+                family: family,
+              }
+              families_display.push(disp)
+            }
+
+            if (family_click && !family_click()) { return }
+
+            const family_list = $('#' + family_list_id)
+            let html = ''
+            families_display.forEach(function (disp) {
+              html += li(family_prefix + '_' + disp.id,
+                disp.name,
+                '')
+            })
+
+            family_list.html(html)
+            field.tooltip('update')
+
+            families_display.forEach(function (disp) {
+              const line_obj = $('#' + family_prefix + '_' + disp.id)
+              line_obj.hover(function () {
+                displayFamily(disp.family, disp.name, user_family_field, profile_pic_field)
+              })
+              line_obj.click(removeFamily(disp, family_prefix, families_display, family_list_id, user_family_field,
+                profile_pic_field))
+            })
+          })
+        })
+      })
+  })
+}
+
+/**
+ * Affiche le nom et la photo d'une famille
+ * @param family L'objet famille à afficher
+ * @param user_family_field L'identifiant du champ où afficher le nom (optionnel)
+ * @param profile_pic_field L'identifiant du champ où afficher la photo (optionnel)
+ */
+function displayFamily(family, user_family_field = null, profile_pic_field = null) {
+  if (!family.display_image) {
+    family.display_image = '/static/member/img/default_picture.png'
+  }
+  if (user_family_field !== null) {
+    $('#' + user_family_field).removeAttr('class')
+    $('#' + user_family_field).text(family.name)
+    if (profile_pic_field != null) {
+      $('#' + profile_pic_field).attr('src', family.display_image)
+      // Si tu veux un lien vers la page famille :
+      $('#' + profile_pic_field + '_link').attr('href', '/family/detail/' + family.id + '/')
+    }
+  }
+}
+
+
+/**
+ * Retire une famille de la liste sélectionnée.
+ * @param d La famille à retirer
+ * @param family_prefix Le préfixe des <li>
+ * @param families_display Le tableau des familles sélectionnées
+ * @param family_list_id L'id du bloc où sont affichées les familles
+ * @param user_family_field Champ d'affichage (optionnel)
+ * @param profile_pic_field Champ photo (optionnel)
+ * @returns une fonction compatible avec les événements jQuery
+ */
+function removeFamily(d, family_prefix, families_display, family_list_id, user_family_field = null, profile_pic_field = null) {
+  return function () {
+    const new_families_display = []
+    let html = ''
+    families_display.forEach(function (disp) {
+    })
+
+    families_display.length = 0
+    new_families_display.forEach(function (disp) {
+      families_display.push(disp)
+    })
+
+    $('#' + family_list_id).html(html)
+    families_display.forEach(function (disp) {
+      const obj = $('#' + family_prefix + '_' + disp.id)
+      obj.click(removeFamily(disp, family_prefix, families_display, family_list_id, user_family_field, profile_pic_field))
+      obj.hover(function () {
+        displayFamily(disp.family, user_family_field, profile_pic_field)
+      })
+    })
+  }
+}

apps/family/tables.py

@@ -0,0 +1,149 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import django_tables2 as tables
+from django.utils.html import format_html
+from django.utils.translation import gettext_lazy as _
+from django_tables2 import A
+from django.urls import reverse, reverse_lazy
+from note_kfet.middlewares import get_current_request
+from permission.backends import PermissionBackend
+
+from .models import Achievement, Challenge, Family, FamilyMembership
+
+
+class FamilyTable(tables.Table):
+    """
+    List all families
+    """
+
+    description = tables.Column(verbose_name=_("Description"))
+
+    class Meta:
+        attrs = {
+            'class': 'table table-condensed table-striped table-hover'
+        }
+        model = Family
+        template_name = 'django_tables2/bootstrap4.html'
+        fields = ('name', 'score', 'rank',)
+        order_by = ('rank',)
+        row_attrs = {
+            'class': 'table-row',
+            'data-href': lambda record: reverse('family:family_detail', args=[record.pk]),
+            'style': 'cursor:pointer',
+        }
+
+
+class ChallengeTable(tables.Table):
+    """
+    List all challenges
+    """
+
+    name = tables.Column(verbose_name=_("Name"))
+    description = tables.Column(verbose_name=_("Description"))
+    points = tables.Column(verbose_name=_("Points"))
+
+    class Meta:
+        attrs = {
+            'class': 'table table-condensed table-striped table-hover'
+        }
+        order_by = ('id',)
+        model = Challenge
+        template_name = 'django_tables2/bootstrap4.html'
+        fields = ('name', 'description', 'points',)
+        row_attrs = {
+            'class': 'table-row',
+            'data-href': lambda record: reverse('family:challenge_detail', args=[record.pk]),
+            'style': 'cursor:pointer',
+        }
+
+
+class FamilyMembershipTable(tables.Table):
+    """
+    List all family memberships.
+    """
+
+    def render_user(self, value):
+        # Display user's name, clickable if permission is granted
+        s = value.username
+        if PermissionBackend.check_perm(get_current_request(), "auth.view_user", value):
+            s = format_html("<a href='{url}'>{name}</a>",
+                            url=reverse_lazy('member:user_detail', kwargs={"pk": value.pk}), name=s)
+        return s
+
+    class Meta:
+        attrs = {
+            'class': 'table table-condensed table-striped',
+            'style': 'table-layout: fixed;'
+        }
+        template_name = 'django_tables2/bootstrap4.html'
+        fields = ('user',)
+        model = FamilyMembership
+
+
+class AchievementTable(tables.Table):
+    """
+    List recent achievements.
+    """
+
+    challenge = tables.Column(verbose_name=_("Challenge"))
+
+    validate = tables.LinkColumn(
+        'family:achievement_validate',
+        args=[A('id')],
+        verbose_name=_("Validate"),
+        text=_("Validate"),
+        orderable=False,
+        attrs={
+            'th': {
+                'id': 'validate-achievement-header'
+            },
+            'a': {
+                'class': 'btn btn-success',
+                'data-type': 'validate-achievement'
+            }
+        },
+    )
+
+    delete = tables.LinkColumn(
+        'family:achievement_delete',
+        args=[A('id')],
+        verbose_name=_("Delete"),
+        text=_("Delete"),
+        orderable=False,
+        attrs={
+            'th': {
+                'id': 'delete-achievement-header'
+            },
+            'a': {
+                'class': 'btn btn-danger',
+                'data-type': 'delete-achievement'
+            }
+        },
+    )
+
+    class Meta:
+        attrs = {
+            'class': 'table table-condensed table-striped table-hover'
+        }
+        model = Achievement
+        fields = ('family', 'challenge', 'challenge__points', 'obtained_at', 'valid')
+        template_name = 'django_tables2/bootstrap4.html'
+        order_by = ('-obtained_at',)
+
+
+class FamilyAchievementTable(tables.Table):
+    """
+    Table des défis réalisés par une famille spécifique.
+    """
+
+    challenge = tables.Column(verbose_name=_("Challenge"))
+
+    class Meta:
+        model = Achievement
+        template_name = 'django_tables2/bootstrap4.html'
+        fields = ('challenge', 'challenge__points', 'obtained_at', 'valid')
+        attrs = {
+            'class': 'table table-condensed table-striped table-hover'
+        }
+        order_by = ('-obtained_at',)

apps/family/templates/family/achievement_confirm_delete.html

@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+    <div class="card bg-light">
+        <div class="card-header text-center">
+            <h4>{% trans "Delete achievement" %}</h4>
+        </div>
+            <div class="card-body">
+                <div class="alert alert-warning">
+                    {% blocktrans %}Are you sure you want to delete this achievement? This action can't be undone.{% endblocktrans %}
+                </div>
+            </div>
+        <div class="card-footer text-center">
+            <form method="post">
+                {% csrf_token %}
+                <a class="btn btn-primary" href="{% url 'family:achievement_list' %}">{% trans "Return to achievements list" %}</a>
+                <button class="btn btn-danger" type="submit">{% trans "Delete" %}</button>
+            </form>
+        </div>
+    </div>
+{% endblock %}

apps/family/templates/family/achievement_confirm_validate.html

@@ -0,0 +1,28 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+    <div class="card bg-light">
+        <div class="card-header text-center">
+            <h4>{% trans "Validate achievement" %}</h4>
+        </div>
+            <div class="card-body">
+                <div class="alert alert-warning">
+                    {% blocktrans %}Are you sure you want to validate this achievement? This action can't be undone.{% endblocktrans %}
+                </div>
+            </div>
+        <div class="card-footer text-center">
+            <form method="post">
+                {% csrf_token %}
+                <a class="btn btn-primary" href="{% url 'family:achievement_list' %}">{% trans "Return to achievements list" %}</a>
+                <form method="post" action="{% url 'family:achievement_validate' pk %}">
+                    {% csrf_token %}
+                    <button type="submit" class="btn btn-success">{% trans "Validate" %}</button>
+                </form>
+            </form>
+        </div>
+    </div>
+{% endblock %}

apps/family/templates/family/achievement_list.html

@@ -0,0 +1,33 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n django_tables2 %}
+
+{% block content %}
+
+<div class="card mb-4" id="history">
+    <div class="card-header">
+        <p class="card-text font-weight-bold">
+            {% trans "Invalid achievements history" %}
+        </p>
+        <a class="btn btn-sm btn-primary mx-2" href="{% url "family:manage" %}">
+            {% trans "Return to management page" %}
+        </a>
+    </div>
+    {% render_table invalid %}
+</div>
+
+<div class="card mb-4" id="history">
+    <div class="card-header">
+        <p class="card-text font-weight-bold">
+            {% trans "Valid achievements history" %}
+        </p>
+        <a class="btn btn-sm btn-primary mx-2" href="{% url "family:manage" %}">
+            {% trans "Return to management page" %}
+        </a>
+    </div>
+    {% render_table valid %}
+</div>
+{% endblock %}

apps/family/templates/family/add_member.html

@@ -0,0 +1,60 @@
+{% extends "family/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load crispy_forms_tags i18n pretty_money %}
+
+{% block profile_content %}
+<div class="card bg-light">
+    <h3 class="card-header text-center">
+        {{ title }}
+    </h3>
+    <div class="card-body">
+        
+        <form method="post" action="">
+            {% csrf_token %}
+            {{ form|crispy }}
+            <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
+        </form>
+    </div>
+</div>
+{% endblock %}
+
+{% block extrajavascript %}
+<script>
+    function autocompleted(user) {
+        $("#id_last_name").val(user.last_name);
+        $("#id_first_name").val(user.first_name);
+        $.getJSON("/api/members/profile/" + user.id + "/", function (profile) {
+            let fee = profile.paid ? "{{ club.membership_fee_paid }}" : "{{ club.membership_fee_unpaid }}";
+            $("#id_credit_amount").val((Number(fee) / 100).toFixed(2));
+        });
+    }
+
+    soge_field = $("#id_soge");
+
+    function fillFields() {
+        let checked = soge_field.is(':checked');
+        if (!checked) {
+            $("input").attr('disabled', false);
+            $("#id_user").attr('disabled', true);
+            $("select").attr('disabled', false);
+            return;
+        }
+
+        let credit_type = $("#id_credit_type");
+        credit_type.attr('disabled', true);
+        credit_type.val(4);
+
+        let credit_amount = $("#id_credit_amount");
+        credit_amount.attr('disabled', true);
+        credit_amount.val('{{ total_fee }}');
+
+        let bank = $("#id_bank");
+        bank.attr('disabled', true);
+        bank.val('Société générale');
+    }
+
+    soge_field.change(fillFields);
+</script>
+{% endblock %}

apps/family/templates/family/base.html

@@ -0,0 +1,52 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n perms %}
+
+{# Use a fluid-width container #}
+{% block containertype %}container-fluid{% endblock %}
+
+{% block content %}
+<div class="row mt-4">
+    <div class="col-xl-4">
+        {% block profile_info %}
+        <div class="card bg-light" id="card-infos">
+            <h4 class="card-header text-center">
+                {{ family.name }}
+            </h4>
+            <div class="text-center">
+                <a href="{% url 'family:update_pic' family.pk  %}">
+                    <img src="{{ family.display_image.url }}" class="img-thumbnail mt-2">
+                </a>
+            </div>
+            <div class="card-body" id="profile_infos">
+                {% include "family/family_info.html" %}
+            </div>
+            <div class="card-footer">
+                {% if can_add_members %}
+                <a class="btn btn-sm btn-success" href="{% url 'family:family_add_member' family_pk=family.pk %}"
+                   data-turbolinks="false"> {% trans "Add member" %}</a>
+                {% endif %}
+                {% if ".change_"|has_perm:family %}
+                <a class="btn btn-sm btn-secondary" href="{% url 'family:family_update' pk=family.pk %}"
+                   data-turbolinks="false">
+                    <i class="fa fa-edit"></i> {% trans 'Update Profile' %}
+                </a>
+                {% endif %}
+                {% url 'family:family_detail' family.pk as family_detail_url %}
+                {% if request.path_info != family_detail_url %}
+                <a class="btn btn-sm btn-primary" href="{{ family_detail_url }}">{% trans 'View Profile' %}</a>
+                {% endif %}
+                <a class="btn btn-sm btn-primary" href="{% url "family:family_list" %}">
+                    {% trans "Return to the family list" %}
+                  </a>
+            </div>
+        </div>
+        {% endblock %}
+    </div>
+    <div class="col-xl-8">
+        {% block profile_content %}{% endblock %}
+    </div>
+</div>
+{% endblock %}

apps/family/templates/family/challenge_detail.html

@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    {{ title }} {{ challenge.name }}
+  </h3>
+  <div class="card-body">
+    <ul>
+      {% for field, value in fields %}
+      <li> {{ field }} : {{ value }}</li>
+      {% endfor %}
+      <li> {% trans "Obtained by " %} {{obtained}}
+        {% if obtained > 1 %}
+          {% trans "families" %}
+        {% else %}
+          {% trans "family" %}
+        {% endif %}
+      </li>
+    </ul>
+      <a class="btn btn-sm btn-primary" href="{% url "family:challenge_list" %}">
+        {% trans "Return to the challenge list" %}
+      </a>
+      {% if update %}
+      <a class="btn btn-sm btn-secondary" href="{% url "family:challenge_update" pk=challenge.pk %}">
+        {% trans "Update" %}
+      </a>
+      {% endif %}
+  </div>
+</div>
+{% endblock %}

apps/family/templates/family/challenge_form.html

@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body" id="form">
+    <form method="post">
+      {% csrf_token %}
+      {{ form | crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}

apps/family/templates/family/challenge_list.html

@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+<div class="row">
+    <div class="col-xl-12">
+        <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0">
+            <a href="{% url "family:family_list" %}" class="btn btn-sm btn-outline-primary">
+                {% trans "Families" %}
+            </a>
+            <a href="#" class="btn btn-sm btn-outline-primary active">
+                {% trans "Challenges" %}
+            </a>
+            {% if can_manage %}
+            <a href="{% url "family:manage" %}" class="btn btn-sm btn-outline-primary">
+                {% trans "Manage" %}
+            </a>
+            {% endif %}
+        </div>
+    </div>
+</div>
+
+<div class="card bg-white mb-3">
+    <h3 class="card-header text-center">
+        {{ title }}
+    </h3>
+    {% render_table table %}
+</div>
+{% endblock %}
+
+{% block extrajavascript %}
+<script type="text/javascript">
+    $(".table-row").click(function () {
+            window.document.location = $(this).data("href");
+        });
+</script>
+{% endblock %}

apps/family/templates/family/family_detail.html

@@ -0,0 +1,29 @@
+{% extends "family/base.html" %}
+{% comment %}
+Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load render_table from django_tables2 %}
+{% load i18n perms %}
+
+{% block profile_content %}
+{% if member_list.data %}
+<div class="card">
+    <div class="card-header position-relative" id="clubListHeading">
+        <i class="fa fa-users"></i> {% trans "Family members" %}
+    </div>
+    {% render_table member_list %}
+</div>
+
+<div class="my-4"></div>
+{% endif %}
+
+{% if achievement_list.data %}
+<div class="card">
+    <div class="card-header position-relative">
+        <i class="fa fa-trophy"></i> {% trans "Completed challenges" %}
+    </div>
+    {% render_table achievement_list %}
+</div>
+{% endif %}
+{% endblock %}

apps/family/templates/family/family_form.html

@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body" id="form">
+    <form method="post">
+      {% csrf_token %}
+      {{ form | crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}

apps/family/templates/family/family_info.html

@@ -0,0 +1,15 @@
+{% load i18n pretty_money perms %}
+
+<dl class="row">
+    <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ family.name }}</dd>
+
+    <dt class="col-xl-6">{% trans 'description'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ family.description }}</dd>
+
+    <dt class="col-xl-6">{% trans 'score'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ family.score }}</dd>
+
+    <dt class="col-xl-6">{% trans 'rank'|capfirst %}</dt>
+    <dd class="col-xl-6">{{ family.rank }}</dd>
+</dl>

apps/family/templates/family/family_list.html

@@ -0,0 +1,43 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+<div class="row">
+    <div class="col-xl-12">
+        <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0">
+            <a href="#" class="btn btn-sm btn-outline-primary active">
+                {% trans "Families" %}
+            </a>
+            <a href="{% url "family:challenge_list" %}" class="btn btn-sm btn-outline-primary">
+                {% trans "Challenges" %}
+            </a>
+            {% if can_manage %}
+            <a href="{% url "family:manage" %}" class="btn btn-sm btn-outline-primary">
+                {% trans "Manage" %}
+            </a>
+            {% endif %}
+        </div>
+    </div>
+</div>
+
+<div class="card bg-white mb-3">
+    <h3 class="card-header text-center">
+        {{ title }}
+    </h3>
+    {% render_table table %}
+</div>
+
+{% endblock %}
+
+{% block extrajavascript %}
+<script type="text/javascript">
+    $(".table-row").click(function () {
+            window.document.location = $(this).data("href");
+        });
+</script>
+{% endblock %}

apps/family/templates/family/manage.html

@@ -0,0 +1,287 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n static django_tables2 %}
+
+{% block containertype %}container-fluid{% endblock %}
+
+{% block content %}
+<div class="row">
+    <div class="col-xl-12">
+        <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0">
+            <a href="{% url "family:family_list" %}" class="btn btn-sm btn-outline-primary">
+                {% trans "Families" %}
+            </a>
+            <a href="{% url "family:challenge_list" %}" class="btn btn-sm btn-outline-primary">
+                {% trans "Challenges" %}
+            </a>
+            <a href="#" class="btn btn-sm btn-outline-primary active">
+                {% trans "Manage" %}
+            </a>
+        </div>
+    </div>
+</div>
+
+<div class="row mb-3">
+    <div class='col-sm-5 col-xl-6' id="infos_div">
+        {% if can_add_achievement %}
+        <div class="row justify-content-center justify-content-md-end">
+            {# Family details column #}
+            <div class="col picture-col">
+                <div class="card bg-light mb-4 text-center">
+                    <a id="profile_pic_link" href="#">
+                        <img src="{% static "member/img/default_picture.png" %}" id="profile_pic" alt="" class="card-img-top d-none d-sm-block">
+                    </a>
+                    <div class="card-body text-center text-break p-2">
+                        <span id="user_note"><i class="small">{% trans "Please select a family" %}</i></span>
+                    </div>
+                </div>
+            </div>
+
+            {# Family selection column #}
+            <div class="col-xl" id="user_select_div">
+                <div class="card bg-light border-success mb-4">
+                    <div class="card-header">
+                        <p class="card-text font-weight-bold">
+                            {% trans "Families" %}
+                        </p>
+                    </div>
+                    <div class="card-body p-0" style="min-height:125px;">
+                        <ul class="list-group list-group-flush" id="note_list"></ul>
+                    </div>
+                    {# User search with autocompletion #}
+                    <div class="card-footer">
+                        <input class="form-control mx-auto d-block mb-2" placeholder="{% trans "Name" %}" type="text" id="note" autofocus />
+                        {% if user_family %}
+                        <button class="btn btn-sm btn-secondary btn-block" id="select_my_family">
+                            {% trans "Select my family" %} ({{ user_family.name }})
+                        </button>
+                        {% endif %}
+                    </div>
+                </div>
+            </div>
+
+            {# Summary of challenges and validate button #}
+            <div class="col-xl-5" id="consos_list_div">
+                <div class="card bg-light border-info mb-4">
+                    <div class="card-header">
+                        <p class="card-text font-weight-bold">
+                            {% trans "Challenges" %}
+                        </p>
+                    </div>
+                    <div class="card-body p-0" style="min-height:125px;">
+                        <ul class="list-group list-group-flush" id="consos_list"></ul>
+                    </div>
+                    <div class="card-footer text-center">
+                        <span id="consume_all" class="btn btn-primary">
+                            {% trans "Validate!" %}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+        {% endif %}
+
+        {# Create family/challenge buttons #}
+        {% if can_add_family or can_add_challenge %}
+        <div class="card bg-light border-success mb-4">
+          <h3 class="card-header font-weight-bold text-center">
+              {% trans "Create a family or challenge" %}
+          </h3>
+        <div class="card-body text-center">
+            {% if can_add_family %}
+            <a class="btn btn-sm btn-primary mx-2" href="{% url "family:family_create" %}">
+                {% trans "Add a family" %}
+            </a>
+            {% endif %}
+            {% if can_add_challenge %}
+            <a class="btn btn-sm btn-primary mx-2" href="{% url "family:challenge_create" %}">
+                {% trans "Add a challenge" %}
+            </a>
+            {% endif %}
+        </div>
+        </div>
+        {% endif %}
+    </div>
+
+    {# Buttons column #}
+    <div class="col">
+        {% if can_add_achievement %}
+        <div class="card bg-light border-primary text-center mb-4">
+            {# Tabs for list and search #}
+            <div class="card-header">
+                <ul class="nav nav-tabs nav-fill card-header-tabs">
+                    <li class="nav-item">
+                        <a class="nav-link font-weight-bold" data-toggle="tab" href="#list">
+                            {% trans "List" %}
+                        </a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link font-weight-bold" data-toggle="tab" href="#search">
+                            {% trans "Search" %}
+                        </a>
+                    </li>
+                </ul>
+            </div>
+
+            {# Tabs content #}
+            <div class="card-body">
+                <div class="tab-content">
+                    <div class="tab-pane" id="list">
+                        <div class="d-inline-flex flex-wrap justify-content-center">
+                            {% for challenge in all_challenges %}
+                                    <button class="btn btn-outline-dark rounded-0 flex-fill"
+                                            id="challenge{{ challenge.id }}" name="button" value="{{ challenge.name }}">
+                                        {{ challenge.name }} ({{ challenge.points }} {% trans "points" %})
+                                    </button>
+                            {% endfor %}
+                        </div>
+                    </div>
+                    <div class="tab-pane" id="search">
+                        <input class="form-control mx-auto d-block mb-3" placeholder="{% trans "Search challenge..." %}" type="search" id="search-input"/>
+                        <div class="d-inline-flex flex-wrap justify-content-center" id="search-results">
+                            {% for challenge in all_challenges %}
+                                    <button class="btn btn-outline-dark rounded-0 flex-fill" hidden
+                                            id="search_challenge{{ challenge.id }}" name="button" value="{{ challenge.name }}">
+                                            {{ challenge.name }} ({{ challenge.points }} {% trans "points" %})
+                                    </button>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        {% endif %}
+    </div>
+</div>
+
+{# achievement history #}
+{% if table.data %}
+    <div class="card">
+        <div class="card-header position-relative" id="historyListHeading">
+            <a class="stretched-link font-weight-bold" 
+                href="{% url 'family:achievement_list' %}" >
+                {% trans "Recent achievements history" %}
+            </a>
+        </div>
+        <div id="history">
+            {% render_table table %}
+        </div>
+    </div>
+
+        <!-- Popup de validation -->
+    <div class="modal fade" id="validationModal" tabindex="-1" role="dialog" aria-labelledby="validationModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content border-success">
+        <div class="modal-header bg-success text-white">
+            <h5 class="modal-title" id="validationModalLabel">{% trans "Confirmation" %}</h5>
+            <button type="button" class="close text-white" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
+        <div class="modal-body">
+                <p><strong>{% trans "Are you sure you want to validate this challenge?" %}</strong></p>
+                <p>{% trans "To have your challenge officially validated, please send a message with:" %}</p>
+                <ul>
+                <li>{% trans "The name of the family" %}</li>
+                <li>{% trans "The name of the challenge" %}</li>
+                <li>{% trans "A photo or video as proof" %}</li>
+                </ul>
+                <p>
+                <strong>{% trans "Send it via WhatsApp to:" %}</strong>
+                {% if phone_numbers %}"
+                {% for num in phone_numbers %}
+                    <a href="https://wa.me/{{ num }}" target="_blank">{{ num }}</a>{% if not forloop.last %}, {% endif %}
+                {% endfor %}
+                {% endif %}
+                </p>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-primary" data-dismiss="modal">{% trans "OK" %}</button>
+        </div>
+        </div>
+    </div>
+    </div>
+{% endif %}
+{% endblock %}
+
+
+
+{% block extrajavascript %}
+    <script type="text/javascript" src="{% static "family/js/achievements.js" %}"></script>
+    <script type="text/javascript">
+        {% for challenge in all_challenges %}
+        document.getElementById("challenge{{ challenge.id }}").addEventListener("click", function() {
+            addChallenge({{ challenge.id}}, "{{ challenge.name|escapejs }}", {{ challenge.points }});
+        });
+        {% endfor %}
+    
+        {% for challenge in all_challenges %}
+            document.getElementById("search_challenge{{ challenge.id }}").addEventListener("click", function() {
+                addChallenge({{ challenge.id}}, "{{ challenge.name|escapejs }}", {{ challenge.points }});
+            });
+        {% endfor %} 
+    </script>
+    <script>
+        document.getElementById("consume_all").addEventListener("click", function () {
+            $('#validationModal').modal('show');
+        });
+
+        $('#validationModal .btn-primary').on('click', function () {
+            consumeAll();
+        });
+        
+        {% if user_family %}
+        document.getElementById("select_my_family").addEventListener("click", function () {
+            // Simulate selecting the user's family
+            var userFamily = {
+                id: {{ user_family.id }},
+                name: "{{ user_family.name|escapejs }}",
+                display_image: "{{ user_family.display_image.url|default:'/static/member/img/default_picture.png'|escapejs }}"
+            };
+            
+            // Check if family is already selected
+            var alreadySelected = false;
+            notes_display.forEach(function (d) {
+                if (d.id === userFamily.id) {
+                    alreadySelected = true;
+                }
+            });
+            
+            if (!alreadySelected) {
+                // Add the family to the selected families
+                var disp = {
+                    name: userFamily.name,
+                    id: userFamily.id,
+                    family: userFamily,
+                };
+                notes_display.push(disp);
+                
+                // Update the display
+                const family_list = $('#note_list');
+                let html = '';
+                notes_display.forEach(function (disp) {
+                    html += li('note_' + disp.id, disp.name, '');
+                });
+                
+                family_list.html(html);
+                
+                // Add click handlers for removal
+                notes_display.forEach(function (disp) {
+                    const line_obj = $('#note_' + disp.id);
+                    line_obj.hover(function () {
+                        displayFamily(disp.family, disp.name, 'user_note', 'profile_pic');
+                    });
+                    line_obj.click(removeFamily(disp, 'note', notes_display, 'note_list', 'user_note', 'profile_pic'));
+                });
+                
+                // Display the family info
+                displayFamily(userFamily, userFamily.name, 'user_note', 'profile_pic');
+            }
+        });
+        {% endif %}
+    </script>
+{% endblock %}

apps/family/templates/family/picture_update.html

@@ -0,0 +1,118 @@
+{% extends "family/base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block profile_content %}
+<div class="card bg-light">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body">
+    <div class="text-center">
+      <form method="post" enctype="multipart/form-data" id="formUpload">
+        {% csrf_token %}
+        {{ form |crispy }}
+        {% if user.note.display_image != "pic/default.png" %}
+          <input type="submit" class="btn btn-primary" value="{% trans "Remove" %}">
+        {% endif %}
+      </form>
+    </div>
+    <!-- MODAL TO CROP THE IMAGE -->
+    <div class="modal fade" id="modalCrop" data-backdrop="static">
+      <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-body-wrapper" style="width: 500px; height: 500px; padding: 16px;">
+              <div class="modal-body" style="width: 100%; height: 100%; padding: 0">
+                <img src="" id="modal-image" style="display: block; max-width: 100%;">
+              </div>
+            </div>
+          <div class="modal-footer">
+            <div class="btn-group pull-left" role="group">
+              <button type="button" class="btn btn-default" id="js-zoom-in">
+                <span class="glyphicon glyphicon-zoom-in"></span>
+              </button>
+              <button type="button" class="btn btn-default js-zoom-out">
+                <span class="glyphicon glyphicon-zoom-out"></span>
+              </button>
+            </div>
+            <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Nevermind" %}</button>
+            <button type="button" class="btn btn-primary js-crop-and-upload">{% trans "Crop and upload" %}</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}
+
+{% block extracss %}
+<link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.css" rel="stylesheet">
+{% endblock %}
+
+{% block extrajavascript%}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/jquery-cropper@1.0.1/dist/jquery-cropper.min.js"></script>
+<script>
+  $(function () {
+
+    /* SCRIPT TO OPEN THE MODAL WITH THE PREVIEW */
+    $("#id_image").change(function (e) {
+      if (this.files && this.files[0]) {
+        // Check the image size
+        if (this.files[0].size > 2*1024*1024) {
+          alert("Ce fichier est trop volumineux.")
+	} else {
+          // Read the selected image file
+          var reader = new FileReader();
+          reader.onload = function (e) {
+            $("#modal-image").attr("src", e.target.result);
+            $("#modalCrop").modal("show");
+          }
+          reader.readAsDataURL(this.files[0]);
+        }
+      }
+    });
+
+    /* SCRIPTS TO HANDLE THE CROPPER BOX */
+    var $image = $("#modal-image");
+    var cropBoxData;
+    var canvasData;
+    $("#modalCrop").on("shown.bs.modal", function () {
+      $image.cropper({
+        viewMode: 1,
+        aspectRatio: 1 / 1,
+        minCropBoxWidth: 200,
+        minCropBoxHeight: 200,
+        ready: function () {
+          $image.cropper("setCanvasData", canvasData);
+          $image.cropper("setCropBoxData", cropBoxData);
+        }
+      });
+    }).on("hidden.bs.modal", function () {
+      cropBoxData = $image.cropper("getCropBoxData");
+      canvasData = $image.cropper("getCanvasData");
+      $image.cropper("destroy");
+    });
+
+    $(".js-zoom-in").click(function () {
+      $image.cropper("zoom", 0.1);
+    });
+
+    $(".js-zoom-out").click(function () {
+      $image.cropper("zoom", -0.1);
+    });
+
+    /* SCRIPT TO COLLECT THE DATA AND POST TO THE SERVER */
+    $(".js-crop-and-upload").click(function () {
+      var cropData = $image.cropper("getData");
+      $("#id_x").val(cropData["x"]);
+      $("#id_y").val(cropData["y"]);
+      $("#id_height").val(cropData["height"]);
+      $("#id_width").val(cropData["width"]);
+      $("#formUpload").submit();
+    });
+  });
+</script>
+{% endblock %}

apps/family/tests/test_family.py

@@ -0,0 +1,328 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import os
+
+from api.tests import TestAPI
+from django.contrib.auth.models import User
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import TestCase
+from rest_framework.test import APITestCase
+from django.urls import reverse
+from django.utils import timezone
+
+from ..api.views import FamilyViewSet, FamilyMembershipViewSet, ChallengeViewSet, AchievementViewSet
+from ..models import Family, FamilyMembership, Challenge, Achievement
+
+
+class TestFamily(TestCase):
+    """
+    Test family
+    """
+
+    def setUp(self):
+        self.user = User.objects.create_superuser(
+            username='admintoto',
+            password='toto1234',
+            email='toto@example.com',
+        )
+        self.client.force_login(self.user)
+
+        sess = self.client.session
+        sess['permission_mask'] = 42
+        sess.save()
+
+        self.family = Family.objects.create(
+            name='Test family',
+            description='',
+        )
+
+        self.challenge = Challenge.objects.create(
+            name='Test challenge',
+            description='',
+            points=100,
+        )
+
+        self.achievement = Achievement.objects.create(
+            family=self.family,
+            challenge=self.challenge,
+            valid=False,
+        )
+
+    def test_family_list(self):
+        """
+        Test display family list
+        """
+        response = self.client.get(reverse("family:family_list"))
+        self.assertEqual(response.status_code, 200)
+
+    def test_family_create(self):
+        """
+        Test create a family
+        """
+        response = self.client.get(reverse("family:family_create"))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(reverse("family:family_create"), data={
+            "name": "Family toto",
+            "description": "A test family",
+        })
+        self.assertTrue(Family.objects.filter(name="Family toto").exists())
+        self.assertRedirects(response, reverse("family:manage"), 302, 200)
+
+    def test_family_detail(self):
+        """
+        Test display the detail of a family
+        """
+        response = self.client.get(reverse("family:family_detail", args=(self.family.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+    def test_family_update(self):
+        """
+        Test update a family
+        """
+        response = self.client.get(reverse("family:family_update", args=(self.family.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(reverse("family:family_update", args=(self.family.pk,)), data=dict(
+            name="Toto family updated",
+            description="A larger description for the test family"
+        ))
+        self.assertRedirects(response, self.family.get_absolute_url(), 302, 200)
+        self.assertTrue(Family.objects.filter(name="Toto family updated").exists())
+
+    def test_family_update_picture(self):
+        """
+        Test update the picture of a family
+        """
+        response = self.client.get(reverse("family:update_pic", args=(self.family.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+        old_pic = self.family.display_image
+
+        with open("apps/family/static/family/img/default_picture.png", "rb") as f:
+            image = SimpleUploadedFile("image.png", f.read(), "image/png")
+            response = self.client.post(reverse("family:update_pic", args=(self.family.pk,)), dict(
+                image=image,
+                x=0,
+                y=0,
+                width=200,
+                height=200,
+            ))
+            self.assertRedirects(response, self.family.get_absolute_url(), 302, 200)
+
+        self.family.refresh_from_db()
+        self.assertTrue(os.path.exists(self.family.display_image.path))
+        os.remove(self.family.display_image.path)
+
+        self.family.display_image = old_pic
+        self.family.save()
+
+    def test_family_add_member(self):
+        """
+        Test add memberships to a family
+        """
+        response = self.client.get(reverse("family:family_add_member", args=(self.family.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+        user = User.objects.create(username="totototo")
+        user.profile.registration_valid = True
+        user.profile.email_confirmed = True
+        user.profile.save()
+        user.save()
+
+        response = self.client.post(reverse("family:family_add_member", args=(self.family.pk,)), data=dict(
+            user=user.pk,
+        ))
+        self.assertRedirects(response, self.family.get_absolute_url(), 302, 200)
+
+        self.assertTrue(FamilyMembership.objects.filter(user=user, family=self.family, year=timezone.now().year).exists())
+
+    def test_challenge_list(self):
+        """
+        Test display challenge list
+        """
+        response = self.client.get(reverse('family:challenge_list'))
+        self.assertEqual(response.status_code, 200)
+
+    def test_challenge_create(self):
+        """
+        Test create a challenge
+        """
+        response = self.client.get(reverse("family:challenge_create"))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(reverse("family:challenge_create"), data={
+            "name": "Challenge for toto",
+            "description": "A test challenge",
+            "points": 50,
+        })
+        self.assertTrue(Challenge.objects.filter(name="Challenge for toto").exists())
+        self.assertRedirects(response, reverse("family:manage"), 302, 200)
+
+    def test_challenge_detail(self):
+        """
+        Test display the detail of a challenge
+        """
+        response = self.client.get(reverse("family:challenge_detail", args=(self.challenge.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+    def test_challenge_update(self):
+        """
+        Test update a challenge
+        """
+        response = self.client.get(reverse("family:challenge_update", args=(self.challenge.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(reverse("family:challenge_update", args=(self.challenge.pk,)), data=dict(
+            name="Challenge updated",
+            description="Another description",
+            points=10,
+        ))
+        self.assertRedirects(response, self.challenge.get_absolute_url(), 302, 200)
+        self.assertTrue(Challenge.objects.filter(name="Challenge updated").exists())
+
+    def test_render_manage_page(self):
+        """
+        Test render manage page
+        """
+        response = self.client.get(reverse("family:manage"))
+        self.assertEqual(response.status_code, 200)
+
+    def test_validate_achievement(self):
+        """
+        Test validate an achievement
+        """
+        old_family_score = self.family.score
+
+        response = self.client.get(reverse("family:achievement_validate", args=(self.achievement.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.post(reverse("family:achievement_validate", args=(self.achievement.pk,)))
+        self.assertRedirects(response, reverse("family:achievement_list"), 302, 200)
+
+        self.achievement.refresh_from_db()
+        self.assertIs(self.achievement.valid, True)
+
+        self.family.refresh_from_db()
+        self.assertEqual(self.family.score, old_family_score + self.achievement.challenge.points)
+
+    def test_delete_achievement(self):
+        """
+        Test delete an achievement
+        """
+        response = self.client.get(reverse("family:achievement_delete", args=(self.achievement.pk,)))
+        self.assertEqual(response.status_code, 200)
+
+        response = self.client.delete(reverse("family:achievement_delete", args=(self.achievement.pk,)))
+        self.assertRedirects(response, reverse("family:achievement_list"), 302, 200)
+        self.assertFalse(Achievement.objects.filter(pk=self.achievement.pk).exists())
+
+
+class TestBatchAchievements(APITestCase):
+    def setUp(self):
+        self.user = User.objects.create_superuser(
+            username='admintoto',
+            password='toto1234',
+            email='toto@example.com',
+        )
+        self.client.force_login(self.user)
+
+        sess = self.client.session
+        sess['permission_mask'] = 42
+        sess.save()
+
+        self.families = [
+            Family.objects.create(name=f'Famille {i}', description='') for i in range(2)
+        ]
+        self.challenges = [
+            Challenge.objects.create(name=f'Challenge {i}', description='', points=50) for i in range(3)
+        ]
+
+        self.achievement = Achievement.objects.create(
+            family=self.families[0],
+            challenge=self.challenges[0],
+            valid=False,
+        )
+
+        self.url = reverse("family:api:batch_achievements")
+
+    def test_batch_achievement_creation(self):
+        family_ids = [f.id for f in self.families]
+        challenge_ids = [c.id for c in self.challenges]
+        response = self.client.post(
+            self.url,
+            data={
+                'families': family_ids,
+                'challenges': challenge_ids
+            },
+            format='json'
+        )
+
+        self.assertEqual(response.status_code, 201)
+        for result in response.data['results']:
+            if result['family'] == self.families[0].name and result['challenge'] == self.challenges[0].name:
+                self.assertEqual(result['status'], 'existed')
+            else:
+                self.assertEqual(result['status'], 'created')
+
+        expected_count = len(family_ids) * len(challenge_ids)
+        self.assertEqual(Achievement.objects.count(), expected_count)
+
+        # Check that correct couples family/challenge exist
+        for f in self.families:
+            for c in self.challenges:
+                self.assertTrue(
+                    Achievement.objects.filter(family=f, challenge=c).exists()
+                )
+
+
+class TestFamilyAPI(TestAPI):
+    def setUp(self):
+        super().setUp()
+
+        self.family = Family.objects.create(
+            name='Test family',
+            description='',
+        )
+
+        self.familymembership = FamilyMembership.objects.create(
+            user=self.user,
+            family=self.family,
+        )
+
+        self.challenge = Challenge.objects.create(
+            name='Test challenge',
+            description='',
+            points=100,
+        )
+
+        self.achievement = Achievement.objects.create(
+            family=self.family,
+            challenge=self.challenge,
+            valid=False,
+        )
+
+    def test_family_api(self):
+        """
+        Load Family API page and test all filters and permissions
+        """
+        self.check_viewset(FamilyViewSet, '/api/family/family/')
+
+    def test_familymembership_api(self):
+        """
+        Load FamilyMembership API page and test all filters and permissions
+        """
+        self.check_viewset(FamilyMembershipViewSet, '/api/family/familymembership/')
+
+    def test_challenge_api(self):
+        """
+        Load Challenge API page and test all filters and permissions
+        """
+        self.check_viewset(ChallengeViewSet, '/api/family/challenge/')
+
+    def test_achievement_api(self):
+        """
+        Load Achievement API page and test all filters and permissions
+        """
+        self.check_viewset(AchievementViewSet, '/api/family/achievement/')

apps/family/urls.py

@@ -0,0 +1,25 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.urls import path, include
+
+from . import views
+
+app_name = 'family'
+urlpatterns = [
+    path('list/', views.FamilyListView.as_view(), name="family_list"),
+    path('create/', views.FamilyCreateView.as_view(), name="family_create"),
+    path('<int:pk>/detail/', views.FamilyDetailView.as_view(), name="family_detail"),
+    path('<int:pk>/update/', views.FamilyUpdateView.as_view(), name="family_update"),
+    path('<int:pk>/update_pic/', views.FamilyPictureUpdateView.as_view(), name="update_pic"),
+    path('<int:family_pk>/add_member/', views.FamilyAddMemberView.as_view(), name="family_add_member"),
+    path('challenge/list/', views.ChallengeListView.as_view(), name="challenge_list"),
+    path('challenge/create/', views.ChallengeCreateView.as_view(), name="challenge_create"),
+    path('challenge/<int:pk>/detail/', views.ChallengeDetailView.as_view(), name="challenge_detail"),
+    path('challenge/<int:pk>/update/', views.ChallengeUpdateView.as_view(), name="challenge_update"),
+    path('manage/', views.FamilyManageView.as_view(), name="manage"),
+    path('achievement/list/', views.AchievementListView.as_view(), name="achievement_list"),
+    path('achievement/<int:pk>/validate/', views.AchievementValidateView.as_view(), name="achievement_validate"),
+    path('achievement/<int:pk>/delete/', views.AchievementDeleteView.as_view(), name="achievement_delete"),
+    path('api/family/', include(('family.api.urls', 'family_api'), namespace='api')),
+]

apps/family/views.py

@@ -0,0 +1,469 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from datetime import date
+
+from django.conf import settings
+from django.shortcuts import redirect
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.exceptions import PermissionDenied
+from django.db import transaction
+from django.views.generic import DetailView, UpdateView, ListView
+from django.views.generic.edit import DeleteView, FormMixin
+from django.views.generic.base import TemplateView
+from django.utils.translation import gettext_lazy as _
+from django_tables2 import SingleTableView, MultiTableMixin
+from permission.backends import PermissionBackend
+from permission.views import ProtectQuerysetMixin, ProtectedCreateView
+from django.urls import reverse_lazy
+from member.forms import ImageForm
+import phonenumbers
+
+from .models import Family, Challenge, FamilyMembership, User, Achievement
+from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable, AchievementTable, FamilyAchievementTable
+from .forms import ChallengeForm, FamilyMembershipForm, FamilyForm
+
+
+class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+    """
+    Create family
+    """
+    model = Family
+    extra_context = {"title": _('Create family')}
+    form_class = FamilyForm
+
+    def get_sample_object(self):
+        return Family(
+            name="",
+            description="Sample family",
+            score=0,
+            rank=0,
+        )
+
+    def get_success_url(self):
+        self.object.refresh_from_db()
+        return reverse_lazy("family:manage")
+
+
+class FamilyListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
+    """
+    List existing Families
+    """
+    model = Family
+    table_class = FamilyTable
+    extra_context = {"title": _('Families list')}
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        fake_family = Family(name="", description="")
+        fake_challenge = Challenge(name="", description="", points=0)
+        can_add_family = PermissionBackend.check_perm(self.request, "family.add_family", fake_family)
+        can_add_challenge = PermissionBackend.check_perm(self.request, "family.add_challenge", fake_challenge)
+
+        if Family.objects.exists() and Challenge.objects.exists():
+            fake_achievement = Achievement(family=Family.objects.first(), challenge=Challenge.objects.first(), valid=False)
+            can_add_achievement = PermissionBackend.check_perm(self.request, "family.add_achievement", fake_achievement)
+        else:
+            can_add_achievement = False
+
+        context["can_manage"] = can_add_family or can_add_challenge or can_add_achievement
+
+        return context
+
+
+class FamilyDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+    """
+    Display details of a family
+    """
+    model = Family
+    context_object_name = "family"
+    extra_context = {"title": _('Family detail')}
+
+    def get_context_data(self, **kwargs):
+        """
+        Add members list
+        """
+        context = super().get_context_data(**kwargs)
+
+        family = self.object
+
+        # member list
+        family_member = FamilyMembership.objects.filter(
+            family=family,
+            year=date.today().year,
+        ).filter(PermissionBackend.filter_queryset(self.request, FamilyMembership, "view"))\
+            .order_by("user__username")
+        family_member = family_member.distinct("user__username")\
+            if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else family_member
+
+        membership_table = FamilyMembershipTable(data=family_member, prefix="membership-")
+        membership_table.paginate(per_page=5, page=self.request.GET.get('membership-page', 1))
+        context['member_list'] = membership_table
+
+        # Check if the user has the right to create a membership, to display the button.
+        empty_membership = FamilyMembership(
+            family=family,
+            user=User.objects.first(),
+            year=date.today().year,
+        )
+        context["can_add_members"] = PermissionBackend()\
+            .has_perm(self.request.user, "family.add_membership", empty_membership)
+
+        # Défis réalisé par la famille
+        achievements = Achievement.objects.filter(family=family)
+        achievements_table = FamilyAchievementTable(data=achievements, prefix="achievement-")
+        achievements_table.paginate(per_page=5, page=self.request.GET.get('achievement-page', 1))
+        context["achievement_list"] = achievements_table
+
+        return context
+
+
+class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
+    """
+    Update the information of a family.
+    """
+    model = Family
+    context_object_name = "family"
+    form_class = FamilyForm
+    extra_context = {"title": _('Update family')}
+
+    def get_success_url(self):
+        return reverse_lazy('family:family_detail', kwargs={'pk': self.object.pk})
+
+
+class FamilyPictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, DetailView):
+    """
+    Update profile picture of the family
+    """
+    model = Family
+    extra_context = {"title": _("Update family picture")}
+    template_name = 'family/picture_update.html'
+    form_class = ImageForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['form'] = self.form_class(self.request.POST, self.request.FILES)
+        return context
+
+    def get_success_url(self):
+        """Redirect to family page after upload"""
+        return reverse_lazy('family:family_detail', kwargs={'pk': self.object.pk})
+
+    def post(self, request, *args, **kwargs):
+        form = self.get_form()
+        self.object = self.get_object()
+        return self.form_valid(form) if form.is_valid() else self.form_invalid(form)
+
+    @transaction.atomic
+    def form_valid(self, form):
+        """
+        Save the image
+        """
+        image = form.cleaned_data['image']
+
+        if image is None:
+            image = "pic/default.png"
+        else:
+            # Rename as PNG or GIF
+            extension = image.name.split(".")[-1]
+            if extension == "gif":
+                image.name = "{}_pic.gif".format(self.object.pk)
+            else:
+                image.name = "{}_pic.png".format(self.object.pk)
+
+        # Save
+        self.object.display_image = image
+        self.object.save()
+        return super().form_valid(form)
+
+
+class FamilyAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
+    """
+    Add a membership to a family
+    """
+    model = FamilyMembership
+    form_class = FamilyMembershipForm
+    template_name = 'family/add_member.html'
+    extra_context = {"title": _("Add a new member to the family")}
+
+    def get_sample_object(self):
+        if "family_pk" in self.kwargs:
+            family = Family.objects.get(pk=self.kwargs["family_pk"])
+        else:
+            family = FamilyMembership.objects.get(pk=self.kwargs["pk"]).family
+        return FamilyMembership(
+            user=self.request.user,
+            family=family,
+            year=date.today().year,
+        )
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        family = Family.objects.filter(PermissionBackend.filter_queryset(self.request, Family, "view"))\
+            .get(pk=self.kwargs['family_pk'])
+
+        context['family'] = family
+
+        return context
+
+    @transaction.atomic
+    def form_valid(self, form):
+        """
+        Create family membership, check that everythinf is good
+        """
+        family = Family.objects.filter(PermissionBackend.filter_queryset(self.request, Family, "view")) \
+            .get(pk=self.kwargs["family_pk"])
+
+        form.instance.family = family
+
+        return super().form_valid(form)
+
+    def get_success_url(self):
+        return reverse_lazy('family:family_detail', kwargs={'pk': self.object.family.id})
+
+
+class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+    """
+    Create challenge
+    """
+    model = Challenge
+    extra_context = {"title": _('Create challenge')}
+    form_class = ChallengeForm
+
+    def get_sample_object(self):
+        return Challenge(
+            name="",
+            description="Sample challenge",
+            points=0,
+        )
+
+    def get_success_url(self):
+        return reverse_lazy('family:manage')
+
+
+class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
+    """
+    List all challenges
+    """
+    model = Challenge
+    table_class = ChallengeTable
+    extra_context = {"title": _('Challenges list')}
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        fake_family = Family(name="", description="")
+        fake_challenge = Challenge(name="", description="", points=0)
+        can_add_family = PermissionBackend.check_perm(self.request, "family.add_family", fake_family)
+        can_add_challenge = PermissionBackend.check_perm(self.request, "family.add_challenge", fake_challenge)
+
+        if Family.objects.exists() and Challenge.objects.exists():
+            fake_achievement = Achievement(family=Family.objects.first(), challenge=Challenge.objects.first(), valid=False)
+            can_add_achievement = PermissionBackend.check_perm(self.request, "family.add_achievement", fake_achievement)
+        else:
+            can_add_achievement = False
+
+        context["can_manage"] = can_add_family or can_add_challenge or can_add_achievement
+
+        return context
+
+
+class ChallengeDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+    """
+    Display details of a challenge
+    """
+    model = Challenge
+    context_object_name = "challenge"
+    extra_context = {"title": _('Details of:')}
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        fields = ["name", "description", "points",]
+
+        fields = dict([(field, getattr(self.object, field)) for field in fields])
+
+        context["fields"] = [(
+            Challenge._meta.get_field(field).verbose_name.capitalize(),
+            value) for field, value in fields.items()]
+        context["obtained"] = self.object.obtained
+        context["update"] = PermissionBackend.check_perm(self.request, "family.change_challenge")
+
+        return context
+
+
+class ChallengeUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
+    """
+    Update the information of a challenge
+    """
+    model = Challenge
+    context_object_name = "challenge"
+    extra_context = {"title": _('Update challenge')}
+    form_class = ChallengeForm
+
+    def get_success_url(self, **kwargs):
+        self.object.refresh_from_db()
+        return reverse_lazy('family:challenge_detail', kwargs={'pk': self.object.pk})
+
+
+class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
+    """
+    Manage families and challenges
+    """
+    model = Achievement
+    template_name = 'family/manage.html'
+    table_class = AchievementTable
+    extra_context = {'title': _('Manage families and challenges')}
+
+    def dispatch(self, request, *args, **kwargs):
+        # Check that the user is authenticated
+        if not request.user.is_authenticated:
+            return self.handle_no_permission()
+
+        perm = PermissionBackend.has_model_perm(self.request, Achievement(), "add")
+        perm = perm or PermissionBackend.has_model_perm(self.request, Challenge(), "add")
+        perm = perm or PermissionBackend.has_model_perm(self.request, Family(), "add")
+        if not perm:
+            raise PermissionDenied(_("You are not able to manage families and challenges."))
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_queryset(self, **kwargs):
+        # retrieves only Transaction that user has the right to see.
+        return Achievement.objects.filter(
+            PermissionBackend.filter_queryset(self.request, Achievement, "view")
+        ).order_by("-obtained_at").all()
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['all_challenges'] = Challenge.objects.filter(
+            PermissionBackend.filter_queryset(self.request, Challenge, "view")
+        ).order_by('name')
+
+        context["can_add_family"] = PermissionBackend.has_model_perm(self.request, Family(), "add")
+        context["can_add_challenge"] = PermissionBackend.has_model_perm(self.request, Challenge(), "add")
+        context["can_add_achievement"] = PermissionBackend.has_model_perm(self.request, Achievement(), "add")
+
+        # Get the user's family if they have one
+        try:
+            user_family_membership = FamilyMembership.objects.get(user=self.request.user)
+            context["user_family"] = user_family_membership.family
+        except FamilyMembership.DoesNotExist:
+            context["user_family"] = None
+
+        phone_numbers = [
+            u.profile.phone_number for u in User.objects.filter(
+                memberships__roles__id=35,
+                memberships__date_end__gte=date.today(),
+                profile__phone_number__isnull=False
+            ).distinct()
+        ]
+        formatted_phone_numbers = [phonenumbers.format_number(num, phonenumbers.PhoneNumberFormat.INTERNATIONAL) for num in phone_numbers if num]
+        context["phone_numbers"] = formatted_phone_numbers
+
+        return context
+
+    def get_table(self, **kwargs):
+        table = super().get_table(**kwargs)
+        table.exclude = ('delete', 'validate',)
+        table.orderable = False
+        return table
+
+    def get_table_data(self, **kwargs):
+        qs = super().get_queryset(**kwargs)
+
+        qs = qs.filter(PermissionBackend.filter_queryset(self.request, Achievement, "view"))
+
+        return qs
+
+
+class AchievementListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
+    """
+    List all achievements
+    """
+    model = Achievement
+    tables = [AchievementTable, AchievementTable, ]
+    extra_context = {'title': _('Achievement list')}
+
+    def dispatch(self, request, *args, **kwargs):
+        if not request.user.is_authenticated:
+            return self.handle_no_permission()
+
+        if not PermissionBackend.has_model_perm(self.request, Achievement(), "change"):
+            raise PermissionDenied(_("You are not able to see the achievement validation interface."))
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_tables(self, **kwargs):
+        tables = super().get_tables(**kwargs)
+
+        tables[0].prefix = 'invalid-'
+        tables[1].prefix = 'valid-'
+        tables[1].exclude = ('validate', 'delete',)
+
+        return tables
+
+    def get_tables_data(self):
+        table_valid = self.get_queryset().filter(valid=True)
+        table_invalid = self.get_queryset().filter(valid=False)
+        return [table_invalid, table_valid, ]
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        tables = context['tables']
+
+        context['invalid'] = tables[0]
+        context['valid'] = tables[1]
+        return context
+
+
+class AchievementValidateView(ProtectQuerysetMixin, LoginRequiredMixin, TemplateView):
+    """
+    Validate an achievement obtained by a family
+    """
+    template_name = 'family/achievement_confirm_validate.html'
+
+    def dispatch(self, request, *args, **kwargs):
+        if not request.user.is_authenticated:
+            return self.handle_no_permission()
+
+        fake_achievement = Achievement(
+            family=Family.objects.first(),
+            challenge=Challenge.objects.first(),
+            valid=False,
+        )
+        if not PermissionBackend.check_perm(self.request, "family.change_achievement_valid", fake_achievement):
+            raise PermissionDenied()
+        return super().dispatch(request, *args, **kwargs)
+
+    def post(self, request, pk):
+        achievement = Achievement.objects.get(pk=pk)
+
+        achievement.valid = True
+        achievement.save()
+
+        return redirect(reverse_lazy('family:achievement_list'))
+
+
+class AchievementDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView):
+    """
+    Delete an Achievement
+    """
+    model = Achievement
+
+    def dispatch(self, request, *args, **kwargs):
+        if not request.user.is_authenticated:
+            return self.handle_no_permission()
+
+        fake_achievement = Achievement(
+            family=Family.objects.first(),
+            challenge=Challenge.objects.first(),
+            valid=False,
+        )
+        if not PermissionBackend.check_perm(self.request, "family.change_achievement_valid", fake_achievement):
+            raise PermissionDenied()
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_success_url(self):
+        return reverse_lazy('family:achievement_list')

apps/food/forms.py

@@ -145,7 +145,7 @@ class AddIngredientForms(forms.ModelForm):
             polymorphic_ctype__model="transformedfood",
             is_ready=False,
             end_of_life='',
-        ).filter(PermissionBackend.filter_queryset(get_current_request(), TransformedFood, "change")).exclude(pk=pk)
+        ).filter(PermissionBackend.filter_queryset(get_current_request(), Food, "change")).exclude(pk=pk)
 
     class Meta:
         model = TransformedFood

apps/food/templates/food/food_detail.html

@@ -12,18 +12,21 @@ SPDX-License-Identifier: GPL-3.0-or-later
   </h3>
   <div class="card-body">
     <ul>
+      {% if QR_code %}
+      <li> {{QR_code}} </li>
+      {% endif %}
       {% for field, value in fields %}
       <li> {{ field }} : {{ value }}</li>
       {% endfor %}
       {% if meals %}
-      <li> {% trans "Contained in" %} : 
+      <li> {% trans "Contained in" %} :
       {% for meal in meals %}
-      <a href="{% url "food:transformedfood_view" pk=meal.pk %}">{{ meal.name }}</a>{% if not forloop.last %},{% endif %} 
+      <a href="{% url "food:transformedfood_view" pk=meal.pk %}">{{ meal.name }}</a>{% if not forloop.last %},{% endif %}
       {% endfor %}
       </li>
       {% endif %}
       {% if foods %}
-      <li> {% trans "Contain" %} : 
+      <li> {% trans "Contain" %} :
       {% for food in foods %}
         <a href="{% url "food:food_view" pk=food.pk %}">{{ food.name }}</a>{% if not forloop.last %},{% endif %}
       {% endfor %}
@@ -31,23 +34,23 @@ SPDX-License-Identifier: GPL-3.0-or-later
       {% endif %}
     </ul>
       {% if update %}
-	<a class="btn btn-sm btn-secondary" href="{% url "food:food_update" pk=food.pk %}">
-	  {% trans "Update" %}
-	</a>
+        <a class="btn btn-sm btn-secondary" href="{% url "food:food_update" pk=food.pk %}">
+          {% trans "Update" %}
+        </a>
       {% endif %}
       {% if add_ingredient %}
-	<a class="btn btn-sm btn-primary" href="{% url "food:add_ingredient" pk=food.pk %}">
-	  {% trans "Add to a meal" %}
-	</a>
+        <a class="btn btn-sm btn-primary" href="{% url "food:add_ingredient" pk=food.pk %}">
+          {% trans "Add to a meal" %}
+        </a>
       {% endif %}
       {% if manage_ingredients %}
         <a class="btn btn-sm btn-secondary" href="{% url "food:manage_ingredients" pk=food.pk %}">
-	  {% trans "Manage ingredients" %}
-	</a>
+          {% trans "Manage ingredients" %}
+        </a>
       {% endif %}
-	<a class="btn btn-sm btn-primary" href="{% url "food:food_list" %}">
-	  {% trans "Return to the food list" %}
-	</a>
+        <a class="btn btn-sm btn-primary" href="{% url "food:food_list" %}">
+          {% trans "Return to the food list" %}
+        </a>
   </div>
 </div>
-{% endblock %}
+{% endblock %}

apps/food/templates/food/food_list.html

@@ -7,7 +7,52 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% load i18n %}
 
 {% block content %}
-{{ block.super }}
+<div class="card bg-light">
+  <h3 class="card-header text-center">
+      {{ title }}
+  </h3>
+  <div class="card-body">
+    <style>
+      input[type=number]::-webkit-inner-spin-button,
+      input[type=number]::-webkit-outer-spin-button {
+          -webkit-appearance: none;
+          margin: 0;
+      }
+      input[type=number] {
+          appearance: textfield;
+          padding: 6px;
+          border: 1px solid #ccc;
+          border-radius: 4px;
+          width: 100px;
+      }
+    </style>
+    <div class="d-flex align-items-center" style="max-width: 300px;">
+      <form method="get" action="{% url 'food:redirect_view' %}" class="d-flex w-100">
+        <input type="number" name="slug" placeholder="QR-code" required class="form-control form-control-sm" style="max-width: 120px;">
+        <button type="submit" class="btn btn-sm btn-primary">{% trans "View food" %}</button>
+      </form>
+    </div>
+  </div>
+  <div class="card-body">
+      <input id="searchbar" type="text" class="form-control"
+          placeholder="{% trans "Search by attribute such as name..." %}">
+  </div>
+
+  {% block extra_inside_card %}
+  {% endblock %}
+
+  <div id="dynamic-table">
+      {% if table.data %}
+      {% render_table table %}
+      {% else %}
+      <div class="card-body">
+          <div class="alert alert-warning">
+              {% trans "There is no results." %}
+          </div>
+      </div>
+      {% endif %}
+  </div>
+</div>
 <br>
 <div class="card bg-light mb-3">
   <h3 class="card-header text-center">
@@ -68,4 +113,20 @@ SPDX-License-Identifier: GPL-3.0-or-later
   {% endfor %}
   {% endif %}
 </div>
-{% endblock %}
+
+
+<script>
+  document.addEventListener('DOMContentLoaded', function() {
+      document.getElementById('goButton').addEventListener('click', function(event) {
+          event.preventDefault();
+          const slug = document.getElementById('slugInput').value;
+          if (slug && !isNaN(slug)) {
+              window.location.href = `/food/${slug}/`;
+          } else {
+              alert("Veuillez entrer un nombre valide.");
+          }
+      });
+  });
+  </script>
+
+{% endblock %}

apps/food/urls.py

@@ -18,4 +18,5 @@ urlpatterns = [
     path('detail/basic/<int:pk>', views.BasicFoodDetailView.as_view(), name='basicfood_view'),
     path('detail/transformed/<int:pk>', views.TransformedFoodDetailView.as_view(), name='transformedfood_view'),
     path('add/ingredient/<int:pk>', views.AddIngredientView.as_view(), name='add_ingredient'),
+    path('redirect/', views.QRCodeRedirectView.as_view(), name='redirect_view'),
 ]

apps/food/views.py

@@ -10,6 +10,7 @@ from django.db.models import Q
 from django.http import HttpResponseRedirect, Http404
 from django.views.generic import DetailView, UpdateView, CreateView
 from django.views.generic.list import ListView
+from django.views.generic.base import RedirectView
 from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -169,7 +170,8 @@ class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
     template_name = "food/food_update.html"
 
     def get_sample_object(self):
-        return BasicFood(
+        # We choose a club which may work or BDE else
+        food = BasicFood(
             name="",
             owner_id=1,
             expiry_date=timezone.now(),
@@ -178,6 +180,14 @@ class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
             date_type='DLC',
         )
 
+        for membership in self.request.user.memberships.all():
+            club_id = membership.club.id
+            food.owner_id = club_id
+            if PermissionBackend.check_perm(self.request, "food.add_basicfood", food):
+                return food
+
+        return food
+
     @transaction.atomic
     def form_valid(self, form):
         if QRCode.objects.filter(qr_code_number=self.kwargs['slug']).count() > 0:
@@ -228,13 +238,22 @@ class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
     template_name = "food/food_update.html"
 
     def get_sample_object(self):
-        return TransformedFood(
+        # We choose a club which may work or BDE else
+        food = TransformedFood(
             name="",
             owner_id=1,
             expiry_date=timezone.now(),
             is_ready=True,
         )
 
+        for membership in self.request.user.memberships.all():
+            club_id = membership.club.id
+            food.owner_id = club_id
+            if PermissionBackend.check_perm(self.request, "food.add_transformedfood", food):
+                return food
+
+        return food
+
     @transaction.atomic
     def form_valid(self, form):
         form.instance.expiry_date = timezone.now() + timedelta(days=3)
@@ -246,10 +265,10 @@ class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
         return reverse_lazy('food:transformedfood_view', kwargs={"pk": self.object.pk})
 
 
-MAX_FORMS = 10
+MAX_FORMS = 100
 
 
-class ManageIngredientsView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
+class ManageIngredientsView(LoginRequiredMixin, UpdateView):
     """
     A view to manage ingredient for a transformed food
     """
@@ -280,6 +299,14 @@ class ManageIngredientsView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView
                     ingredient.end_of_life = _('Fully used in {meal}'.format(
                         meal=self.object.name))
                     ingredient.save()
+        # We recalculate new expiry date and allergens
+        self.object.expiry_date = self.object.creation_date + self.object.shelf_life
+        self.object.allergens.clear()
+
+        for ingredient in self.object.ingredients.iterator():
+            if not (ingredient.polymorphic_ctype.model == 'basicfood' and ingredient.date_type == 'DDM'):
+                self.object.expiry_date = min(self.object.expiry_date, ingredient.expiry_date)
+            self.object.allergens.set(self.object.allergens.union(ingredient.allergens.all()))
 
         self.object.save(old_ingredients=old_ingredients, old_allergens=old_allergens)
         return HttpResponseRedirect(self.get_success_url())
@@ -428,6 +455,8 @@ class FoodDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         context["fields"] = [(
             Food._meta.get_field(field).verbose_name.capitalize(),
             value) for field, value in fields.items()]
+        if self.object.QR_code.exists():
+            context["QR_code"] = self.object.QR_code.first()
         context["meals"] = self.object.transformed_ingredient_inv.all()
         context["update"] = PermissionBackend.check_perm(self.request, "food.change_food")
         context["add_ingredient"] = (self.object.end_of_life == '' and PermissionBackend.check_perm(self.request, "food.change_transformedfood"))
@@ -481,3 +510,14 @@ class TransformedFoodDetailView(FoodDetailView):
         if Food.objects.filter(pk=kwargs['pk']).count() == 1:
             kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'transformedfood')
         return super().get(*args, **kwargs)
+
+
+class QRCodeRedirectView(RedirectView):
+    """
+    Redirects to the QR code creation page from Food List
+    """
+    def get_redirect_url(self, *args, **kwargs):
+        slug = self.request.GET.get('slug')
+        if slug:
+            return reverse_lazy('food:qrcode_create', kwargs={'slug': slug})
+        return reverse_lazy('food:list')

apps/member/apps.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.db.models.signals import post_save
 from django.utils.translation import gettext_lazy as _
 
-from .signals import save_user_profile
+from .signals import save_user_profile, update_wei_registration_fee_on_membership_creation, update_wei_registration_fee_on_club_change
 
 
 class MemberConfig(AppConfig):
@@ -17,7 +17,16 @@ class MemberConfig(AppConfig):
         """
         Define app internal signals to interact with other apps
         """
+        from .models import Membership, Club
         post_save.connect(
             save_user_profile,
             sender=settings.AUTH_USER_MODEL,
         )
+        post_save.connect(
+            update_wei_registration_fee_on_membership_creation,
+            sender=Membership
+        )
+        post_save.connect(
+            update_wei_registration_fee_on_club_change,
+            sender=Club
+        )

apps/member/migrations/0014_create_bda.py

@@ -0,0 +1,46 @@
+from django.db import migrations
+
+def create_bda(apps, schema_editor):
+    """
+    The club BDA is now pre-injected.
+    """
+    Club = apps.get_model("member", "club")
+    NoteClub = apps.get_model("note", "noteclub")
+    Alias = apps.get_model("note", "alias")
+    ContentType = apps.get_model('contenttypes', 'ContentType')
+    polymorphic_ctype_id = ContentType.objects.get_for_model(NoteClub).id
+    
+    Club.objects.get_or_create(
+        id=10,
+        name="BDA",
+        email="bda.ensparissaclay@gmail.com",
+        require_memberships=True,
+        membership_fee_paid=750,
+        membership_fee_unpaid=750,
+        membership_duration=396,
+        membership_start="2024-08-01",
+        membership_end="2025-09-30",
+    )
+    NoteClub.objects.get_or_create(
+        id=1937,
+        club_id=10,
+        polymorphic_ctype_id=polymorphic_ctype_id,
+    )
+    Alias.objects.get_or_create(
+        id=1937,
+        note_id=1937,
+        name="BDA",
+        normalized_name="bda",
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('member', '0013_auto_20240801_1436'),
+    ]
+    
+    operations = [
+        migrations.RunPython(create_bda),
+    ]
+

apps/member/migrations/0015_alter_profile_promotion.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-08-02 13:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('member', '0014_create_bda'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='profile',
+            name='promotion',
+            field=models.PositiveSmallIntegerField(default=2025, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
+        ),
+    ]

apps/member/models.py

@@ -438,8 +438,6 @@ class Membership(models.Model):
             )
             if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
                 new_membership._force_renew_parent = True
-            if hasattr(self, '_soge') and self._soge:
-                new_membership._soge = True
             if hasattr(self, '_force_save') and self._force_save:
                 new_membership._force_save = True
             new_membership.save()
@@ -458,8 +456,6 @@ class Membership(models.Model):
             # Renew the previous membership of the parent club
             parent_membership = parent_membership.first()
             parent_membership._force_renew_parent = True
-            if hasattr(self, '_soge'):
-                parent_membership._soge = True
             if hasattr(self, '_force_save'):
                 parent_membership._force_save = True
             parent_membership.renew()
@@ -471,8 +467,6 @@ class Membership(models.Model):
                 date_start=self.date_start,
             )
             parent_membership._force_renew_parent = True
-            if hasattr(self, '_soge'):
-                parent_membership._soge = True
             if hasattr(self, '_force_save'):
                 parent_membership._force_save = True
             parent_membership.save()

apps/member/signals.py

@@ -13,3 +13,27 @@ def save_user_profile(instance, created, raw, **_kwargs):
             instance.profile.email_confirmed = True
             instance.profile.registration_valid = True
         instance.profile.save()
+
+
+def update_wei_registration_fee_on_membership_creation(sender, instance, created, **kwargs):
+    if not hasattr(instance, "_no_signal") and created:
+        from wei.models import WEIRegistration
+        if instance.club.id == 1 or instance.club.id == 2:
+            registrations = WEIRegistration.objects.filter(
+                user=instance.user,
+                wei__year=instance.date_start.year,
+            )
+            for r in registrations:
+                r._force_save = True
+                r.save()
+
+
+def update_wei_registration_fee_on_club_change(sender, instance, **kwargs):
+    from wei.models import WEIRegistration
+    if not hasattr(instance, "_no_signal") and (instance.id == 1 or instance.id == 2):
+        registrations = WEIRegistration.objects.filter(
+            wei__year=instance.membership_start.year,
+        )
+        for r in registrations:
+            r._force_save = True
+            r.save()

apps/member/templates/member/includes/profile_info.html

@@ -7,6 +7,17 @@
     <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt>
     <dd class="col-xl-6">{{ user_object.username }}</dd>
 
+    <dt class="col-xl-6">{% trans 'family'|capfirst %}</dt>
+    <dd class="col-xl-6">
+        {% if families %}
+            {% for fam in families %}
+            <a href="{% url 'family:family_detail' fam.pk %}">{{ fam.name }}</a>{% if not forloop.last %}, {% endif %}
+            {% endfor %}
+        {% else %}
+            <span class="text-muted">Aucune</span>
+        {% endif %}
+    </dd>
+
     {% if user_object.pk == user.pk %}
     <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt>
     <dd class="col-xl-6">
@@ -60,7 +71,10 @@
 {% if user_object.pk == user.pk %}
     <div class="text-center">
         <a class="small badge badge-secondary" href="{% url 'member:auth_token' %}">
-            <i class="fa fa-cogs"></i>{% trans 'API token' %}
+            <i class="fa fa-cogs"></i>&nbsp;{% trans 'API token' %}
+        </a>
+        <a class="small badge badge-secondary" href="{% url 'member:qr_code' user_object.pk %}">
+            <i class="fa fa-qrcode"></i>&nbsp;{% trans 'QR Code' %}
         </a>
     </div>
 {% endif %}

apps/member/templates/member/qr_code.html

@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n %}
+
+{% block content %}
+<div class="card bg-light">
+  	<h3 class="card-header text-center">
+		{% trans "QR Code for" %} {{ user_object.username }} ({{ user_object.first_name }} {{user_object.last_name }})
+  	</h3>
+  	<div class="text-center" id="qrcode">
+  	</div>
+</div>
+
+
+{% endblock %}
+
+{% block extrajavascript %}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.min.js" integrity="sha512-CNgIRecGo7nphbeZ04Sc13ka07paqdeTu0WR1IM4kNcpmBAUSHSQX0FslNhTDadL4O5SAGapGt4FodqL8My0mA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+	var qrc = new QRCode(document.getElementById("qrcode"), {
+		text: "{{ user_object.pk }}\0",
+		width: 1024,
+		height: 1024
+	});
+</script>
+{% endblock %}
+
+{% block extracss %}
+<style>
+img {
+    width: 100%
+}
+</style>
+{% endblock %}

apps/member/tests/test_login.py

@@ -44,7 +44,7 @@ class TemplateLoggedInTests(TestCase):
         self.assertRedirects(response, settings.LOGIN_REDIRECT_URL, 302, 302)
 
     def test_logout(self):
-        response = self.client.get(reverse("logout"))
+        response = self.client.post(reverse("logout"))
         self.assertEqual(response.status_code, 200)
 
     def test_admin_index(self):

apps/member/urls.py

@@ -25,4 +25,5 @@ urlpatterns = [
     path('user/<int:pk>/aliases/', views.ProfileAliasView.as_view(), name="user_alias"),
     path('user/<int:pk>/trust', views.ProfileTrustView.as_view(), name="user_trust"),
     path('manage-auth-token/', views.ManageAuthTokens.as_view(), name='auth_token'),
+    path('user/<int:pk>/qr_code/', views.QRCodeView.as_view(), name='qr_code'),
 ]

apps/member/views.py

@@ -26,6 +26,7 @@ from note_kfet.middlewares import _set_current_request
 from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
+from family.models import Family
 from django import forms
 
 from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \
@@ -207,6 +208,9 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
             context["can_unlock_note"] = not user.note.is_active and PermissionBackend\
                 .check_perm(self.request, "note.change_noteuser_is_active", modified_note)
 
+        families = Family.objects.filter(memberships__user=user).distinct()
+        context["families"] = families
+
         return context
 
 
@@ -402,6 +406,14 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView):
         context['token'] = Token.objects.get_or_create(user=self.request.user)[0]
         return context
 
+class QRCodeView(LoginRequiredMixin, DetailView):
+    """
+    Affiche le QR Code
+    """
+    model = User
+    context_object_name = "user_object"
+    template_name = "member/qr_code.html"
+    extra_context = {"title": _("QR Code")}
 
 # ******************************* #
 #              CLUB               #

apps/note/api/urls.py

@@ -13,7 +13,7 @@ def register_note_urls(router, path):
     router.register(path + '/note', NotePolymorphicViewSet)
     router.register(path + '/alias', AliasViewSet)
     router.register(path + '/trust', TrustViewSet)
-    router.register(path + '/consumer', ConsumerViewSet)
+    router.register(path + '/consumer', ConsumerViewSet, basename='alias2')
 
     router.register(path + '/transaction/category', TemplateCategoryViewSet)
     router.register(path + '/transaction/transaction', TransactionViewSet)

apps/permission/scopes.py

@@ -18,7 +18,18 @@ class PermissionScopes(BaseScopes):
     and can be useful to make queries through the API with limited privileges.
     """
 
-    def get_all_scopes(self):
+    def get_all_scopes(self, **kwargs):
+        scopes = {}
+        if 'scopes' in kwargs:
+            for scope in kwargs['scopes']:
+                if scope == 'openid':
+                    scopes['openid'] = "OpenID Connect"
+                else:
+                    p = Permission.objects.get(id=scope.split('_')[0])
+                    club = Club.objects.get(id=scope.split('_')[1])
+                    scopes[scope] = f"{p.description} (club {club.name})"
+            return scopes
+
         scopes = {f"{p.id}_{club.id}": f"{p.description} (club {club.name})"
                   for p in Permission.objects.all() for club in Club.objects.all()}
         scopes['openid'] = "OpenID Connect"

apps/permission/signals.py

@@ -13,6 +13,7 @@ EXCLUDED = [
     'cas_server.serviceticket',
     'cas_server.user',
     'cas_server.userattributes',
+    'constance.constance',
     'contenttypes.contenttype',
     'logs.changelog',
     'migrations.migration',

apps/permission/tests/test_permission_denied.py

@@ -10,7 +10,7 @@ from django.utils import timezone
 from django.utils.crypto import get_random_string
 from activity.models import Activity
 from member.models import Club, Membership
-from note.models import NoteUser
+from note.models import NoteUser, NoteClub
 from wei.models import WEIClub, Bus, WEIRegistration
 
 
@@ -122,10 +122,13 @@ class TestPermissionDenied(TestCase):
 
     def test_validate_weiregistration(self):
         wei = WEIClub.objects.create(
+            name="WEI Test",
             membership_start=date.today(),
             date_start=date.today() + timedelta(days=1),
             date_end=date.today() + timedelta(days=1),
+            parent_club=Club.objects.get(name="Kfet"),
         )
+        NoteClub.objects.create(club=wei)
         registration = WEIRegistration.objects.create(wei=wei, user=self.user, birth_date="2000-01-01")
         response = self.client.get(reverse("wei:validate_registration", kwargs=dict(pk=registration.pk)))
         self.assertEqual(response.status_code, 403)

apps/permission/views.py

@@ -164,14 +164,24 @@ class ScopesView(LoginRequiredMixin, TemplateView):
         from oauth2_provider.models import Application
         from .scopes import PermissionScopes
 
-        scopes = PermissionScopes()
+        oidc = False
         context["scopes"] = {}
-        all_scopes = scopes.get_all_scopes()
         for app in Application.objects.filter(user=self.request.user).all():
-            available_scopes = scopes.get_available_scopes(app)
+            available_scopes = PermissionScopes().get_available_scopes(app)
             context["scopes"][app] = OrderedDict()
-            items = [(k, v) for (k, v) in all_scopes.items() if k in available_scopes]
-            # items.sort(key=lambda x: (int(x[0].split("_")[1]), int(x[0].split("_")[0])))
+            all_scopes = PermissionScopes().get_all_scopes(scopes=available_scopes)
+            scopes = {}
+            for scope in available_scopes:
+                scopes[scope] = all_scopes[scope]
+            # remove OIDC scope for sort
+            if 'openid' in scopes:
+                del scopes['openid']
+                oidc = True
+            items = [(k, v) for (k, v) in scopes.items()]
+            items.sort(key=lambda x: (int(x[0].split("_")[1]), int(x[0].split("_")[0])))
+            # add oidc if necessary
+            if oidc:
+                items.append(('openid', PermissionScopes().get_all_scopes(scopes=['openid'])['openid']))
             for k, v in items:
                 context["scopes"][app][k] = v
 

apps/treasury/models.py

@@ -353,13 +353,11 @@ class SogeCredit(models.Model):
     def amount(self):
         if self.valid:
             return self.credit_transaction.total
-        amount = sum(transaction.total for transaction in self.transactions.all())
-        if 'wei' in settings.INSTALLED_APPS:
-            from wei.models import WEIMembership
-            if not WEIMembership.objects\
-                    .filter(club__weiclub__year=self.credit_transaction.created_at.year, user=self.user).exists():
-                # 80 € for people that don't go to WEI
-                amount += 8000
+        amount = 0
+        transactions_wei = self.transactions.filter(membership__club__weiclub__isnull=False)
+        amount += sum(max(transaction.total - transaction.membership.club.weiclub.fee_soge_credit, 0) for transaction in transactions_wei)
+        transactions_not_wei = self.transactions.filter(membership__club__weiclub__isnull=True)
+        amount += sum(transaction.total for transaction in transactions_not_wei)
         return amount
 
     def update_transactions(self):
@@ -441,7 +439,7 @@ class SogeCredit(models.Model):
         With Great Power Comes Great Responsibility...
         """
 
-        total_fee = sum(transaction.total for transaction in self.transactions.all() if not transaction.valid)
+        total_fee = self.amount
         if self.user.note.balance < total_fee:
             raise ValidationError(_("This user doesn't have enough money to pay the memberships with its note. "
                                     "Please ask her/him to credit the note before invalidating this credit."))

apps/treasury/views.py

@@ -168,7 +168,7 @@ class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
 
 class InvoiceDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView):
     """
-    Delete a non-validated WEI registration
+    Delete a non-locked Invoice
     """
     model = Invoice
     extra_context = {"title": _("Delete invoice")}

apps/wei/api/views.py

@@ -77,7 +77,7 @@ class WEIRegistrationViewSet(ReadProtectedModelViewSet):
     filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
     filterset_fields = ['user', 'user__username', 'user__first_name', 'user__last_name', 'user__email',
                         'user__note__alias__name', 'user__note__alias__normalized_name', 'wei', 'wei__name',
-                        'wei__email', 'wei__year', 'soge_credit', 'caution_check', 'birth_date', 'gender',
+                        'wei__email', 'wei__year', 'soge_credit', 'deposit_given', 'birth_date', 'gender',
                         'clothing_cut', 'clothing_size', 'first_year', 'emergency_contact_name',
                         'emergency_contact_phone', ]
     search_fields = ['$user__username', '$user__first_name', '$user__last_name', '$user__email',

apps/wei/forms/__init__.py

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

apps/wei/forms/registration.py

@@ -5,7 +5,7 @@ from bootstrap_datepicker_plus.widgets import DatePickerInput
 from django import forms
 from django.contrib.auth.models import User
 from django.db.models import Q
-from django.forms import CheckboxSelectMultiple
+from django.forms import CheckboxSelectMultiple, RadioSelect
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
 from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget
@@ -24,6 +24,8 @@ class WEIForm(forms.ModelForm):
             "membership_end": DatePickerInput(),
             "date_start": DatePickerInput(),
             "date_end": DatePickerInput(),
+            "deposit_amount": AmountInput(),
+            "fee_soge_credit": AmountInput(),
         }
 
 
@@ -39,7 +41,11 @@ class WEIRegistrationForm(forms.ModelForm):
 
     class Meta:
         model = WEIRegistration
-        exclude = ('wei', 'clothing_cut')
+        fields = [
+            'user', 'soge_credit', 'birth_date', 'gender', 'clothing_size',
+            'health_issues', 'emergency_contact_name', 'emergency_contact_phone',
+            'first_year', 'information_json', 'deposit_given', 'deposit_type'
+        ]
         widgets = {
             "user": Autocomplete(
                 User,
@@ -49,15 +55,21 @@ class WEIRegistrationForm(forms.ModelForm):
                     'placeholder': 'Nom ...',
                 },
             ),
-            "birth_date": DatePickerInput(options={'minDate': '1900-01-01',
-                                                   'maxDate': '2100-01-01'}),
+            "birth_date": DatePickerInput(options={
+                'minDate': '1900-01-01',
+                'maxDate': '2100-01-01'
+            }),
+            "deposit_given": forms.CheckboxInput(
+                attrs={'class': 'form-check-input'},
+            ),
+            "deposit_type": forms.RadioSelect(),
         }
 
 
 class WEIChooseBusForm(forms.Form):
     bus = forms.ModelMultipleChoiceField(
         queryset=Bus.objects,
-        label=_("bus"),
+        label=_("Bus"),
         help_text=_("This choice is not definitive. The WEI organizers are free to attribute for you a bus and a team,"
                     + " in particular if you are a free eletron."),
         widget=CheckboxSelectMultiple(),
@@ -72,22 +84,17 @@ class WEIChooseBusForm(forms.Form):
     )
 
     roles = forms.ModelMultipleChoiceField(
-        queryset=WEIRole.objects.filter(~Q(name="1A")),
+        queryset=WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")),
         label=_("WEI Roles"),
         help_text=_("Select the roles that you are interested in."),
-        initial=WEIRole.objects.filter(name="Adhérent⋅e WEI").all(),
+        initial=WEIRole.objects.filter(Q(name="Adhérent⋅e WEI") | Q(name="\u00c9lectron libre")).all(),
         widget=CheckboxSelectMultiple(),
     )
 
 
 class WEIMembershipForm(forms.ModelForm):
-    caution_check = forms.BooleanField(
-        required=False,
-        label=_("Caution check given"),
-    )
-
     roles = forms.ModelMultipleChoiceField(
-        queryset=WEIRole.objects,
+        queryset=WEIRole.objects.filter(~Q(name="GC WEI")),
         label=_("WEI Roles"),
         widget=CheckboxSelectMultiple(),
     )
@@ -121,6 +128,19 @@ class WEIMembershipForm(forms.ModelForm):
         required=False,
     )
 
+    def __init__(self, *args, wei=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if 'bus' in self.fields:
+            if wei is not None:
+                self.fields['bus'].queryset = Bus.objects.filter(wei=wei)
+            else:
+                self.fields['bus'].queryset = Bus.objects.none()
+        if 'team' in self.fields:
+            if wei is not None:
+                self.fields['team'].queryset = BusTeam.objects.filter(bus__wei=wei)
+            else:
+                self.fields['team'].queryset = BusTeam.objects.none()
+
     def clean(self):
         cleaned_data = super().clean()
         if 'team' in cleaned_data and cleaned_data["team"] is not None \
@@ -132,21 +152,8 @@ class WEIMembershipForm(forms.ModelForm):
         model = WEIMembership
         fields = ('roles', 'bus', 'team',)
         widgets = {
-            "bus": Autocomplete(
-                Bus,
-                attrs={
-                    'api_url': '/api/wei/bus/',
-                    'placeholder': 'Bus ...',
-                }
-            ),
-            "team": Autocomplete(
-                BusTeam,
-                attrs={
-                    'api_url': '/api/wei/team/',
-                    'placeholder': 'Équipe ...',
-                },
-                resetable=True,
-            ),
+            "bus": RadioSelect(),
+            "team": RadioSelect(),
         }
 
 
@@ -154,7 +161,7 @@ class WEIMembership1AForm(WEIMembershipForm):
     """
     Used to confirm registrations of first year members without choosing a bus now.
     """
-    caution_check = None
+    deposit_given = None
     roles = None
 
     def clean(self):

apps/wei/forms/surveys/__init__.py

@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm
-from .wei2024 import WEISurvey2024
+from .wei2025 import WEISurvey2025
 
 
 __all__ = [
     'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
 ]
 
-CurrentSurvey = WEISurvey2024
+CurrentSurvey = WEISurvey2025

apps/wei/forms/surveys/base.py

@@ -121,6 +121,13 @@ class WEISurveyAlgorithm:
         """
         raise NotImplementedError
 
+    @classmethod
+    def get_bus_information_form(cls):
+        """
+        The class of the form to update the bus information.
+        """
+        raise NotImplementedError
+
 
 class WEISurvey:
     """

apps/wei/forms/surveys/wei2025.py

@@ -0,0 +1,580 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import time
+import json
+from functools import lru_cache
+from random import Random
+
+from django import forms
+from django.db import transaction
+from django.db.models import Q
+from django.utils.translation import gettext_lazy as _
+from django.utils.safestring import mark_safe
+
+from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
+from ...models import WEIMembership, Bus
+
+WORDS = {
+    'list': [
+        'Fiesta', 'Graillance', 'Move it move it', 'Calme', 'Nert et geek', 'Jeux de rôles et danse rock',
+        'Strass et paillettes', 'Spectaculaire', 'Splendide', 'Flow inégalable', 'Rap', 'Battles légendaires',
+        'Techno', 'Alcool', 'Kiffeur·euse', 'Rugby', 'Médiéval', 'Festif',
+        'Stylé', 'Chipie', 'Rétro', 'Vache', 'Farfadet', 'Fanfare',
+    ],
+    'questions': {
+        "alcool": [
+            """Sur une échelle allant de 0 (= 0 alcool ou très peu) à 5 (= la fontaine de jouvence alcoolique),
+            quel niveau de consommation d’alcool souhaiterais-tu ?""",
+            {
+                42: 4,
+                47: 1,
+                48: 3,
+                45: 3.5,
+                44: 4,
+                46: 5,
+                43: 3,
+                49: 3
+            }
+        ],
+        "voie_post_bac": [
+            """Si la DA du bus de ton choix correspondait à une voie post-bac, laquelle serait-elle ?""",
+            {
+                42: "Double licence cuisine/arts du cirque option burger",
+                47: "BTS Exploration de donjon",
+                48: "Ecole des stars en herbe",
+                45: "Déscolarisation précoce",
+                44: "Rattrapage pour excès de kiff",
+                46: "Double cursus STAPS / Licence d’histoire",
+                43: "Recherche active d’un sugar daddy/d’un sugar mommy",
+                49: "Licence de musicologie"
+            }
+        ],
+        "boite": [
+            """Tu es seul·e sur une île déserte et devant toi il y a une sombre boîte de taille raisonnable.
+            Qu’y a-t-il à l’intérieur ?""",
+            {
+                42: "Un burgouzz de valouzz",
+                47: "Un ocarina (pour me téléporter hors de ce bourbier)",
+                48: "Des paillettes, un micro de karaoké et une enceinte bluetooth",
+                45: "",
+                44: "Une 86 et un caisson pour taper du pied",
+                46: "Une épée, un ballon et une tireuse",
+                43: "Des lunettes de soleil",
+                49: "Mon instrument de musique"
+            }
+        ],
+        "tardif": [
+            """Il est 00h, tu as passé la journée à la plage avec tes copains et iels te proposent de prolonger parce
+            qu’après tout, il n’y a plus personne sur la plage à cette heure-ci. Tu n’habites pas loin mais t’enchaînes
+            demain avec une journée similaire avec un autre groupe d’amis parce que t’es trop #busy. Que fais-tu ?""",
+            {
+                42: "On veut se déchaîner toute la nuit !!",
+                47: "Je prends une glace et chill un moment avant d’aller dormir",
+                48: "J’enfile mes boogie shoes pour enflammer le dancefloor avec elleux et lancer un concours de slay, le perdant finit la bouteille de rhum",
+                45: "La fête continuuuuue",
+                44: "Soirée sangria plage → boîte → lever de soleil sur la plage",
+                46: "Minuit ? C’est l’heure du genepi. On commence les alcools forts !!",
+                43: "T’enchaînes direct (faut pas les priver de ta présence)",
+                49: "On continue en mode chill (soirée potins)"
+            }
+        ],
+        "cohesion": [
+            """C’est la rentrée de Seconde et tu découvres ta classe, tes camarades et ta prof principale!!!
+            qui vous propose une activité de cohésion. Laquelle est-elle ?""",
+            {
+                42: "Un relais cubi en ventriglisse",
+                47: "Un jeu de rôle",
+                48: "Organiser la soirée de l’année dans le lycée. Le thème : SLAY (Spotlight, Love, Amaze/All-night, Yeah), paillettes, disco",
+                45: "La prof de français propose un slam parce qu'elle pense que c'est du rap littéraire qui fera plaisir aux élèves",
+                44: "P’tit escape game + apéro",
+                46: "Joute avec des boucliers Gilbert",
+                43: "Tournage d’un clip de confessions nocturnes de Diam’s",
+                49: "Je sais pas j’ai raté mon BAFA"
+            }
+        ],
+        "artiste": [
+            """C’est l’été et la saison des festivals a commencé. Tu regardes la programmation du festival
+            pas loin de chez toi et tu découvres avec joie la présence d’un·e artiste. De qui s’agit-il ?""",
+            {
+                42: "Moto-Moto (il chantera son fameux tube “je les aime grosses, je les aime bombées”)",
+                47: "Hatsune Miku",
+                48: "Rihanna",
+                45: "Vald",
+                44: "Qui connaît vraiment les noms des artistes de tech ?",
+                46: "Perceval",
+                43: "Fatal bazooka",
+                49: "Måneskin"
+            }
+        ],
+        "annonce_noel": [
+            """C’est Noël et tu revois toute ta famille, oncles, tantes, cousin·e·s, grands-parents, la totale.
+            D’un coup, tu te lèves, tapotes de manière pompeuse sur ton verre avec un de tes couverts.
+            Qu’annonces-tu ?""",
+            {
+                42: """« Chère famille. Je sais bien que nous avions dit : pas de politique à table.
+                    Je ne peux toutefois me retenir de vous annoncer une grande nouvelle…
+                    j’ai décidé de quitter la ville pour consacrer ma vie au culte du Roi Julian.
+                    A moi la jungle luxuriante, là où le soleil chaud caresse les palmiers,
+                    où les lémuriens dansent avec frénésie et où chaque repas est une ode au burger sauvage.
+                    Longue vie à Sa Majesté le Roi Julian ! »""",
+                47: "« J’ai perdu »",
+                48: "« Mes chers parents je pars, j’arrête l’ENS pour devenir DJ slay à Ibiza »",
+                45: "J’interromps le repas pour rapper les 6min de bande organisée",
+                44: "« Digestif ? Pétanque ? Les deux ? »",
+                46: "« Montjoie St Denis à bas la Macronie »",
+                43: "« Je suis enceinte » (c’est faux j’ai juste besoin d’attention)",
+                49: """Discours de remerciement :
+                    je lance un powerpoint de 65 slides et sors une feuille A4 blanche (je fais semblant de lire mon discours dessus)"""
+            }
+        ],
+        "vacances": [
+            """Les vacances sont là et t’aimerais bien partir quelque part, mais où ?""",
+            {
+                42: "A Madagascar, à bord d’un bus conduit par des pingouins",
+                47: "Dans ma chambre",
+                48: "Rio de Janeiro",
+                45: "N'importe où tant qu'on peut sortir tous les soirs",
+                44: "Tu suis les plans du club ski ou de piratens",
+                46: "Carcassonne",
+                43: "Coachella",
+                49: "Dans les montagnes de la république populaire d’Auvergne-Rhônes-Alpes pour profiter de la fraîcheur, de la nature et de mes ami·e·s"
+            }
+        ],
+        "loisir": [
+            """T’as fini ta journée de cours et tu t’apprêtes à profiter d’une activité/hobby/loisir de ton choix.
+            Laquelle est-ce ?""",
+            {
+                42: "Cueillir des noix de coco",
+                47: "Essayer de travailler puis chill avec des potes autour d’un jeu en buvant du thé",
+                48: "Repet du nouveau spectacle de mon club, before (potins) puis sortie avec les potes jusqu’au bout de la night",
+                45: "Zoner avec les copaings jusqu’à pas d’heure",
+                44: "Go Kfet pour se faire traquenard jusqu’à 3h du mat",
+                46: "Déterminer ce qui est le plus solide entre mon crâne et une ecocup",
+                43: "Revoir pour la 6e fois gossip girl au fond de ton lit",
+                49: "Jouer de mon instrument préféré avec les copains/copines pour préparer le prochain concert #solidays"
+            }
+        ],
+        "plan": [
+            """Tu reçois un message sur la conversation de groupe que tu partages avec tes potes :
+            vous êtes chaud·e·s pour vous retrouver. Quel plan t’attire le plus ?""",
+            {
+                42: """Après-midi piscine, puis before arrosé de mojito,
+                    avant d’aller s’éclater en pot avec toute la savane et de finir sur un after spécial pina colada""",
+                47: """(matin) : Ptit jeu de rôle
+                    (repas) : le traditionnel poké-tacos
+                    (juste après le repas) : combat avec des épées en mousse avec les copains!
+                    (16h00) : pause thé
+                    (fin d’après midi) : initiation à la danse rock
+                    (soirée) : découverte d’un jeu de société avec des règles obscures
+                    """,
+                48: "Soirée champagne and chic : spectacle et dîner au moulin rouge puis soirée sur les champs",
+                45: "Se regrouper pour une soirée, même si il n’est encore que 10h",
+                44: "P’tit poké qui termine en koin koin avec after poker",
+                46: "Une dégustation de bière, un rugby et toute autre activité joviale",
+                43: "Un brunch de pour papoter puis friperies",
+                49: "Soirée raclette !"
+            }
+        ]
+    }
+}
+
+IMAGES = {
+    "vacances": {
+        49: "/static/wei/img/logo_auvergne_rhone_alpes.jpg",
+    }
+}
+
+NB_WORDS = 5
+
+
+class OptionalImageRadioSelect(forms.RadioSelect):
+    def __init__(self, images=None, *args, **kwargs):
+        self.images = images or {}
+        super().__init__(*args, **kwargs)
+
+    def create_option(self, name, value, label, selected, index, subindex=None, attrs=None):
+        option = super().create_option(name, value, label, selected, index, subindex=subindex, attrs=attrs)
+        img_url = self.images.get(value)
+        if img_url:
+            option['label'] = mark_safe(f'{label} <img src="{img_url}" style="height:32px;vertical-align:middle;">')
+        else:
+            option['label'] = label
+        return option
+
+
+class WEISurveyForm2025(forms.Form):
+    """
+    Survey form for the year 2025.
+    Members choose 20 words, from which we calculate the best associated bus.
+    """
+
+    def set_registration(self, registration):
+        """
+        Filter the bus selector with the buses of the current WEI.
+        """
+        information = WEISurveyInformation2025(registration)
+        if not information.seed:
+            information.seed = int(1000 * time.time())
+            information.save(registration)
+            registration._force_save = True
+            registration.save()
+
+        rng = Random((information.step + 1) * information.seed)
+
+        if information.step == 0:
+            self.fields["words"] = forms.MultipleChoiceField(
+                label=_(f"Select {NB_WORDS} words that describe the WEI experience you want to have."),
+                choices=[(w, w) for w in WORDS['list']],
+                widget=forms.CheckboxSelectMultiple(),
+                required=True,
+            )
+            if self.is_valid():
+                return
+
+            all_preferred_words = WORDS['list']
+            rng.shuffle(all_preferred_words)
+            self.fields["words"].choices = [(w, w) for w in all_preferred_words]
+        else:
+            questions = list(WORDS['questions'].items())
+            idx = information.step - 1
+            if idx < len(questions):
+                q, (desc, answers) = questions[idx]
+                if q == 'alcool':
+                    choices = [(i / 2, str(i / 2)) for i in range(11)]
+                else:
+                    choices = [(k, v) for k, v in answers.items()]
+                    rng.shuffle(choices)
+                self.fields[q] = forms.ChoiceField(
+                    label=desc,
+                    choices=choices,
+                    widget=OptionalImageRadioSelect(images=IMAGES.get(q, {})),
+                    required=True,
+                )
+
+    def clean_words(self):
+        data = self.cleaned_data['words']
+        if len(data) != NB_WORDS:
+            raise forms.ValidationError(_(f"Please choose exactly {NB_WORDS} words"))
+        return data
+
+
+class WEIBusInformation2025(WEIBusInformation):
+    """
+    For each word, the bus has a score
+    """
+    scores: dict
+
+    def __init__(self, bus):
+        self.scores = {}
+        super().__init__(bus)
+
+
+class BusInformationForm2025(forms.ModelForm):
+    class Meta:
+        model = Bus
+        fields = ['information_json']
+        widgets = {
+            'information_json': forms.HiddenInput(),
+        }
+
+    def __init__(self, *args, words=None, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        initial_scores = {}
+        if self.instance and self.instance.information_json:
+            try:
+                info = json.loads(self.instance.information_json)
+                initial_scores = info.get("scores", {})
+            except (json.JSONDecodeError, TypeError, AttributeError):
+                initial_scores = {}
+        if words is None:
+            words = WORDS['list']
+        self.words = words
+
+        choices = [(i, str(i)) for i in range(6)]  # [(0, '0'), (1, '1'), ..., (5, '5')]
+        for word in words:
+            self.fields[word] = forms.TypedChoiceField(
+                label=word,
+                choices=choices,
+                coerce=int,
+                initial=initial_scores.get(word, 0) if word in initial_scores else None,
+                required=True,
+                widget=forms.RadioSelect,
+                help_text=_("Rate between 0 and 5."),
+            )
+
+    def clean(self):
+        cleaned_data = super().clean()
+        scores = {}
+        for word in self.words:
+            value = cleaned_data.get(word)
+            if value is not None:
+                scores[word] = value
+        # On encode en JSON
+        cleaned_data['information_json'] = json.dumps({"scores": scores})
+        return cleaned_data
+
+
+class WEISurveyInformation2025(WEISurveyInformation):
+    """
+    We store the id of the selected bus. We store only the name, but is not used in the selection:
+    that's only for humans that try to read data.
+    """
+    # Random seed that is stored at the first time to ensure that words are generated only once
+    seed = 0
+    step = 0
+
+    def __init__(self, registration):
+        for i in range(1, NB_WORDS + 1):
+            setattr(self, "word" + str(i), None)
+        for q in WORDS['questions']:
+            setattr(self, q, None)
+        super().__init__(registration)
+
+    def reset(self, registration):
+        """
+        Réinitialise complètement le questionnaire : step, seed, mots choisis et réponses aux questions.
+        """
+        self.step = 0
+        self.seed = 0
+        for i in range(1, NB_WORDS + 1):
+            setattr(self, f"word{i}", None)
+        for q in WORDS['questions']:
+            setattr(self, q, None)
+        self.save(registration)
+        registration._force_save = True
+        registration.save()
+
+
+class WEISurvey2025(WEISurvey):
+    """
+    Survey for the year 2025.
+    """
+
+    @classmethod
+    def get_year(cls):
+        return 2025
+
+    @classmethod
+    def get_survey_information_class(cls):
+        return WEISurveyInformation2025
+
+    def get_form_class(self):
+        return WEISurveyForm2025
+
+    def update_form(self, form):
+        """
+        Filter the bus selector with the buses of the WEI.
+        """
+        form.set_registration(self.registration)
+
+    @transaction.atomic
+    def form_valid(self, form):
+        if self.information.step == 0:
+            words = form.cleaned_data['words']
+            for i, word in enumerate(words, 1):
+                setattr(self.information, "word" + str(i), word)
+            self.information.step += 1
+            self.save()
+        else:
+            questions = list(WORDS['questions'].keys())
+            idx = self.information.step - 1
+            if idx < len(questions):
+                q = questions[idx]
+                setattr(self.information, q, form.cleaned_data[q])
+                self.information.step += 1
+                self.save()
+
+    @classmethod
+    def get_algorithm_class(cls):
+        return WEISurveyAlgorithm2025
+
+    def is_complete(self) -> bool:
+        """
+        The survey is complete once the bus is chosen.
+        """
+        return self.information.step > len(WORDS['questions'])
+
+    @classmethod
+    @lru_cache()
+    def word_mean(cls, word):
+        """
+        Calculate the mid-score given by all buses.
+        """
+        buses = cls.get_algorithm_class().get_buses()
+        return sum([cls.get_algorithm_class().get_bus_information(bus).scores[word] for bus in buses]) / buses.count()
+
+    @lru_cache()
+    def score_questions(self, bus):
+        """
+        The score given by the answers to the questions
+        """
+        if not self.is_complete():
+            raise ValueError("Survey is not ended, can't calculate score")
+        s = sum(1 for q in WORDS['questions'] if q != 'alcool' and getattr(self.information, q) == bus.pk)
+        if 'alcool' in WORDS['questions'] and bus.pk in WORDS['questions']['alcool'][1] and hasattr(self.information, 'alcool'):
+            s -= abs(float(self.information.alcool) - float(WORDS['questions']['alcool'][1][bus.pk]))
+        return s
+
+    @lru_cache()
+    def score_words(self, bus):
+        """
+        The score given by the choice of words
+        """
+        if not self.is_complete():
+            raise ValueError("Survey is not ended, can't calculate score")
+
+        bus_info = self.get_algorithm_class().get_bus_information(bus)
+        # Score is the given score by the bus subtracted to the mid-score of the buses.
+        s = sum(bus_info.scores[getattr(self.information, 'word' + str(i))]
+                - self.word_mean(getattr(self.information, 'word' + str(i))) for i in range(1, 1 + NB_WORDS)) / self.get_algorithm_class().get_buses().count()
+        return s
+
+    @lru_cache()
+    def scores_per_bus(self):
+        return {bus: (self.score_questions(bus), self.score_words(bus)) for bus in self.get_algorithm_class().get_buses()}
+
+    @lru_cache()
+    def ordered_buses(self):
+        """
+        Order the buses by the score_questions of the survey.
+        """
+        values = list(self.scores_per_bus().items())
+        values.sort(key=lambda item: -item[1][0])
+        return values
+
+    @classmethod
+    def clear_cache(cls):
+        cls.word_mean.cache_clear()
+        return super().clear_cache()
+
+
+class WEISurveyAlgorithm2025(WEISurveyAlgorithm):
+    """
+    The algorithm class for the year 2025.
+    We use Gale-Shapley algorithm to attribute 1y students into buses.
+    """
+
+    @classmethod
+    def get_survey_class(cls):
+        return WEISurvey2025
+
+    @classmethod
+    def get_bus_information_class(cls):
+        return WEIBusInformation2025
+
+    @classmethod
+    def get_bus_information_form(cls):
+        return BusInformationForm2025
+
+    @classmethod
+    def get_buses(cls):
+
+        if not hasattr(cls, '_buses'):
+            cls._buses = Bus.objects.filter(wei__year=cls.get_survey_class().get_year(), size__gt=0).all().exclude(name='Staff')
+        return cls._buses
+
+    def run_algorithm(self, display_tqdm=False):
+        """
+        Gale-Shapley algorithm implementation.
+        We modify it to allow buses to have multiple "weddings".
+        We use lexigographical order on both scores
+        """
+        surveys = list(self.get_survey_class()(r) for r in self.get_registrations())  # All surveys
+        surveys = [s for s in surveys if s.is_complete()]  # Don't consider invalid surveys
+        # Don't manage hardcoded people
+        surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
+
+        # Reset previous algorithm run
+        for survey in surveys:
+            survey.free()
+            survey.save()
+
+        non_men = [s for s in surveys if s.registration.gender != 'male']
+        men = [s for s in surveys if s.registration.gender == 'male']
+
+        quotas = {}
+        registrations = self.get_registrations()
+        non_men_total = registrations.filter(~Q(gender='male')).count()
+        for bus in self.get_buses():
+            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
+            # Remove hardcoded people
+            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
+                                                       registration__information_json__icontains="hardcoded").count()
+            quotas[bus] = 4 + int(non_men_total / registrations.count() * free_seats)
+
+        tqdm_obj = None
+        if display_tqdm:
+            from tqdm import tqdm
+            tqdm_obj = tqdm(total=len(non_men), desc="Non-hommes")
+
+        # Repartition for non men people first
+        self.make_repartition(non_men, quotas, tqdm_obj=tqdm_obj)
+
+        quotas = {}
+        for bus in self.get_buses():
+            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
+            free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
+            # Remove hardcoded people
+            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
+                                                       registration__information_json__icontains="hardcoded").count()
+            quotas[bus] = free_seats
+
+        if display_tqdm:
+            tqdm_obj.close()
+
+            from tqdm import tqdm
+            tqdm_obj = tqdm(total=len(men), desc="Hommes")
+
+        self.make_repartition(men, quotas, tqdm_obj=tqdm_obj)
+
+        if display_tqdm:
+            tqdm_obj.close()
+
+        # Clear cache information after running algorithm
+        WEISurvey2025.clear_cache()
+
+    def make_repartition(self, surveys, quotas=None, tqdm_obj=None):
+        free_surveys = surveys.copy()  # Remaining surveys
+        while free_surveys:  # Some students are not affected
+            survey = free_surveys[0]
+            buses = survey.ordered_buses()  # Preferences of the student
+            for bus, current_scores in buses:
+                if self.get_bus_information(bus).has_free_seats(surveys, quotas):
+                    # Selected bus has free places. Put student in the bus
+                    survey.select_bus(bus)
+                    survey.save()
+                    free_surveys.remove(survey)
+                    break
+                else:
+                    # Current bus has not enough places. Remove the least preferred student from the bus if existing
+                    least_preferred_survey = None
+                    least_score = -1
+                    # Find the least student in the bus that has a lower score than the current student
+                    for survey2 in surveys:
+                        if not survey2.information.valid or survey2.information.get_selected_bus() != bus:
+                            continue
+                        score2 = survey2.score_words(bus)
+                        if current_scores[1] <= score2:  # Ignore better students
+                            continue
+                        if least_preferred_survey is None or score2 < least_score:
+                            least_preferred_survey = survey2
+                            least_score = score2
+
+                    if least_preferred_survey is not None:
+                        # Remove the least student from the bus and put the current student in.
+                        # If it does not exist, choose the next bus.
+                        least_preferred_survey.free()
+                        least_preferred_survey.save()
+                        free_surveys.append(least_preferred_survey)
+                        survey.select_bus(bus)
+                        survey.save()
+                        free_surveys.remove(survey)
+                        break
+            else:
+                raise ValueError(f"User {survey.registration.user} has no free seat")
+
+            if tqdm_obj is not None:
+                tqdm_obj.n = len(surveys) - len(free_surveys)
+                tqdm_obj.refresh()

apps/wei/migrations/0011_alter_weiclub_year.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.21 on 2025-05-25 12:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0010_remove_weiregistration_specific_diet'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weiclub',
+            name='year',
+            field=models.PositiveIntegerField(default=2025, unique=True, verbose_name='year'),
+        ),
+    ]

apps/wei/migrations/0012_bus_club.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.21 on 2025-05-29 16:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('member', '0014_create_bda'),
+        ('wei', '0011_alter_weiclub_year'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bus',
+            name='club',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bus', to='member.club', verbose_name='club'),
+        ),
+    ]

apps/wei/migrations/0013_weiclub_caution_amount_weiregistration_caution_type.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.21 on 2025-06-01 21:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0012_bus_club'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='weiclub',
+            name='caution_amount',
+            field=models.PositiveIntegerField(default=0, verbose_name='caution amount'),
+        ),
+        migrations.AddField(
+            model_name='weiregistration',
+            name='caution_type',
+            field=models.CharField(choices=[('check', 'Check'), ('note', 'Note transaction')], default='check', max_length=16, verbose_name='caution type'),
+        ),
+    ]

apps/wei/migrations/0014_weiclub_fee_soge_credit.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.23 on 2025-07-15 14:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0013_weiclub_caution_amount_weiregistration_caution_type'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='weiclub',
+            name='fee_soge_credit',
+            field=models.PositiveIntegerField(default=2000, verbose_name='fee soge credit'),
+        ),
+    ]

apps/wei/migrations/0015_remove_weiclub_caution_amount_and_more.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.2.23 on 2025-07-15 16:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0014_weiclub_fee_soge_credit'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='weiclub',
+            name='caution_amount',
+        ),
+        migrations.RemoveField(
+            model_name='weiregistration',
+            name='caution_check',
+        ),
+        migrations.RemoveField(
+            model_name='weiregistration',
+            name='caution_type',
+        ),
+        migrations.AddField(
+            model_name='weiclub',
+            name='deposit_amount',
+            field=models.PositiveIntegerField(default=0, verbose_name='deposit amount'),
+        ),
+        migrations.AddField(
+            model_name='weiregistration',
+            name='deposit_check',
+            field=models.BooleanField(default=False, verbose_name='Deposit check given'),
+        ),
+        migrations.AddField(
+            model_name='weiregistration',
+            name='deposit_type',
+            field=models.CharField(choices=[('check', 'Check'), ('note', 'Note transaction')], default='check', max_length=16, verbose_name='deposit type'),
+        ),
+    ]

apps/wei/migrations/0016_weiregistration_fee_alter_weiclub_fee_soge_credit.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.2.4 on 2025-07-19 12:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0015_remove_weiclub_caution_amount_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='weiregistration',
+            name='fee',
+            field=models.PositiveIntegerField(blank=True, default=0, verbose_name='fee'),
+        ),
+        migrations.AlterField(
+            model_name='weiclub',
+            name='fee_soge_credit',
+            field=models.PositiveIntegerField(default=2000, verbose_name='membership fee (soge credit)'),
+        ),
+    ]

apps/wei/migrations/0017_alter_weiclub_fee_soge_credit.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-08-02 13:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0016_weiregistration_fee_alter_weiclub_fee_soge_credit'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='weiclub',
+            name='fee_soge_credit',
+            field=models.PositiveIntegerField(default=0, verbose_name='membership fee (soge credit)'),
+        ),
+    ]

apps/wei/migrations/0018_remove_weiregistration_deposit_check_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.4 on 2025-08-02 17:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wei', '0017_alter_weiclub_fee_soge_credit'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='weiregistration',
+            name='deposit_check',
+        ),
+        migrations.AddField(
+            model_name='weiregistration',
+            name='deposit_given',
+            field=models.BooleanField(default=False, verbose_name='Deposit given'),
+        ),
+    ]

apps/wei/models.py

@@ -33,6 +33,16 @@ class WEIClub(Club):
         verbose_name=_("date end"),
     )
 
+    deposit_amount = models.PositiveIntegerField(
+        verbose_name=_("deposit amount"),
+        default=0,
+    )
+
+    fee_soge_credit = models.PositiveIntegerField(
+        verbose_name=_("membership fee (soge credit)"),
+        default=0,
+    )
+
     class Meta:
         verbose_name = _("WEI")
         verbose_name_plural = _("WEI")
@@ -72,6 +82,15 @@ class Bus(models.Model):
         default=50,
     )
 
+    club = models.OneToOneField(
+        Club,
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="bus",
+        verbose_name=_("club"),
+    )
+
     description = models.TextField(
         blank=True,
         default="",
@@ -183,9 +202,19 @@ class WEIRegistration(models.Model):
         verbose_name=_("Credit from Société générale"),
     )
 
-    caution_check = models.BooleanField(
+    deposit_given = models.BooleanField(
         default=False,
-        verbose_name=_("Caution check given")
+        verbose_name=_("Deposit given")
+    )
+
+    deposit_type = models.CharField(
+        max_length=16,
+        choices=(
+            ('check', _("Check")),
+            ('note', _("Note transaction")),
+        ),
+        default='check',
+        verbose_name=_("deposit type"),
     )
 
     birth_date = models.DateField(
@@ -256,6 +285,12 @@ class WEIRegistration(models.Model):
                     "encoded in JSON"),
     )
 
+    fee = models.PositiveIntegerField(
+        default=0,
+        verbose_name=_('fee'),
+        blank=True,
+    )
+
     class Meta:
         unique_together = ('user', 'wei',)
         verbose_name = _("WEI User")
@@ -280,7 +315,25 @@ class WEIRegistration(models.Model):
         self.information_json = json.dumps(information, indent=2)
 
     @property
-    def fee(self):
+    def is_validated(self):
+        try:
+            return self.membership is not None
+        except AttributeError:
+            return False
+
+    @property
+    def validation_status(self):
+        """
+        Define an order to have easier access to validatable registrations
+        """
+        if self.fee + (self.wei.deposit_amount if self.deposit_type == 'note' else 0) > self.user.note.balance:
+            return 2
+        elif self.first_year:
+            return 1
+        else:
+            return 0
+
+    def calculate_fee(self):
         bde = Club.objects.get(pk=1)
         kfet = Club.objects.get(pk=2)
 
@@ -295,7 +348,8 @@ class WEIRegistration(models.Model):
             date_start__gte=bde.membership_start,
         ).exists()
 
-        fee = self.wei.membership_fee_paid if self.user.profile.paid \
+        fee = self.wei.fee_soge_credit if self.soge_credit \
+            else self.wei.membership_fee_paid if self.user.profile.paid \
             else self.wei.membership_fee_unpaid
         if not kfet_member:
             fee += kfet.membership_fee_paid if self.user.profile.paid \
@@ -306,12 +360,9 @@ class WEIRegistration(models.Model):
 
         return fee
 
-    @property
-    def is_validated(self):
-        try:
-            return self.membership is not None
-        except AttributeError:
-            return False
+    def save(self, *args, **kwargs):
+        self.fee = self.calculate_fee()
+        super().save(*args, **kwargs)
 
 
 class WEIMembership(Membership):

apps/wei/tables.py

@@ -58,8 +58,8 @@ class WEIRegistrationTable(tables.Table):
 
     validate = tables.Column(
         verbose_name=_("Validate"),
-        orderable=False,
-        accessor=A('pk'),
+        orderable=True,
+        accessor='validate_status',
         attrs={
             'th': {
                 'id': 'validate-membership-header'
@@ -71,7 +71,7 @@ class WEIRegistrationTable(tables.Table):
         'wei:wei_delete_registration',
         args=[A('pk')],
         orderable=False,
-        verbose_name=_("delete"),
+        verbose_name=_("Delete"),
         text=_("Delete"),
         attrs={
             'th': {
@@ -84,6 +84,35 @@ class WEIRegistrationTable(tables.Table):
         },
     )
 
+    def render_deposit_type(self, record):
+        if record.first_year:
+            return format_html("∅")
+        if record.deposit_type == 'check':
+            # TODO Install Font Awesome 6 to acces more icons (and keep compaibility with current used v4)
+            return format_html("""
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="1.5em" height="1.5em"
+        fill="currentColor" style="position: relative; left: -0.15em;">
+            <path d="
+                M128 128C92.7 128 64 156.7 64 192L64 448C64 483.3 92.7 512 128 512L512 512
+                C547.3 512 576 483.3 576 448L576 192C576 156.7 547.3 128 512 128L128 128z
+                M360 352L488 352C501.3 352 512 362.7 512 376C512 389.3 501.3 400 488 400L360 400
+                C346.7 400 336 389.3 336 376C336 362.7 346.7 352 360 352z
+                M336 264C336 250.7 346.7 240 360 240L488 240C501.3 240 512 250.7 512 264
+                C512 277.3 501.3 288 488 288L360 288C346.7 288 336 277.3 336 264z
+                M212 208C223 208 232 217 232 228L232 232L240 232C251 232 260 241 260 252
+                C260 263 251 272 240 272L192.5 272C185.6 272 180 277.6 180 284.5
+                C180 290.6 184.4 295.8 190.4 296.8L232.1 303.8C257.4 308 276 329.9 276 355.6
+                C276 381.7 257 403.3 232 407.4L232 412.1C232 423.1 223 432.1 212 432.1
+                C201 432.1 192 423.1 192 412.1L192 408.1L168 408.1C157 408.1 148 399.1 148 388.1
+                C148 377.1 157 368.1 168 368.1L223.5 368.1C230.4 368.1 236 362.5 236 355.6
+                C236 349.5 231.6 344.3 225.6 343.3L183.9 336.3C158.5 332 140 310.1 140 284.5
+                C140 255.7 163.2 232.3 192 232L192 228C192 217 201 208 212 208z
+            " />
+        </svg>
+    """)
+        if record.deposit_type == 'note':
+            return format_html("<i class=\"fa fa-exchange\"></i>")
+
     def render_validate(self, record):
         hasperm = PermissionBackend.check_perm(
             get_current_request(), "wei.add_weimembership", WEIMembership(
@@ -100,10 +129,11 @@ class WEIRegistrationTable(tables.Table):
 
         url = reverse_lazy('wei:validate_registration', args=(record.pk,))
         text = _('Validate')
-        if record.fee > record.user.note.balance and not record.soge_credit:
+        status = record.validation_status
+        if status == 2:
             btn_class = 'btn-secondary'
             tooltip = _("The user does not have enough money.")
-        elif record.first_year:
+        elif status == 1:
             btn_class = 'btn-info'
             tooltip = _("The user is in first year. You may validate the credit, the algorithm will run later.")
         else:
@@ -121,10 +151,11 @@ class WEIRegistrationTable(tables.Table):
         attrs = {
             'class': 'table table-condensed table-striped table-hover'
         }
+        order_by = ('validate', 'user',)
         model = WEIRegistration
         template_name = 'django_tables2/bootstrap4.html'
-        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'caution_check',
-                  'edit', 'validate', 'delete',)
+        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'deposit_given',
+                  'deposit_type', 'edit', 'validate', 'delete',)
         row_attrs = {
             'class': 'table-row',
             'id': lambda record: "row-" + str(record.pk),
@@ -134,8 +165,8 @@ class WEIRegistrationTable(tables.Table):
 
 class WEIMembershipTable(tables.Table):
     user = tables.LinkColumn(
-        'wei:wei_update_registration',
-        args=[A('registration__pk')],
+        'wei:wei_update_membership',
+        args=[A('pk')],
     )
 
     year = tables.Column(
@@ -156,6 +187,35 @@ class WEIMembershipTable(tables.Table):
     def render_year(self, record):
         return str(record.user.profile.ens_year) + "A"
 
+    def render_registration__deposit_type(self, record):
+        if record.registration.first_year:
+            return format_html("∅")
+        if record.registration.deposit_type == 'check':
+            # TODO Install Font Awesome 6 to acces more icons (and keep compaibility with current used v4)
+            return format_html("""
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="1.5em" height="1.5em"
+        fill="currentColor" style="position: relative; left: -0.15em;">
+            <path d="
+                M128 128C92.7 128 64 156.7 64 192L64 448C64 483.3 92.7 512 128 512L512 512
+                C547.3 512 576 483.3 576 448L576 192C576 156.7 547.3 128 512 128L128 128z
+                M360 352L488 352C501.3 352 512 362.7 512 376C512 389.3 501.3 400 488 400L360 400
+                C346.7 400 336 389.3 336 376C336 362.7 346.7 352 360 352z
+                M336 264C336 250.7 346.7 240 360 240L488 240C501.3 240 512 250.7 512 264
+                C512 277.3 501.3 288 488 288L360 288C346.7 288 336 277.3 336 264z
+                M212 208C223 208 232 217 232 228L232 232L240 232C251 232 260 241 260 252
+                C260 263 251 272 240 272L192.5 272C185.6 272 180 277.6 180 284.5
+                C180 290.6 184.4 295.8 190.4 296.8L232.1 303.8C257.4 308 276 329.9 276 355.6
+                C276 381.7 257 403.3 232 407.4L232 412.1C232 423.1 223 432.1 212 432.1
+                C201 432.1 192 423.1 192 412.1L192 408.1L168 408.1C157 408.1 148 399.1 148 388.1
+                C148 377.1 157 368.1 168 368.1L223.5 368.1C230.4 368.1 236 362.5 236 355.6
+                C236 349.5 231.6 344.3 225.6 343.3L183.9 336.3C158.5 332 140 310.1 140 284.5
+                C140 255.7 163.2 232.3 192 232L192 228C192 217 201 208 212 208z
+            " />
+        </svg>
+    """)
+        if record.registration.deposit_type == 'note':
+            return format_html("<i class=\"fa fa-exchange\"></i>")
+
     class Meta:
         attrs = {
             'class': 'table table-condensed table-striped table-hover'
@@ -163,7 +223,7 @@ class WEIMembershipTable(tables.Table):
         model = WEIMembership
         template_name = 'django_tables2/bootstrap4.html'
         fields = ('user', 'user__last_name', 'user__first_name', 'registration__gender', 'user__profile__department',
-                  'year', 'bus', 'team', 'registration__caution_check', )
+                  'year', 'bus', 'team', 'registration__deposit_given', 'registration__deposit_type')
         row_attrs = {
             'class': 'table-row',
             'id': lambda record: "row-" + str(record.pk),

apps/wei/templates/wei/base.html

@@ -40,22 +40,20 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     <dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
                     <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
                     {% else %}
-                    {% with bde_kfet_fee=club.parent_club.membership_fee_paid|add:club.parent_club.parent_club.membership_fee_paid %}
-                    <dt class="col-xl-6">{% trans 'WEI fee (paid students)'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }}
-                        <i class="fa fa-question-circle"
-                            title="{% trans "The BDE membership is included in the WEI registration." %}"></i></dd>
-                    {% endwith %}
 
-                    {% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %}
+                    <dt class="col-xl-6">{% trans 'WEI fee (paid students)'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}
+
                     <dt class="col-xl-6">{% trans 'WEI fee (unpaid students)'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }}
-                        <i class="fa fa-question-circle"
-                            title="{% trans "The BDE membership is included in the WEI registration." %}"></i></dd>
-                    {% endwith %}
+                    <dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}
                     {% endif %}
                     {% endif %}
 
+                    {% if club.deposit_amount > 0 %}
+                    <dt class="col-xl-6">{% trans 'deposit amount'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ club.deposit_amount|pretty_money }}</dd>
+                    {% endif %}
+
                     {% if "note.view_note"|has_perm:club.note %}
                     <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
                     <dd class="col-xl-6">{{ club.note.balance | pretty_money }}</dd>

apps/wei/templates/wei/bus_detail.html

@@ -16,8 +16,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </div>
 
     <div class="card-footer text-center">
+        {% if object.club %}
+        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_detail' pk=object.club.pk %}"
+            data-turbolinks="false">{% trans "View club" %}</a>
+        {% endif %}
         <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:update_bus' pk=object.pk %}"
             data-turbolinks="false">{% trans "Edit" %}</a>
+        <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:update_bus_info' pk=object.pk %}"
+            data-turbolinks="false">{% trans "Edit information for survey" %}</a>
         <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:add_team' pk=object.pk %}"
             data-turbolinks="false">{% trans "Add team" %}</a>
     </div>

apps/wei/templates/wei/busteam_detail.html

@@ -18,6 +18,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <div class="card-footer text-center">
         <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:update_bus' pk=bus.pk %}"
             data-turbolinks="false">{% trans "Edit" %}</a>
+        <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:manage_bus' pk=bus.pk %}"
+            data-turbolinks="false">{% trans "View" %}</a>
         <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:add_team' pk=bus.pk %}"
             data-turbolinks="false">{% trans "Add team" %}</a>
     </div>

apps/wei/templates/wei/busteam_form.html

@@ -13,9 +13,17 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <div class="card-body">
         <form method="post">
             {% csrf_token %}
+            {{ form.media }} 
             {{ form|crispy }}
             <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
         </form>
     </div>
 </div>
+<script>
+    document.addEventListener("DOMContentLoaded", function () {
+        if (window.jscolor && jscolor.install) {
+            jscolor.install();
+        }
+    });
+</script>
 {% endblock %}

apps/wei/templates/wei/weiclub_detail.html

@@ -31,15 +31,29 @@ SPDX-License-Identifier: GPL-3.0-or-later
         <a class="btn btn-success" href="{% url "wei:wei_register_1A_myself" wei_pk=club.pk %}" data-turbolinks="false">
             {% trans "Register to the WEI! – 1A" %}
         </a>
-        {% endif %}
-        <a class="btn btn-success" href="{% url "wei:wei_register_2A_myself" wei_pk=club.pk %}" data-turbolinks="false">
-            {% trans "Register to the WEI! – 2A+" %}</a>
         {% else %}
+        <a class="btn btn-success" href="{% url "wei:wei_register_2A_myself" wei_pk=club.pk %}" data-turbolinks="false">
+            {% trans "Register to the WEI! – 2A+" %}
+        </a>
+        {% endif %}
+        {% else %}
+        {% if registration.validated %}
         <a class="btn btn-warning" href="{% url "wei:wei_update_registration" pk=my_registration.pk %}"
             data-turbolinks="false">
             {% trans "Update my registration" %}
         </a>
         {% endif %}
+        {% if my_registration.first_year %}
+        {% if not survey_complete %}
+        <a class="btn btn-warning" href="{% url "wei:wei_survey" pk=my_registration.pk %}" data-turbolinks="false">
+            {% trans "Continue survey" %}
+        </a>
+        {% endif %}
+        <a class="btn btn-warning" href="{% url "wei:wei_survey" pk=my_registration.pk %}?reset=true" data-turbolinks="false">
+            {% trans "Restart survey" %}
+        </a>
+        {% endif %}
+        {% endif %}
     </div>
     {% endif %}
 </div>
@@ -67,20 +81,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </div>
 {% endif %}
 
-{% if history_list.data %}
-<div class="card bg-white mb-3">
-    <div class="card-header position-relative" id="historyListHeading">
-        <a class="stretched-link font-weight-bold text-decoration-none" {% if "note.view_note"|has_perm:club.note %}
-            href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
-            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
-        </a>
-    </div>
-    <div id="history_list">
-        {% render_table history_list %}
-    </div>
-</div>
-{% endif %}
-
 {% if pre_registrations.data %}
 <div class="card bg-white mb-3">
     <div class="card-header position-relative" id="historyListHeading">
@@ -95,9 +95,24 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </div>
 {% endif %}
 
-    {% if can_validate_1a %}
-        <a href="{% url 'wei:wei_1A_list' pk=object.pk %}" class="btn btn-block btn-info">{% trans "Attribute buses" %}</a>
-    {% endif %}
+{% if can_validate_1a %}
+    <a href="{% url 'wei:wei_1A_list' pk=object.pk %}" class="btn btn-block btn-info">{% trans "Attribute buses" %}</a>
+{% endif %}
+
+{% if history_list.data %}
+<div class="card bg-white mt-3">
+    <div class="card-header position-relative" id="historyListHeading">
+        <a class="stretched-link font-weight-bold text-decoration-none" {% if "note.view_note"|has_perm:club.note %}
+            href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
+            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
+        </a>
+    </div>
+    <div id="history_list">
+        {% render_table history_list %}
+    </div>
+</div>
+{% endif %}
+
 {% endblock %}
 
 {% block extrajavascript %}

apps/wei/templates/wei/weimembership_form.html

@@ -95,8 +95,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         <dd class="col-xl-6"><em>{% trans "The algorithm didn't run." %}</em></dd>
                     {% endif %}
                 {% else %}
-                    <dt class="col-xl-6">{% trans 'caution check given'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ registration.caution_check|yesno }}</dd>
+                    <dt class="col-xl-6">{% trans 'Deposit check given'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ registration.deposit_given|yesno }}</dd>
 
                     {% with information=registration.information %}
                         <dt class="col-xl-6">{% trans 'preferred bus'|capfirst %}</dt>
@@ -137,33 +137,41 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 {% if registration.soge_credit %}
                     <div class="alert alert-warning">
                         {% blocktrans trimmed %}
-                            The WEI will be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
+                            The WEI will partially be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
                             The membership transaction will be created but will be invalid. You will have to validate it once the bank
                             validated the creation of the account, or to change the payment method.
                         {% endblocktrans %}
                     </div>
-                {% else %}
-                    {% if registration.user.note.balance < fee %}
-                        <div class="alert alert-danger">
-                            {% with pretty_fee=fee|pretty_money %}
-                            {% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
-                                The note don't have enough money ({{ balance }}, {{ pretty_fee }} required).
-                                The registration may fail if you don't credit the note now.
-                            {% endblocktrans %}
-                            {% endwith %}
-                        </div>
-                    {% else %}
-                        <div class="alert alert-success">
-                            {% blocktrans trimmed with pretty_fee=fee|pretty_money %}
-                                The note has enough money ({{ pretty_fee }} required), the registration is possible.
-                            {% endblocktrans %}
-                        </div>
-                    {% endif %}
                 {% endif %}
+                <div class="alert {% if registration.validation_status == 2 %}alert-danger{% else %}alert-success{% endif %}">
+                    <h5>{% trans "Required payments:" %}</h5>
+                    <ul>
+                        <li>{% blocktrans trimmed with amount=fee|pretty_money %}
+                            Membership fees: {{ amount }}
+                        {% endblocktrans %}</li>
+                        {% if not registration.first_year %}
+                        {% if registration.deposit_type == 'note' %}
+                            <li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
+                                Deposit (by Note transaction): {{ amount }}
+                            {% endblocktrans %}</li>
+                        {% else %}
+                            <li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
+                                Deposit (by check): {{ amount }}
+                            {% endblocktrans %}</li>
+                        {% endif %}
+                        {% endif %}
+                        <li><strong>{% blocktrans trimmed with total=total_needed|pretty_money %}
+                            Total needed: {{ total }}
+                        {% endblocktrans %}</strong></li>
+                    </ul>
+                    <p>{% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
+                        Current balance: {{ balance }}
+                    {% endblocktrans %}</p>
+                    </div>
 
-                {% if not registration.caution_check and not registration.first_year %}
+                {% if not registration.deposit_given and not registration.first_year and registration.caution_type == 'check' %}
                     <div class="alert alert-danger">
-                        {% trans "The user didn't give her/his caution check." %}
+                        {% trans "The user didn't give her/his caution." %}
                     </div>
                 {% endif %}
 
@@ -200,4 +208,26 @@ SPDX-License-Identifier: GPL-3.0-or-later
             }
         }
     </script>
+    <script>
+        $(document).ready(function () {
+            function refreshTeams() {
+                let buses = [];
+                $("input[name='bus']:checked").each(function (ignored) {
+                    buses.push($(this).parent().text().trim());
+                });
+                $("input[name='team']").each(function () {
+                    let label = $(this).parent();
+                    $(this).parent().addClass('d-none');
+                    buses.forEach(function (bus) {
+                        if (label.text().includes(bus))
+                            label.removeClass('d-none');
+                    });
+                });
+            }
+    
+            $("input[name='bus']").change(refreshTeams);
+    
+            refreshTeams();
+        });
+    </script>
 {% endblock %}

apps/wei/templates/wei/weimembership_update.html

@@ -0,0 +1,46 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body" id="form">
+    <form method="post">
+      {% csrf_token %}
+      {{ form | crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}
+
+{% block extrajavascript %}
+    <script>
+        $(document).ready(function () {
+            function refreshTeams() {
+                let buses = [];
+                $("input[name='bus']:checked").each(function (ignored) {
+                    buses.push($(this).parent().text().trim());
+                });
+                $("input[name='team']").each(function () {
+                    let label = $(this).parent();
+                    $(this).parent().addClass('d-none');
+                    buses.forEach(function (bus) {
+                        if (label.text().includes(bus))
+                            label.removeClass('d-none');
+                    });
+                });
+            }
+    
+            $("input[name='bus']").change(refreshTeams);
+    
+            refreshTeams();
+        });
+    </script>
+{% endblock %}

apps/wei/tests/test_wei_algorithm_2024.py

@@ -6,8 +6,6 @@ from datetime import date, timedelta
 
 from django.contrib.auth.models import User
 from django.test import TestCase
-from django.urls import reverse
-from note.models import NoteUser
 
 from ..forms.surveys.wei2024 import WEIBusInformation2024, WEISurvey2024, WORDS, WEISurveyInformation2024
 from ..models import Bus, WEIClub, WEIRegistration
@@ -129,44 +127,3 @@ class TestWEIAlgorithm(TestCase):
             self.assertLessEqual(max_score - score, 25)  # Always less than 25 % of tolerance
 
         self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %
-
-    def test_register_1a(self):
-        """
-        Test register a first year member to the WEI and complete the survey
-        """
-        response = self.client.get(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)))
-        self.assertEqual(response.status_code, 200)
-
-        user = User.objects.create(username="toto", email="toto@example.com")
-        NoteUser.objects.create(user=user)
-        response = self.client.post(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)), dict(
-            user=user.id,
-            soge_credit=True,
-            birth_date=date(2000, 1, 1),
-            gender='nonbinary',
-            clothing_cut='female',
-            clothing_size='XS',
-            health_issues='I am a bot',
-            emergency_contact_name='NoteKfet2020',
-            emergency_contact_phone='+33123456789',
-        ))
-        qs = WEIRegistration.objects.filter(user_id=user.id)
-        self.assertTrue(qs.exists())
-        registration = qs.get()
-        self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302, 200)
-        for question in WORDS:
-            # Fill 1A Survey, 10 pages
-            # be careful if questionnary form change (number of page, type of answer...)
-            response = self.client.post(reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), {
-                question: "1"
-            })
-            registration.refresh_from_db()
-            survey = WEISurvey2024(registration)
-            self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302,
-                                 302 if survey.is_complete() else 200)
-            self.assertIsNotNone(getattr(survey.information, question), "Survey page " + question + " failed")
-        survey = WEISurvey2024(registration)
-        self.assertTrue(survey.is_complete())
-        survey.select_bus(self.buses[0])
-        survey.save()
-        self.assertIsNotNone(survey.information.get_selected_bus())

apps/wei/tests/test_wei_algorithm_2025.py

@@ -0,0 +1,127 @@
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+import random
+
+from django.contrib.auth.models import User
+from django.test import TestCase
+
+from ..forms.surveys.wei2025 import WEIBusInformation2025, WEISurvey2025, WORDS, NB_WORDS, WEISurveyInformation2025
+from ..models import Bus, WEIClub, WEIRegistration
+
+
+class TestWEIAlgorithm(TestCase):
+    """
+    Run some tests to ensure that the WEI algorithm is working well.
+    """
+    fixtures = ('initial',)
+
+    def setUp(self):
+        """
+        Create some test data, with one WEI and 10 buses with random score attributions.
+        """
+        self.wei = WEIClub.objects.create(
+            name="WEI 2025",
+            email="wei2025@example.com",
+            date_start='2025-09-12',
+            date_end='2025-09-14',
+            year=2025,
+            membership_start='2025-06-01'
+        )
+
+        self.buses = []
+        for i in range(8):
+            bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
+            self.buses.append(bus)
+            information = WEIBusInformation2025(bus)
+            for word in WORDS['list']:
+                information.scores[word] = random.randint(0, 6)
+            information.save()
+            bus.save()
+
+    def test_survey_algorithm_small(self):
+        """
+        There are only a few people in each bus, ensure that each person has its best bus
+        """
+        # Add a few users
+        for i in range(10):
+            user = User.objects.create(username=f"user{i}")
+            registration = WEIRegistration.objects.create(
+                user=user,
+                wei=self.wei,
+                first_year=True,
+                birth_date='2000-01-01',
+            )
+            information = WEISurveyInformation2025(registration)
+            for j in range(1, 21):
+                setattr(information, f'word{j}', random.choice(WORDS['list']))
+            information.step = 20
+            information.save(registration)
+            registration.save()
+
+        # Run algorithm
+        WEISurvey2025.get_algorithm_class()().run_algorithm()
+
+        # Ensure that everyone has its first choice
+        for r in WEIRegistration.objects.filter(wei=self.wei).all():
+            survey = WEISurvey2025(r)
+            preferred_bus = survey.ordered_buses()[0][0]
+            chosen_bus = survey.information.get_selected_bus()
+            self.assertEqual(preferred_bus, chosen_bus)
+
+    def test_survey_algorithm_full(self):
+        """
+        Buses are full of first year people, ensure that they are happy
+        """
+        # Add a lot of users
+        for i in range(80):
+            user = User.objects.create(username=f"user{i}")
+            registration = WEIRegistration.objects.create(
+                user=user,
+                wei=self.wei,
+                first_year=True,
+                birth_date='2000-01-01',
+            )
+            information = WEISurveyInformation2025(registration)
+            for j in range(1, 1 + NB_WORDS):
+                setattr(information, f'word{j}', random.choice(WORDS['list']))
+            for q in WORDS['questions']:
+                setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys())))
+            information.step = len(WORDS['questions']) + 1
+            information.save(registration)
+            registration.save()
+            survey = WEISurvey2025(registration)
+
+        # Run algorithm
+        WEISurvey2025.get_algorithm_class()().run_algorithm()
+
+        penalty = 0
+        # Ensure that everyone seems to be happy
+        # We attribute a penalty for each user that didn't have its first choice
+        # The penalty is the square of the distance between the score of the preferred bus
+        # and the score of the attributed bus
+        # We consider it acceptable if the mean of this distance is lower than 5 %
+        for r in WEIRegistration.objects.filter(wei=self.wei).all():
+            survey = WEISurvey2025(r)
+            chosen_bus = survey.information.get_selected_bus()
+            buses = survey.ordered_buses()
+            self.assertIn(chosen_bus, [x[0] for x in buses])
+            score_questions, score_words = next(scores for bus, scores in buses if bus == chosen_bus)
+            max_score_questions = max(buses[i][1][0] for i in range(len(buses)))
+            max_score_words = max(buses[i][1][1] for i in range(len(buses)))
+            penalty += (max_score_words - score_words) ** 2
+            penalty += (max_score_questions - score_questions) ** 2
+        self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %
+
+        # There shouldn't be users who would prefer to switch buses
+        for r1 in WEIRegistration.objects.filter(wei=self.wei).all():
+            survey1 = WEISurvey2025(r1)
+            bus1 = survey1.information.get_selected_bus()
+            for r2 in WEIRegistration.objects.filter(wei=self.wei, pk__gt=r1.pk):
+                survey2 = WEISurvey2025(r2)
+                bus2 = survey2.information.get_selected_bus()
+
+                prefer_switch_bus_words = survey1.score_words(bus2) > survey1.score_words(bus1) and survey2.score_words(bus1) > survey2.score_words(bus2)
+                prefer_switch_bus_questions = survey1.score_questions(bus2) > survey1.score_questions(bus1) and\
+                    survey2.score_questions(bus1) > survey2.score_questions(bus2)
+                self.assertFalse(prefer_switch_bus_words and prefer_switch_bus_questions)

apps/wei/tests/test_wei_registration.py

@@ -101,7 +101,7 @@ class TestWEIRegistration(TestCase):
             user_id=self.user.id,
             wei_id=self.wei.id,
             soge_credit=True,
-            caution_check=True,
+            deposit_given=True,
             birth_date=date(2000, 1, 1),
             gender="nonbinary",
             clothing_cut="male",
@@ -121,11 +121,13 @@ class TestWEIRegistration(TestCase):
             email="gc.wei@example.com",
             membership_fee_paid=12500,
             membership_fee_unpaid=5500,
+            fee_soge_credit=2000,
             membership_start=str(self.year + 1) + "-08-01",
             membership_end=str(self.year + 1) + "-09-30",
             year=self.year + 1,
             date_start=str(self.year + 1) + "-09-01",
             date_end=str(self.year + 1) + "-09-03",
+            deposit_amount=12000,
         ))
         qs = WEIClub.objects.filter(name="Create WEI Test", year=self.year + 1)
         self.assertTrue(qs.exists())
@@ -156,10 +158,12 @@ class TestWEIRegistration(TestCase):
             email="wei-updated@example.com",
             membership_fee_paid=0,
             membership_fee_unpaid=0,
+            fee_soge_credit=0,
             membership_start="2000-08-01",
             membership_end="2000-09-30",
             date_start="2000-09-01",
             date_end="2000-09-03",
+            deposit_amount=12000,
         ))
         qs = WEIClub.objects.filter(name="Update WEI Test", id=self.wei.id)
         self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=self.wei.pk)), 302, 200)
@@ -318,6 +322,7 @@ class TestWEIRegistration(TestCase):
             bus=[],
             team=[],
             roles=[],
+            deposit_type='check'
         ))
         self.assertEqual(response.status_code, 200)
         self.assertFalse(response.context["membership_form"].is_valid())
@@ -334,7 +339,8 @@ 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")).all()],
+            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")).all()],
+            deposit_type='check'
         ))
         qs = WEIRegistration.objects.filter(user_id=user.id)
         self.assertTrue(qs.exists())
@@ -354,6 +360,7 @@ class TestWEIRegistration(TestCase):
             bus=[self.bus.id],
             team=[self.team.id],
             roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A")).all()],
+            deposit_type='check'
         ))
         self.assertEqual(response.status_code, 200)
         self.assertTrue("This user is already registered to this WEI." in str(response.context["form"].errors))
@@ -506,11 +513,12 @@ class TestWEIRegistration(TestCase):
                 team=[self.team.id],
                 roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
                 information_json=self.registration.information_json,
+                deposit_type='check'
             )
         )
         qs = WEIRegistration.objects.filter(user_id=self.user.id, soge_credit=False, clothing_size="M")
         self.assertTrue(qs.exists())
-        self.assertRedirects(response, reverse("wei:validate_registration", kwargs=dict(pk=qs.get().pk)), 302, 200)
+        self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=qs.get().wei.pk)), 302, 200)
 
         # Check the page when the registration is already validated
         membership = WEIMembership(
@@ -560,11 +568,12 @@ class TestWEIRegistration(TestCase):
                 team=[self.team.id],
                 roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
                 information_json=self.registration.information_json,
+                deposit_type='check'
             )
         )
         qs = WEIRegistration.objects.filter(user_id=self.user.id, clothing_size="L")
         self.assertTrue(qs.exists())
-        self.assertRedirects(response, reverse("wei:validate_registration", kwargs=dict(pk=qs.get().pk)), 302, 200)
+        self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=qs.get().wei.pk)), 302, 200)
 
         # Test invalid form
         response = self.client.post(
@@ -583,6 +592,7 @@ class TestWEIRegistration(TestCase):
                 team=[],
                 roles=[],
                 information_json=self.registration.information_json,
+                deposit_type='check'
             )
         )
         self.assertFalse(response.context["membership_form"].is_valid())
@@ -624,7 +634,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="GC WEI").id],
+            roles=[WEIRole.objects.get(name="Adhérent⋅e WEI").id],
             bus=self.bus.pk,
             team=second_team.pk,
             credit_type=4,  # Bank transfer
@@ -632,13 +642,14 @@ class TestWEIRegistration(TestCase):
             last_name="admin",
             first_name="admin",
             bank="Société générale",
+            deposit_given=True,
         ))
         self.assertEqual(response.status_code, 200)
         self.assertFalse(response.context["form"].is_valid())
         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="GC WEI").id],
+            roles=[WEIRole.objects.get(name="Adhérent⋅e WEI").id],
             bus=self.bus.pk,
             team=self.team.pk,
             credit_type=4,  # Bank transfer
@@ -646,8 +657,10 @@ class TestWEIRegistration(TestCase):
             last_name="admin",
             first_name="admin",
             bank="Société générale",
+            deposit_given=True,
         ))
         self.assertRedirects(response, reverse("wei:wei_registrations", kwargs=dict(pk=self.registration.wei.pk)), 302, 200)
+
         # Check if the membership is successfully created
         membership = WEIMembership.objects.filter(user_id=self.user.id, club=self.wei)
         self.assertTrue(membership.exists())
@@ -667,11 +680,7 @@ class TestWEIRegistration(TestCase):
             self.assertTrue(soge_credit.exists())
             soge_credit = soge_credit.get()
             self.assertTrue(membership.transaction in soge_credit.transactions.all())
-            self.assertTrue(kfet_membership.transaction in soge_credit.transactions.all())
-            self.assertTrue(bde_membership.transaction in soge_credit.transactions.all())
             self.assertFalse(membership.transaction.valid)
-            self.assertFalse(kfet_membership.transaction.valid)
-            self.assertFalse(bde_membership.transaction.valid)
 
         # Check that if the WEI is started, we can't update a wei
         self.wei.date_start = date(2000, 1, 1)
@@ -767,7 +776,7 @@ class TestDefaultWEISurvey(TestCase):
         WEISurvey.update_form(None, None)
 
         self.assertEqual(CurrentSurvey.get_algorithm_class().get_survey_class(), CurrentSurvey)
-        self.assertEqual(CurrentSurvey.get_year(), 2024)
+        self.assertEqual(CurrentSurvey.get_year(), 2025)
 
 
 class TestWeiAPI(TestAPI):
@@ -804,7 +813,7 @@ class TestWeiAPI(TestAPI):
             user_id=self.user.id,
             wei_id=self.wei.id,
             soge_credit=True,
-            caution_check=True,
+            deposit_given=True,
             birth_date=date(2000, 1, 1),
             gender="nonbinary",
             clothing_cut="male",

apps/wei/urls.py

@@ -4,10 +4,10 @@
 from django.urls import path
 
 from .views import CurrentWEIDetailView, WEI1AListView, WEIListView, WEICreateView, WEIDetailView, WEIUpdateView, \
-    WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, \
+    WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, BusInformationUpdateView, \
     BusCreateView, BusManageView, BusUpdateView, BusTeamCreateView, BusTeamManageView, BusTeamUpdateView, \
     WEIAttributeBus1AView, WEIAttributeBus1ANextView, WEIRegister1AView, WEIRegister2AView, WEIUpdateRegistrationView, \
-    WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView
+    WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView, WEIUpdateMembershipView
 
 app_name = 'wei'
 urlpatterns = [
@@ -42,4 +42,7 @@ urlpatterns = [
     path('detail/<int:pk>/closed/', WEIClosedView.as_view(), name="wei_closed"),
     path('bus-1A/<int:pk>/', WEIAttributeBus1AView.as_view(), name="wei_bus_1A"),
     path('bus-1A/next/<int:pk>/', WEIAttributeBus1ANextView.as_view(), name="wei_bus_1A_next"),
+    path('update-bus-info/<int:pk>/', BusInformationUpdateView.as_view(), name="update_bus_info"),
+
+    path('edit_membership/<int:pk>/', WEIUpdateMembershipView.as_view(), name="wei_update_membership"),
 ]

apps/wei/views.py

@@ -4,16 +4,18 @@
 import os
 import shutil
 import subprocess
-from datetime import date, timedelta
+from datetime import date
 from tempfile import mkdtemp
 
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
-from django.db.models import Q, Count
+from django.db.models import Q, Count, Case, When, Value, IntegerField, F
 from django.db.models.functions.text import Lower
+from django import forms
 from django.http import HttpResponse, Http404
 from django.shortcuts import redirect
 from django.template.loader import render_to_string
@@ -25,7 +27,7 @@ from django.views.generic.edit import BaseFormView, DeleteView
 from django_tables2 import SingleTableView, MultiTableMixin
 from api.viewsets import is_regex
 from member.models import Membership, Club
-from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSpecial
+from note.models import Transaction, NoteClub, Alias, SpecialTransaction
 from note.tables import HistoryTable
 from note_kfet.settings import BASE_DIR
 from permission.backends import PermissionBackend
@@ -131,6 +133,23 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
             membership=None,
             wei=club
         )
+        # Annotate the query to be able to sort registrations on validate status
+        pre_registrations = pre_registrations.annotate(
+            deposit=Case(
+                When(deposit_type='note', then=F('wei__deposit_amount')),
+                default=Value(0),
+                output_field=IntegerField()
+            )
+        ).annotate(
+            total_fee=F('fee') + F('deposit')
+        ).annotate(
+            validate_status=Case(
+                When(total_fee__gt=F('user__note__balance'), then=Value(2)),
+                When(first_year=True, then=Value(1)),
+                default=Value(0),
+                output_field=IntegerField(),
+            )
+        )
         buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request, Bus, "view")) \
             .filter(wei=self.object).annotate(count=Count("memberships")).order_by("name")
         return [club_transactions, club_member, pre_registrations, buses, ]
@@ -147,6 +166,7 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
         my_registration = WEIRegistration.objects.filter(wei=club, user=self.request.user)
         if my_registration.exists():
             my_registration = my_registration.get()
+            context["survey_complete"] = CurrentSurvey(my_registration).is_complete()
         else:
             my_registration = None
         context["my_registration"] = my_registration
@@ -194,6 +214,8 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
 
         context["not_first_year"] = WEIMembership.objects.filter(user=self.request.user).exists()
 
+        context["registration_validated"] = WEIMembership.objects.filter(registration=my_registration).exists() if my_registration else False
+
         qs = WEIMembership.objects.filter(club=club, registration__first_year=True, bus__isnull=True)
         context["can_validate_1a"] = PermissionBackend.check_perm(
             self.request, "wei.change_weimembership_bus", qs.first()) if qs.exists() else False
@@ -258,6 +280,23 @@ class WEIRegistrationsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable
 
     def get_queryset(self, **kwargs):
         qs = super().get_queryset(**kwargs).filter(wei=self.club, membership=None).distinct()
+        # Annotate the query to be able to sort registrations on validate status
+        qs = qs.annotate(
+            deposit=Case(
+                When(deposit_type='note', then=F('wei__deposit_amount')),
+                default=Value(0),
+                output_field=IntegerField()
+            )
+        ).annotate(
+            total_fee=F('fee') + F('deposit')
+        ).annotate(
+            validate_status=Case(
+                When(total_fee__gt=F('user__note__balance'), then=Value(2)),
+                When(first_year=True, then=Value(1)),
+                default=Value(0),
+                output_field=IntegerField(),
+            )
+        )
 
         pattern = self.request.GET.get("search", "")
 
@@ -441,6 +480,10 @@ class BusTeamCreateView(ProtectQuerysetMixin, ProtectedCreateView):
         self.object.refresh_from_db()
         return reverse_lazy("wei:manage_bus_team", kwargs={"pk": self.object.pk})
 
+    def get_template_names(self):
+        names = super().get_template_names()
+        return names
+
 
 class BusTeamUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     """
@@ -473,6 +516,10 @@ class BusTeamUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         self.object.refresh_from_db()
         return reverse_lazy("wei:manage_bus_team", kwargs={"pk": self.object.pk})
 
+    def get_template_names(self):
+        names = super().get_template_names()
+        return names
+
 
 class BusTeamManageView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
@@ -546,9 +593,19 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         form.fields["user"].initial = self.request.user
-        del form.fields["first_year"]
-        del form.fields["caution_check"]
-        del form.fields["information_json"]
+
+        # Cacher les champs pendant l'inscription initiale
+        if "first_year" in form.fields:
+            del form.fields["first_year"]
+        if "deposit_given" in form.fields:
+            del form.fields["deposit_given"]
+        if "information_json" in form.fields:
+            del form.fields["information_json"]
+        if "deposit_type" in form.fields:
+            del form.fields["deposit_type"]
+
+        if "soge_credit" in form.fields:
+            form.fields["soge_credit"].help_text = _('Check if you will open a Société Générale account')
         return form
 
     @transaction.atomic
@@ -640,13 +697,26 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         form.fields["user"].initial = self.request.user
+        if "soge_credit" in form.fields:
+            form.fields["soge_credit"].help_text = _('Check if you will open a Société Générale account')
+
         if "myself" in self.request.path and self.request.user.profile.soge:
             form.fields["soge_credit"].disabled = True
             form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
 
-        del form.fields["caution_check"]
-        del form.fields["first_year"]
-        del form.fields["information_json"]
+        # Cacher les champs pendant l'inscription initiale
+        if "first_year" in form.fields:
+            del form.fields["first_year"]
+        if "deposit_given" in form.fields:
+            del form.fields["deposit_given"]
+        if "information_json" in form.fields:
+            del form.fields["information_json"]
+
+        # S'assurer que le champ deposit_type est obligatoire
+        if "deposit_type" in form.fields:
+            form.fields["deposit_type"].required = True
+            form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
+            form.fields["deposit_type"].widget = forms.RadioSelect(choices=form.fields["deposit_type"].choices)
 
         return form
 
@@ -673,6 +743,9 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
         information["preferred_roles_pk"] = [role.pk for role in choose_bus_form.cleaned_data["roles"]]
         information["preferred_roles_name"] = [role.name for role in choose_bus_form.cleaned_data["roles"]]
         form.instance.information = information
+
+        # Sauvegarder le type de caution
+        form.instance.deposit_type = form.cleaned_data["deposit_type"]
         form.instance.save()
 
         if 'treasury' in settings.INSTALLED_APPS:
@@ -702,6 +775,7 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
         # We can't update a registration once the WEI is started and before the membership start date
         if today >= wei.date_start or today < wei.membership_start:
             return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
+        # Store the validate parameter in the view's state
         return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
@@ -727,23 +801,37 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
             choose_bus_form.fields["team"].queryset = BusTeam.objects.filter(bus__wei=context["club"])
             context["membership_form"] = choose_bus_form
 
-        if not self.object.soge_credit and self.object.user.profile.soge:
-            form = context["form"]
-            form.fields["soge_credit"].disabled = True
-            form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
-
         return context
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         form.fields["user"].disabled = True
         # The auto-json-format may cause issues with the default field remove
-        if not PermissionBackend.check_perm(self.request, 'wei.change_weiregistration_information_json', self.object):
+        if "information_json" in form.fields:
             del form.fields["information_json"]
+        # Masquer le champ deposit_given pour tout le monde dans le formulaire de modification
+        if "deposit_given" in form.fields:
+            form.fields["deposit_given"].help_text = _("Tick if the deposit check has been given")
+            if self.object.first_year or self.object.deposit_type == 'note':
+                del form.fields["deposit_given"]
+
+        # S'assurer que le champ deposit_type est obligatoire pour les 2A+
+        if "deposit_type" in form.fields:
+            if self.object.first_year:
+                del form.fields["deposit_type"]
+            else:
+                form.fields["deposit_type"].required = True
+                form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
+
+        if self.object.user.profile.soge:
+            form.fields["soge_credit"].disabled = True
+            form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
+
         return form
 
     def get_membership_form(self, data=None, instance=None):
-        membership_form = WEIMembershipForm(data if data else None, instance=instance)
+        registration = self.get_object()
+        membership_form = WEIMembershipForm(data if data else None, instance=instance, wei=registration.wei)
         del membership_form.fields["credit_type"]
         del membership_form.fields["credit_amount"]
         del membership_form.fields["first_name"]
@@ -759,10 +847,30 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
     def form_valid(self, form):
         # If the membership is already validated, then we update the bus and the team (and the roles)
         if form.instance.is_validated:
-            membership_form = self.get_membership_form(self.request.POST, form.instance.membership)
-            if not membership_form.is_valid():
+            try:
+                membership = form.instance.membership
+                if membership is None:
+                    raise ValueError(_("No membership found for this registration"))
+
+                membership_form = self.get_membership_form(self.request.POST, instance=membership)
+                if not membership_form.is_valid():
+                    return self.form_invalid(form)
+
+                # Vérifier que l'utilisateur a la permission de modifier le membership
+                # On vérifie d'abord si l'utilisateur a la permission générale de modification
+                if not self.request.user.has_perm("wei.change_weimembership"):
+                    raise PermissionDenied(_("You don't have the permission to update memberships"))
+
+                # On vérifie ensuite les permissions spécifiques pour chaque champ modifié
+                for field_name in membership_form.changed_data:
+                    perm = f"wei.change_weimembership_{field_name}"
+                    if not self.request.user.has_perm(perm):
+                        raise PermissionDenied(_("You don't have the permission to update the field %(field)s") % {'field': field_name})
+
+                membership_form.save()
+            except (WEIMembership.DoesNotExist, ValueError, PermissionDenied) as e:
+                form.add_error(None, str(e))
                 return self.form_invalid(form)
-            membership_form.save()
         # If it is not validated and if this is an old member, then we update the choices
         elif not form.instance.first_year and PermissionBackend.check_perm(
                 self.request, "wei.change_weiregistration_information_json", self.object):
@@ -777,6 +885,9 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
             information["preferred_roles_pk"] = [role.pk for role in choose_bus_form.cleaned_data["roles"]]
             information["preferred_roles_name"] = [role.name for role in choose_bus_form.cleaned_data["roles"]]
             form.instance.information = information
+
+            if "deposit_type" in form.cleaned_data:
+                form.instance.deposit_type = form.cleaned_data["deposit_type"]
             form.instance.save()
 
         return super().form_valid(form)
@@ -787,15 +898,6 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
             survey = CurrentSurvey(self.object)
             if not survey.is_complete():
                 return reverse_lazy("wei:wei_survey", kwargs={"pk": self.object.pk})
-        if PermissionBackend.check_perm(self.request, "wei.add_weimembership", WEIMembership(
-            club=self.object.wei,
-            user=self.object.user,
-            date_start=date.today(),
-            date_end=date.today(),
-            fee=0,
-            registration=self.object,
-        )):
-            return reverse_lazy("wei:validate_registration", kwargs={"pk": self.object.pk})
         return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.wei.pk})
 
 
@@ -836,18 +938,23 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
     extra_context = {"title": _("Validate WEI registration")}
 
     def get_sample_object(self):
+        """
+        Return a sample object for permission checking
+        """
         registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
         return WEIMembership(
-            club=registration.wei,
             user=registration.user,
-            date_start=date.today(),
-            date_end=date.today() + timedelta(days=1),
-            fee=0,
+            club=registration.wei,
+            date_start=registration.wei.date_start,
+            fee=registration.wei.membership_fee_paid if registration.user.profile.paid else registration.wei.membership_fee_unpaid,
+            # Add any fields needed for proper permission checking
             registration=registration,
         )
 
     def dispatch(self, request, *args, **kwargs):
-        wei = WEIRegistration.objects.get(pk=self.kwargs["pk"]).wei
+        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
+
+        wei = registration.wei
         today = date.today()
         # We can't validate anyone once the WEI is started and before the membership start date
         if today >= wei.date_start or today < wei.membership_start:
@@ -878,39 +985,61 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
             date_start__gte=bde.membership_start,
         ).exists()
 
-        context["fee"] = registration.fee
+        fee = registration.fee
+        context["fee"] = fee
+
+        # Calculer le montant total nécessaire (frais + caution si transaction)
+        total_needed = fee
+        if registration.deposit_type == 'note':
+            total_needed += registration.wei.deposit_amount
+        context["total_needed"] = total_needed
 
         form = context["form"]
         if registration.soge_credit:
-            form.fields["credit_amount"].initial = registration.fee
+            form.fields["credit_amount"].initial = fee
         else:
-            form.fields["credit_amount"].initial = max(0, registration.fee - registration.user.note.balance)
+            form.fields["credit_amount"].initial = max(0, fee - registration.user.note.balance)
 
         return context
 
     def get_form_class(self):
         registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
-        if registration.first_year and 'sleected_bus_pk' not in registration.information:
+        if registration.first_year and 'selected_bus_pk' not in registration.information:
             return WEIMembership1AForm
         return WEIMembershipForm
 
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
+        wei = registration.wei
+        kwargs['wei'] = wei
+        return kwargs
+
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
         form.fields["last_name"].initial = registration.user.last_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:
-            form.fields["credit_type"].disabled = True
-            form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire")
-            form.fields["credit_amount"].disabled = True
-            form.fields["last_name"].disabled = True
-            form.fields["first_name"].disabled = True
-            form.fields["bank"].disabled = True
-            form.fields["bank"].initial = "Société générale"
+        # Ajouter le champ deposit_given uniquement pour les non-première année et le rendre obligatoire
+        if not registration.first_year:
+            if registration.deposit_type == 'check':
+                form.fields["deposit_given"] = forms.BooleanField(
+                    required=True,
+                    disabled=True,
+                    initial=registration.deposit_given,
+                    label=_("Deposit check given"),
+                    help_text=_("Only treasurers can validate this field")
+                )
+            else:
+                form.fields["deposit_given"] = forms.BooleanField(
+                    required=True,
+                    initial=False,
+                    label=_("Create deposit transaction"),
+                    help_text=_("A transaction of %(amount).2f€ will be created from the user's Note account") % {
+                        'amount': registration.wei.deposit_amount / 100
+                    }
+                )
 
         if 'bus' in form.fields:
             # For 2A+ and hardcoded 1A
@@ -944,8 +1073,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         club = registration.wei
         user = registration.user
 
-        if "caution_check" in form.data:
-            registration.caution_check = form.data["caution_check"] == "on"
+        if "deposit_given" in form.data:
+            registration.deposit_given = form.data["deposit_given"] == "on"
             registration.save()
         membership = form.instance
         membership.user = user
@@ -956,6 +1085,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         membership._force_renew_parent = True
 
         fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
+        if registration.soge_credit:
+            fee = registration.wei.fee_soge_credit
 
         kfet = club.parent_club
         bde = kfet.parent_club
@@ -982,23 +1113,33 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         first_name = form.cleaned_data["first_name"]
         bank = form.cleaned_data["bank"]
 
-        if credit_type is None or registration.soge_credit:
+        if credit_type is None:
             credit_amount = 0
 
-        if not registration.soge_credit and user.note.balance + credit_amount < fee:
-            # Users must have money before registering to the WEI.
+        # Calculer le montant total nécessaire (frais + caution si transaction)
+        total_needed = fee
+        if registration.deposit_type == 'note':
+            total_needed += club.deposit_amount
+
+        # Vérifier que l'utilisateur a assez d'argent pour tout payer
+        if user.note.balance + credit_amount < total_needed:
             form.add_error('credit_type',
-                           _("This user don't have enough money to join this club, and can't have a negative balance."))
-            return super().form_invalid(form)
+                           _("This user doesn't have enough money to join this club and pay the deposit. "
+                               "Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€") % {
+                               'balance': user.note.balance,
+                               'credit': credit_amount,
+                               'needed': total_needed}
+                           )
+            return self.form_invalid(form)
 
         if credit_amount:
             if not last_name:
                 form.add_error('last_name', _("This field is required."))
-                return super().form_invalid(form)
+                return self.form_invalid(form)
 
             if not first_name:
                 form.add_error('first_name', _("This field is required."))
-                return super().form_invalid(form)
+                return self.form_invalid(form)
 
             # Credit note before adding the membership
             SpecialTransaction.objects.create(
@@ -1028,13 +1169,74 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         membership.refresh_from_db()
         membership.roles.add(WEIRole.objects.get(name="Adhérent⋅e WEI"))
 
+        # Créer la transaction de caution si nécessaire
+        if registration.deposit_type == 'note':
+            from note.models import Transaction
+            Transaction.objects.create(
+                source=user.note,
+                destination=club.note,
+                quantity=1,
+                amount=club.deposit_amount,
+                reason=_("Deposit %(name)s") % {'name': club.name},
+                valid=True,
+            )
+
         return super().form_valid(form)
 
+    def form_invalid(self, form):
+        registration = getattr(form.instance, "registration", None)
+        if registration is not None:
+            registration.deposit_given = False
+            registration.save()
+        return super().form_invalid(form)
+
     def get_success_url(self):
         self.object.refresh_from_db()
         return reverse_lazy("wei:wei_registrations", kwargs={"pk": self.object.club.pk})
 
 
+class WEIUpdateMembershipView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
+    """
+    Update a membership for the WEI
+    """
+    model = WEIMembership
+    context_object_name = "membership"
+    template_name = "wei/weimembership_update.html"
+    extra_context = {"title": _("Update WEI Membership")}
+
+    def dispatch(self, request, *args, **kwargs):
+        wei = self.get_object().registration.wei
+        today = date.today()
+        # We can't update a registration once the WEI is started and before the membership start date
+        if today >= wei.date_start or today < wei.membership_start:
+            return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
+        # Store the validate parameter in the view's state
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_form(self):
+        form = WEIMembershipForm(
+            self.request.POST or None,
+            self.request.FILES or None,
+            instance=self.object,
+            wei=self.object.registration.wei,
+        )
+
+        form.fields["roles"].initial = self.object.roles.all()
+        form.fields["bus"].initial = self.object.bus
+        form.fields["team"].initial = self.object.team
+
+        del form.fields["credit_type"]
+        del form.fields["credit_amount"]
+        del form.fields["first_name"]
+        del form.fields["last_name"]
+        del form.fields["bank"]
+
+        return form
+
+    def get_success_url(self):
+        return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.registration.wei.pk})
+
+
 class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
     """
     Display the survey for the WEI for first year members.
@@ -1057,6 +1259,10 @@ class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
 
         if not self.survey:
             self.survey = CurrentSurvey(obj)
+
+        if request.GET.get("reset") == "true":
+            info = self.survey.information
+            info.reset(obj)
         # If the survey is complete, then display the end page.
         if self.survey.is_complete():
             return redirect(reverse_lazy('wei:wei_survey_end', args=(self.survey.registration.pk,)))
@@ -1247,6 +1453,7 @@ class WEI1AListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableView):
     def get_queryset(self, filter_permissions=True, **kwargs):
         qs = super().get_queryset(filter_permissions, **kwargs)
         qs = qs.filter(first_year=True, membership__isnull=False)
+        qs = qs.filter(wei=self.club)
         qs = qs.order_by('-membership__bus')
         return qs
 
@@ -1289,8 +1496,48 @@ class WEIAttributeBus1ANextView(LoginRequiredMixin, RedirectView):
         if not wei.exists():
             raise Http404
         wei = wei.get()
-        qs = WEIRegistration.objects.filter(wei=wei, membership__isnull=False, membership__bus__isnull=True)
-        qs = qs.filter(information_json__contains='selected_bus_pk')  # not perfect, but works...
-        if qs.exists():
-            return reverse_lazy('wei:wei_bus_1A', args=(qs.first().pk, ))
-        return reverse_lazy('wei:wei_1A_list', args=(wei.pk, ))
+
+        # On cherche d'abord les 1A qui ont une inscription validée (membership) mais pas de bus
+        qs = WEIRegistration.objects.filter(
+            wei=wei,
+            first_year=True,
+            membership__isnull=False,
+            membership__bus__isnull=True
+        )
+
+        # Parmi eux, on prend ceux qui ont répondu au questionnaire (ont un bus préféré)
+        qs = qs.filter(information_json__contains='selected_bus_pk')
+
+        if not qs.exists():
+            # Si on ne trouve personne, on affiche un message et on retourne à la liste
+            messages.info(self.request, _("No first year student without a bus found. Either all of them have a bus, or none has filled the survey yet."))
+            return reverse_lazy('wei:wei_1A_list', args=(wei.pk,))
+
+        # On redirige vers la page d'attribution pour le premier étudiant trouvé
+        return reverse_lazy('wei:wei_bus_1A', args=(qs.first().pk,))
+
+
+class BusInformationUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
+    model = Bus
+
+    def get_form_class(self):
+        return CurrentSurvey.get_algorithm_class().get_bus_information_form()
+
+    def dispatch(self, request, *args, **kwargs):
+        wei = self.get_object().wei
+        today = date.today()
+        # We can't update a bus once the WEI is started
+        if today >= wei.date_start:
+            return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
+        return super().dispatch(request, *args, **kwargs)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["club"] = self.object.wei
+        context["information"] = CurrentSurvey.get_algorithm_class().get_bus_information(self.object)
+        self.object.save()
+        return context
+
+    def get_success_url(self):
+        self.object.refresh_from_db()
+        return reverse_lazy("wei:manage_bus", kwargs={"pk": self.object.pk})

docs/scripts.rst

@@ -136,7 +136,7 @@ de diffusion utiles.
    Faîtes attention, donc où la sortie est stockée.
 
 
-Il prend 2 options :
+Il prend 4 options :
 
 * ``--type``, qui prend en argument ``members`` (défaut), ``clubs``, ``events``, ``art``,
   ``sport``, qui permet respectivement de sortir la liste des adresses mails des adhérent⋅es
@@ -149,7 +149,10 @@ Il prend 2 options :
   pour la ML Adhérents, pour exporter les mails des adhérents au BDE pendant n'importe 
   laquelle des ``n+1`` dernières années. 
 
-Le script sort sur la sortie standard la liste des adresses mails à inscrire.
+* ``--email``, qui prend en argument une chaine de caractère contenant une adresse email.
+  
+Si aucun email n'est renseigné, le script sort sur la sortie standard la liste des adresses mails à inscrire.
+Dans le cas contraire, la liste est envoyée à l'adresse passée en argument.
 
 Attention : il y a parfois certains cas particuliers à prendre en compte, il n'est
 malheureusement pas aussi simple que de simplement supposer que ces listes sont exhaustives.