Merge branch 'summary_notes' into 'main'

treasury summary See merge request bde/nk20!223
Merge branch 'survey_wei_2024' into 'main'
2024-08-30 13:00:59 +02:00 · 2024-08-29 23:10:57 +02:00 · 2024-08-29 22:47:33 +02:00 · 2024-08-29 22:19:11 +02:00 · 2024-08-29 19:12:23 +02:00 · 2024-08-29 18:36:20 +02:00
25 changed files with 1085 additions and 52 deletions
--- a/apps/activity/migrations/0005_alter_opener_options_alter_opener_opener.py
+++ b/apps/activity/migrations/0005_alter_opener_options_alter_opener_opener.py
@ -0,0 +1,24 @@
 # Generated by Django 4.2.15 on 2024-08-28 08:00
 from django.db import migrations, models
 import django.db.models.deletion
 class Migration(migrations.Migration):
    dependencies = [
        ('note', '0006_trust'),
        ('activity', '0004_opener'),
    ]
    operations = [
        migrations.AlterModelOptions(
            name='opener',
            options={'verbose_name': 'Opener', 'verbose_name_plural': 'Openers'},
        ),
        migrations.AlterField(
            model_name='opener',
            name='opener',
            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activity_responsible', to='note.note', verbose_name='Opener'),
        ),
    ]
--- a/apps/food/migrations/0005_alter_food_polymorphic_ctype.py
+++ b/apps/food/migrations/0005_alter_food_polymorphic_ctype.py
@ -0,0 +1,20 @@
 # Generated by Django 4.2.15 on 2024-08-28 08:00
 from django.db import migrations, models
 import django.db.models.deletion
 class Migration(migrations.Migration):
    dependencies = [
        ('contenttypes', '0002_remove_content_type_name'),
        ('food', '0004_auto_20240813_2358'),
    ]
    operations = [
        migrations.AlterField(
            model_name='food',
            name='polymorphic_ctype',
            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
        ),
    ]
--- a/apps/member/migrations/0013_auto_20240807_1409.py
+++ b/apps/member/migrations/0013_auto_20240807_1409.py
@ -0,0 +1,18 @@
 # Generated by Django 2.2.28 on 2024-08-07 12:09
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ('member', '0012_club_add_registration_form'),
    ]
    operations = [
        migrations.AlterField(
            model_name='profile',
            name='promotion',
            field=models.PositiveSmallIntegerField(default=2024, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
        ),
    ]
--- a/apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py
+++ b/apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py
@ -0,0 +1,25 @@
 # Generated by Django 4.2.15 on 2024-08-28 08:00
 from django.db import migrations, models
 import django.db.models.deletion
 class Migration(migrations.Migration):
    dependencies = [
        ('contenttypes', '0002_remove_content_type_name'),
        ('note', '0006_trust'),
    ]
    operations = [
        migrations.AlterField(
            model_name='note',
            name='polymorphic_ctype',
            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
        ),
        migrations.AlterField(
            model_name='transaction',
            name='polymorphic_ctype',
            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
        ),
    ]
--- a/apps/note/templates/note/mails/summary_notes_report.html
+++ b/apps/note/templates/note/mails/summary_notes_report.html
@ -0,0 +1,65 @@
 {% load pretty_money %}
 {% load i18n %}
 <!DOCTYPE html>
 <html lang="fr">
 <head>
    <meta charset="UTF-8">
    <title>[Note Kfet] Récapitulatif de trésorerie</title>
 </head>
 <body>
 <h1>
  Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
 </h1>
 <h2>
  Tous les utilisateur⋅rices :
 </h2>
 <ul>
  <li>Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €</li>
  <li>Neutres : {{ summary.total_zero_user }}</li>
  <li>Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €</li>
 </ul>
 <h2>
  Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
 </h2>
 <ul>
  <li>Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €</li>
  <li>Neutres : {{ summary.total_zero_user_bde }}</li>
  <li>Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde / 100 }} €</li>
 </ul>
 <h2>
  Clubs :
 </h2>
 <ul>
  <li>Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €</li>
  <li>Neutres : {{ summary.total_zero_club }}</li>
  <li>Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €</li>
 </ul>
 <h2>
  Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
 </h2>
 <ul>
  <li>Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €</li>
  <li>Neutres : {{ summary.total_zero_club_nbde }}</li>
  <li>Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €</li>
 </ul>
 <h2>
  Progression :
 </h2>
 <ul>
  <li>Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices</li>
  <li>Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs</li>
 </ul>
 --
 <p>
    Le BDE<br>
    {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
 </p>
 </body>
 </html>
--- a/apps/note/templates/note/mails/summary_notes_report.txt
+++ b/apps/note/templates/note/mails/summary_notes_report.txt
@ -0,0 +1,33 @@
 {% load pretty_money %}
 {% load i18n %}
 Récapitulatif de trésorerie au {{ summary.date|date:"d/m/Y" }} à {{ summary.date|date:"H:i:s" }} :
 Tous les utilisateur⋅rices :
  - Positifs : {{ summary.total_positive_user }} soit {{ summary.balance_positive_user / 100 }} €
  - Neutres : {{ summary.total_zero_user }}
  - Négatifs : {{ summary.total_negative_user }} soit {{ summary.balance_negative_user / 100 }} €
 Les {{ summary.total_positive_user_bde + summary.total_zero_user_bde + summary.total_negative_user_bde }} adhérent⋅es BDE :
  - Positifs : {{ summary.total_positive_user_bde }} soit {{ summary.balance_positive_user_bde / 100 }} €
  - Neutres : {{ summary.total_zero_user_bde }}
  - Négatifs : {{ summary.total_negative_user_bde }} soit {{ summary.balance_negative_user_bde /100 }} €
 Clubs :
  - Positifs : {{ summary.total_positive_club }} soit {{ summary.balance_positive_club / 100 }} €
  - Neutres : {{ summary.total_zero_club }}
  - Négatifs : {{ summary.total_negative_club }} soit {{ summary.balance_negative_club / 100 }} €
 Clubs hors BDE / Kfet et club dont le nom fini par "- BDE" :
  - Positifs : {{ summary.total_positive_club_nbde }} soit {{ summary.balance_positive_club_nbde / 100 }} €
  - Neutres : {{ summary.total_zero_club_nbde }}
  - Négatifs : {{ summary.total_negative_club_nbde }} soit {{ summary.balance_negative_club_nbde / 100 }} €
 Progression :
  - Ceci correspond à une différence de {{ balance_difference_user / 100 }} € pour les utilisateur⋅rices
  - Ceci correspond à une différence de {{ balance_difference_club / 100 }} € pour les clubs
 --
 Le BDE
 {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
--- a/apps/scripts
+++ b/apps/scripts
@ -1 +1 @@
-Subproject commit f580f9b9e9beee76605975fdbc3a2014769e3c61
+Subproject commit f76acb32487635fe28907b637955e110a37b06cc
--- a/apps/treasury/admin.py
+++ b/apps/treasury/admin.py
@ -5,13 +5,13 @@ from django.contrib import admin
 from note_kfet.admin import admin_site
 from .forms import ProductForm
-from .models import RemittanceType, Remittance, SogeCredit, Invoice, Product
+from .models import Invoice, NoteSummary, Product, RemittanceType, Remittance, SogeCredit
@admin.register(RemittanceType, site=admin_site)
 class RemittanceTypeAdmin(admin.ModelAdmin):
    """
-    Admin customisation for RemiitanceType
+    Admin customisation for RemittanceType
    """
    list_display = ('note', )
@ -55,3 +55,19 @@ class InvoiceAdmin(admin.ModelAdmin):
    """
    list_display = ('object', 'id', 'bde', 'name', 'date', 'acquitted',)
    inlines = (ProductInline,)
@admin.register(NoteSummary, site=admin_site)
 class NoteSummaryAdmin(admin.ModelAdmin):
    """
    Admin customisation for NoteSummary
    """
    list_display = (
        'date', 'total_positive_user', 'balance_positive_user', 'total_positive_user_bde',
        'balance_positive_user_bde', 'total_zero_user', 'total_zero_user_bde', 'total_negative_user',
        'balance_negative_user', 'total_negative_user_bde', 'balance_negative_user_bde',
        'total_vnegative_user', 'balance_vnegative_user', 'total_vnegative_user_bde',
        'balance_vnegative_user_bde', 'total_positive_club', 'balance_positive_club',
        'total_positive_club_nbde', 'balance_positive_club_nbde', 'total_zero_club', 'total_zero_club_nbde',
        'total_negative_club', 'balance_negative_club', 'total_negative_club_nbde', 'balance_negative_club_nbde',
    )
--- a/apps/treasury/migrations/0009_alter_sogecredit_transactions.py
+++ b/apps/treasury/migrations/0009_alter_sogecredit_transactions.py
@ -0,0 +1,19 @@
 # Generated by Django 4.2.15 on 2024-08-28 08:00
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ('note', '0007_alter_note_polymorphic_ctype_and_more'),
        ('treasury', '0008_auto_20240322_0045'),
    ]
    operations = [
        migrations.AlterField(
            model_name='sogecredit',
            name='transactions',
            field=models.ManyToManyField(blank=True, related_name='+', to='note.membershiptransaction', verbose_name='membership transactions'),
        ),
    ]
--- a/apps/treasury/migrations/0009_notesummary.py
+++ b/apps/treasury/migrations/0009_notesummary.py
@ -0,0 +1,49 @@
 # Generated by Django 2.2.28 on 2024-08-07 12:09
 import datetime
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ('treasury', '0008_auto_20240322_0045'),
    ]
    operations = [
        migrations.CreateModel(
            name='NoteSummary',
            fields=[
                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                ('date', models.DateField(default=datetime.date.today, verbose_name='Date')),
                ('total_positive_user', models.PositiveIntegerField(verbose_name='Total positive user')),
                ('balance_positive_user', models.PositiveIntegerField(verbose_name='Balance positive user')),
                ('total_positive_user_bde', models.PositiveIntegerField(verbose_name='Total positive user BDE')),
                ('balance_positive_user_bde', models.PositiveIntegerField(verbose_name='Balance positive user BDE')),
                ('total_zero_user', models.PositiveIntegerField(verbose_name='Total zero user')),
                ('total_zero_user_bde', models.PositiveIntegerField(verbose_name='Total zero user BDE')),
                ('total_negative_user', models.PositiveIntegerField(verbose_name='Total negative user')),
                ('balance_negative_user', models.PositiveIntegerField(verbose_name='Balance negative user')),
                ('total_negative_user_bde', models.PositiveIntegerField(verbose_name='Total negative user BDE')),
                ('balance_negative_user_bde', models.PositiveIntegerField(verbose_name='Balance negative user BDE')),
                ('total_vnegative_user', models.PositiveIntegerField(verbose_name='Total very negative user')),
                ('balance_vnegative_user', models.PositiveIntegerField(verbose_name='Balance very negative user')),
                ('total_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Total very negative user BDE')),
                ('balance_vnegative_user_bde', models.PositiveIntegerField(verbose_name='Balance very negative user BDE')),
                ('total_positive_club', models.PositiveIntegerField(verbose_name='Total positive club')),
                ('balance_positive_club', models.PositiveIntegerField(verbose_name='Balance positive club')),
                ('total_positive_club_nbde', models.PositiveIntegerField(verbose_name='Total positive club nbde')),
                ('balance_positive_club_nbde', models.PositiveIntegerField(verbose_name='Balance positive club nbde')),
                ('total_zero_club', models.PositiveIntegerField(verbose_name='Total zero club')),
                ('total_zero_club_nbde', models.PositiveIntegerField(verbose_name='Total zero club nbde')),
                ('total_negative_club', models.PositiveIntegerField(verbose_name='Total negative club')),
                ('balance_negative_club', models.PositiveIntegerField(verbose_name='Balance negative club')),
                ('total_negative_club_nbde', models.PositiveIntegerField(verbose_name='Total negative club nbde')),
                ('balance_negative_club_nbde', models.PositiveIntegerField(verbose_name='Balance negative club nbde')),
            ],
            options={
                'verbose_name': 'Summary',
                'verbose_name_plural': 'Summaries',
            },
        ),
    ]
--- a/apps/treasury/models.py
+++ b/apps/treasury/models.py
@ -460,3 +460,117 @@ class SogeCredit(models.Model):
            self.credit_transaction._force_save = True
            self.credit_transaction.save()
        super().delete(**kwargs)
 class NoteSummary(models.Model):
    """
    Summary of every notes
    """
    date = models.DateField(
        default=date.today,
        verbose_name=_("Date"),
    )
    total_positive_user = models.PositiveIntegerField(
        verbose_name=_("Total positive user"),
    )
    balance_positive_user = models.PositiveIntegerField(
        verbose_name=_("Balance positive user"),
    )
    total_positive_user_bde = models.PositiveIntegerField(
        verbose_name=_("Total positive user BDE"),
    )
    balance_positive_user_bde = models.PositiveIntegerField(
        verbose_name=_("Balance positive user BDE"),
    )
    total_zero_user = models.PositiveIntegerField(
        verbose_name=_("Total zero user"),
    )
    total_zero_user_bde = models.PositiveIntegerField(
        verbose_name=_("Total zero user BDE"),
    )
    total_negative_user = models.PositiveIntegerField(
        verbose_name=_("Total negative user"),
    )
    balance_negative_user = models.PositiveIntegerField(
        verbose_name=_("Balance negative user"),
    )
    total_negative_user_bde = models.PositiveIntegerField(
        verbose_name=_("Total negative user BDE"),
    )
    balance_negative_user_bde = models.PositiveIntegerField(
        verbose_name=_("Balance negative user BDE"),
    )
    total_vnegative_user = models.PositiveIntegerField(
        verbose_name=_("Total very negative user"),
    )
    balance_vnegative_user = models.PositiveIntegerField(
        verbose_name=_("Balance very negative user"),
    )
    total_vnegative_user_bde = models.PositiveIntegerField(
        verbose_name=_("Total very negative user BDE"),
    )
    balance_vnegative_user_bde = models.PositiveIntegerField(
        verbose_name=_("Balance very negative user BDE"),
    )
    total_positive_club = models.PositiveIntegerField(
        verbose_name=_("Total positive club"),
    )
    balance_positive_club = models.PositiveIntegerField(
        verbose_name=_("Balance positive club"),
    )
    total_positive_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Total positive club nbde"),
    )
    balance_positive_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Balance positive club nbde"),
    )
    total_zero_club = models.PositiveIntegerField(
        verbose_name=_("Total zero club"),
    )
    total_zero_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Total zero club nbde"),
    )
    total_negative_club = models.PositiveIntegerField(
        verbose_name=_("Total negative club"),
    )
    balance_negative_club = models.PositiveIntegerField(
        verbose_name=_("Balance negative club"),
    )
    total_negative_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Total negative club nbde"),
    )
    balance_negative_club_nbde = models.PositiveIntegerField(
        verbose_name=_("Balance negative club nbde"),
    )
    class Meta:
        verbose_name = _("Summary")
        verbose_name_plural = _("Summaries")
    def __str__(self):
        return "Note summary of {date}".format(date=self.date)
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@ -81,6 +81,11 @@ class WEIChooseBusForm(forms.Form):
 class WEIMembershipForm(forms.ModelForm):
    caution_check = forms.BooleanField(
        required=False,
        label=_("Caution check given"),
    )
    roles = forms.ModelMultipleChoiceField(
        queryset=WEIRole.objects,
        label=_("WEI Roles"),
@ -149,6 +154,7 @@ class WEIMembership1AForm(WEIMembershipForm):
    """
    Used to confirm registrations of first year members without choosing a bus now.
    """
    caution_check = None
    roles = None
    def clean(self):
--- a/apps/wei/forms/surveys/init.py
+++ b/apps/wei/forms/surveys/init.py
@ -2,11 +2,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm
-from .wei2023 import WEISurvey2023
+from .wei2024 import WEISurvey2024
 __all__ = [
    'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
 ]
-CurrentSurvey = WEISurvey2023
+CurrentSurvey = WEISurvey2024
--- a/apps/wei/forms/surveys/wei2024.py
+++ b/apps/wei/forms/surveys/wei2024.py
@ -0,0 +1,372 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from functools import lru_cache
 from django import forms
 from django.utils.safestring import mark_safe
 from django.db import transaction
 from django.db.models import Q
 from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
 from ...models import WEIMembership
 buses_descr = [
    [
        "Magi[Kar]p 🐙🎮🎲", "#ef5568", 1,
        """Vous l'aurez compris au nom du bus, l'ambiance est aux jeux et à la culture geek ! Ici, vous trouverez une ambiance
        calme avec une bonne dose d'autodérision et de second degré. Que vous ayez besoin de beaucoup dormir pour tenir la soirée
        du lendemain, ou que vous souhaitiez faire nuit blanche pour jouer toute la nuit, vous pouvez nous rejoindre. Votre voix
        n'y survivra peut-être pas à force de chanter. PS : les meilleurs cocktails du WEI sont chez nous, à déguster, pas à
        siphonner !""",
    ],
    [
        "Va[car]me 🎷🍎🔊", "#fd7a28", 3,
        """Ici, c'est le bus du bruit. Si vous voulez réveiller les autres bus en musique, apprendre de merveilleuses
        mélodies au kazoo tout le week-end, ou simplement profiter d'une bonne ambiance musicale, le BDA et la
        F[ENS]foire sont là pour vous. Vous pourrez également goûter au célèbre cocktail de la fanfare, concocté
        pour l'occasion par les tout nouveaux "meilleurs artisans v*********** de France" ! Alors que vous soyez artiste
        dans l'âme ou que vous souhaitiez juste faire le plus grand Vacarme, rejoignez-nous !""",
    ],
    [
        "[Kar]aïbes 🏝️🏴‍☠️🥥", "#a5cfdd", 3,
        """Ahoy, explorateurs du WEI ! Le bus Karaibes t’invite à une traversée sous les tropiques, où l’ambiance est
        toujours au beau fixe ! ☀️🍹 Ici, c’est soleil, rhum, et bonne humeur assurée : une atmosphère de vacances où
        l’on se laisse porter par la chaleur humaine et la fête. Que tu sois un pirate en quête de sensations fortes ou
        un amateur de chill avec un cocktail à la main, tu seras à ta place dans notre bus. Les soirées seront marquées
        par des rythmes tropicaux qui te feront vibrer jusqu’à l’aube. Prêt à embarquer pour une aventure inoubliable
        avec les meilleurs matelots du WEI ? On t’attend sur le pont du Karaibes pour lever l’ancre ensemble !""",
    ],
    [
        "[Kar]di [Bus] 🎙️💅", "#e46398", 2.5,
        """Bienvenue à bord du Kardi Bus, la seul, l’unique, l’inimitable pépite de ce weekend d’intégration ! Inspiré par les
        icônes suprêmes de la pop culture telles les Bratz, les Winx et autres Mean Girls, notre bus est un sanctuaire de style,
        d’audace et de pur plaisir. A nos cotés attends toi à siroter tes meilleurs Cosmo, sex on the Beach et autres cocktails
        de maxi pétasse tout en papotant entre copains copines ! Si tu rejoins le Kardi Bus, tu entres dans un monde où tu
        pourras te déhancher sur du Beyoncé, Britney, Aya et autres reines de la pop ! À très vite, les futures stars du Kardi
        Bus !""",
    ],
    [
        "Sparta[bus] 🐺🐒🏉", "#ebdac2", 5,
        """Dans notre bus, on vous donne un avant goût des plus grandes assos de l'ENS : les Kyottes et l'Aspique (clubs de rugby
        féminin et masculin, mais pas que). Bien entendu, qui dit rugby dit les copaings, le pastaga et la Pena Bayona, mais vous
        verrez par vous même qu'on est ouvert⋅e à toutes propositions quand il s'agit de faire la fête. Pour les casse-cous comme
        pour les plus calmes, vous trouverez au bus Aspique-Kyottes les 2A+ qui vous feront kiffer votre WEI.""",
    ],
    [
        "Zanzo[Bus] 🤯🚸🐒", "#FFFF", 3,
        """Dans un entre-trois bien senti entre zinzinerie, enfance et vieillerie, le Zanzo[BUS] est un concentré de fun mêlé à
        de la dinguerie à gogo. N'hésitez plus et rejoignez-nous pour un WEI toujours plus déjanté !""",
    ],
    [
        "Bran[Kar] 🍹🥳", "#6da1ac", 4,
        """Si vous ne connaissez pas le Bran[Kar], c’est comme une grande famille qui fait un apéro, qui se bourre un peu la
        gueule en discutant des heures autour d’une table remplie de bouffe et de super bons cocktails (la plupart des
        barmen/barwomen du bus sont les barmans de Shakens), sauf qu’on est un bus du Wei (vous comprendrez bien le nom de notre
        bus en voyant l’état de certain·e·s). Il nous arrive de faire quelques conneries, mais surtout de jouer au Bière-pong en
        musique !""",
    ],
    [
        "Techno [kar]ade 🔊🚩", "#8065a3", 3,
        """Avis à tous·tes les gauchos, amoureux·ses de la fête et des manifs : le Techno [kar]ade vous ouvre grand ses bras pour
        finir en beauté votre première inté. Préparez-vous à vous abreuver de cocktails (savamment élaborés) à la vibration d’un
        système son fabriqué pour l’occasion. Des sets technos à « Mon père était tellement de gauche » en passant par « Female
        Body », le car accueillant les meilleures DJs du plateau saura animer le trajet aussi bien que les soirées. Si alcool et
        musique seront au rendez-vous, les maîtres mots sont sécurité et inclusivité. Qui que vous soyez et quelle que soit votre
        manière de vous amuser, notre objectif est que vous vous sentiez à l’aise pour rencontrer au mieux les 1A, les 2A et les
        (nombreux⋅ses) 3A+ qui auront répondu à l’appel. Bref, rejoignez-nous, on est super cools :)"""
    ],
    [
        "[Bus]ka-P 🥇🍻🎤", "#7c4768", 4.5,
        """Booska-p, c’est le « site N°1 du Rap français ». Le [Bus]ka-p ? Le bus N°1 sur l’ambiance au WEI. Les nuits vont être
        courtes, les cocktails vont couler à flots : tout sera réuni pour vivre un week-end dont tu te souviendras toute ta vie.
        Au programme pas un seul temps mort et un maximum de rencontres pour bien commencer ta première année à l’ENS. Et bien
        entendu, le tout accompagné des meilleurs sons, de Jul à Aya, en passant par ABBA et Sexion d’Assaut. Bref, si tu veux
        vivre un WEI d’anthologie et faire la fête, de jour comme de nuit, nous t’accueillons avec plaisir !""",
    ],
 ]
 def print_bus(i):
    return f"""<h1 style="color:{buses_descr[i][1]};-webkit-text-stroke: 2px black;font-size: 50px;">{buses_descr[i][0]}</h1><br>
    <b>Alcoolomètre : {buses_descr[i][2]} / 5 🍻</b><br><br>{buses_descr[i][3]}<br>"""
 def print_all_buses():
    liste = [print_bus(i) for i in range(len(buses_descr))]
    return "<br><br><br><br>".join(liste)
 def get_number_comment(i):
    if i == 1:
        return "Même pas en rêve"
    elif i == 2:
        return "Pas envie"
    elif i == 3:
        return "Mouais..."
    elif i == 4:
        return "Pourquoi pas !"
    elif i == 5:
        return "Ce bus ou rien !!!"
    else:
        return ""
 WORDS = {
    "recap":
        [
            """<b>Chèr⋅e 1A, te voilà arrivé⋅e au moment fatidique du choix de ton bus !<br><br><br>
            Ton bus est constitué des gens avec qui tu passeras la majorité de ton temps : que ce soit le voyage d'aller et de
            retour et les différentes activité qu'ils pourront te proposer tout au long du WEI donc choisis le bien !
            <br><br>Tu trouveras ci-dessous la liste de tous les bus ainsi qu'une description détaillée de ces derniers.
            Prends ton temps pour étudier chacun d'eux et quand tu te sens prêt⋅e, appuie sur le bouton « J'ai pris connaissance
            des bus » pour continuer
            <br>(pas besoin d'apprendre par cœur chaque bus, la description de chaque bus te sera rappeler avant de lui attribuer
            une note !)</b><br><br><br>""" + print_all_buses(),
            {
                "1": "J'ai pris connaissance des différents bus et me sent fin prêt à choisir celui qui me convient le mieux !",
            }
        ]
 }
 WORDS.update({
    f"bus{id}": [print_bus(id), {i: f"{get_number_comment(i)}   ({i}/5)" for i in range(1, 5 + 1)}] for id in range(len(buses_descr))
 })
 class WEISurveyForm2024(forms.Form):
    """
    Survey form for the year 2024.
    Members score the different buses, from which we calculate the best associated bus.
    """
    def set_registration(self, registration):
        """
        Filter the bus selector with the buses of the current WEI.
        """
        information = WEISurveyInformation2024(registration)
        question = information.questions[information.step]
        self.fields[question] = forms.ChoiceField(
            label=mark_safe(WORDS[question][0]),
            widget=forms.RadioSelect(),
        )
        answers = [(answer, WORDS[question][1][answer]) for answer in WORDS[question][1]]
        self.fields[question].choices = answers
 class WEIBusInformation2024(WEIBusInformation):
    """
    For each question, the bus has ordered answers
    """
    scores: dict
    def __init__(self, bus):
        self.scores = {}
        for question in WORDS:
            self.scores[question] = []
        super().__init__(bus)
 class WEISurveyInformation2024(WEISurveyInformation):
    """
    We store the id of the selected bus. We store only the name, but is not used in the selection:
    that's only for humans that try to read data.
    """
    step = 0
    questions = list(WORDS.keys())
    def __init__(self, registration):
        for question in WORDS:
            setattr(self, str(question), None)
        super().__init__(registration)
 class WEISurvey2024(WEISurvey):
    """
    Survey for the year 2024.
    """
    @classmethod
    def get_year(cls):
        return 2024
    @classmethod
    def get_survey_information_class(cls):
        return WEISurveyInformation2024
    def get_form_class(self):
        return WEISurveyForm2024
    def update_form(self, form):
        """
        Filter the bus selector with the buses of the WEI.
        """
        form.set_registration(self.registration)
    @transaction.atomic
    def form_valid(self, form):
        self.information.step += 1
        for question in WORDS:
            if question in form.cleaned_data:
                answer = form.cleaned_data[question]
                setattr(self.information, question, answer)
        self.save()
    @classmethod
    def get_algorithm_class(cls):
        return WEISurveyAlgorithm2024
    def is_complete(self) -> bool:
        """
        The survey is complete once the bus is chosen.
        """
        for question in WORDS:
            if not getattr(self.information, question):
                return False
        return True
    @lru_cache()
    def score(self, bus):
        if not self.is_complete():
            raise ValueError("Survey is not ended, can't calculate score")
        bus_info = self.get_algorithm_class().get_bus_information(bus)
        # Score is the given score by the bus subtracted to the mid-score of the buses.
        s = 0
        for question in WORDS:
            s += bus_info.scores[question][str(getattr(self.information, question))]
        return s
    @lru_cache()
    def scores_per_bus(self):
        return {bus: self.score(bus) for bus in self.get_algorithm_class().get_buses()}
    @lru_cache()
    def ordered_buses(self):
        values = list(self.scores_per_bus().items())
        values.sort(key=lambda item: -item[1])
        return values
    @classmethod
    def clear_cache(cls):
        return super().clear_cache()
 class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
    """
    The algorithm class for the year 2024.
    We use Gale-Shapley algorithm to attribute 1y students into buses.
    """
    @classmethod
    def get_survey_class(cls):
        return WEISurvey2024
    @classmethod
    def get_bus_information_class(cls):
        return WEIBusInformation2024
    def run_algorithm(self, display_tqdm=False):
        """
        Gale-Shapley algorithm implementation.
        We modify it to allow buses to have multiple "weddings".
        """
        surveys = list(self.get_survey_class()(r) for r in self.get_registrations())  # All surveys
        surveys = [s for s in surveys if s.is_complete()]  # Don't consider invalid surveys
        # Don't manage hardcoded people
        surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
        # Reset previous algorithm run
        for survey in surveys:
            survey.free()
            survey.save()
        non_men = [s for s in surveys if s.registration.gender != 'male']
        men = [s for s in surveys if s.registration.gender == 'male']
        quotas = {}
        registrations = self.get_registrations()
        non_men_total = registrations.filter(~Q(gender='male')).count()
        for bus in self.get_buses():
            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
            # Remove hardcoded people
            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
                                                       registration__information_json__icontains="hardcoded").count()
            quotas[bus] = 4 + int(non_men_total / registrations.count() * free_seats)
        tqdm_obj = None
        if display_tqdm:
            from tqdm import tqdm
            tqdm_obj = tqdm(total=len(non_men), desc="Non-hommes")
        # Repartition for non men people first
        self.make_repartition(non_men, quotas, tqdm_obj=tqdm_obj)
        quotas = {}
        for bus in self.get_buses():
            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
            free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
            # Remove hardcoded people
            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
                                                       registration__information_json__icontains="hardcoded").count()
            quotas[bus] = free_seats
        if display_tqdm:
            tqdm_obj.close()
            from tqdm import tqdm
            tqdm_obj = tqdm(total=len(men), desc="Hommes")
        self.make_repartition(men, quotas, tqdm_obj=tqdm_obj)
        if display_tqdm:
            tqdm_obj.close()
        # Clear cache information after running algorithm
        WEISurvey2024.clear_cache()
    def make_repartition(self, surveys, quotas=None, tqdm_obj=None):
        free_surveys = surveys.copy()  # Remaining surveys
        while free_surveys:  # Some students are not affected
            survey = free_surveys[0]
            buses = survey.ordered_buses()  # Preferences of the student
            for bus, current_score in buses:
                if self.get_bus_information(bus).has_free_seats(surveys, quotas):
                    # Selected bus has free places. Put student in the bus
                    survey.select_bus(bus)
                    survey.save()
                    free_surveys.remove(survey)
                    break
                else:
                    # Current bus has not enough places. Remove the least preferred student from the bus if existing
                    least_preferred_survey = None
                    least_score = -1
                    # Find the least student in the bus that has a lower score than the current student
                    for survey2 in surveys:
                        if not survey2.information.valid or survey2.information.get_selected_bus() != bus:
                            continue
                        score2 = survey2.score(bus)
                        if current_score <= score2:  # Ignore better students
                            continue
                        if least_preferred_survey is None or score2 < least_score:
                            least_preferred_survey = survey2
                            least_score = score2
                    if least_preferred_survey is not None:
                        # Remove the least student from the bus and put the current student in.
                        # If it does not exist, choose the next bus.
                        least_preferred_survey.free()
                        least_preferred_survey.save()
                        free_surveys.append(least_preferred_survey)
                        survey.select_bus(bus)
                        survey.save()
                        free_surveys.remove(survey)
                        break
            else:
                raise ValueError(f"User {survey.registration.user} has no free seat")
            if tqdm_obj is not None:
                tqdm_obj.n = len(surveys) - len(free_surveys)
                tqdm_obj.refresh()
--- a/apps/wei/migrations/0009_weiregistration_specific_diet.py
+++ b/apps/wei/migrations/0009_weiregistration_specific_diet.py
@ -0,0 +1,18 @@
 # Generated by Django 4.2.15 on 2024-08-28 20:47
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ('wei', '0008_auto_20240111_1545'),
    ]
    operations = [
        migrations.AddField(
            model_name='weiregistration',
            name='specific_diet',
            field=models.TextField(blank=True, default='', verbose_name='specific diet'),
        ),
    ]
--- a/apps/wei/migrations/0010_remove_weiregistration_specific_diet.py
+++ b/apps/wei/migrations/0010_remove_weiregistration_specific_diet.py
@ -0,0 +1,17 @@
 # Generated by Django 4.2.15 on 2024-08-29 20:15
 from django.db import migrations
 class Migration(migrations.Migration):
    dependencies = [
        ('wei', '0009_weiregistration_specific_diet'),
    ]
    operations = [
        migrations.RemoveField(
            model_name='weiregistration',
            name='specific_diet',
        ),
    ]
--- a/apps/wei/templates/wei/attribute_bus_1A.html
+++ b/apps/wei/templates/wei/attribute_bus_1A.html
@ -25,7 +25,7 @@
                <dt class="col-xl-6">{% trans 'department'|capfirst %}</dt>
                <dd class="col-xl-6">{{ object.user.profile.get_department_display }}</dd>
-                <dt class="col-xl-6">{% trans 'health issues'|capfirst %}</dt>
+                <dt class="col-xl-6">{% trans 'health issues or specific diet'|capfirst %}</dt>
                <dd class="col-xl-6">{{ object.health_issues|default:"—" }}</dd>
                <dt class="col-xl-6">{% trans 'suggested bus'|capfirst %}</dt>
--- a/apps/wei/templates/wei/weimembership_form.html
+++ b/apps/wei/templates/wei/weimembership_form.html
@ -64,7 +64,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                <dt class="col-xl-6">{% trans 'birth date'|capfirst %}</dt>
                <dd class="col-xl-6">{{ registration.birth_date }}</dd>
-                <dt class="col-xl-6">{% trans 'health issues'|capfirst %}</dt>
+                <dt class="col-xl-6">{% trans 'health issues or specific diet'|capfirst %}</dt>
                <dd class="col-xl-6">{{ registration.health_issues }}</dd>
                <dt class="col-xl-6">{% trans 'emergency contact name'|capfirst %}</dt>
--- a/apps/wei/tests/test_wei_algorithm_2023.py
+++ b/apps/wei/tests/test_wei_algorithm_2023.py
@ -6,8 +6,6 @@ from datetime import date, timedelta
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.urls import reverse
 from note.models import NoteUser
 from ..forms.surveys.wei2023 import WEIBusInformation2023, WEISurvey2023, WORDS, WEISurveyInformation2023
 from ..models import Bus, WEIClub, WEIRegistration
@ -127,44 +125,3 @@ class TestWEIAlgorithm(TestCase):
            self.assertLessEqual(max_score - score, 25)  # Always less than 25 % of tolerance
        self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %
    def test_register_1a(self):
        """
        Test register a first year member to the WEI and complete the survey
        """
        response = self.client.get(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)))
        self.assertEqual(response.status_code, 200)
        user = User.objects.create(username="toto", email="toto@example.com")
        NoteUser.objects.create(user=user)
        response = self.client.post(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)), dict(
            user=user.id,
            soge_credit=True,
            birth_date=date(2000, 1, 1),
            gender='nonbinary',
            clothing_cut='female',
            clothing_size='XS',
            health_issues='I am a bot',
            emergency_contact_name='NoteKfet2020',
            emergency_contact_phone='+33123456789',
        ))
        qs = WEIRegistration.objects.filter(user_id=user.id)
        self.assertTrue(qs.exists())
        registration = qs.get()
        self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302, 200)
        for question in WORDS:
            # Fill 1A Survey, 20 pages
            # be careful if questionnary form change (number of page, type of answer...)
            response = self.client.post(reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), {
                question: "1"
            })
            registration.refresh_from_db()
            survey = WEISurvey2023(registration)
            self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302,
                                 302 if survey.is_complete() else 200)
            self.assertIsNotNone(getattr(survey.information, question), "Survey page " + question + " failed")
        survey = WEISurvey2023(registration)
        self.assertTrue(survey.is_complete())
        survey.select_bus(self.buses[0])
        survey.save()
        self.assertIsNotNone(survey.information.get_selected_bus())
--- a/apps/wei/tests/test_wei_algorithm_2024.py
+++ b/apps/wei/tests/test_wei_algorithm_2024.py
@ -0,0 +1,172 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 import random
 from datetime import date, timedelta
 from django.contrib.auth.models import User
 from django.test import TestCase
 from django.urls import reverse
 from note.models import NoteUser
 from ..forms.surveys.wei2024 import WEIBusInformation2024, WEISurvey2024, WORDS, WEISurveyInformation2024
 from ..models import Bus, WEIClub, WEIRegistration
 class TestWEIAlgorithm(TestCase):
    """
    Run some tests to ensure that the WEI algorithm is working well.
    """
    fixtures = ('initial',)
    def setUp(self):
        """
        Create some test data, with one WEI and 10 buses with random score attributions.
        """
        self.user = User.objects.create_superuser(
            username="weiadmin",
            password="admin",
            email="admin@example.com",
        )
        self.user.save()
        self.client.force_login(self.user)
        sess = self.client.session
        sess["permission_mask"] = 42
        sess.save()
        self.wei = WEIClub.objects.create(
            name="WEI 2024",
            email="wei2024@example.com",
            parent_club_id=2,
            membership_fee_paid=12500,
            membership_fee_unpaid=5500,
            membership_start='2024-01-01',
            membership_end='2024-12-31',
            date_start=date.today() + timedelta(days=2),
            date_end='2024-12-31',
            year=2024,
        )
        self.buses = []
        for i in range(10):
            bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
            self.buses.append(bus)
            information = WEIBusInformation2024(bus)
            for question in WORDS:
                information.scores[question] = {answer: random.randint(1, 5) for answer in WORDS[question][1]}
            information.save()
            bus.save()
    def test_survey_algorithm_small(self):
        """
        There are only a few people in each bus, ensure that each person has its best bus
        """
        # Add a few users
        for i in range(10):
            user = User.objects.create(username=f"user{i}")
            registration = WEIRegistration.objects.create(
                user=user,
                wei=self.wei,
                first_year=True,
                birth_date='2000-01-01',
            )
            information = WEISurveyInformation2024(registration)
            for question in WORDS:
                options = list(WORDS[question][1].keys())
                setattr(information, question, random.choice(options))
            information.step = 20
            information.save(registration)
            registration.save()
        # Run algorithm
        WEISurvey2024.get_algorithm_class()().run_algorithm()
        # Ensure that everyone has its first choice
        for r in WEIRegistration.objects.filter(wei=self.wei).all():
            survey = WEISurvey2024(r)
            preferred_bus = survey.ordered_buses()[0][0]
            chosen_bus = survey.information.get_selected_bus()
            self.assertEqual(preferred_bus, chosen_bus)
    def test_survey_algorithm_full(self):
        """
        Buses are full of first year people, ensure that they are happy
        """
        # Add a lot of users
        for i in range(95):
            user = User.objects.create(username=f"user{i}")
            registration = WEIRegistration.objects.create(
                user=user,
                wei=self.wei,
                first_year=True,
                birth_date='2000-01-01',
            )
            information = WEISurveyInformation2024(registration)
            for question in WORDS:
                options = list(WORDS[question][1].keys())
                setattr(information, question, random.choice(options))
            information.step = 20
            information.save(registration)
            registration.save()
        # Run algorithm
        WEISurvey2024.get_algorithm_class()().run_algorithm()
        penalty = 0
        # Ensure that everyone seems to be happy
        # We attribute a penalty for each user that didn't have its first choice
        # The penalty is the square of the distance between the score of the preferred bus
        # and the score of the attributed bus
        # We consider it acceptable if the mean of this distance is lower than 5 %
        for r in WEIRegistration.objects.filter(wei=self.wei).all():
            survey = WEISurvey2024(r)
            chosen_bus = survey.information.get_selected_bus()
            buses = survey.ordered_buses()
            score = min(v for bus, v in buses if bus == chosen_bus)
            max_score = buses[0][1]
            penalty += (max_score - score) ** 2
            self.assertLessEqual(max_score - score, 25)  # Always less than 25 % of tolerance
        self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %
    def test_register_1a(self):
        """
        Test register a first year member to the WEI and complete the survey
        """
        response = self.client.get(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)))
        self.assertEqual(response.status_code, 200)
        user = User.objects.create(username="toto", email="toto@example.com")
        NoteUser.objects.create(user=user)
        response = self.client.post(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)), dict(
            user=user.id,
            soge_credit=True,
            birth_date=date(2000, 1, 1),
            gender='nonbinary',
            clothing_cut='female',
            clothing_size='XS',
            health_issues='I am a bot',
            emergency_contact_name='NoteKfet2020',
            emergency_contact_phone='+33123456789',
        ))
        qs = WEIRegistration.objects.filter(user_id=user.id)
        self.assertTrue(qs.exists())
        registration = qs.get()
        self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302, 200)
        for question in WORDS:
            # Fill 1A Survey, 10 pages
            # be careful if questionnary form change (number of page, type of answer...)
            response = self.client.post(reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), {
                question: "1"
            })
            registration.refresh_from_db()
            survey = WEISurvey2024(registration)
            self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302,
                                 302 if survey.is_complete() else 200)
            self.assertIsNotNone(getattr(survey.information, question), "Survey page " + question + " failed")
        survey = WEISurvey2024(registration)
        self.assertTrue(survey.is_complete())
        survey.select_bus(self.buses[0])
        survey.save()
        self.assertIsNotNone(survey.information.get_selected_bus())
--- a/apps/wei/tests/test_wei_registration.py
+++ b/apps/wei/tests/test_wei_registration.py
@ -767,7 +767,7 @@ class TestDefaultWEISurvey(TestCase):
        WEISurvey.update_form(None, None)
        self.assertEqual(CurrentSurvey.get_algorithm_class().get_survey_class(), CurrentSurvey)
-        self.assertEqual(CurrentSurvey.get_year(), 2023)
+        self.assertEqual(CurrentSurvey.get_year(), 2024)
 class TestWeiAPI(TestAPI):
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@ -900,6 +900,9 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
        form.fields["last_name"].initial = registration.user.last_name
        form.fields["first_name"].initial = registration.user.first_name
        if "caution_check" in form.fields:
            form.fields["caution_check"].initial = registration.caution_check
        if registration.soge_credit:
            form.fields["credit_type"].disabled = True
            form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire")
@ -941,6 +944,9 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
        club = registration.wei
        user = registration.user
        if "caution_check" in form.data:
            registration.caution_check = form.data["caution_check"] == "on"
            registration.save()
        membership = form.instance
        membership.user = user
        membership.club = club
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@ -1970,6 +1970,8 @@ msgstr "Historique des transactions récentes"
 #: apps/note/templates/note/mails/negative_balance.txt:25
 #: apps/note/templates/note/mails/negative_notes_report.html:46
 #: apps/note/templates/note/mails/negative_notes_report.txt:13
 #: apps/note/templates/note/mails/summary_notes_report.html:62
 #: apps/note/templates/note/mails/summary_ntoes_report.txt:33
 #: apps/note/templates/note/mails/weekly_report.html:51
 #: apps/note/templates/note/mails/weekly_report.txt:32
 #: apps/registration/templates/registration/mails/email_validation_email.html:40
@ -2526,6 +2528,7 @@ msgid "Address"
 msgstr "Adresse"
 #: apps/treasury/models.py:69 apps/treasury/models.py:202
 #: apps/treasury/models.py:472
 msgid "Date"
 msgstr "Date"
@ -2644,6 +2647,102 @@ msgstr ""
 "Cet·te utilisateur·rice n'a pas assez d'argent pour payer les adhésions avec sa "
 "note. Merci de lui demander de recharger sa note avant d'invalider ce crédit."
 #: apps/treasury/models.py:476
 msgid "Total positive user"
 msgstr "Nombre d'utilisateur⋅rices en positif"
 #: apps/treasury/models.py:480
 msgid "Balance positive user"
 msgstr "Solde des utilisateur⋅rices en positif"
 #: apps/treasury/models.py:484
 msgid "Total positive user BDE"
 msgstr "Nombre d'adhérent⋅es au BDE en positif"
 #: apps/treasury/models.py:488
 msgid "Balance positive user BDE"
 msgstr "Solde des adhérent⋅es au BDE en positif"
 #: apps/treasury/models.py:492
 msgid "Total zero user"
 msgstr "Nombre d'utilisateur⋅rices à zéro"
 #: apps/treasury/models.py:496
 msgid "Total zero user BDE"
 msgstr "Nombre d'adhérent⋅es au BDE à zéro"
 #: apps/treasury/models.py:500
 msgid "Total negative user"
 msgstr "Nombre d'utilisateur⋅rices en négatif"
 #: apps/treasury/models.py:504
 msgid "Balance negative user"
 msgstr "Solde des utilisateur⋅rices en négatif"
 #: apps/treasury/models.py:508
 msgid "Total negative user BDE"
 msgstr "Nombre d'adhérent⋅es au BDE en négatif"
 #: apps/treasury/models.py:512
 msgid "Balance negative user BDE"
 msgstr "Solde des adhérent⋅es au BDE en négatif"
 #: apps/treasury/models.py:516
 msgid "Total very negative user"
 msgstr "Nombre d'utilisateur⋅rices en négatif sévère"
 #: apps/treasury/models.py:520
 msgid "Balance very negative user"
 msgstr "Solde des utilisateur⋅rices en négatif sévère"
 #: apps/treasury/models.py:524
 msgid "Total very negative user BDE"
 msgstr "Nombre d'adhérent⋅es au BDE en négatif sévère"
 #: apps/treasury/models.py:528
 msgid "Balance very negative user BDE"
 msgstr "Solde des adhérent⋅es au BDE en négatif sévère"
 #: apps/treasury/models.py:532
 msgid "Total positive club"
 msgstr "Nombre de clubs en positif"
 #: apps/treasury/models.py:536
 msgid "Balance positive club"
 msgstr "Solde des clubs en positif"
 #: apps/treasury/models.py:540
 msgid "Total positive club nbde"
 msgstr "Nombre de clubs non-BDE en positif"
 #: apps/treasury/models.py:544
 msgid "Balance positive club nbde"
 msgstr "Solde des clubs non-BDE en positif"
 #: apps/treasury/models.py:548
 msgid "Total zero club"
 msgstr "Nombre de clubs à zéro"
 #: apps/treasury/models.py:552
 msgid "Total zero club nbde"
 msgstr "Nombre de clubs non-BDE à zéro"
 #: apps/treasury/models.py:556
 msgid "Total negative club"
 msgstr "Nombre de clubs en négatif"
 #: apps/treasury/models.py:560
 msgid "Balance negative club"
 msgstr "Solde des clubs en négatif"
 #: apps/treasury/models.py:564
 msgid "Total negative club nbde"
 msgstr "Nombre de clubs non-BDE en négatif"
 #: apps/treasury/models.py:568
 msgid "Balance negative club nbde"
 msgstr "Solde des clubs non-BDE en négatif"
 #: apps/treasury/tables.py:20
 msgid "Invoice #{:d}"
 msgstr "Facture n°{:d}"
@ -3001,6 +3100,7 @@ msgid "Credit from Société générale"
 msgstr "Crédit de la Société générale"
 #: apps/wei/models.py:188
 #: apps/wei/forms/registration.py:84
 msgid "Caution check given"
 msgstr "Chèque de caution donné"
--- a/note.cron
+++ b/note.cron
@ -19,6 +19,8 @@ MAILTO=notekfet2020@lists.crans.org
 00  5     *   *   2     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam --negative-amount 1 -v 0
 # Envoyer le rapport mensuel aux trésoriers et respos info
 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report --add-years 1 -v 0
 # Envoyer le recap de tresorerie
 00  8     *   *   5     root   cd /var/www/note_kfet && env/bin/python manage.py send_summary_notes_report --negative-amount 2000
 # Envoyer les rapports aux gens
 55  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py send_reports -v 0
 # Mettre à jour les boutons mis en avant
Author	SHA1	Message	Date
hugoooo	a4bf0f3c9a	Merge branch 'summary_notes' into 'main' treasury summary See merge request bde/nk20!223	2024-08-30 13:00:59 +02:00
mcngnt	21cbf2b21a	Merge branch 'survey_wei_2024' into 'main' Survey wei 2024 See merge request bde/nk20!269	2024-08-29 23:10:57 +02:00
mcngnt	185a2cabf2	corrected emoji + linting	2024-08-29 22:47:33 +02:00
mcngnt	7552e55c8d	removed diet filed	2024-08-29 22:19:11 +02:00
mcngnt	e4aa16986f	Merge branch 'survey_wei_2024' into 'main' linting See merge request bde/nk20!267	2024-08-29 19:12:23 +02:00
mcngnt	b92e6e4e10	linting	2024-08-29 18:36:20 +02:00
mcngnt	dd675b3676	Merge branch 'survey_wei_2024' into 'main' Survey wei 2024 See merge request bde/nk20!266	2024-08-29 14:45:28 +02:00
mcngnt	f50849b4f8	delete print	2024-08-29 14:01:55 +02:00
mcngnt	73ff35c232	updated bus descr	2024-08-29 12:42:26 +02:00
mcngnt	96539d262f	working html for survey + fixed json error + added specific diet text field	2024-08-29 00:05:44 +02:00
korenstin	946674f59b	inclusif, avoids python3.10 syntax	2024-08-28 11:11:32 +02:00
mcngnt	a201d8376a	updated survey	2024-08-28 11:01:33 +02:00
korenstin	a21b9275ea	Add caution_check in the validation form, #96	2024-08-28 09:48:52 +02:00
korenstin	d4e85e8215	test wei 2024, linters	2024-08-28 09:48:52 +02:00
mcngnt	7af2ebba40	basic survey	2024-08-28 09:48:52 +02:00
korenstin	5a0fe7a6f0	Fr translation (treasury summary)	2024-08-07 20:01:22 +02:00
korenstin	eda8460014	Inclusif, admin and migrations (treasury summary)	2024-08-07 19:24:23 +02:00
Hugo	15c71ad31a	treasury summary	2024-08-02 01:35:13 +02:00
		`@ -1 +1 @@`
			`Subproject commit f580f9b9e9beee76605975fdbc3a2014769e3c61`				`Subproject commit f76acb32487635fe28907b637955e110a37b06cc`