Merge branch 'qrcode' into 'main'

Draft: Qrcode

See merge request bde/nk20!196

apps/activity/forms.py

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

apps/activity/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/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/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/permission/fixtures/initial.json

@@ -4347,23 +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"
+            "description": "Ajouter un membre au BDE ou à la Kfet"
         }
     },
     {
@@ -4780,6 +4764,7 @@
             "name": "Chef\u22c5fe de bus",
             "permissions": [
                 22,
+                84,
                 115,
                 117,
                 118,
@@ -4793,8 +4778,7 @@
                 287,
                 289,
                 290,
-                291,
-                293
+                291
             ]
         }
     },
@@ -4806,6 +4790,7 @@
             "name": "Chef\u22c5fe d'\u00e9quipe",
             "permissions": [
                 22,
+                84,
                 116,
                 123,
                 124,
@@ -4820,7 +4805,8 @@
             "for_club": null,
             "name": "\u00c9lectron libre",
             "permissions": [
-                22
+                22,
+                84
             ]
         }
     },
@@ -4971,6 +4957,7 @@
             "name": "Référent⋅e Bus",
             "permissions": [
                 22,
+                84,
                 115,
                 117,
                 118,
@@ -4984,8 +4971,7 @@
                 287,
                 289,
                 290,
-                291,
-                293
+                291
             ]
         }
     }, 

apps/wei/forms/registration.py

@@ -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(),

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()
@@ -366,41 +200,23 @@ class WEISurvey2025(WEISurvey):
 
     @lru_cache()
     def score(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
-        """
         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.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), 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][1])
-        values = values[:3]
+        values.sort(key=lambda item: -item[1])
         return values
 
     @classmethod
@@ -427,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
@@ -499,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)
@@ -509,17 +317,17 @@ class WEISurveyAlgorithm2025(WEISurveyAlgorithm):
                 else:
                     # Current bus has not enough places. Remove the least preferred student from the bus if existing
                     least_preferred_survey = None
-                    least_scores = (-1, -1)
+                    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
-                        scores2 = survey2.score(bus), survey2.score_words(bus)
-                        if current_scores <= scores2:  # Ignore better students
+                        score2 = survey2.score(bus)
+                        if current_score <= score2:  # Ignore better students
                             continue
-                        if least_preferred_survey is None or scores2 < least_scores:
+                        if least_preferred_survey is None or score2 < least_score:
                             least_preferred_survey = survey2
-                            least_scores = scores2
+                            least_score = score2
 
                     if least_preferred_survey is not None:
                         # Remove the least student from the bus and put the current student in.

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': {
@@ -136,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(

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 %}
 

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 %}

apps/wei/templates/wei/weimembership_form.html

@@ -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>
@@ -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');

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 %}

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,11 +102,10 @@ class TestWEIAlgorithm(TestCase):
             survey = WEISurvey2025(r)
             chosen_bus = survey.information.get_selected_bus()
             buses = survey.ordered_buses()
-            self.assertIn(chosen_bus, [x[0] for x in buses])
-            score = min(v for bus, (v, __) in buses if bus == chosen_bus)
-            max_score = buses[0][1][0]
+            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, 1)  # Always less than 25 % of tolerance
+            self.assertLessEqual(max_score - score, 25)  # Always less than 25 % of tolerance
 
         self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %

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"),
 ]

apps/wei/views.py

@@ -816,12 +816,9 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
             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 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
 
@@ -882,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()
@@ -1125,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(
@@ -1178,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_check = 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.
@@ -1255,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,)))

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 "