Merge branch 'qrcode' into 'main'

Draft: Qrcode

See merge request bde/nk20!196

.env_example

@@ -21,6 +21,3 @@ EMAIL_PASSWORD=CHANGE_ME
 # Wiki configuration
 WIKI_USER=NoteKfet2020
 WIKI_PASSWORD=
-
-# OIDC
-OIDC_RSA_PRIVATE_KEY=CHANGE_ME

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 # Ubuntu 22.04
-py310-django52:
+py310-django42:
   stage: test
   image: ubuntu:22.04
   before_script:
@@ -22,10 +22,10 @@ py310-django52:
         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-django52
+  script: tox -e py310-django42
 
 # Debian Bookworm
-py311-django52:
+py311-django42:
   stage: test
   image: debian:bookworm
   before_script:
@@ -37,7 +37,7 @@ py311-django52:
         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-django52
+  script: tox -e py311-django42
 
 linters:
   stage: quality-assurance

README.md

@@ -61,8 +61,8 @@ Bien que cela permette de créer une instance sur toutes les distributions,
 6. (Optionnel) **Création d'une clé privée OpenID Connect**
 
 Pour activer le support d'OpenID Connect, il faut générer une clé privée, par
-exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et copier la clé dans .env dans le champ
-`OIDC_RSA_PRIVATE_KEY`.
+exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner son
+emplacement dans `OIDC_RSA_PRIVATE_KEY` (par défaut `/var/secrets/oidc.key`).
 
 7.  Enjoy :
 
@@ -237,8 +237,8 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
 7. **Création d'une clé privée OpenID Connect**
 
 Pour activer le support d'OpenID Connect, il faut générer une clé privée, par
-exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner le champ
-`OIDC_RSA_PRIVATE_KEY` dans le .env (par défaut `/var/secrets/oidc.key`).
+exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner son
+emplacement dans `OIDC_RSA_PRIVATE_KEY` (par défaut `/var/secrets/oidc.key`).
 
 8.  *Enjoy \o/*
 

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/api/urls.py

@@ -19,10 +19,6 @@ 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

@@ -1,46 +0,0 @@
-# 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

@@ -1,20 +0,0 @@
-# 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

@@ -1,88 +0,0 @@
-# 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 rest_framework.filters import SearchFilter
-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, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-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, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-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, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-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, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-class BatchAchievementsAPIView(APIView):
-    permission_classes = [IsAuthenticated]
-
-    def post(self, request, format=None):
-        print("POST de la view spéciale")
-        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)
-
-        for family in families:
-            for challenge in challenges:
-                a = Achievement(family=family, challenge=challenge)
-                a.save(update_score=False)
-
-        for family in families:
-            family.update_score()
-        Family.update_ranking()
-
-        return Response({'status': 'ok'}, status=status.HTTP_201_CREATED)

apps/family/apps.py

@@ -1,11 +0,0 @@
-# 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

@@ -1,44 +0,0 @@
-# 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

@@ -1,73 +0,0 @@
-# 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

@@ -1,18 +0,0 @@
-# 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/models.py

@@ -1,207 +0,0 @@
-# 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.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 update_score(self, *args, **kwargs):
-        challenge_set = Challenge.objects.select_for_update().filter(achievement__family=self)
-        points_sum = challenge_set.aggregate(models.Sum("points"))
-        self.score = points_sum["points__sum"]
-        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=_('members'),
-        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'),
-    )
-
-    obtained = models.PositiveIntegerField(
-        verbose_name=_('obtained'),
-        default=0,
-    )
-
-    @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')
-
-    def __str__(self):
-        return self.name
-
-
-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,
-    )
-
-    class Meta:
-        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)
-        is_new = self.pk is None
-
-        super().save(*args, **kwargs)
-
-        if update_score:
-            self.family.refresh_from_db()
-            self.family.update_score()
-
-        # Count only when getting a new achievement
-        if is_new:
-            self.challenge.refresh_from_db()
-            self.challenge.obtained += 1
-            self.challenge._force_save = True
-            self.challenge.save()
-
-    @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()
-
-        self.challenge.refresh_from_db()
-        self.challenge.obtained -= 1
-        self.challenge._force_save = True
-        self.challenge.save()

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

@@ -1,449 +0,0 @@
-// 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')
-  })
-
- 
-  // Ensure we begin in single consumption. Fix issue with TurboLinks and BootstrapJS
-
-
-  document.getElementById("consume_all").addEventListener('click', consumeAll)
-})
-
-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) {
-      b.quantity += 1
-      challenge = b
-    }
-  })
-  if (challenge == null) {
-    challenge = {
-      id: id,
-      name: name,
-      quantity: 1,
-      amount: amount,
-    }
-    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 +
-                '<span class="badge badge-dark badge-pill">' + challenge.quantity + '</span>')
-    })
-    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 () {
-  console.log("reset lancée")
-  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 () {
-      reset()
-      addMsg("Défis validés pour les familles !", 'success', 5000)
-    },
-    error: function (e) {
-      reset()
-      addMsg("Erreur lors de la création des achievements.",'danger',5000)
-    }
-  })
-}
-
-/**
- * Create a new achievement through the API.
- * @param family The selected family
- * @param challenge The selected challenge
- */
-function grantAchievement (family, challenge) {
-  console.log("grant lancée",family,challenge)
-  $.post('/api/family/achievement/',
-    {
-      csrfmiddlewaretoken: CSRF_TOKEN,
-      family: family.id,
-      challenge: challenge.id,
-    })
-    .done(function () {
-      reset()
-      addMsg("Défi validé pour la famille !", 'success', 5000)
-    })
-    .fail(function (e) {
-      reset()
-      if (e.responseJSON) {
-        errMsg(e.responseJSON)
-      } else if (e.responseText) {
-        errMsg(e.responseText)
-      } else {
-        errMsg("Erreur inconnue lors de la création de l'achievement.")
-      }
-    })
-}
-
-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)
-  console.log("autoCompleteFamily commence")
-  // 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) {
-                d.quantity += 1
-                disp = d
-              }
-            })
-            if (disp == null) {
-              disp = {
-                name: family.name,
-                id: family.id,
-                family: family,
-                quantity: 1
-              }
-              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 +
-                                '<span class="badge badge-dark badge-pill">' +
-                                disp.quantity + '</span>',
-                '')
-            })
-
-            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) {
-      if (disp.quantity > 1 || disp.id !== d.id) {
-        disp.quantity -= disp.id === d.id ? 1 : 0
-        new_families_display.push(disp)
-        html += li(family_prefix + '_' + disp.id, disp.name +
-          '<span class="badge badge-dark badge-pill">' + disp.quantity + '</span>')
-      }
-    })
-
-    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

@@ -1,105 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import django_tables2 as tables
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
-from django_tables2 import A
-
-from .models import Family, Challenge, FamilyMembership, Achievement
-
-
-class FamilyTable(tables.Table):
-    """
-    List all families
-    """
-    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
-    """
-    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.
-    """
-    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.
-    """
-    delete = tables.LinkColumn(
-        'family:achievement_delete',
-        args=[A('id')],
-        verbose_name=_("Delete"),
-        text=_("Delete"),
-        orderable=False,
-        attrs={
-            'th': {
-                'id': 'delete-membership-header'
-            },
-            'a': {
-                'class': 'btn btn-danger',
-                'data-type': 'delete-membership'
-            }
-        },
-    )
-
-    class Meta:
-        attrs = {
-            'class': 'table table-condensed table-striped table-hover'
-        }
-        model = Achievement
-        fields = ('family', 'challenge', 'challenge__points', 'obtained_at', )
-        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.
-    """
-    class Meta:
-        model = Achievement
-        template_name = 'django_tables2/bootstrap4.html'
-        fields = ('challenge', 'challenge__points', 'obtained_at',)
-        attrs = {
-            'class': 'table table-condensed table-striped table-hover'
-        }
-        order_by = ('-obtained_at',)

apps/family/templates/family/achievement_confirm_delete.html

@@ -1,27 +0,0 @@
-{% 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>
-                {% if not object.locked %}
-                    <button class="btn btn-danger" type="submit">{% trans "Delete" %}</button>
-                {% endif %}
-            </form>
-        </div>
-    </div>
-{% endblock %}

apps/family/templates/family/achievement_list.html

@@ -1,22 +0,0 @@
-{% 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 "Recent 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 table %}
-</div>
-
-{% endblock %}

apps/family/templates/family/add_member.html

@@ -1,60 +0,0 @@
-{% 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

@@ -1,52 +0,0 @@
-{% 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

@@ -1,36 +0,0 @@
-{% 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

@@ -1,21 +0,0 @@
-{% 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

@@ -1,40 +0,0 @@
-{% 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>
-            <a href="{% url "family:manage" %}" class="btn btn-sm btn-outline-primary">
-                {% trans "Manage" %}
-            </a>
-        </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

@@ -1,25 +0,0 @@
-{% 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 %}
-<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>
-
-<div class="card">
-    <div class="card-header position-relative">
-        <i class="fa fa-trophy"></i> {% trans "Completed challenges" %}
-    </div>
-    {% render_table achievement_list %}
-</div>
-{% endblock %}

apps/family/templates/family/family_form.html

@@ -1,21 +0,0 @@
-{% 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

@@ -1,15 +0,0 @@
-{% 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

@@ -1,41 +0,0 @@
-{% 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>
-            <a href="{% url "family:manage" %}" class="btn btn-sm btn-outline-primary">
-                {% trans "Manage" %}
-            </a>
-        </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

@@ -1,181 +0,0 @@
-{% 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">
-        <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" placeholder="{% trans "Name" %}" type="text" id="note" autofocus />
-                    </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>
-
-        {# Create family/challenge buttons #}
-        <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:add_family" %}">
-                {% trans "Add a family" %}
-            </a>
-            {% endif %}
-            {% if can_add_challenge %}
-            <a class="btn btn-sm btn-primary mx-2" href="{% url "family:add_challenge" %}">
-                {% trans "Add a challenge" %}
-            </a>
-            {% endif %}
-        </div>
-        </div>
-    </div>
-
-    {# Buttons column #}
-    <div class="col">
-        <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>
-    </div>
-</div>
-
-{# transaction history #}
-    <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_list">
-            {% render_table table %}
-        </div>
-    </div>
-{% 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>
-{% endblock %}

apps/family/templates/family/picture_update.html

@@ -1,118 +0,0 @@
-{% 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/urls.py

@@ -1,24 +0,0 @@
-# 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('add-family/', views.FamilyCreateView.as_view(), name="add_family"),
-    path('detail/<int:pk>/', views.FamilyDetailView.as_view(), name="family_detail"),
-    path('update/<int:pk>/', views.FamilyUpdateView.as_view(), name="family_update"),
-    path('update_pic/<int:pk>/', views.FamilyPictureUpdateView.as_view(), name="update_pic"),
-    path('add_member/<int:family_pk>/', views.FamilyAddMemberView.as_view(), name="family_add_member"),
-    path('challenge/list/', views.ChallengeListView.as_view(), name="challenge_list"),
-    path('add-challenge/', views.ChallengeCreateView.as_view(), name="add_challenge"),
-    path('challenge/detail/<int:pk>/', views.ChallengeDetailView.as_view(), name="challenge_detail"),
-    path('challenge/update/<int:pk>/', views.ChallengeUpdateView.as_view(), name="challenge_update"),
-    path('manage/', views.FamilyManageView.as_view(), name="manage"),
-    path('achievements/', views.AchievementsView.as_view(), name="achievement_list"),
-    path('achievement/delete/<int:pk>/', views.AchievementDeleteView.as_view(), name="achievement_delete"),
-    path('api/family/', include('family.api.urls')),
-]

apps/family/views.py

@@ -1,316 +0,0 @@
-# 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.contrib.auth.mixins import LoginRequiredMixin
-from django.db import transaction
-from django.views.generic import DetailView, UpdateView
-from django.views.generic.edit import DeleteView
-from django.utils.translation import gettext_lazy as _
-from django_tables2 import SingleTableView
-from permission.backends import PermissionBackend
-from permission.views import ProtectQuerysetMixin, ProtectedCreateView
-from django.urls import reverse_lazy
-from member.views import PictureUpdateView
-
-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')}
-
-
-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(PictureUpdateView):
-    """
-    Update profile picture of the family
-    """
-    model = Family
-    extra_context = {"title": _("Update family picture")}
-    template_name = 'family/picture_update.html'
-
-    def get_success_url(self):
-        """Redirect to family page after upload"""
-        return reverse_lazy('family:family_detail', kwargs={'pk': self.object.id})
-
-    @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)
-
-
-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')}
-
-
-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()
-
-        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.check_perm(self.request, "family.add_family")
-        context["can_add_challenge"] = PermissionBackend.check_perm(self.request, "family.add_challenge")
-
-        return context
-
-    def get_table(self, **kwargs):
-        table = super().get_table(**kwargs)
-        table.exclude = ('delete',)
-        table.orderable = False
-        return table
-
-
-class AchievementsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
-    """
-    List all achievements
-    """
-    model = Achievement
-    table_class = AchievementTable
-    extra_context = {'title': _('Achievement list')}
-
-    def get_table(self, **kwargs):
-        table = super().get_table(**kwargs)
-        table.orderable = True
-        return table
-
-
-class AchievementDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView):
-    """
-    Delete an Achievement
-    """
-    model = Achievement
-
-    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(), Food, "change")).exclude(pk=pk)
+        ).filter(PermissionBackend.filter_queryset(get_current_request(), TransformedFood, "change")).exclude(pk=pk)
 
     class Meta:
         model = TransformedFood

apps/food/templates/food/food_detail.html

@@ -12,21 +12,18 @@ 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 %}
@@ -34,23 +31,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,52 +7,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% load i18n %}
 
 {% block content %}
-<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>
+{{ block.super }}
 <br>
 <div class="card bg-light mb-3">
   <h3 class="card-header text-center">
@@ -113,20 +68,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
   {% endfor %}
   {% endif %}
 </div>
-
-
-<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 %}
+{% endblock %}

apps/food/urls.py

@@ -18,5 +18,4 @@ 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,7 +10,6 @@ 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 _
@@ -455,8 +454,6 @@ 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"))
@@ -510,14 +507,3 @@ 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/models.py

@@ -438,6 +438,8 @@ 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()
@@ -456,6 +458,8 @@ 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()
@@ -467,6 +471,8 @@ 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/templates/member/includes/profile_info.html

@@ -60,7 +60,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.post(reverse("logout"))
+        response = self.client.get(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

@@ -402,6 +402,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, basename='alias2')
+    router.register(path + '/consumer', ConsumerViewSet)
 
     router.register(path + '/transaction/category', TemplateCategoryViewSet)
     router.register(path + '/transaction/transaction', TransactionViewSet)

apps/permission/fixtures/initial.json

@@ -1695,7 +1695,7 @@
                 "wei",
                 "weimembership"
             ],
-            "query": "{\"club\": [\"club\"]}",
+            "query": "[\"AND\", {\"club\": [\"club\"], \"club__weiclub__membership_end__gte\": [\"today\"]}, [\"OR\", {\"registration__soge_credit\": true}, {\"user__note__balance__gte\": {\"F\": [\"F\", \"fee\"]}}]]",
             "type": "add",
             "mask": 2,
             "field": "",
@@ -3998,358 +3998,6 @@
             "description": "Créer une transaction de ou vers la note d'un club tant que la source reste au dessus de -50 €"
         }
     },
-    {
-        "model": "permission.permission",
-        "pk": 271,
-        "fields": {
-            "model": [
-                "wei",
-                "bus"
-            ],
-            "query": "{\"wei\": [\"club\"]}",
-            "type": "change",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Modifier n'importe quel bus du wei"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 272,
-        "fields": {
-            "model": [
-                "wei",
-                "bus"
-            ],
-            "query": "{\"wei\": [\"club\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir tous les bus du wei"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 273,
-        "fields": {
-            "model": [
-                "wei",
-                "busteam"
-            ],
-            "query": "{\"bus__wei\": [\"club\"], \"bus__wei__membership_end__gte\": [\"today\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir toutes les équipes WEI"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 274,
-        "fields": {
-            "model": [
-                "member",
-                "club"
-            ],
-            "query": "{\"bus__wei\": [\"club\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir les informations de clubs des bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 275,
-        "fields": {
-            "model": [
-                "member",
-                "club"
-            ],
-            "query": "{\"bus__wei\": [\"club\"]}",
-            "type": "change",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Modifier les clubs des bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 276,
-        "fields": {
-            "model": [
-                "member",
-                "membership"
-            ],
-            "query": "{\"club__bus__wei\": [\"club\"]}",
-            "type": "add",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Ajouter un⋅e membre à un club de bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 277,
-        "fields": {
-            "model": [
-                "member",
-                "membership"
-            ],
-            "query": "{\"club__bus__wei\": [\"club\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir les adhérents d'un club de bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 278,
-        "fields": {
-            "model": [
-                "member",
-                "membership"
-            ],
-            "query": "{\"club__bus__wei\": [\"club\"]}",
-            "type": "change",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Modifier l'adhésion d'un club de bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 279,
-        "fields": {
-            "model": [
-                "note",
-                "note"
-            ],
-            "query": "{\"noteclub__club__bus__wei\": [\"club\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir la note d'un club de bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 280,
-        "fields": {
-            "model": [
-                "note",
-                "transaction"
-            ],
-            "query": "[\"OR\", {\"source__noteclub__club__bus__wei\": [\"club\"]}, {\"destination__noteclub__club__bus__wei\": [\"club\"]}]",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir les transactions d'un club de bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 281,
-        "fields": {
-            "model": [
-                "note",
-                "transaction"
-            ],
-            "query": "[\"AND\", [\"OR\", {\"source__noteclub__club__bus__wei\": [\"club\"]}, {\"destination__noteclub__club__bus__wei\": [\"club\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]]",
-            "type": "add",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Créer une transaction d'un club de bus tant que la source reste au dessus de -20 €"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 282,
-        "fields": {
-            "model": [
-                "note",
-                "transaction"
-            ],
-            "query": "[\"AND\", [\"OR\", {\"source__noteclub__club\": [\"club\"]}, {\"destination__noteclub__club\": [\"club\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]]",
-            "type": "add",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Créer une transaction d'un WEI tant que la source reste au dessus de -20 €"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 283,
-        "fields": {
-            "model": [
-                "auth",
-                "user"
-            ],
-            "query": "{\"memberships__club__name\": \"Kfet\", \"memberships__roles__name\": \"Adh\u00e9rent\u22c5e Kfet\", \"memberships__date_start__lte\": [\"today\"], \"memberships__date_end__gte\": [\"today\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir n'importe quel⋅le utilisateur⋅rice qui est adhérent⋅e Kfet"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 284,
-        "fields": {
-            "model": [
-                "member",
-                "club"
-            ],
-            "query": "{\"bus\":  [\"membership\", \"weimembership\", \"bus\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir les informations de club de son bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 285,
-        "fields": {
-            "model": [
-                "member",
-                "club"
-            ],
-            "query": "{\"bus\": [\"membership\", \"weimembership\", \"bus\"]}",
-            "type": "change",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Modifier le club de son bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 286,
-        "fields": {
-            "model": [
-                "member",
-                "membership"
-            ],
-            "query": "{\"club__bus\": [\"membership\", \"weimembership\", \"bus\"]}",
-            "type": "add",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Ajouter un⋅e membre au club de son bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 287,
-        "fields": {
-            "model": [
-                "member",
-                "membership"
-            ],
-            "query": "{\"club__bus\": [\"membership\", \"weimembership\", \"bus\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir les adhérents du club de son bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 288,
-        "fields": {
-            "model": [
-                "member",
-                "membership"
-            ],
-            "query": "{\"club__bus\": [\"membership\", \"weimembership\", \"bus\"]}",
-            "type": "change",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Modifier l'adhésion au club de son bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 289,
-        "fields": {
-            "model": [
-                "note",
-                "note"
-            ],
-            "query": "{\"noteclub__club__bus\": [\"membership\", \"weimembership\", \"bus\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir la note du club de son bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 290,
-        "fields": {
-            "model": [
-                "note",
-                "transaction"
-            ],
-            "query": "[\"OR\", {\"source__noteclub__club__bus\": [\"membership\", \"weimembership\", \"bus\"]}, {\"destination__noteclub__club__bus\": [\"membership\", \"weimembership\", \"bus\"]}]",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir les transactions du club de son bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 291,
-        "fields": {
-            "model": [
-                "wei",
-                "bus"
-            ],
-            "query": "{\"pk\": [\"membership\", \"weimembership\", \"bus\", \"pk\"], \"wei__date_end__gte\": [\"today\"]}",
-            "type": "view",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Voir mon bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 292,
-        "fields": {
-            "model": [
-                "member",
-                "membership"
-            ],
-            "query": "{\"club__pk__lte\": 2}",
-            "type": "add",
-            "mask": 3,
-            "field": "",
-            "permanent": false,
-            "description": "Ajouter un membre au BDE ou à la Kfet"
-        }
-    },
     {
         "model": "permission.role",
         "pk": 1,
@@ -4710,8 +4358,6 @@
             "name": "GC WEI",
             "permissions": [
                 22,
-                49,
-                62,
                 70,
                 72,
                 76,
@@ -4736,23 +4382,7 @@
                 112,
                 113,
                 128,
-                130,
-                142,
-                269,
-                271,
-                272,
-                273,
-                274,
-                275,
-                276,
-                277,
-                278,
-                279,
-                280,
-                281,
-                282,
-                283,
-                292
+                130
             ]
         }
     },
@@ -4771,14 +4401,7 @@
                 119,
                 120,
                 121,
-                122,
-                284,
-                285,
-                286,
-                287,
-                289,
-                290,
-                291
+                122
             ]
         }
     },
@@ -4810,6 +4433,18 @@
             ]
         }
     },
+    {
+        "model": "permission.role",
+        "pk": 16,
+        "fields": {
+            "for_club": null,
+            "name": "\u00c9lectron libre (avec perm)",
+            "permissions": [
+                22,
+                84
+            ]
+        }
+    },
     {
         "model": "permission.role",
         "pk": 17,
@@ -4964,14 +4599,7 @@
                 119,
                 120,
                 121,
-                122,
-                284,
-                285,
-                286,
-                287,
-                289,
-                290,
-                291
+                122
             ]
         }
     }, 
@@ -5081,6 +4709,11 @@
         "pk": 15,
         "fields": {}
     },
+    {
+        "model": "wei.weirole",
+        "pk": 16,
+        "fields": {}
+    },
     {
         "model": "wei.weirole",
         "pk": 17,

apps/permission/scopes.py

@@ -1,6 +1,5 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 from oauth2_provider.oauth2_validators import OAuth2Validator
 from oauth2_provider.scopes import BaseScopes
 from member.models import Club
@@ -18,39 +17,22 @@ class PermissionScopes(BaseScopes):
     and can be useful to make queries through the API with limited privileges.
     """
 
-    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"
-        return scopes
+    def get_all_scopes(self):
+        return {f"{p.id}_{club.id}": f"{p.description} (club {club.name})"
+                for p in Permission.objects.all() for club in Club.objects.all()}
 
     def get_available_scopes(self, application=None, request=None, *args, **kwargs):
         if not application:
             return []
-        scopes = [f"{p.id}_{p.membership.club.id}"
-                  for t in Permission.PERMISSION_TYPES
-                  for p in PermissionBackend.get_raw_permissions(get_current_request(), t[0])]
-        scopes.append('openid')
-        return scopes
+        return [f"{p.id}_{p.membership.club.id}"
+                for t in Permission.PERMISSION_TYPES
+                for p in PermissionBackend.get_raw_permissions(get_current_request(), t[0])]
 
     def get_default_scopes(self, application=None, request=None, *args, **kwargs):
         if not application:
             return []
-        scopes = [f"{p.id}_{p.membership.club.id}"
-                  for p in PermissionBackend.get_raw_permissions(get_current_request(), 'view')]
-        scopes.append('openid')
-        return scopes
+        return [f"{p.id}_{p.membership.club.id}"
+                for p in PermissionBackend.get_raw_permissions(get_current_request(), 'view')]
 
 
 class PermissionOAuth2Validator(OAuth2Validator):
@@ -67,10 +49,6 @@ class PermissionOAuth2Validator(OAuth2Validator):
             "email": request.user.email,
         }
 
-    def get_discovery_claims(self, request):
-        claims = super().get_discovery_claims(self)
-        return claims + ["name", "normalized_name", "email"]
-
     def validate_scopes(self, client_id, scopes, client, request, *args, **kwargs):
         """
         User can request as many scope as he wants, including invalid scopes,
@@ -88,8 +66,6 @@ class PermissionOAuth2Validator(OAuth2Validator):
                 if scope in scopes:
                     valid_scopes.add(scope)
 
-        if 'openid' in scopes:
-            valid_scopes.add('openid')
-
         request.scopes = valid_scopes
+
         return valid_scopes

apps/permission/signals.py

@@ -13,14 +13,12 @@ EXCLUDED = [
     'cas_server.serviceticket',
     'cas_server.user',
     'cas_server.userattributes',
-    'constance.constance',
     'contenttypes.contenttype',
     'logs.changelog',
     'migrations.migration',
     'oauth2_provider.accesstoken',
     'oauth2_provider.grant',
     'oauth2_provider.refreshtoken',
-    'oauth2_provider.idtoken',
     'sessions.session',
 ]
 

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, NoteClub
+from note.models import NoteUser
 from wei.models import WEIClub, Bus, WEIRegistration
 
 
@@ -122,13 +122,10 @@ 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,24 +164,14 @@ class ScopesView(LoginRequiredMixin, TemplateView):
         from oauth2_provider.models import Application
         from .scopes import PermissionScopes
 
-        oidc = False
+        scopes = PermissionScopes()
         context["scopes"] = {}
+        all_scopes = scopes.get_all_scopes()
         for app in Application.objects.filter(user=self.request.user).all():
-            available_scopes = PermissionScopes().get_available_scopes(app)
+            available_scopes = scopes.get_available_scopes(app)
             context["scopes"][app] = OrderedDict()
-            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 = [(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])))
-            # 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,7 +353,7 @@ class SogeCredit(models.Model):
     def amount(self):
         if self.valid:
             return self.credit_transaction.total
-        amount = sum(max(transaction.total - 2000, 0) for transaction in self.transactions.all())
+        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\
@@ -441,7 +441,7 @@ class SogeCredit(models.Model):
         With Great Power Comes Great Responsibility...
         """
 
-        total_fee = sum(max(transaction.total - 2000, 0) for transaction in self.transactions.all() if not transaction.valid)
+        total_fee = sum(transaction.total for transaction in self.transactions.all() if not transaction.valid)
         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-locked Invoice
+    Delete a non-validated WEI registration
     """
     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', 'deposit_check', 'birth_date', 'gender',
+                        'wei__email', 'wei__year', 'soge_credit', 'caution_check', '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,11 +1,10 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from .registration import WEIForm, WEIRegistrationForm, WEIRegistration1AForm, WEIRegistration2AForm, WEIMembership1AForm, \
-    WEIMembershipForm, BusForm, BusTeamForm
+from .registration import WEIForm, WEIRegistrationForm, WEIMembership1AForm, WEIMembershipForm, BusForm, BusTeamForm
 from .surveys import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, CurrentSurvey
 
 __all__ = [
-    'WEIForm', 'WEIRegistrationForm', 'WEIRegistration1AForm', 'WEIRegistration2AForm', 'WEIMembership1AForm', 'WEIMembershipForm', 'BusForm', 'BusTeamForm',
+    'WEIForm', 'WEIRegistrationForm', 'WEIMembership1AForm', 'WEIMembershipForm', 'BusForm', 'BusTeamForm',
     'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
 ]

apps/wei/forms/registration.py

@@ -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, RadioSelect
+from django.forms import CheckboxSelectMultiple
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
 from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget
@@ -24,8 +24,6 @@ class WEIForm(forms.ModelForm):
             "membership_end": DatePickerInput(),
             "date_start": DatePickerInput(),
             "date_end": DatePickerInput(),
-            "deposit_amount": AmountInput(),
-            "fee_soge_credit": AmountInput(),
         }
 
 
@@ -41,11 +39,7 @@ class WEIRegistrationForm(forms.ModelForm):
 
     class Meta:
         model = WEIRegistration
-        fields = [
-            'user', 'soge_credit', 'birth_date', 'gender', 'clothing_size',
-            'health_issues', 'emergency_contact_name', 'emergency_contact_phone',
-            'first_year', 'information_json', 'deposit_check'
-        ]
+        exclude = ('wei', 'clothing_cut')
         widgets = {
             "user": Autocomplete(
                 User,
@@ -55,30 +49,11 @@ class WEIRegistrationForm(forms.ModelForm):
                     'placeholder': 'Nom ...',
                 },
             ),
-            "birth_date": DatePickerInput(options={
-                'minDate': '1900-01-01',
-                'maxDate': '2100-01-01'
-            }),
-            "deposit_check": forms.BooleanField(
-                required=False,
-            ),
+            "birth_date": DatePickerInput(options={'minDate': '1900-01-01',
+                                                   'maxDate': '2100-01-01'}),
         }
 
 
-class WEIRegistration2AForm(WEIRegistrationForm):
-    class Meta(WEIRegistrationForm.Meta):
-        fields = WEIRegistrationForm.Meta.fields + ['deposit_type']
-        widgets = WEIRegistrationForm.Meta.widgets.copy()
-        widgets.update({
-            "deposit_type": forms.RadioSelect(),
-        })
-
-
-class WEIRegistration1AForm(WEIRegistrationForm):
-    class Meta(WEIRegistrationForm.Meta):
-        fields = WEIRegistrationForm.Meta.fields
-
-
 class WEIChooseBusForm(forms.Form):
     bus = forms.ModelMultipleChoiceField(
         queryset=Bus.objects,
@@ -97,17 +72,22 @@ class WEIChooseBusForm(forms.Form):
     )
 
     roles = forms.ModelMultipleChoiceField(
-        queryset=WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")),
+        queryset=WEIRole.objects.filter(~Q(name="1A")),
         label=_("WEI Roles"),
         help_text=_("Select the roles that you are interested in."),
-        initial=WEIRole.objects.filter(Q(name="Adhérent⋅e WEI") | Q(name="\u00c9lectron libre")).all(),
+        initial=WEIRole.objects.filter(name="Adhérent⋅e WEI").all(),
         widget=CheckboxSelectMultiple(),
     )
 
 
 class WEIMembershipForm(forms.ModelForm):
+    caution_check = forms.BooleanField(
+        required=False,
+        label=_("Caution check given"),
+    )
+
     roles = forms.ModelMultipleChoiceField(
-        queryset=WEIRole.objects.filter(~Q(name="GC WEI")),
+        queryset=WEIRole.objects,
         label=_("WEI Roles"),
         widget=CheckboxSelectMultiple(),
     )
@@ -141,19 +121,6 @@ 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 \
@@ -165,8 +132,21 @@ class WEIMembershipForm(forms.ModelForm):
         model = WEIMembership
         fields = ('roles', 'bus', 'team',)
         widgets = {
-            "bus": RadioSelect(),
-            "team": RadioSelect(),
+            "bus": Autocomplete(
+                Bus,
+                attrs={
+                    'api_url': '/api/wei/bus/',
+                    'placeholder': 'Bus ...',
+                }
+            ),
+            "team": Autocomplete(
+                BusTeam,
+                attrs={
+                    'api_url': '/api/wei/team/',
+                    'placeholder': 'Équipe ...',
+                },
+                resetable=True,
+            ),
         }
 
 
@@ -174,7 +154,7 @@ class WEIMembership1AForm(WEIMembershipForm):
     """
     Used to confirm registrations of first year members without choosing a bus now.
     """
-    deposit_check = None
+    caution_check = 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 .wei2025 import WEISurvey2025
+from .wei2024 import WEISurvey2024
 
 
 __all__ = [
     'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
 ]
 
-CurrentSurvey = WEISurvey2025
+CurrentSurvey = WEISurvey2024

apps/wei/forms/surveys/base.py

@@ -121,13 +121,6 @@ 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

@@ -1,347 +0,0 @@
-# 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 .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
-from ...models import WEIMembership, Bus
-
-WORDS = [
-    '13 organisé', '3ième mi temps', 'Années 2000', 'Apéro', 'BBQ', 'BP', 'Beauf', 'Binge drinking', 'Bon enfant',
-    'Cartouche', 'Catacombes', 'Chansons paillardes', 'Chansons populaires', 'Chanteur', 'Chartreuse', 'Chill',
-    'Core', 'DJ', 'Dancefloor', 'Danse', 'David Guetta', 'Disco', 'Eau de vie', 'Électro', 'Escalade', 'Familial',
-    'Fanfare', 'Fracassage', 'Féria', 'Hard rock', 'Hoeggarden', 'House', 'Huit-six', 'IPA', 'Inclusif', 'Inferno',
-    'Introverti', 'Jager bomb', 'Jazz', 'Jeux d\'alcool', 'Jeux de rôles', 'Jeux vidéo', 'Jul', 'Jus de fruit',
-    'Karaoké', 'LGBTQI+', 'Lady Gaga', 'Loup garou', 'Morning beer', 'Métal', 'Nuit blanche', 'Ovalie', 'Psychedelic',
-    'Pétanque', 'Rave', 'Reggae', 'Rhum', 'Ricard', 'Rock', 'Rosé', 'Rétro', 'Séducteur', 'Techno', 'Thérapie taxi',
-    'Théâtre', 'Trap', 'Turn up', 'Underground', 'Volley', 'Wati B', 'Zinédine Zidane',
-]
-
-
-class WEISurveyForm2025(forms.Form):
-    """
-    Survey form for the year 2025.
-    Members choose 20 words, from which we calculate the best associated bus.
-    """
-
-    word = forms.ChoiceField(
-        label=_("Choose a word:"),
-        widget=forms.RadioSelect(),
-    )
-
-    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()
-
-        if self.data:
-            self.fields["word"].choices = [(w, w) for w in WORDS]
-            if self.is_valid():
-                return
-
-        rng = Random((information.step + 1) * information.seed)
-
-        buses = WEISurveyAlgorithm2025.get_buses()
-        informations = {bus: WEIBusInformation2025(bus) for bus in buses}
-        scores = sum((list(informations[bus].scores.values()) for bus in buses), [])
-        if scores:
-            average_score = sum(scores) / len(scores)
-        else:
-            average_score = 0
-
-        preferred_words = {bus: [word for word in WORDS
-                                 if informations[bus].scores[word] >= average_score]
-                           for bus in buses}
-
-        # Correction : proposer plusieurs mots différents à chaque étape
-        n_choices = 4  # Nombre de mots à proposer à chaque étape
-        all_preferred_words = set()
-        for bus_words in preferred_words.values():
-            all_preferred_words.update(bus_words)
-        all_preferred_words = list(all_preferred_words)
-        rng.shuffle(all_preferred_words)
-        words = all_preferred_words[:n_choices]
-        self.fields["word"].choices = [(w, w) for w in words]
-
-
-class WEIBusInformation2025(WEIBusInformation):
-    """
-    For each word, the bus has a score
-    """
-    scores: dict
-
-    def __init__(self, bus):
-        self.scores = {}
-        for word in WORDS:
-            self.scores[word] = 0
-        super().__init__(bus)
-
-
-class BusInformationForm2025(forms.ModelForm):
-    class Meta:
-        model = Bus
-        fields = ['information_json']
-        widgets = {}
-
-    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
-        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),
-                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, 21):
-            setattr(self, "word" + str(i), None)
-        super().__init__(registration)
-
-
-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):
-        word = form.cleaned_data["word"]
-        self.information.step += 1
-        setattr(self.information, "word" + str(self.information.step), word)
-        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 == 20
-
-    @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(self, bus):
-        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, 21)) / 20
-        return s
-
-    @lru_cache()
-    def scores_per_bus(self):
-        return {bus: self.score(bus) for bus in self.get_algorithm_class().get_buses()}
-
-    @lru_cache()
-    def ordered_buses(self):
-        values = list(self.scores_per_bus().items())
-        values.sort(key=lambda item: -item[1])
-        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
-
-    def run_algorithm(self, display_tqdm=False):
-        """
-        Gale-Shapley algorithm implementation.
-        We modify it to allow buses to have multiple "weddings".
-        """
-        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_score 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(bus)
-                        if current_score <= 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

@@ -1,18 +0,0 @@
-# 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

@@ -1,20 +0,0 @@
-# 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

@@ -1,23 +0,0 @@
-# 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

@@ -1,18 +0,0 @@
-# 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

@@ -1,40 +0,0 @@
-# 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/models.py

@@ -33,16 +33,6 @@ 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=2000,
-    )
-
     class Meta:
         verbose_name = _("WEI")
         verbose_name_plural = _("WEI")
@@ -82,15 +72,6 @@ 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="",
@@ -202,19 +183,9 @@ class WEIRegistration(models.Model):
         verbose_name=_("Credit from Société générale"),
     )
 
-    deposit_check = models.BooleanField(
+    caution_check = models.BooleanField(
         default=False,
-        verbose_name=_("Deposit check given")
-    )
-
-    deposit_type = models.CharField(
-        max_length=16,
-        choices=(
-            ('check', _("Check")),
-            ('note', _("Note transaction")),
-        ),
-        default='check',
-        verbose_name=_("deposit type"),
+        verbose_name=_("Caution check given")
     )
 
     birth_date = models.DateField(
@@ -324,8 +295,7 @@ class WEIRegistration(models.Model):
             date_start__gte=bde.membership_start,
         ).exists()
 
-        fee = self.wei.fee_soge_credit if self.soge_credit \
-            else self.wei.membership_fee_paid if self.user.profile.paid \
+        fee = 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 \

apps/wei/tables.py

@@ -98,7 +98,7 @@ class WEIRegistrationTable(tables.Table):
         if not hasperm:
             return format_html("<span class='no-perm'></span>")
 
-        url = reverse_lazy('wei:wei_update_registration', args=(record.pk,)) + '?validate=true'
+        url = reverse_lazy('wei:validate_registration', args=(record.pk,))
         text = _('Validate')
         if record.fee > record.user.note.balance and not record.soge_credit:
             btn_class = 'btn-secondary'
@@ -123,7 +123,7 @@ class WEIRegistrationTable(tables.Table):
         }
         model = WEIRegistration
         template_name = 'django_tables2/bootstrap4.html'
-        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'deposit_check',
+        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'caution_check',
                   'edit', 'validate', 'delete',)
         row_attrs = {
             'class': 'table-row',
@@ -163,7 +163,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__deposit_check', )
+                  'year', 'bus', 'team', 'registration__caution_check', )
         row_attrs = {
             'class': 'table-row',
             'id': lambda record: "row-" + str(record.pk),

apps/wei/templates/wei/base.html

@@ -40,20 +40,22 @@ 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|pretty_money }}
+                    <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 (unpaid students)'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}
+                    <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 %}
                     {% 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,14 +16,8 @@ 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" %}</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,8 +18,6 @@ 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,17 +13,9 @@ 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

@@ -95,11 +95,9 @@ 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 %}
 {% 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 'Deposit check given'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ registration.deposit_check|yesno }}</dd>
+                    <dt class="col-xl-6">{% trans 'caution check given'|capfirst %}</dt>
+                    <dd class="col-xl-6">{{ registration.caution_check|yesno }}</dd>
 
                     {% with information=registration.information %}
                         <dt class="col-xl-6">{% trans 'preferred bus'|capfirst %}</dt>
@@ -137,37 +137,31 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 {% if registration.soge_credit %}
                     <div class="alert alert-warning">
                         {% blocktrans trimmed %}
-                            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 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 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.user.note.balance < fee %}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 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 %}
-                        <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.deposit_check and not registration.first_year and registration.caution_type == 'check' %}
+                {% if not registration.caution_check and not registration.first_year %}
                     <div class="alert alert-danger">
                         {% trans "The user didn't give her/his caution check." %}
                     </div>
@@ -206,27 +200,4 @@ 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());
-                });
-                console.log(buses);
-                $("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,6 +6,8 @@ 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
@@ -127,3 +129,44 @@ 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

@@ -1,111 +0,0 @@
-# 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, 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(10):
-            bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
-            self.buses.append(bus)
-            information = WEIBusInformation2025(bus)
-            for word in WORDS:
-                information.scores[word] = random.randint(0, 101)
-            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))
-            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(95):
-            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))
-            information.step = 20
-            information.save(registration)
-            registration.save()
-
-        # 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()
-            score = min(v for bus, v in buses if bus == chosen_bus)
-            max_score = buses[0][1]
-            penalty += (max_score - score) ** 2
-
-            self.assertLessEqual(max_score - score, 25)  # Always less than 25 % of tolerance
-
-        self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %

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,
-            deposit_check=True,
+            caution_check=True,
             birth_date=date(2000, 1, 1),
             gender="nonbinary",
             clothing_cut="male",
@@ -121,13 +121,11 @@ 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())
@@ -158,12 +156,10 @@ 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)
@@ -322,7 +318,6 @@ class TestWEIRegistration(TestCase):
             bus=[],
             team=[],
             roles=[],
-            deposit_type='check'
         ))
         self.assertEqual(response.status_code, 200)
         self.assertFalse(response.context["membership_form"].is_valid())
@@ -339,8 +334,7 @@ class TestWEIRegistration(TestCase):
             emergency_contact_phone='+33123456789',
             bus=[self.bus.id],
             team=[self.team.id],
-            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")).all()],
-            deposit_type='check'
+            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A")).all()],
         ))
         qs = WEIRegistration.objects.filter(user_id=user.id)
         self.assertTrue(qs.exists())
@@ -360,7 +354,6 @@ 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))
@@ -513,12 +506,11 @@ 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:wei_detail", kwargs=dict(pk=qs.get().wei.pk)), 302, 200)
+        self.assertRedirects(response, reverse("wei:validate_registration", kwargs=dict(pk=qs.get().pk)), 302, 200)
 
         # Check the page when the registration is already validated
         membership = WEIMembership(
@@ -568,12 +560,11 @@ 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:wei_detail", kwargs=dict(pk=qs.get().wei.pk)), 302, 200)
+        self.assertRedirects(response, reverse("wei:validate_registration", kwargs=dict(pk=qs.get().pk)), 302, 200)
 
         # Test invalid form
         response = self.client.post(
@@ -592,7 +583,6 @@ class TestWEIRegistration(TestCase):
                 team=[],
                 roles=[],
                 information_json=self.registration.information_json,
-                deposit_type='check'
             )
         )
         self.assertFalse(response.context["membership_form"].is_valid())
@@ -634,7 +624,7 @@ class TestWEIRegistration(TestCase):
         second_bus = Bus.objects.create(wei=self.wei, name="Second bus")
         second_team = BusTeam.objects.create(bus=second_bus, name="Second team", color=42)
         response = self.client.post(reverse("wei:validate_registration", kwargs=dict(pk=self.registration.pk)), dict(
-            roles=[WEIRole.objects.get(name="Adhérent⋅e WEI").id],
+            roles=[WEIRole.objects.get(name="GC WEI").id],
             bus=self.bus.pk,
             team=second_team.pk,
             credit_type=4,  # Bank transfer
@@ -642,14 +632,13 @@ class TestWEIRegistration(TestCase):
             last_name="admin",
             first_name="admin",
             bank="Société générale",
-            deposit_check=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="Adhérent⋅e WEI").id],
+            roles=[WEIRole.objects.get(name="GC WEI").id],
             bus=self.bus.pk,
             team=self.team.pk,
             credit_type=4,  # Bank transfer
@@ -657,10 +646,8 @@ class TestWEIRegistration(TestCase):
             last_name="admin",
             first_name="admin",
             bank="Société générale",
-            deposit_check=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())
@@ -680,7 +667,11 @@ 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)
@@ -776,7 +767,7 @@ class TestDefaultWEISurvey(TestCase):
         WEISurvey.update_form(None, None)
 
         self.assertEqual(CurrentSurvey.get_algorithm_class().get_survey_class(), CurrentSurvey)
-        self.assertEqual(CurrentSurvey.get_year(), 2025)
+        self.assertEqual(CurrentSurvey.get_year(), 2024)
 
 
 class TestWeiAPI(TestAPI):
@@ -813,7 +804,7 @@ class TestWeiAPI(TestAPI):
             user_id=self.user.id,
             wei_id=self.wei.id,
             soge_credit=True,
-            deposit_check=True,
+            caution_check=True,
             birth_date=date(2000, 1, 1),
             gender="nonbinary",
             clothing_cut="male",

apps/wei/urls.py

@@ -4,7 +4,7 @@
 from django.urls import path
 
 from .views import CurrentWEIDetailView, WEI1AListView, WEIListView, WEICreateView, WEIDetailView, WEIUpdateView, \
-    WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, BusInformationUpdateView, \
+    WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, \
     BusCreateView, BusManageView, BusUpdateView, BusTeamCreateView, BusTeamManageView, BusTeamUpdateView, \
     WEIAttributeBus1AView, WEIAttributeBus1ANextView, WEIRegister1AView, WEIRegister2AView, WEIUpdateRegistrationView, \
     WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView
@@ -42,5 +42,4 @@ 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"),
 ]

apps/wei/views.py

@@ -4,18 +4,16 @@
 import os
 import shutil
 import subprocess
-from datetime import date
+from datetime import date, timedelta
 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.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
@@ -27,7 +25,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
+from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSpecial
 from note.tables import HistoryTable
 from note_kfet.settings import BASE_DIR
 from permission.backends import PermissionBackend
@@ -35,7 +33,7 @@ from permission.views import ProtectQuerysetMixin, ProtectedCreateView
 
 from .forms.registration import WEIChooseBusForm
 from .models import WEIClub, WEIRegistration, WEIMembership, Bus, BusTeam, WEIRole
-from .forms import WEIForm, WEIRegistrationForm, WEIRegistration1AForm, WEIRegistration2AForm, BusForm, BusTeamForm, WEIMembership1AForm, \
+from .forms import WEIForm, WEIRegistrationForm, BusForm, BusTeamForm, WEIMembership1AForm, \
     WEIMembershipForm, CurrentSurvey
 from .tables import BusRepartitionTable, BusTable, BusTeamTable, WEITable, WEIRegistrationTable, \
     WEIRegistration1ATable, WEIMembershipTable
@@ -443,10 +441,6 @@ 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):
     """
@@ -479,10 +473,6 @@ 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):
     """
@@ -510,7 +500,7 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
     Register a new user to the WEI
     """
     model = WEIRegistration
-    form_class = WEIRegistration1AForm
+    form_class = WEIRegistrationForm
     extra_context = {"title": _("Register first year student to the WEI")}
 
     def get_sample_object(self):
@@ -556,19 +546,9 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         form.fields["user"].initial = self.request.user
-
-        # Cacher les champs pendant l'inscription initiale
-        if "first_year" in form.fields:
-            del form.fields["first_year"]
-        if "deposit_check" in form.fields:
-            del form.fields["deposit_check"]
-        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')
+        del form.fields["first_year"]
+        del form.fields["caution_check"]
+        del form.fields["information_json"]
         return form
 
     @transaction.atomic
@@ -606,7 +586,7 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
     Register an old user to the WEI
     """
     model = WEIRegistration
-    form_class = WEIRegistration2AForm
+    form_class = WEIRegistrationForm
     extra_context = {"title": _("Register old student to the WEI")}
 
     def get_sample_object(self):
@@ -660,26 +640,13 @@ 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.")
 
-        # Cacher les champs pendant l'inscription initiale
-        if "first_year" in form.fields:
-            del form.fields["first_year"]
-        if "deposit_check" in form.fields:
-            del form.fields["deposit_check"]
-        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)
+        del form.fields["caution_check"]
+        del form.fields["first_year"]
+        del form.fields["information_json"]
 
         return form
 
@@ -706,9 +673,6 @@ 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:
@@ -738,15 +702,11 @@ 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
-        self.should_validate = request.GET.get('validate', False)
         return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["club"] = self.object.wei
-        # Pass the validate parameter to the template
-        context["should_validate"] = self.should_validate
 
         if self.object.is_validated:
             membership_form = self.get_membership_form(instance=self.object.membership,
@@ -778,23 +738,12 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
         form = super().get_form(form_class)
         form.fields["user"].disabled = True
         # The auto-json-format may cause issues with the default field remove
-        if "information_json" in form.fields:
+        if not PermissionBackend.check_perm(self.request, 'wei.change_weiregistration_information_json', self.object):
             del form.fields["information_json"]
-        # Masquer le champ deposit_check pour tout le monde dans le formulaire de modification
-        if "deposit_check" in form.fields:
-            del form.fields["deposit_check"]
-
-        # S'assurer que le champ deposit_type est obligatoire pour les 2A+
-        if not self.object.first_year and "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
 
     def get_membership_form(self, data=None, instance=None):
-        registration = self.get_object()
-        membership_form = WEIMembershipForm(data if data else None, instance=instance, wei=registration.wei)
+        membership_form = WEIMembershipForm(data if data else None, instance=instance)
         del membership_form.fields["credit_type"]
         del membership_form.fields["credit_amount"]
         del membership_form.fields["first_name"]
@@ -810,30 +759,10 @@ 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:
-            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))
+            membership_form = self.get_membership_form(self.request.POST, form.instance.membership)
+            if not membership_form.is_valid():
                 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):
@@ -848,10 +777,6 @@ 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
-
-            # Sauvegarder le type de caution pour les 2A+
-            if "deposit_type" in form.cleaned_data:
-                form.instance.deposit_type = form.cleaned_data["deposit_type"]
             form.instance.save()
 
         return super().form_valid(form)
@@ -862,8 +787,14 @@ 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})
-        # On redirige vers la validation uniquement si c'est explicitement demandé (et stocké dans la vue)
-        if self.should_validate and self.request.user.has_perm("wei.add_weimembership"):
+        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})
 
@@ -905,23 +836,18 @@ 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(
-            user=registration.user,
             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
+            user=registration.user,
+            date_start=date.today(),
+            date_end=date.today() + timedelta(days=1),
+            fee=0,
             registration=registration,
         )
 
     def dispatch(self, request, *args, **kwargs):
-        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
-
-        wei = registration.wei
+        wei = WEIRegistration.objects.get(pk=self.kwargs["pk"]).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:
@@ -952,14 +878,7 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
             date_start__gte=bde.membership_start,
         ).exists()
 
-        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
+        context["fee"] = registration.fee
 
         form = context["form"]
         if registration.soge_credit:
@@ -971,41 +890,27 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
 
     def get_form_class(self):
         registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
-        if registration.first_year and 'selected_bus_pk' not in registration.information:
+        if registration.first_year and 'sleected_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
 
-        # Ajouter le champ deposit_check 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_check"] = forms.BooleanField(
-                    required=True,
-                    initial=registration.deposit_check,
-                    label=_("Deposit check given"),
-                    help_text=_("Please make sure the check is given before validating the registration")
-                )
-            else:
-                form.fields["deposit_check"] = 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 "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"
 
         if 'bus' in form.fields:
             # For 2A+ and hardcoded 1A
@@ -1039,8 +944,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         club = registration.wei
         user = registration.user
 
-        if "deposit_check" in form.data:
-            registration.deposit_check = form.data["deposit_check"] == "on"
+        if "caution_check" in form.data:
+            registration.caution_check = form.data["caution_check"] == "on"
             registration.save()
         membership = form.instance
         membership.user = user
@@ -1051,8 +956,6 @@ 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 = 2000
 
         kfet = club.parent_club
         bde = kfet.parent_club
@@ -1079,23 +982,13 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         first_name = form.cleaned_data["first_name"]
         bank = form.cleaned_data["bank"]
 
-        if credit_type is None:
+        if credit_type is None or registration.soge_credit:
             credit_amount = 0
 
-        # 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:
+        if not registration.soge_credit and user.note.balance + credit_amount < fee:
+            # Users must have money before registering to the WEI.
             form.add_error('credit_type',
-                           _("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}
-                           )
+                           _("This user don't have enough money to join this club, and can't have a negative balance."))
             return super().form_invalid(form)
 
         if credit_amount:
@@ -1135,18 +1028,6 @@ 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 get_success_url(self):
@@ -1366,7 +1247,6 @@ 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
 
@@ -1409,48 +1289,8 @@ class WEIAttributeBus1ANextView(LoginRequiredMixin, RedirectView):
         if not wei.exists():
             raise Http404
         wei = wei.get()
-
-        # 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})
+        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, ))

note.cron

@@ -27,6 +27,5 @@ MAILTO=notekfet2020@lists.crans.org
 # Vider les tokens Oauth2
  00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
 # Envoyer la liste des abonnés à la NL BDA
- 00  10    *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"
-# Envoyer la liste de la bouffe au club et aux GCKs
- 00  8     *   *   1     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_for_food --report --club
+ 00  10     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"
+ 

note_kfet/admin.py

@@ -56,8 +56,3 @@ if "cas_server" in settings.INSTALLED_APPS:
     from cas_server.models import *
     admin_site.register(ServicePattern, ServicePatternAdmin)
     admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)
-
-if "constance" in settings.INSTALLED_APPS:
-    from constance.admin import *
-    from constance.models import *
-    admin_site.register([Config], ConstanceAdmin)

note_kfet/inputs.py

@@ -63,16 +63,8 @@ class ColorWidget(Widget):
     def format_value(self, value):
         if value is None:
             value = 0xFFFFFF
-        if isinstance(value, str):
-            return value  # Assume it's already a hex string like "#FFAA33"
-        try:
-            return "#{:06X}".format(value)
-        except Exception:
-            return "#FFFFFF"
-
+        return "#{:06X}".format(value)
 
     def value_from_datadict(self, data, files, name):
         val = super().value_from_datadict(data, files, name)
-        if val:
-            return int(val[1:], 16)
-        return None
+        return int(val[1:], 16)

note_kfet/settings/base.py

@@ -39,9 +39,7 @@ SECURE_HSTS_PRELOAD = True
 INSTALLED_APPS = [
     # External apps
     'bootstrap_datepicker_plus',
-    'cas_server',
     'colorfield',
-    'constance',
     'crispy_bootstrap4',
     'crispy_forms',
 #    'django_htcpcp_tea',
@@ -72,7 +70,6 @@ INSTALLED_APPS = [
     # Note apps
     'api',
     'activity',
-    'family',
     'food',
     'logs',
     'member',
@@ -114,7 +111,6 @@ TEMPLATES = [
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
-                'constance.context_processors.config',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
@@ -274,7 +270,7 @@ OAUTH2_PROVIDER = {
     'PKCE_REQUIRED': False, # PKCE (fix a breaking change of django-oauth-toolkit 2.0.0)
     'OIDC_ENABLED': True,
     'OIDC_RSA_PRIVATE_KEY':
-        os.getenv('OIDC_RSA_PRIVATE_KEY', 'CHANGE_ME_IN_ENV_SETTINGS').replace('\\n', '\n'), # for multilines
+        os.getenv('OIDC_RSA_PRIVATE_KEY', '/var/secrets/oidc.key'),
     'SCOPES': { 'openid': "OpenID Connect scope" },
 }
 
@@ -311,30 +307,6 @@ PHONENUMBER_DEFAULT_REGION = 'FR'
 
 # We add custom information to CAS, in order to give a normalized name to other services
 CAS_AUTH_CLASS = 'member.auth.CustomAuthUser'
-CAS_LOGIN_TEMPLATE = 'cas/login.html'
-CAS_LOGOUT_TEMPLATE = 'cas/logout.html'
-CAS_WARN_TEMPLATE = 'cas/warn.html'
-CAS_LOGGED_TEMPLATE = 'cas/logged.html'
 
 # Default field for primary key
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
-
-# Constance settings
-CONSTANCE_ADDITIONAL_FIELDS = {
-    'banner_type': ['django.forms.fields.ChoiceField', {
-        'widget': 'django.forms.Select',
-        'choices': (('info', 'Info'), ('success', 'Success'), ('warning', 'Warning'), ('danger', 'Danger'))
-    }],
-}
-CONSTANCE_CONFIG = {
-    'BANNER_MESSAGE': ('', 'Some message', str),
-    'BANNER_TYPE': ('info', 'Banner type', 'banner_type'),
-    'MAINTENANCE': (False, 'check for mainteance mode', bool),
-    'MAINTENANCE_MESSAGE': ('', 'Some maintenance message', str),
-}
-CONSTANCE_CONFIG_FIELDSETS = {
-    'Maintenance': ('MAINTENANCE_MESSAGE', 'MAINTENANCE'),
-    'Banner': ('BANNER_MESSAGE', 'BANNER_TYPE'),
-}
-CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
-CONSTANCE_SUPERUSER_ONLY = True

note_kfet/templates/base.html

@@ -5,7 +5,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html lang="{{ LANGUAGE_CODE|default:"en" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %} class="position-relative h-100">
-{% if not config.MAINTENANCE %}
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -79,13 +78,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                             <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %}</a>
                         </li>
                     {% endif %}
-                    {% if user.is_authenticated %}
-                        <li class="nav-item">
-                            {% url 'family:family_list' as url %}
-                            <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-users"></i> {% trans 'Families' %}</a>
-                        </li>
-                    {% endif %}
-
                     {% if "auth.user"|model_list_length >= 2 %}
                         <li class="nav-item">
                             {% url 'member:user_list' as url %}
@@ -146,12 +138,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                                 <a class="dropdown-item" href="{% url 'member:user_detail' pk=request.user.pk %}">
                                     <i class="fa fa-user"></i> {% trans "My account" %}
                                 </a>
-				<form method="post" action="{% url 'logout' %}">
-				    {% csrf_token %}
-				    <button class="dropdown-item" type=submit">
-					<i class="fa fa-sign-out"></i> {% trans "Log out" %}
-				    </button>
-                                </form>
+                                <a class="dropdown-item" href="{% url 'logout' %}">
+                                    <i class="fa fa-sign-out"></i> {% trans "Log out" %}
+                                </a>
                             </div>
                         </li>
                     {% else %}
@@ -199,11 +188,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     {% endblocktrans %}
                 </div>
             {% endif %}
-	    {% if config.BANNER_MESSAGE and user.is_authenticated %}
-	    <div class="alert alert-{{ config.BANNER_TYPE }}">
-	      {{ config.BANNER_MESSAGE }}
-	    </div>
-	    {% endif %}
+            {# TODO Add banners #}
         </div>
         {% block content %}
             <p>Default content...</p>
@@ -225,10 +210,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                            class="text-muted">{% trans "Charte Info (FR)" %}</a> &mdash;
                         <a href="https://note.crans.org/doc/faq/"
                            class="text-muted">{% trans "FAQ (FR)" %}</a> &mdash;
-		   	<a href="https://bde.ens-cachan.fr"
-			   class="text-muted">{% trans "Managed by BDE" %}</a> &mdash;
-		   	<a href="https://crans.org"
-			   class="text-muted">{% trans "Hosted by Cr@ns" %}</a> &mdash;
                     </span>
                     {% csrf_token %}
                     <select title="language" name="language"
@@ -265,15 +246,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 {% block extrajavascript %}{% endblock %}
 </body>
-{% endif %}
-{% if config.MAINTENANCE %}
-<body>
-  <div style="text-align:center">
-    <br />
-    {% trans "The note is not available for now" %}<br /><br />
-    {{ config.MAINTENANCE_MESSAGE }}<br /><br />
-    {% trans "Thank you for your understanding -- The Respos Info of BDE" %}
-  </div>
-</body>
-{% endif %}
 </html>

note_kfet/templates/cas/logged.html

@@ -1,28 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS-Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-{% block content %}
-<div class="alert alert-success" role="alert">{% blocktrans %}<h3>Log In Successful</h3>You have successfully logged into the Central Authentication Service.<br/>For security reasons, please Log Out and Exit your web browser when you are done accessing services that require authentication!{% endblocktrans %}</div>
-<div class="card bg-light mx-auto" style="max-width:30rem;">
-  <div class="card-body">
-    <form class="form-signin" method="get" action="logout">
-      <div class="checkbox">
-	<label>
-	  <input type="checkbox" name="all" value="1">{% trans "Log me out from all my sessions" %}
-	</label>
-      </div>
-      {% if settings.CAS_FEDERATE and request.COOKIES.remember_provider %}
-      <div class="checkbox">
-	<label>
-	  <input type="checkbox" name="forget_provider" value="1">{% trans "Forget the identity provider" %}
-	</label>
-      </div>
-      {% endif %}
-      <button class="btn btn-danger btn-block btn-lg" type="submit">{% trans "Logout" %}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}

note_kfet/templates/cas/login.html

@@ -1,42 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS-Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-
-{% block ante_messages %}
-  {% if auto_submit %}<noscript>{% endif %}
-  <div class="card-header text-center">
-    <h2 class="form-signin-heading">{% trans "Please log in" %}</h2>
-  </div>
-  {% if auto_submit %}</noscript>{% endif %}
-{% endblock %}
-
-{% block content %}
-  <div class="card bg-light mx-auto" style="max-width: 30rem;">
-    <div class="card-body">
-	<form class="form-signin" method="post" id="login_form"{% if post_url %} action="{{post_url}}"{% endif %}>
-	  {% csrf_token %}
-	  {% include "cas_server/bs4/form.html" %}
-	  {% if auto_submit %}<noscript>{% endif %}
-	  <button class="btn btn-primary btn-block btn-lg" type="submit">{% trans "Login" %}</button>
-	  {% if auto_submit %}</noscript>{% endif %}
-	</div>
-      </form>
-    </div>
-  </div>
-{% endblock %}
-
-{% block javascript_inline %}
-jQuery(function( $ ){
-  $("#id_warn").click(function(e){
-    if($("#id_warn").is(':checked')){
-      createCookie("warn", "on", 10 * 365);
-    } else {
-      eraseCookie("warn");
-    }
-  });
-});
-{% if auto_submit %}document.getElementById('login_form').submit(); // SUBMIT FORM{% endif %}
-{% endblock %}

note_kfet/templates/cas/logout.html

@@ -1,10 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS-Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n static %}
-{% block content %}
-    <div class="alert alert-success" role="alert">{{ logout_msg }}</div>
-{% endblock %}
-  

note_kfet/templates/cas/warn.html

@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS-Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n static %}
-
-{% block content %}
-  <div class="card bg-light mx-auto" style="max-width: 30rem;">
-    <div class="card-body">
-      <form class="form-signin" method="post">
-	{% csrf_token %}
-	{% include "cas_server/bs4/form.html" %}
-	<button class="btn btn-primary btn-block btn-lg" type="submit">{% trans "Connect to the service" %}</button>
-      </form>
-    </div>
-  </div>
-{% endblock %}
-  

note_kfet/templates/colorfield/color.html

@@ -1,5 +0,0 @@
-<input type="text"
-       name="{{ widget.name }}"
-       value="{{ widget.value }}"
-       class="jscolor"
-       {% include "django/forms/widgets/attrs.html" %}>

note_kfet/urls.py

@@ -21,9 +21,8 @@ urlpatterns = [
     path('activity/', include('activity.urls')),
     path('treasury/', include('treasury.urls')),
     path('wei/', include('wei.urls')),
-    path('food/', include('food.urls')),
-    path('wrapped/', include('wrapped.urls')),
-    path('family/', include('family.urls')),
+    path('food/',include('food.urls')),
+    path('wrapped/',include('wrapped.urls')),
 
     # Include Django Contrib and Core routers
     path('i18n/', include('django.conf.urls.i18n')),

requirements.txt

@@ -1,21 +1,20 @@
-beautifulsoup4~=4.13.4
-crispy-bootstrap4~=2025.6
-Django~=5.2.4
+beautifulsoup4~=4.12.3
+crispy-bootstrap4~=2023.1
+Django~=4.2.9
 django-bootstrap-datepicker-plus~=5.0.5
-django-cas-server~=3.1.0
-django-colorfield~=0.14.0
-django-constance~=4.3.2
-django-crispy-forms~=2.4.0
-django-extensions>=4.1.0
-django-filter~=25.1
+#django-cas-server~=2.0.0
+django-colorfield~=0.11.0
+django-crispy-forms~=2.1.0
+django-extensions>=3.2.3
+django-filter~=23.5
 #django-htcpcp-tea~=0.8.1
-django-mailer~=2.3.2
-django-oauth-toolkit~=3.0.1
-django-phonenumber-field~=8.1.0
+django-mailer~=2.3.1
+django-oauth-toolkit~=2.3.0
+django-phonenumber-field~=7.3.0
 django-polymorphic~=3.1.0
-djangorestframework~=3.16.0
+djangorestframework~=3.14.0
 django-rest-polymorphic~=0.1.10
-django-tables2~=2.7.5
+django-tables2~=2.7.0
 python-memcached~=1.62
-phonenumbers~=9.0.8
-Pillow>=11.3.0
+phonenumbers~=8.13.28
+Pillow>=10.2.0

tox.ini

@@ -1,13 +1,13 @@
 [tox]
 envlist =
     # Ubuntu 22.04 Python
-    py310-django52
+    py310-django42
 
     # Debian Bookworm Python
-    py311-django52
+    py311-django42
 
     # Ubuntu 24.04 Python
-    py312-django52
+    py312-django42
 
     linters
 skipsdist = True
@@ -32,7 +32,8 @@ deps =
     pep8-naming
     pyflakes
 commands =
-    flake8 apps --extend-exclude apps/scripts
+    flake8 apps --extend-exclude apps/scripts,apps/wrapped/management/commands
+    flake8 apps/wrapped/management/commands --extend-ignore=C901
 
 [flake8]
 ignore = W503, I100, I101, B019