Merge branch 'qrcode' into 'main'

Draft: Qrcode See merge request bde/nk20!196
Merge branch 'translations' into 'main'
2025-08-03 06:03:58 +02:00 · 2025-07-20 14:24:03 +02:00 · 2025-07-19 18:29:18 +02:00 · 2025-07-19 18:04:14 +02:00 · 2025-07-19 17:27:20 +02:00 · 2025-07-18 23:49:34 +02:00
24 changed files with 223 additions and 670 deletions
--- a/apps/activity/templates/activity/activity_entry.html
+++ b/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 %}
--- a/apps/member/migrations/0015_alter_profile_promotion.py
+++ b/apps/member/migrations/0015_alter_profile_promotion.py
@@ -1,18 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-02 13:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0014_create_bda'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='promotion',
-            field=models.PositiveSmallIntegerField(default=2025, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
-        ),
-    ]
--- a/apps/member/templates/member/includes/profile_info.html
+++ b/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 %}
--- a/apps/member/templates/member/qr_code.html
+++ b/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 %}
--- a/apps/member/urls.py
+++ b/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'),
 ]
--- a/apps/member/views.py
+++ b/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               #
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -1391,12 +1391,12 @@
                "wei",
                "weiregistration"
            ],
-            "query": "[\"AND\", {\"wei\": [\"club\"], \"wei__membership_end__gte\": [\"today\"]}, {\"deposit_type\": \"note\"}]",
+            "query": "{\"wei\": [\"club\"], \"wei__membership_end__gte\": [\"today\"]}",
            "type": "change",
            "mask": 2,
-            "field": "deposit_given",
+            "field": "caution_check",
            "permanent": false,
-            "description": "Autoriser une transaction de caution WEI"
+            "description": "Dire si un chèque de caution est donné pour une inscription WEI"
        }
    },
    {
@@ -4347,87 +4347,7 @@
            "mask": 3,
            "field": "",
            "permanent": false,
-            "description": "Faire adhérer BDE ou Kfet"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 293,
-        "fields": {
-            "model": [
-                "wei",
-                "weimembership"
-            ],
-            "query": "[\"AND\", {\"bus\": [\"membership\", \"weimembership\", \"bus\"]}, {\"club\": [\"club\"], \"club__weiclub__membership_end__gte\": [\"today\"]}]",
-            "type": "change",
-            "mask": 2,
-            "field": "team",
-            "permanent": false,
-            "description": "Modifier l'équipe d'une adhésion WEI à son bus"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 294,
-        "fields": {
-            "model": [
-                "wei",
-                "weiregistration"
-            ],
-            "query": "[\"AND\", {\"wei__year\": [\"today\", \"year\"], \"wei__membership_start__lte\": [\"today\"], \"wei__membership_end__gte\": [\"today\"]}, {\"deposit_type\": \"check\"}]",
-            "type": "change",
-            "mask": 2,
-            "field": "deposit_given",
-            "permanent": false,
-            "description": "Dire si un chèque de caution a été donné"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 295,
-        "fields": {
-            "model": [
-                "wei",
-                "weiregistration"
-            ],
-            "query": "{\"wei__year\": [\"today\", \"year\"]}",
-            "type": "view",
-            "mask": 2,
-            "field": "",
-            "permanent": false,
-            "description": "Voir toutes les inscriptions au WEI courant"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 296,
-        "fields": {
-            "model": [
-                "wei",
-                "weimembership"
-            ],
-            "query": "{\"club__weiclub__year\": [\"today\", \"year\"]}",
-            "type": "view",
-            "mask": 2,
-            "field": "",
-            "permanent": false,
-            "description": "Voir toutes les adhésions au WEI courant"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 297,
-        "fields": {
-            "model": [
-                "wei",
-                "weiregistration"
-            ],
-            "query": "[\"AND\", {\"user\": [\"user\"], \"wei__membership_start__lte\": [\"today\"], \"wei__membership_end__gte\": [\"today\"]}, [\"OR\", {\"wei\": [\"club\"]}, {\"wei__year\": [\"today\", \"year\"], \"membership\": null}]]",
-            "type": "change",
-            "mask": 1,
-            "field": "deposit_type",
-            "permanent": false,
-            "description": "Modifier le type de caution de mon inscription WEI tant qu'elle n'est pas validée"
+            "description": "Ajouter un membre au BDE ou à la Kfet"
        }
    },
    {
@@ -4524,8 +4444,7 @@
                159,
                160,
                212,
-                222,
-                297
+                222
            ]
        }
    },
@@ -4712,10 +4631,7 @@
                176,
                177,
                178,
-                183,
-                294,
-                295,
-                296
+                183
            ]
        }
    },
@@ -4848,6 +4764,7 @@
            "name": "Chef\u22c5fe de bus",
            "permissions": [
                22,
+                84,
                115,
                117,
                118,
@@ -4861,8 +4778,7 @@
                287,
                289,
                290,
-                291,
-                293
+                291
            ]
        }
    },
@@ -4874,6 +4790,7 @@
            "name": "Chef\u22c5fe d'\u00e9quipe",
            "permissions": [
                22,
+                84,
                116,
                123,
                124,
@@ -4888,7 +4805,8 @@
            "for_club": null,
            "name": "\u00c9lectron libre",
            "permissions": [
-                22
+                22,
+                84
            ]
        }
    },
@@ -5039,6 +4957,7 @@
            "name": "Référent⋅e Bus",
            "permissions": [
                22,
+                84,
                115,
                117,
                118,
@@ -5052,8 +4971,7 @@
                287,
                289,
                290,
-                291,
-                293
+                291
            ]
        }
    }, 
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@@ -353,11 +353,13 @@ class SogeCredit(models.Model):
    def amount(self):
        if self.valid:
            return self.credit_transaction.total
-        amount = 0
-        transactions_wei = self.transactions.filter(membership__club__weiclub__isnull=False)
-        amount += sum(max(transaction.total - transaction.membership.club.weiclub.fee_soge_credit, 0) for transaction in transactions_wei)
-        transactions_not_wei = self.transactions.filter(membership__club__weiclub__isnull=True)
-        amount += sum(transaction.total for transaction in transactions_not_wei)
+        amount = sum(max(transaction.total - 2000, 0) for transaction in self.transactions.all())
+        if 'wei' in settings.INSTALLED_APPS:
+            from wei.models import WEIMembership
+            if not WEIMembership.objects\
+                    .filter(club__weiclub__year=self.credit_transaction.created_at.year, user=self.user).exists():
+                # 80 € for people that don't go to WEI
+                amount += 8000
        return amount

    def update_transactions(self):
@@ -439,7 +441,7 @@ class SogeCredit(models.Model):
        With Great Power Comes Great Responsibility...
        """

-        total_fee = self.amount
+        total_fee = sum(max(transaction.total - 2000, 0) 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."))
--- a/apps/wei/api/views.py
+++ b/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_given', 'birth_date', 'gender',
+                        'wei__email', 'wei__year', 'soge_credit', 'deposit_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',
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@@ -44,7 +44,7 @@ class WEIRegistrationForm(forms.ModelForm):
        fields = [
            'user', 'soge_credit', 'birth_date', 'gender', 'clothing_size',
            'health_issues', 'emergency_contact_name', 'emergency_contact_phone',
-            'first_year', 'information_json', 'deposit_given', 'deposit_type'
+            'first_year', 'information_json', 'deposit_check', 'deposit_type'
        ]
        widgets = {
            "user": Autocomplete(
@@ -59,8 +59,8 @@ class WEIRegistrationForm(forms.ModelForm):
                'minDate': '1900-01-01',
                'maxDate': '2100-01-01'
            }),
-            "deposit_given": forms.CheckboxInput(
-                attrs={'class': 'form-check-input'},
+            "deposit_check": forms.BooleanField(
+                required=False,
            ),
            "deposit_type": forms.RadioSelect(),
        }
@@ -69,7 +69,7 @@ class WEIRegistrationForm(forms.ModelForm):
 class WEIChooseBusForm(forms.Form):
    bus = forms.ModelMultipleChoiceField(
        queryset=Bus.objects,
-        label=_("bus"),
+        label=_("Bus"),
        help_text=_("This choice is not definitive. The WEI organizers are free to attribute for you a bus and a team,"
                    + " in particular if you are a free eletron."),
        widget=CheckboxSelectMultiple(),
@@ -161,7 +161,7 @@ class WEIMembership1AForm(WEIMembershipForm):
    """
    Used to confirm registrations of first year members without choosing a bus now.
    """
-    deposit_given = None
+    deposit_check = None
    roles = None

    def clean(self):
--- a/apps/wei/forms/surveys/wei2025.py
+++ b/apps/wei/forms/surveys/wei2025.py
@@ -14,139 +14,16 @@ from django.utils.translation import gettext_lazy as _
 from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
 from ...models import WEIMembership, Bus

-WORDS = {
-    'list': [
-        '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',
-    ],
-    'questions': {
-        'Question 1': [
-            'Description 1',
-            {
-                3: 'Réponse 1 Madagas[car]',
-                4: 'Réponse 1 Y2[KAR]',
-                2: 'Réponse 1 Tcherno[bus]',
-                5: 'Réponse 1 [Kar]tier',
-                1: 'Réponse 1 [Car]cassonne',
-                6: 'Réponse 1 O[car]ina',
-                7: 'Réponse 1 Show[bus]',
-                8: 'Réponse 1 [Car]ioca'
-            }
-        ],
-        'Question 2': [
-            'Description 2',
-            {
-                3: 'Réponse 2 Madagas[car]',
-                4: 'Réponse 2 Y2[KAR]',
-                2: 'Réponse 2 Tcherno[bus]',
-                5: 'Réponse 2 [Kar]tier',
-                1: 'Réponse 2 [Car]cassonne',
-                6: 'Réponse 2 O[car]ina',
-                7: 'Réponse 2 Show[bus]',
-                8: 'Réponse 2 [Car]ioca'
-            }
-        ],
-        'Question 3': [
-            'Description 3',
-            {
-                3: 'Réponse 3 Madagas[car]',
-                4: 'Réponse 3 Y2[KAR]',
-                2: 'Réponse 3 Tcherno[bus]',
-                5: 'Réponse 3 [Kar]tier',
-                1: 'Réponse 3 [Car]cassonne',
-                6: 'Réponse 3 O[car]ina',
-                7: 'Réponse 3 Show[bus]',
-                8: 'Réponse 3 [Car]ioca'
-            }
-        ],
-        'Question 4': [
-            'Description 4',
-            {
-                3: 'Réponse 4 Madagas[car]',
-                4: 'Réponse 4 Y2[KAR]',
-                2: 'Réponse 4 Tcherno[bus]',
-                5: 'Réponse 4 [Kar]tier',
-                1: 'Réponse 4 [Car]cassonne',
-                6: 'Réponse 4 O[car]ina',
-                7: 'Réponse 4 Show[bus]',
-                8: 'Réponse 4 [Car]ioca'
-            }
-        ],
-        'Question 5': [
-            'Description 5',
-            {
-                3: 'Réponse 5 Madagas[car]',
-                4: 'Réponse 5 Y2[KAR]',
-                2: 'Réponse 5 Tcherno[bus]',
-                5: 'Réponse 5 [Kar]tier',
-                1: 'Réponse 5 [Car]cassonne',
-                6: 'Réponse 5 O[car]ina',
-                7: 'Réponse 5 Show[bus]',
-                8: 'Réponse 5 [Car]ioca'
-            }
-        ],
-        'Question 6': [
-            'Description 6',
-            {
-                3: 'Réponse 6 Madagas[car]',
-                4: 'Réponse 6 Y2[KAR]',
-                2: 'Réponse 6 Tcherno[bus]',
-                5: 'Réponse 6 [Kar]tier',
-                1: 'Réponse 6 [Car]cassonne',
-                6: 'Réponse 6 O[car]ina',
-                7: 'Réponse 6 Show[bus]',
-                8: 'Réponse 6 [Car]ioca'
-            }
-        ],
-        'Question 7': [
-            'Description 7',
-            {
-                3: 'Réponse 7 Madagas[car]',
-                4: 'Réponse 7 Y2[KAR]',
-                2: 'Réponse 7 Tcherno[bus]',
-                5: 'Réponse 7 [Kar]tier',
-                1: 'Réponse 7 [Car]cassonne',
-                6: 'Réponse 7 O[car]ina',
-                7: 'Réponse 7 Show[bus]',
-                8: 'Réponse 7 [Car]ioca'
-            }
-        ],
-        'Question 8': [
-            'Description 8',
-            {
-                3: 'Réponse 8 Madagas[car]',
-                4: 'Réponse 8 Y2[KAR]',
-                2: 'Réponse 8 Tcherno[bus]',
-                5: 'Réponse 8 [Kar]tier',
-                1: 'Réponse 8 [Car]cassonne',
-                6: 'Réponse 8 O[car]ina',
-                7: 'Réponse 8 Show[bus]',
-                8: 'Réponse 8 [Car]ioca'
-            }
-        ],
-        'Question 9': [
-            'Description 9',
-            {
-                3: 'Réponse 9 Madagas[car]',
-                4: 'Réponse 9 Y2[KAR]',
-                2: 'Réponse 9 Tcherno[bus]',
-                5: 'Réponse 9 [Kar]tier',
-                1: 'Réponse 9 [Car]cassonne',
-                6: 'Réponse 9 O[car]ina',
-                7: 'Réponse 9 Show[bus]',
-                8: 'Réponse 9 [Car]ioca'
-            }
-        ]
-    }
-}
-
-NB_WORDS = 5
+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):
@@ -155,6 +32,11 @@ class WEISurveyForm2025(forms.Form):
    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.
@@ -166,56 +48,34 @@ class WEISurveyForm2025(forms.Form):
            registration._force_save = True
            registration.save()

-        rng = Random((information.step + 1) * information.seed)
-
-        if information.step == 0:
-            self.fields["words"] = forms.MultipleChoiceField(
-                label=_(f"Choose {NB_WORDS} words:"),
-                choices=[(w, w) for w in WORDS['list']],
-                widget=forms.CheckboxSelectMultiple(),
-                required=True,
-            )
+        if self.data:
+            self.fields["word"].choices = [(w, w) for w in WORDS]
            if self.is_valid():
                return

-            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
+        rng = Random((information.step + 1) * information.seed)

-            preferred_words = {
-                bus: [word for word in WORDS['list'] if informations[bus].scores[word] >= average_score]
-                for bus in buses
-            }
-
-            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)
-            self.fields["words"].choices = [(w, w) for w in all_preferred_words]
+        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:
-            questions = list(WORDS['questions'].items())
-            idx = information.step - 1
-            if idx < len(questions):
-                q, (desc, answers) = questions[idx]
-                choices = [(k, v) for k, v in answers.items()]
-                rng.shuffle(choices)
-                self.fields[q] = forms.ChoiceField(
-                    label=desc,
-                    choices=choices,
-                    widget=forms.RadioSelect,
-                    required=True,
-                )
+            average_score = 0

-    def clean_words(self):
-        data = self.cleaned_data['words']
-        if len(data) != NB_WORDS:
-            raise forms.ValidationError(_(f"Please choose exactly {NB_WORDS} words"))
-        return data
+        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):
@@ -226,7 +86,7 @@ class WEIBusInformation2025(WEIBusInformation):

    def __init__(self, bus):
        self.scores = {}
-        for word in WORDS['list']:
+        for word in WORDS:
            self.scores[word] = 0
        super().__init__(bus)

@@ -248,7 +108,7 @@ class BusInformationForm2025(forms.ModelForm):
            except (json.JSONDecodeError, TypeError, AttributeError):
                initial_scores = {}
        if words is None:
-            words = WORDS['list']
+            words = WORDS
        self.words = words

        choices = [(i, str(i)) for i in range(6)]  # [(0, '0'), (1, '1'), ..., (5, '5')]
@@ -285,26 +145,10 @@ class WEISurveyInformation2025(WEISurveyInformation):
    step = 0

    def __init__(self, registration):
-        for i in range(1, 5):
+        for i in range(1, 21):
            setattr(self, "word" + str(i), None)
-        for q in WORDS['questions']:
-            setattr(self, q, None)
        super().__init__(registration)

-    def reset(self, registration):
-        """
-        Réinitialise complètement le questionnaire : step, seed, mots choisis et réponses aux questions.
-        """
-        self.step = 0
-        self.seed = 0
-        for i in range(1, 5):
-            setattr(self, f"word{i}", None)
-        for q in WORDS['questions']:
-            setattr(self, q, None)
-        self.save(registration)
-        registration._force_save = True
-        registration.save()
-

 class WEISurvey2025(WEISurvey):
    """
@@ -330,20 +174,10 @@ class WEISurvey2025(WEISurvey):

    @transaction.atomic
    def form_valid(self, form):
-        if self.information.step == 0:
-            words = form.cleaned_data['words']
-            for i, word in enumerate(words, 1):
-                setattr(self.information, "word" + str(i), word)
-            self.information.step += 1
-            self.save()
-        else:
-            questions = list(WORDS['questions'].keys())
-            idx = self.information.step - 1
-            if idx < len(questions):
-                q = questions[idx]
-                setattr(self.information, q, form.cleaned_data[q])
-                self.information.step += 1
-                self.save()
+        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):
@@ -353,7 +187,7 @@ class WEISurvey2025(WEISurvey):
        """
        The survey is complete once the bus is chosen.
        """
-        return self.information.step > len(WORDS['questions'])
+        return self.information.step == 20

    @classmethod
    @lru_cache()
@@ -365,41 +199,24 @@ class WEISurvey2025(WEISurvey):
        return sum([cls.get_algorithm_class().get_bus_information(bus).scores[word] for bus in buses]) / buses.count()

    @lru_cache()
-    def score_questions(self, bus):
-        """
-        The score given by the answers to the questions
-        """
-        if not self.is_complete():
-            raise ValueError("Survey is not ended, can't calculate score")
-        # Score is the given score by the bus subtracted to the mid-score of the buses.
-        s = sum(1 for q in WORDS['questions'] if getattr(self.information, q) == bus.pk)
-        return s
-
-    @lru_cache()
-    def score_words(self, bus):
-        """
-        The score given by the choice of words
-        """
+    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, 1 + NB_WORDS)) / self.get_algorithm_class().get_buses().count()
+                - 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_questions(bus), self.score_words(bus)) for bus in self.get_algorithm_class().get_buses()}
+        return {bus: self.score(bus) for bus in self.get_algorithm_class().get_buses()}

    @lru_cache()
    def ordered_buses(self):
-        """
-        Force the choice of bus to be in the 3 preferred buses according to the words
-        """
        values = list(self.scores_per_bus().items())
-        values.sort(key=lambda item: -item[1][0])
+        values.sort(key=lambda item: -item[1])
        return values

    @classmethod
@@ -426,18 +243,10 @@ class WEISurveyAlgorithm2025(WEISurveyAlgorithm):
    def get_bus_information_form(cls):
        return BusInformationForm2025

-    @classmethod
-    def get_buses(cls):
-
-        if not hasattr(cls, '_buses'):
-            cls._buses = Bus.objects.filter(wei__year=cls.get_survey_class().get_year(), size__gt=0).all().exclude(name='Staff')
-        return cls._buses
-
    def run_algorithm(self, display_tqdm=False):
        """
        Gale-Shapley algorithm implementation.
        We modify it to allow buses to have multiple "weddings".
-        We use lexigographical order on both scores
        """
        surveys = list(self.get_survey_class()(r) for r in self.get_registrations())  # All surveys
        surveys = [s for s in surveys if s.is_complete()]  # Don't consider invalid surveys
@@ -498,7 +307,7 @@ class WEISurveyAlgorithm2025(WEISurveyAlgorithm):
        while free_surveys:  # Some students are not affected
            survey = free_surveys[0]
            buses = survey.ordered_buses()  # Preferences of the student
-            for bus, current_scores in buses:
+            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)
@@ -513,8 +322,8 @@ class WEISurveyAlgorithm2025(WEISurveyAlgorithm):
                    for survey2 in surveys:
                        if not survey2.information.valid or survey2.information.get_selected_bus() != bus:
                            continue
-                        score2 = survey2.score_questions(bus)
-                        if current_scores[1] <= score2:  # Ignore better students
+                        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
--- a/apps/wei/migrations/0017_alter_weiclub_fee_soge_credit.py
+++ b/apps/wei/migrations/0017_alter_weiclub_fee_soge_credit.py
@@ -1,18 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-02 13:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0016_weiregistration_fee_alter_weiclub_fee_soge_credit'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='weiclub',
-            name='fee_soge_credit',
-            field=models.PositiveIntegerField(default=0, verbose_name='membership fee (soge credit)'),
-        ),
-    ]
--- a/apps/wei/migrations/0018_remove_weiregistration_deposit_check_and_more.py
+++ b/apps/wei/migrations/0018_remove_weiregistration_deposit_check_and_more.py
@@ -1,22 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-02 17:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0017_alter_weiclub_fee_soge_credit'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='weiregistration',
-            name='deposit_check',
-        ),
-        migrations.AddField(
-            model_name='weiregistration',
-            name='deposit_given',
-            field=models.BooleanField(default=False, verbose_name='Deposit given'),
-        ),
-    ]
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -40,7 +40,7 @@ class WEIClub(Club):

    fee_soge_credit = models.PositiveIntegerField(
        verbose_name=_("membership fee (soge credit)"),
-        default=0,
+        default=2000,
    )

    class Meta:
@@ -202,9 +202,9 @@ class WEIRegistration(models.Model):
        verbose_name=_("Credit from Société générale"),
    )

-    deposit_given = models.BooleanField(
+    deposit_check = models.BooleanField(
        default=False,
-        verbose_name=_("Deposit given")
+        verbose_name=_("Deposit check given")
    )

    deposit_type = models.CharField(
--- a/apps/wei/tables.py
+++ b/apps/wei/tables.py
@@ -71,7 +71,7 @@ class WEIRegistrationTable(tables.Table):
        'wei:wei_delete_registration',
        args=[A('pk')],
        orderable=False,
-        verbose_name=_("Delete"),
+        verbose_name=_("delete"),
        text=_("Delete"),
        attrs={
            'th': {
@@ -84,35 +84,6 @@ class WEIRegistrationTable(tables.Table):
        },
    )

-    def render_deposit_type(self, record):
-        if record.first_year:
-            return format_html("∅")
-        if record.deposit_type == 'check':
-            # TODO Install Font Awesome 6 to acces more icons (and keep compaibility with current used v4)
-            return format_html("""
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="1.5em" height="1.5em"
-        fill="currentColor" style="position: relative; left: -0.15em;">
-            <path d="
-                M128 128C92.7 128 64 156.7 64 192L64 448C64 483.3 92.7 512 128 512L512 512
-                C547.3 512 576 483.3 576 448L576 192C576 156.7 547.3 128 512 128L128 128z
-                M360 352L488 352C501.3 352 512 362.7 512 376C512 389.3 501.3 400 488 400L360 400
-                C346.7 400 336 389.3 336 376C336 362.7 346.7 352 360 352z
-                M336 264C336 250.7 346.7 240 360 240L488 240C501.3 240 512 250.7 512 264
-                C512 277.3 501.3 288 488 288L360 288C346.7 288 336 277.3 336 264z
-                M212 208C223 208 232 217 232 228L232 232L240 232C251 232 260 241 260 252
-                C260 263 251 272 240 272L192.5 272C185.6 272 180 277.6 180 284.5
-                C180 290.6 184.4 295.8 190.4 296.8L232.1 303.8C257.4 308 276 329.9 276 355.6
-                C276 381.7 257 403.3 232 407.4L232 412.1C232 423.1 223 432.1 212 432.1
-                C201 432.1 192 423.1 192 412.1L192 408.1L168 408.1C157 408.1 148 399.1 148 388.1
-                C148 377.1 157 368.1 168 368.1L223.5 368.1C230.4 368.1 236 362.5 236 355.6
-                C236 349.5 231.6 344.3 225.6 343.3L183.9 336.3C158.5 332 140 310.1 140 284.5
-                C140 255.7 163.2 232.3 192 232L192 228C192 217 201 208 212 208z
-            " />
-        </svg>
-    """)
-        if record.deposit_type == 'note':
-            return format_html("<i class=\"fa fa-exchange\"></i>")
-
    def render_validate(self, record):
        hasperm = PermissionBackend.check_perm(
            get_current_request(), "wei.add_weimembership", WEIMembership(
@@ -154,8 +125,8 @@ class WEIRegistrationTable(tables.Table):
        order_by = ('validate', 'user',)
        model = WEIRegistration
        template_name = 'django_tables2/bootstrap4.html'
-        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'deposit_given',
-                  'deposit_type', 'edit', 'validate', 'delete',)
+        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'deposit_check',
+                  'edit', 'validate', 'delete',)
        row_attrs = {
            'class': 'table-row',
            'id': lambda record: "row-" + str(record.pk),
@@ -165,8 +136,8 @@ class WEIRegistrationTable(tables.Table):

 class WEIMembershipTable(tables.Table):
    user = tables.LinkColumn(
-        'wei:wei_update_membership',
-        args=[A('pk')],
+        'wei:wei_update_registration',
+        args=[A('registration__pk')],
    )

    year = tables.Column(
@@ -187,35 +158,6 @@ class WEIMembershipTable(tables.Table):
    def render_year(self, record):
        return str(record.user.profile.ens_year) + "A"

-    def render_registration__deposit_type(self, record):
-        if record.registration.first_year:
-            return format_html("∅")
-        if record.registration.deposit_type == 'check':
-            # TODO Install Font Awesome 6 to acces more icons (and keep compaibility with current used v4)
-            return format_html("""
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="1.5em" height="1.5em"
-        fill="currentColor" style="position: relative; left: -0.15em;">
-            <path d="
-                M128 128C92.7 128 64 156.7 64 192L64 448C64 483.3 92.7 512 128 512L512 512
-                C547.3 512 576 483.3 576 448L576 192C576 156.7 547.3 128 512 128L128 128z
-                M360 352L488 352C501.3 352 512 362.7 512 376C512 389.3 501.3 400 488 400L360 400
-                C346.7 400 336 389.3 336 376C336 362.7 346.7 352 360 352z
-                M336 264C336 250.7 346.7 240 360 240L488 240C501.3 240 512 250.7 512 264
-                C512 277.3 501.3 288 488 288L360 288C346.7 288 336 277.3 336 264z
-                M212 208C223 208 232 217 232 228L232 232L240 232C251 232 260 241 260 252
-                C260 263 251 272 240 272L192.5 272C185.6 272 180 277.6 180 284.5
-                C180 290.6 184.4 295.8 190.4 296.8L232.1 303.8C257.4 308 276 329.9 276 355.6
-                C276 381.7 257 403.3 232 407.4L232 412.1C232 423.1 223 432.1 212 432.1
-                C201 432.1 192 423.1 192 412.1L192 408.1L168 408.1C157 408.1 148 399.1 148 388.1
-                C148 377.1 157 368.1 168 368.1L223.5 368.1C230.4 368.1 236 362.5 236 355.6
-                C236 349.5 231.6 344.3 225.6 343.3L183.9 336.3C158.5 332 140 310.1 140 284.5
-                C140 255.7 163.2 232.3 192 232L192 228C192 217 201 208 212 208z
-            " />
-        </svg>
-    """)
-        if record.registration.deposit_type == 'note':
-            return format_html("<i class=\"fa fa-exchange\"></i>")
-
    class Meta:
        attrs = {
            'class': 'table table-condensed table-striped table-hover'
@@ -223,7 +165,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_given', 'registration__deposit_type')
+                  'year', 'bus', 'team', 'registration__deposit_check', )
        row_attrs = {
            'class': 'table-row',
            'id': lambda record: "row-" + str(record.pk),
--- a/apps/wei/templates/wei/base.html
+++ b/apps/wei/templates/wei/base.html
@@ -50,7 +50,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                    {% endif %}

                    {% if club.deposit_amount > 0 %}
-                    <dt class="col-xl-6">{% trans 'deposit amount'|capfirst %}</dt>
+                    <dt class="col-xl-6">{% trans 'Deposit amount'|capfirst %}</dt>
                    <dd class="col-xl-6">{{ club.deposit_amount|pretty_money }}</dd>
                    {% endif %}

--- a/apps/wei/templates/wei/weiclub_detail.html
+++ b/apps/wei/templates/wei/weiclub_detail.html
@@ -39,11 +39,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
            data-turbolinks="false">
            {% trans "Update my registration" %}
        </a>
-        {% if not not_first_year %}
-        <a class="btn btn-warning" href="{% url "wei:wei_survey" pk=my_registration.pk %}?reset=true" data-turbolinks="false">
-            {% trans "Restart survey" %}
-        </a>
-        {% endif %}
        {% endif %}
    </div>
    {% endif %}
--- a/apps/wei/templates/wei/weimembership_form.html
+++ b/apps/wei/templates/wei/weimembership_form.html
@@ -96,7 +96,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                    {% endif %}
                {% else %}
                    <dt class="col-xl-6">{% trans 'Deposit check given'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ registration.deposit_given|yesno }}</dd>
+                    <dd class="col-xl-6">{{ registration.deposit_check|yesno }}</dd>

                    {% with information=registration.information %}
                        <dt class="col-xl-6">{% trans 'preferred bus'|capfirst %}</dt>
@@ -143,13 +143,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
                        {% endblocktrans %}
                    </div>
                {% endif %}
-                <div class="alert {% if registration.validation_status == 2 %}alert-danger{% else %}alert-success{% 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 not registration.first_year %}
                        {% if registration.deposit_type == 'note' %}
                            <li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
                                Deposit (by Note transaction): {{ amount }}
@@ -159,7 +158,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                                Deposit (by check): {{ amount }}
                            {% endblocktrans %}</li>
                        {% endif %}
-                        {% endif %}
                        <li><strong>{% blocktrans trimmed with total=total_needed|pretty_money %}
                            Total needed: {{ total }}
                        {% endblocktrans %}</strong></li>
@@ -169,9 +167,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                    {% endblocktrans %}</p>
                    </div>

-                {% if not registration.deposit_given and not registration.first_year and registration.caution_type == 'check' %}
+                {% if not registration.deposit_check and not registration.first_year and registration.caution_type == 'check' %}
                    <div class="alert alert-danger">
-                        {% trans "The user didn't give her/his caution." %}
+                        {% trans "The user didn't give her/his caution check." %}
                    </div>
                {% endif %}

@@ -215,6 +213,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                $("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');
--- a/apps/wei/templates/wei/weimembership_update.html
+++ b/apps/wei/templates/wei/weimembership_update.html
@@ -1,46 +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 %}
-
-{% block extrajavascript %}
-    <script>
-        $(document).ready(function () {
-            function refreshTeams() {
-                let buses = [];
-                $("input[name='bus']:checked").each(function (ignored) {
-                    buses.push($(this).parent().text().trim());
-                });
-                $("input[name='team']").each(function () {
-                    let label = $(this).parent();
-                    $(this).parent().addClass('d-none');
-                    buses.forEach(function (bus) {
-                        if (label.text().includes(bus))
-                            label.removeClass('d-none');
-                    });
-                });
-            }
-    
-            $("input[name='bus']").change(refreshTeams);
-    
-            refreshTeams();
-        });
-    </script>
-{% endblock %}
--- a/apps/wei/tests/test_wei_algorithm_2025.py
+++ b/apps/wei/tests/test_wei_algorithm_2025.py
@@ -6,7 +6,7 @@ import random
 from django.contrib.auth.models import User
 from django.test import TestCase

-from ..forms.surveys.wei2025 import WEIBusInformation2025, WEISurvey2025, WORDS, NB_WORDS, WEISurveyInformation2025
+from ..forms.surveys.wei2025 import WEIBusInformation2025, WEISurvey2025, WORDS, WEISurveyInformation2025
 from ..models import Bus, WEIClub, WEIRegistration


@@ -30,12 +30,12 @@ class TestWEIAlgorithm(TestCase):
        )

        self.buses = []
-        for i in range(8):
+        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['list']:
-                information.scores[word] = random.randint(0, 6)
+            for word in WORDS:
+                information.scores[word] = random.randint(0, 101)
            information.save()
            bus.save()

@@ -54,7 +54,7 @@ class TestWEIAlgorithm(TestCase):
            )
            information = WEISurveyInformation2025(registration)
            for j in range(1, 21):
-                setattr(information, f'word{j}', random.choice(WORDS['list']))
+                setattr(information, f'word{j}', random.choice(WORDS))
            information.step = 20
            information.save(registration)
            registration.save()
@@ -74,7 +74,7 @@ class TestWEIAlgorithm(TestCase):
        Buses are full of first year people, ensure that they are happy
        """
        # Add a lot of users
-        for i in range(80):
+        for i in range(95):
            user = User.objects.create(username=f"user{i}")
            registration = WEIRegistration.objects.create(
                user=user,
@@ -83,14 +83,11 @@ class TestWEIAlgorithm(TestCase):
                birth_date='2000-01-01',
            )
            information = WEISurveyInformation2025(registration)
-            for j in range(1, 1 + NB_WORDS):
-                setattr(information, f'word{j}', random.choice(WORDS['list']))
-            for q in WORDS['questions']:
-                setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys())))
-            information.step = len(WORDS['questions']) + 1
+            for j in range(1, 21):
+                setattr(information, f'word{j}', random.choice(WORDS))
+            information.step = 20
            information.save(registration)
            registration.save()
-            survey = WEISurvey2025(registration)

        # Run algorithm
        WEISurvey2025.get_algorithm_class()().run_algorithm()
@@ -105,25 +102,10 @@ class TestWEIAlgorithm(TestCase):
            survey = WEISurvey2025(r)
            chosen_bus = survey.information.get_selected_bus()
            buses = survey.ordered_buses()
-            '''print(buses)
-            print(chosen_bus)'''
-            self.assertIn(chosen_bus, [x[0] for x in buses])
-            score_questions, score_words = next(scores for bus, scores in buses if bus == chosen_bus)
-            max_score_questions = max(buses[i][1][0] for i in range(len(buses)))
-            max_score_words = max(buses[i][1][1] for i in range(len(buses)))
-            penalty += (max_score_words - score_words) ** 2
-            penalty += (max_score_questions - score_questions) ** 2
+            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 %
-
-        # There shouldn't be users who would prefer to switch buses
-        for r1 in WEIRegistration.objects.filter(wei=self.wei).all():
-            survey1 = WEISurvey2025(r1)
-            bus1 = survey1.information.get_selected_bus()
-            for r2 in WEIRegistration.objects.filter(wei=self.wei, pk__gt=r1.pk):
-                survey2 = WEISurvey2025(r2)
-                bus2 = survey2.information.get_selected_bus()
-
-                prefer_switch_bus_words = survey1.score_words(bus2) > survey1.score_words(bus1) and survey2.score_words(bus1) > survey2.score_words(bus2)
-                prefer_switch_bus_questions = survey1.score_questions(bus2) > survey1.score_questions(bus1) and\
-                    survey2.score_questions(bus1) > survey2.score_questions(bus2)
-                self.assertFalse(prefer_switch_bus_words and prefer_switch_bus_questions)
--- a/apps/wei/tests/test_wei_registration.py
+++ b/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_given=True,
+            deposit_check=True,
            birth_date=date(2000, 1, 1),
            gender="nonbinary",
            clothing_cut="male",
@@ -642,7 +642,7 @@ class TestWEIRegistration(TestCase):
            last_name="admin",
            first_name="admin",
            bank="Société générale",
-            deposit_given=True,
+            deposit_check=True,
        ))
        self.assertEqual(response.status_code, 200)
        self.assertFalse(response.context["form"].is_valid())
@@ -657,7 +657,7 @@ class TestWEIRegistration(TestCase):
            last_name="admin",
            first_name="admin",
            bank="Société générale",
-            deposit_given=True,
+            deposit_check=True,
        ))
        self.assertRedirects(response, reverse("wei:wei_registrations", kwargs=dict(pk=self.registration.wei.pk)), 302, 200)

@@ -813,7 +813,7 @@ class TestWeiAPI(TestAPI):
            user_id=self.user.id,
            wei_id=self.wei.id,
            soge_credit=True,
-            deposit_given=True,
+            deposit_check=True,
            birth_date=date(2000, 1, 1),
            gender="nonbinary",
            clothing_cut="male",
--- a/apps/wei/urls.py
+++ b/apps/wei/urls.py
@@ -7,7 +7,7 @@ from .views import CurrentWEIDetailView, WEI1AListView, WEIListView, WEICreateVi
    WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, BusInformationUpdateView, \
    BusCreateView, BusManageView, BusUpdateView, BusTeamCreateView, BusTeamManageView, BusTeamUpdateView, \
    WEIAttributeBus1AView, WEIAttributeBus1ANextView, WEIRegister1AView, WEIRegister2AView, WEIUpdateRegistrationView, \
-    WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView, WEIUpdateMembershipView
+    WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView

 app_name = 'wei'
 urlpatterns = [
@@ -43,6 +43,4 @@ urlpatterns = [
    path('bus-1A/<int:pk>/', WEIAttributeBus1AView.as_view(), name="wei_bus_1A"),
    path('bus-1A/next/<int:pk>/', WEIAttributeBus1ANextView.as_view(), name="wei_bus_1A_next"),
    path('update-bus-info/<int:pk>/', BusInformationUpdateView.as_view(), name="update_bus_info"),
-
-    path('edit_membership/<int:pk>/', WEIUpdateMembershipView.as_view(), name="wei_update_membership"),
 ]
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -594,8 +594,8 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
        # Cacher les champs pendant l'inscription initiale
        if "first_year" in form.fields:
            del form.fields["first_year"]
-        if "deposit_given" in form.fields:
-            del form.fields["deposit_given"]
+        if "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:
@@ -704,8 +704,8 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
        # Cacher les champs pendant l'inscription initiale
        if "first_year" in form.fields:
            del form.fields["first_year"]
-        if "deposit_given" in form.fields:
-            del form.fields["deposit_given"]
+        if "deposit_check" in form.fields:
+            del form.fields["deposit_check"]
        if "information_json" in form.fields:
            del form.fields["information_json"]

@@ -798,6 +798,11 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
            choose_bus_form.fields["team"].queryset = BusTeam.objects.filter(bus__wei=context["club"])
            context["membership_form"] = choose_bus_form

+        if not self.object.soge_credit and self.object.user.profile.soge:
+            form = context["form"]
+            form.fields["soge_credit"].disabled = True
+            form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
+
        return context

    def get_form(self, form_class=None):
@@ -806,23 +811,14 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
        # The auto-json-format may cause issues with the default field remove
        if "information_json" in form.fields:
            del form.fields["information_json"]
-        # Masquer le champ deposit_given pour tout le monde dans le formulaire de modification
-        if "deposit_given" in form.fields:
-            form.fields["deposit_given"].help_text = _("Tick if the deposit check has been given")
-            if self.object.first_year or self.object.deposit_type == 'note':
-                del form.fields["deposit_given"]
+        # 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 "deposit_type" in form.fields:
-            if self.object.first_year:
-                del form.fields["deposit_type"]
-            else:
-                form.fields["deposit_type"].required = True
-                form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
-
-        if self.object.user.profile.soge:
-            form.fields["soge_credit"].disabled = True
-            form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
+        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")

        return form

@@ -883,6 +879,7 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
            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()
@@ -1018,18 +1015,17 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
        form.fields["last_name"].initial = registration.user.last_name
        form.fields["first_name"].initial = registration.user.first_name

-        # Ajouter le champ deposit_given uniquement pour les non-première année et le rendre obligatoire
+        # 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_given"] = forms.BooleanField(
+                form.fields["deposit_check"] = forms.BooleanField(
                    required=True,
-                    disabled=True,
-                    initial=registration.deposit_given,
+                    initial=registration.deposit_check,
                    label=_("Deposit check given"),
-                    help_text=_("Only treasurers can validate this field")
+                    help_text=_("Please make sure the check is given before validating the registration")
                )
            else:
-                form.fields["deposit_given"] = forms.BooleanField(
+                form.fields["deposit_check"] = forms.BooleanField(
                    required=True,
                    initial=False,
                    label=_("Create deposit transaction"),
@@ -1070,8 +1066,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
        club = registration.wei
        user = registration.user

-        if "deposit_given" in form.data:
-            registration.deposit_given = form.data["deposit_given"] == "on"
+        if "deposit_check" in form.data:
+            registration.deposit_check = form.data["deposit_check"] == "on"
            registration.save()
        membership = form.instance
        membership.user = user
@@ -1127,16 +1123,16 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
                               'credit': credit_amount,
                               'needed': total_needed}
                           )
-            return self.form_invalid(form)
+            return super().form_invalid(form)

        if credit_amount:
            if not last_name:
                form.add_error('last_name', _("This field is required."))
-                return self.form_invalid(form)
+                return super().form_invalid(form)

            if not first_name:
                form.add_error('first_name', _("This field is required."))
-                return self.form_invalid(form)
+                return super().form_invalid(form)

            # Credit note before adding the membership
            SpecialTransaction.objects.create(
@@ -1180,61 +1176,11 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):

        return super().form_valid(form)

-    def form_invalid(self, form):
-        registration = getattr(form.instance, "registration", None)
-        if registration is not None:
-            registration.deposit_given = False
-            registration.save()
-        return super().form_invalid(form)
-
    def get_success_url(self):
        self.object.refresh_from_db()
        return reverse_lazy("wei:wei_registrations", kwargs={"pk": self.object.club.pk})


-class WEIUpdateMembershipView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    Update a membership for the WEI
-    """
-    model = WEIMembership
-    context_object_name = "membership"
-    template_name = "wei/weimembership_update.html"
-    extra_context = {"title": _("Update WEI Membership")}
-
-    def dispatch(self, request, *args, **kwargs):
-        wei = self.get_object().registration.wei
-        today = date.today()
-        # We can't update a registration once the WEI is started and before the membership start date
-        if today >= wei.date_start or today < wei.membership_start:
-            return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
-        # Store the validate parameter in the view's state
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_form(self):
-        form = WEIMembershipForm(
-            self.request.POST or None,
-            self.request.FILES or None,
-            instance=self.object,
-            wei=self.object.registration.wei,
-        )
-
-        form.fields["roles"].initial = self.object.roles.all()
-        form.fields["bus"].initial = self.object.bus
-        form.fields["team"].initial = self.object.team
-
-        del form.fields["credit_type"]
-        del form.fields["credit_amount"]
-        del form.fields["first_name"]
-        del form.fields["last_name"]
-        del form.fields["bank"]
-
-        return form
-
-    def get_success_url(self):
-        print("get_success_url")
-        return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.registration.wei.pk})
-
-
 class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
    """
    Display the survey for the WEI for first year members.
@@ -1257,10 +1203,6 @@ class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):

        if not self.survey:
            self.survey = CurrentSurvey(obj)
-
-        if request.GET.get("reset") == "true":
-            info = self.survey.information
-            info.reset(obj)
        # If the survey is complete, then display the end page.
        if self.survey.is_complete():
            return redirect(reverse_lazy('wei:wei_survey_end', args=(self.survey.registration.pk,)))
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -3152,10 +3152,8 @@ msgid "Note transaction"
 msgstr "Transaction Note"

 #: apps/wei/models.py:217
-#, fuzzy
-#| msgid "Credit type"
 msgid "deposit type"
-msgstr "Type de rechargement"
+msgstr "type de caution"

 #: apps/wei/models.py:221 apps/wei/templates/wei/weimembership_form.html:64
 msgid "birth date"
@@ -4095,14 +4093,6 @@ msgstr "La note est indisponible pour le moment"
 msgid "Thank you for your understanding -- The Respos Info of BDE"
 msgstr "Merci de votre compréhension -- Les Respos Info du BDE"

-#: note_kfet/templates/base_search.html:15
-msgid "Search by attribute such as name..."
-msgstr "Chercher par un attribut tel que le nom..."
-
-#: note_kfet/templates/base_search.html:23
-msgid "There is no results."
-msgstr "Il n'y a pas de résultat."
-
 #: note_kfet/templates/cas/logged.html:8
 msgid ""
 "<h3>Log In Successful</h3>You have successfully logged into the Central "
Author	SHA1	Message	Date
Otthorn	424aebbf3a	Merge branch 'qrcode' into 'main' Draft: Qrcode See merge request bde/nk20!196	2025-07-20 14:24:03 +02:00
ehouarn	4975c1ab6f	Merge branch 'translations' into 'main' Translations See merge request bde/nk20!332	2025-07-19 18:29:18 +02:00
Ehouarn	61999a31a5	Wei details	2025-07-19 18:04:14 +02:00
ehouarn	b217f7ceec	Merge branch 'wei' into 'main' Wei See merge request bde/nk20!331	2025-07-19 17:27:20 +02:00
Ehouarn	03c1bb41b6	First of many	2025-07-18 23:49:34 +02:00
ehouarn	f03c13a4b8	Merge branch 'wei' into 'main' Wei See merge request bde/nk20!330	2025-07-15 19:26:32 +02:00
Nicolas Margulies	e6f3084588	Added a first pass for automatically entering an activity with a qrcode	2023-10-11 18:01:51 +02:00
otthorn	145e55da75	remove useless comment	2022-03-22 15:06:04 +01:00
otthorn	d3ba95cdca	Insecable space for more clarity	2022-03-22 15:04:41 +01:00
otthorn	8ffb0ebb56	Use DetailView	2022-03-22 14:59:01 +01:00
otthorn	5038af9e34	Final html template	2022-03-22 14:58:26 +01:00
otthorn	819b4214c9	Add QRCode View, URL and test template	2022-03-22 12:26:44 +01:00
otthorn	b8a93b0b75	Add link to QR code	2022-03-19 16:25:15 +01:00