translation

Merge branch 'food_traceability' into 'beta'
Easier access to food details See merge request bde/nk20!326
2025-07-25 10:05:23 +02:00 · 2025-07-12 14:05:53 +02:00 · 2025-07-11 17:15:50 +02:00 · 2025-07-11 17:00:45 +02:00 · 2025-07-11 16:35:49 +02:00 · 2025-07-11 12:26:55 +02:00
47 changed files with 617 additions and 1239 deletions
--- a/.env_example
+++ b/.env_example
@ -21,3 +21,6 @@ EMAIL_PASSWORD=CHANGE_ME
 # Wiki configuration
 WIKI_USER=NoteKfet2020
 WIKI_PASSWORD=
+
+# OIDC
+OIDC_RSA_PRIVATE_KEY=CHANGE_ME
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -8,7 +8,7 @@ variables:
  GIT_SUBMODULE_STRATEGY: recursive

 # Ubuntu 22.04
-py310-django42:
+py310-django52:
  stage: test
  image: ubuntu:22.04
  before_script:
@ -22,10 +22,10 @@ py310-django42:
        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py310-django42
+  script: tox -e py310-django52

 # Debian Bookworm
-py311-django42:
+py311-django52:
  stage: test
  image: debian:bookworm
  before_script:
@ -37,7 +37,7 @@ py311-django42:
        python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
        python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
        python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py311-django42
+  script: tox -e py311-django52

 linters:
  stage: quality-assurance
--- a/README.md
+++ b/README.md
@ -61,8 +61,8 @@ Bien que cela permette de créer une instance sur toutes les distributions,
 6. (Optionnel) **Création d'une clé privée OpenID Connect**

 Pour activer le support d'OpenID Connect, il faut générer une clé privée, par
-exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner son
-emplacement dans `OIDC_RSA_PRIVATE_KEY` (par défaut `/var/secrets/oidc.key`).
+exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et copier la clé dans .env dans le champ
+`OIDC_RSA_PRIVATE_KEY`.

 7.  Enjoy :

@ -237,8 +237,8 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
 7. **Création d'une clé privée OpenID Connect**

 Pour activer le support d'OpenID Connect, il faut générer une clé privée, par
-exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner son
-emplacement dans `OIDC_RSA_PRIVATE_KEY` (par défaut `/var/secrets/oidc.key`).
+exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner le champ
+`OIDC_RSA_PRIVATE_KEY` dans le .env (par défaut `/var/secrets/oidc.key`).

 8.  *Enjoy \o/*

--- a/apps/family/init.py
+++ b/apps/family/init.py
--- a/apps/family/apps.py
+++ b/apps/family/apps.py
@ -1,11 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-
-from django.utils.translation import gettext_lazy as _
-from django.apps import AppConfig
-
-
-class FamilyConfig(AppConfig):
-    name = 'family'
-    verbose_name = _('family')
--- a/apps/family/forms.py
+++ b/apps/family/forms.py
@ -1,44 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django import forms
-from django.forms.widgets import NumberInput
-from note_kfet.inputs import Autocomplete
-
-from .models import Challenge, FamilyMembership, User, Family
-
-
-class ChallengeUpdateForm(forms.ModelForm):
-    """
-    To update a challenge
-    """
-    class Meta:
-        model = Challenge
-        fields = ('name', 'description', 'points',)
-        widgets = {
-            "points": NumberInput()
-        }
-
-
-class FamilyMembershipForm(forms.ModelForm):
-    class Meta:
-        model = FamilyMembership
-        fields = ('user', )
-
-        widgets = {
-            "user":
-                Autocomplete(
-                    User,
-                    attrs={
-                        'api_url': '/api/user/',
-                        'name_field': 'username',
-                        'placeholder': 'Nom ...',
-                    },
-                )
-        }
-
-
-class FamilyUpdateForm(forms.ModelForm):
-    class Meta:
-        model = Family
-        fields = ('description', )
--- a/apps/family/migrations/0001_initial.py
+++ b/apps/family/migrations/0001_initial.py
@ -1,73 +0,0 @@
-# Generated by Django 4.2.21 on 2025-07-06 16:07
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Challenge',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, verbose_name='name')),
-                ('description', models.CharField(max_length=255, verbose_name='description')),
-                ('points', models.PositiveIntegerField(verbose_name='points')),
-                ('obtained', models.PositiveIntegerField(default=0, verbose_name='obtained')),
-            ],
-            options={
-                'verbose_name': 'challenge',
-                'verbose_name_plural': 'challenges',
-            },
-        ),
-        migrations.CreateModel(
-            name='Family',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255, unique=True, verbose_name='name')),
-                ('description', models.CharField(max_length=255, verbose_name='description')),
-                ('score', models.PositiveIntegerField(default=0, verbose_name='score')),
-                ('rank', models.PositiveIntegerField(verbose_name='rank')),
-            ],
-            options={
-                'verbose_name': 'Family',
-                'verbose_name_plural': 'Families',
-            },
-        ),
-        migrations.CreateModel(
-            name='Achievement',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('obtained_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='obtained at')),
-                ('challenge', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='family.challenge')),
-                ('family', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='family.family', verbose_name='family')),
-            ],
-            options={
-                'verbose_name': 'achievement',
-                'verbose_name_plural': 'achievements',
-            },
-        ),
-        migrations.CreateModel(
-            name='FamilyMembership',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('year', models.PositiveIntegerField(default=2025, verbose_name='year')),
-                ('family', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='members', to='family.family', verbose_name='family')),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='family_memberships', to=settings.AUTH_USER_MODEL, verbose_name='user')),
-            ],
-            options={
-                'verbose_name': 'family membership',
-                'verbose_name_plural': 'family memberships',
-                'unique_together': {('user', 'year')},
-            },
-        ),
-    ]
--- a/apps/family/migrations/0002_family_display_image.py
+++ b/apps/family/migrations/0002_family_display_image.py
@ -1,18 +0,0 @@
-# Generated by Django 4.2.23 on 2025-07-17 15:28
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('family', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='family',
-            name='display_image',
-            field=models.ImageField(default='pic/default.png', max_length=255, upload_to='pic/', verbose_name='display image'),
-        ),
-    ]
--- a/apps/family/migrations/init.py
+++ b/apps/family/migrations/init.py
--- a/apps/family/models.py
+++ b/apps/family/models.py
@ -1,206 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.db import models, transaction
-from django.utils import timezone
-from django.contrib.auth.models import User
-from django.utils.translation import gettext_lazy as _
-
-
-class Family(models.Model):
-    name = models.CharField(
-        max_length=255,
-        verbose_name=_('name'),
-        unique=True,
-    )
-
-    description = models.CharField(
-        max_length=255,
-        verbose_name=_('description'),
-    )
-
-    score = models.PositiveIntegerField(
-        verbose_name=_('score'),
-        default=0,
-    )
-
-    rank = models.PositiveIntegerField(
-        verbose_name=_('rank'),
-    )
-
-    display_image = models.ImageField(
-        verbose_name=_('display image'),
-        max_length=255,
-        blank=False,
-        null=False,
-        upload_to='pic/',
-        default='pic/default.png'
-    )
-
-    class Meta:
-        verbose_name = _('Family')
-        verbose_name_plural = _('Families')
-
-    def __str__(self):
-        return self.name
-
-    def update_score(self, *args, **kwargs):
-        challenge_set = Challenge.objects.select_for_update().filter(achievement__family=self)
-        points_sum = challenge_set.aggregate(models.Sum("points"))
-        self.score = points_sum["points__sum"]
-        self.save()
-        self.update_ranking()
-
-    @staticmethod
-    def update_ranking(*args, **kwargs):
-        """
-        Update ranking when adding or removing points
-        """
-        family_set = Family.objects.select_for_update().all().order_by("-score")
-        for i in range(family_set.count()):
-            if i == 0 or family_set[i].score != family_set[i - 1].score:
-                new_rank = i + 1
-            family = family_set[i]
-            family.rank = new_rank
-            family._force_save = True
-            family.save()
-
-    def save(self, *args, **kwargs):
-        if self.rank is None:
-            last_family = Family.objects.order_by("rank").last()
-            if last_family is None or last_family.score > self.score:
-                self.rank = Family.objects.count() + 1
-            else:
-                self.rank = last_family.rank
-        super().save(*args, **kwargs)
-
-
-class FamilyMembership(models.Model):
-    user = models.OneToOneField(
-        User,
-        on_delete=models.PROTECT,
-        related_name=_('family_memberships'),
-        verbose_name=_('user'),
-    )
-
-    family = models.ForeignKey(
-        Family,
-        on_delete=models.PROTECT,
-        related_name=_('members'),
-        verbose_name=_('family'),
-    )
-
-    year = models.PositiveIntegerField(
-        verbose_name=_('year'),
-        default=timezone.now().year,
-    )
-
-    class Meta:
-        unique_together = ('user', 'year',)
-        verbose_name = _('family membership')
-        verbose_name_plural = _('family memberships')
-
-    def __str__(self):
-        return _('Family membership of {user} to {family}').format(user=self.user.username, family=self.family.name, )
-
-
-class Challenge(models.Model):
-    name = models.CharField(
-        max_length=255,
-        verbose_name=_('name'),
-    )
-
-    description = models.CharField(
-        max_length=255,
-        verbose_name=_('description'),
-    )
-
-    points = models.PositiveIntegerField(
-        verbose_name=_('points'),
-    )
-
-    obtained = models.PositiveIntegerField(
-        verbose_name=_('obtained'),
-        default=0,
-    )
-
-    @transaction.atomic
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        # Update families who already obtained this challenge
-        achievements = Achievement.objects.filter(challenge=self)
-        for achievement in achievements:
-            achievement.save()
-
-    class Meta:
-        verbose_name = _('challenge')
-        verbose_name_plural = _('challenges')
-
-    def __str__(self):
-        return self.name
-
-
-class Achievement(models.Model):
-    challenge = models.ForeignKey(
-        Challenge,
-        on_delete=models.PROTECT,
-
-    )
-    family = models.ForeignKey(
-        Family,
-        on_delete=models.PROTECT,
-        verbose_name=_('family'),
-    )
-
-    obtained_at = models.DateTimeField(
-        verbose_name=_('obtained at'),
-        default=timezone.now,
-    )
-
-    class Meta:
-        verbose_name = _('achievement')
-        verbose_name_plural = _('achievements')
-
-    def __str__(self):
-        return _('Challenge {challenge} carried out by Family {family}').format(challenge=self.challenge.name, family=self.family.name, )
-
-    @transaction.atomic
-    def save(self, *args, **kwargs):
-        """
-        When saving, also grants points to the family
-        """
-        self.family = Family.objects.select_for_update().get(pk=self.family_id)
-        self.challenge = Challenge.objects.select_for_update().get(pk=self.challenge_id)
-        is_new = self.pk is None
-
-        super().save(*args, **kwargs)
-
-        self.family.refresh_from_db()
-        self.family.update_score()
-
-        # Count only when getting a new achievement
-        if is_new:
-            self.challenge.refresh_from_db()
-            self.challenge.obtained += 1
-            self.challenge._force_save = True
-            self.challenge.save()
-
-    @transaction.atomic
-    def delete(self, *args, **kwargs):
-        """
-        When deleting, also removes points from the family
-        """
-        # Get the family and challenge before deletion
-        self.family = Family.objects.select_for_update().get(pk=self.family_id)
-
-        # Delete the achievement
-        super().delete(*args, **kwargs)
-
-        # Remove points from the family
-        self.family.refresh_from_db()
-        self.family.update_score()
-
-        self.challenge.refresh_from_db()
-        self.challenge.obtained -= 1
-        self.challenge._force_save = True
-        self.challenge.save()
--- a/apps/family/tables.py
+++ b/apps/family/tables.py
@ -1,59 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import django_tables2 as tables
-from django_tables2 import A
-
-from .models import Family, Challenge, FamilyMembership
-
-
-class FamilyTable(tables.Table):
-    """
-    List all families
-    """
-    name = tables.LinkColumn(
-        "family:family_detail",
-        args=[A("pk")],
-    )
-
-    class Meta:
-        attrs = {
-            'class': 'table table-condensed table-striped table-hover'
-        }
-        model = Family
-        template_name = 'django_tables2/bootstrap4.html'
-        fields = ('name', 'score', 'rank',)
-        order_by = ('rank',)
-
-
-class ChallengeTable(tables.Table):
-    """
-    List all challenges
-    """
-    name = tables.LinkColumn(
-        "family:challenge_detail",
-        args=[A("pk")],
-    )
-
-    class Meta:
-        attrs = {
-            'class': 'table table-condensed table-striped table-hover'
-        }
-        order_by = ('id',)
-        model = Challenge
-        template_name = 'django_tables2/bootstrap4.html'
-        fields = ('name', 'description', 'points',)
-
-
-class FamilyMembershipTable(tables.Table):
-    """
-    List all family memberships.
-    """
-    class Meta:
-        attrs = {
-            'class': 'table table-condensed table-striped',
-            'style': 'table-layout: fixed;'
-        }
-        template_name = 'django_tables2/bootstrap4.html'
-        fields = ('user',)
-        model = FamilyMembership
--- a/apps/family/templates/family/add_member.html
+++ b/apps/family/templates/family/add_member.html
@ -1,60 +0,0 @@
-{% extends "family/base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load crispy_forms_tags i18n pretty_money %}
-
-{% block profile_content %}
-<div class="card bg-light">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    <div class="card-body">
-        
-        <form method="post" action="">
-            {% csrf_token %}
-            {{ form|crispy }}
-            <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
-        </form>
-    </div>
-</div>
-{% endblock %}
-
-{% block extrajavascript %}
-<script>
-    function autocompleted(user) {
-        $("#id_last_name").val(user.last_name);
-        $("#id_first_name").val(user.first_name);
-        $.getJSON("/api/members/profile/" + user.id + "/", function (profile) {
-            let fee = profile.paid ? "{{ club.membership_fee_paid }}" : "{{ club.membership_fee_unpaid }}";
-            $("#id_credit_amount").val((Number(fee) / 100).toFixed(2));
-        });
-    }
-
-    soge_field = $("#id_soge");
-
-    function fillFields() {
-        let checked = soge_field.is(':checked');
-        if (!checked) {
-            $("input").attr('disabled', false);
-            $("#id_user").attr('disabled', true);
-            $("select").attr('disabled', false);
-            return;
-        }
-
-        let credit_type = $("#id_credit_type");
-        credit_type.attr('disabled', true);
-        credit_type.val(4);
-
-        let credit_amount = $("#id_credit_amount");
-        credit_amount.attr('disabled', true);
-        credit_amount.val('{{ total_fee }}');
-
-        let bank = $("#id_bank");
-        bank.attr('disabled', true);
-        bank.val('Société générale');
-    }
-
-    soge_field.change(fillFields);
-</script>
-{% endblock %}
--- a/apps/family/templates/family/base.html
+++ b/apps/family/templates/family/base.html
@ -1,52 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n perms %}
-
-{# Use a fluid-width container #}
-{% block containertype %}container-fluid{% endblock %}
-
-{% block content %}
-<div class="row mt-4">
-    <div class="col-xl-4">
-        {% block profile_info %}
-        <div class="card bg-light" id="card-infos">
-            <h4 class="card-header text-center">
-                {{ family.name }}
-            </h4>
-            <div class="text-center">
-                <a href="{% url 'family:update_pic' family.pk  %}">
-                    <img src="{{ family.display_image.url }}" class="img-thumbnail mt-2">
-                </a>
-            </div>
-            <div class="card-body" id="profile_infos">
-                {% include "family/family_info.html" %}
-            </div>
-            <div class="card-footer">
-                {% if can_add_members %}
-                <a class="btn btn-sm btn-success" href="{% url 'family:family_add_member' family_pk=family.pk %}"
-                   data-turbolinks="false"> {% trans "Add member" %}</a>
-                {% endif %}
-                {% if ".change_"|has_perm:family %}
-                <a class="btn btn-sm btn-secondary" href="{% url 'family:family_update' pk=family.pk %}"
-                   data-turbolinks="false">
-                    <i class="fa fa-edit"></i> {% trans 'Update Profile' %}
-                </a>
-                {% endif %}
-                {% url 'family:family_detail' family.pk as family_detail_url %}
-                {% if request.path_info != family_detail_url %}
-                <a class="btn btn-sm btn-primary" href="{{ family_detail_url }}">{% trans 'View Profile' %}</a>
-                {% endif %}
-                <a class="btn btn-sm btn-primary" href="{% url "family:family_list" %}">
-                    {% trans "Return to the family list" %}
-                  </a>
-            </div>
-        </div>
-        {% endblock %}
-    </div>
-    <div class="col-xl-8">
-        {% block profile_content %}{% endblock %}
-    </div>
-</div>
-{% endblock %}
--- a/apps/family/templates/family/challenge_detail.html
+++ b/apps/family/templates/family/challenge_detail.html
@ -1,36 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }} {{ challenge.name }}
-  </h3>
-  <div class="card-body">
-    <ul>
-      {% for field, value in fields %}
-      <li> {{ field }} : {{ value }}</li>
-      {% endfor %}
-      <li> {% trans "Obtained by " %} {{obtained}}
-        {% if obtained > 1 %}
-          {% trans "families" %}
-        {% else %}
-          {% trans "family" %}
-        {% endif %}
-      </li>
-    </ul>
-      <a class="btn btn-sm btn-primary" href="{% url "family:challenge_list" %}">
-        {% trans "Return to the challenge list" %}
-      </a>
-      {% if update %}
-      <a class="btn btn-sm btn-secondary" href="{% url "family:challenge_update" pk=challenge.pk %}">
-        {% trans "Update" %}
-      </a>
-      {% endif %}
-  </div>
-</div>
-{% endblock %}
--- a/apps/family/templates/family/challenge_list.html
+++ b/apps/family/templates/family/challenge_list.html
@ -1,30 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load render_table from django_tables2 %}
-{% load i18n %}
-
-{% block content %}
-<div class="row">
-    <div class="col-xl-12">
-        <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0">
-            <a href="{% url "family:family_list" %}" class="btn btn-sm btn-outline-primary">
-                {% trans "Families" %}
-            </a>
-            <a href="#" class="btn btn-sm btn-outline-primary active">
-                {% trans "Challenges" %}
-            </a>
-        </div>
-    </div>
-</div>
-
-<<div class="card bg-white mb-3">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    {% render_table table %}
-</div>
-{% endblock %}
-
--- a/apps/family/templates/family/challenge_update.html
+++ b/apps/family/templates/family/challenge_update.html
@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {% csrf_token %}
-      {{ form | crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}
--- a/apps/family/templates/family/family_detail.html
+++ b/apps/family/templates/family/family_detail.html
@ -1,16 +0,0 @@
-{% extends "family/base.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load render_table from django_tables2 %}
-{% load i18n perms %}
-
-{% block profile_content %}
-<div class="card">
-    <div class="card-header position-relative" id="clubListHeading">
-        <i class="fa fa-users"></i> {% trans "Family members" %}
-    </div>
-    {% render_table member_list %}
-</div>
-{% endblock %}
--- a/apps/family/templates/family/family_info.html
+++ b/apps/family/templates/family/family_info.html
@ -1,15 +0,0 @@
-{% load i18n pretty_money perms %}
-
-<dl class="row">
-    <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ family.name }}</dd>
-
-    <dt class="col-xl-6">{% trans 'description'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ family.description }}</dd>
-
-    <dt class="col-xl-6">{% trans 'score'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ family.score }}</dd>
-
-    <dt class="col-xl-6">{% trans 'rank'|capfirst %}</dt>
-    <dd class="col-xl-6">{{ family.rank }}</dd>
-</dl>
--- a/apps/family/templates/family/family_list.html
+++ b/apps/family/templates/family/family_list.html
@ -1,30 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load render_table from django_tables2 %}
-{% load i18n %}
-
-{% block content %}
-<div class="row">
-    <div class="col-xl-12">
-        <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0">
-            <a href="#" class="btn btn-sm btn-outline-primary active">
-                {% trans "Families" %}
-            </a>
-            <a href="{% url "family:challenge_list" %}" class="btn btn-sm btn-outline-primary">
-                {% trans "Challenges" %}
-            </a>
-        </div>
-    </div>
-</div>
-
-<<div class="card bg-white mb-3">
-    <h3 class="card-header text-center">
-        {{ title }}
-    </h3>
-    {% render_table table %}
-</div>
-{% endblock %}
-
--- a/apps/family/templates/family/family_update.html
+++ b/apps/family/templates/family/family_update.html
@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {% csrf_token %}
-      {{ form | crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}
--- a/apps/family/templates/family/picture_update.html
+++ b/apps/family/templates/family/picture_update.html
@ -1,118 +0,0 @@
-{% extends "family/base.html" %}
-{% comment %}
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block profile_content %}
-<div class="card bg-light">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body">
-    <div class="text-center">
-      <form method="post" enctype="multipart/form-data" id="formUpload">
-        {% csrf_token %}
-        {{ form |crispy }}
-        {% if user.note.display_image != "pic/default.png" %}
-          <input type="submit" class="btn btn-primary" value="{% trans "Remove" %}">
-        {% endif %}
-      </form>
-    </div>
-    <!-- MODAL TO CROP THE IMAGE -->
-    <div class="modal fade" id="modalCrop" data-backdrop="static">
-      <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-body-wrapper" style="width: 500px; height: 500px; padding: 16px;">
-              <div class="modal-body" style="width: 100%; height: 100%; padding: 0">
-                <img src="" id="modal-image" style="display: block; max-width: 100%;">
-              </div>
-            </div>
-          <div class="modal-footer">
-            <div class="btn-group pull-left" role="group">
-              <button type="button" class="btn btn-default" id="js-zoom-in">
-                <span class="glyphicon glyphicon-zoom-in"></span>
-              </button>
-              <button type="button" class="btn btn-default js-zoom-out">
-                <span class="glyphicon glyphicon-zoom-out"></span>
-              </button>
-            </div>
-            <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Nevermind" %}</button>
-            <button type="button" class="btn btn-primary js-crop-and-upload">{% trans "Crop and upload" %}</button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-{% endblock %}
-
-{% block extracss %}
-<link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.css" rel="stylesheet">
-{% endblock %}
-
-{% block extrajavascript%}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/jquery-cropper@1.0.1/dist/jquery-cropper.min.js"></script>
-<script>
-  $(function () {
-
-    /* SCRIPT TO OPEN THE MODAL WITH THE PREVIEW */
-    $("#id_image").change(function (e) {
-      if (this.files && this.files[0]) {
-        // Check the image size
-        if (this.files[0].size > 2*1024*1024) {
-          alert("Ce fichier est trop volumineux.")
-	} else {
-          // Read the selected image file
-          var reader = new FileReader();
-          reader.onload = function (e) {
-            $("#modal-image").attr("src", e.target.result);
-            $("#modalCrop").modal("show");
-          }
-          reader.readAsDataURL(this.files[0]);
-        }
-      }
-    });
-
-    /* SCRIPTS TO HANDLE THE CROPPER BOX */
-    var $image = $("#modal-image");
-    var cropBoxData;
-    var canvasData;
-    $("#modalCrop").on("shown.bs.modal", function () {
-      $image.cropper({
-        viewMode: 1,
-        aspectRatio: 1 / 1,
-        minCropBoxWidth: 200,
-        minCropBoxHeight: 200,
-        ready: function () {
-          $image.cropper("setCanvasData", canvasData);
-          $image.cropper("setCropBoxData", cropBoxData);
-        }
-      });
-    }).on("hidden.bs.modal", function () {
-      cropBoxData = $image.cropper("getCropBoxData");
-      canvasData = $image.cropper("getCanvasData");
-      $image.cropper("destroy");
-    });
-
-    $(".js-zoom-in").click(function () {
-      $image.cropper("zoom", 0.1);
-    });
-
-    $(".js-zoom-out").click(function () {
-      $image.cropper("zoom", -0.1);
-    });
-
-    /* SCRIPT TO COLLECT THE DATA AND POST TO THE SERVER */
-    $(".js-crop-and-upload").click(function () {
-      var cropData = $image.cropper("getData");
-      $("#id_x").val(cropData["x"]);
-      $("#id_y").val(cropData["y"]);
-      $("#id_height").val(cropData["height"]);
-      $("#id_width").val(cropData["width"]);
-      $("#formUpload").submit();
-    });
-  });
-</script>
-{% endblock %}
--- a/apps/family/urls.py
+++ b/apps/family/urls.py
@ -1,18 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.urls import path
-
-from .views import FamilyListView, FamilyDetailView, FamilyUpdateView, FamilyPictureUpdateView, FamilyAddMemberView, ChallengeListView, ChallengeDetailView, ChallengeUpdateView
-
-app_name = 'family'
-urlpatterns = [
-    path('list/', FamilyListView.as_view(), name="family_list"),
-    path('detail/<int:pk>/', FamilyDetailView.as_view(), name="family_detail"),
-    path('update/<int:pk>/', FamilyUpdateView.as_view(), name="family_update"),
-    path('update_pic/<int:pk>/', FamilyPictureUpdateView.as_view(), name="update_pic"),
-    path('add_member/<int:family_pk>/', FamilyAddMemberView.as_view(), name="family_add_member"),
-    path('challenge/list/', ChallengeListView.as_view(), name="challenge_list"),
-    path('challenge/detail/<int:pk>/', ChallengeDetailView.as_view(), name="challenge_detail"),
-    path('challenge/update/<int:pk>/', ChallengeUpdateView.as_view(), name="challenge_update"),
-]
--- a/apps/family/views.py
+++ b/apps/family/views.py
@ -1,242 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from datetime import date
-
-from django.conf import settings
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.db import transaction
-from django.views.generic import DetailView, UpdateView
-from django.utils.translation import gettext_lazy as _
-from django_tables2 import SingleTableView
-from permission.backends import PermissionBackend
-from permission.views import ProtectQuerysetMixin, ProtectedCreateView
-from django.urls import reverse_lazy
-
-from .models import Family, Challenge, FamilyMembership, User
-from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable
-from .forms import ChallengeUpdateForm, FamilyMembershipForm, FamilyUpdateForm
-from member.forms import ImageForm
-from member.views import PictureUpdateView
-
-
-class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView):
-    """
-    Create family
-    """
-    model = Family
-    extra_context = {"title": _('Create family')}
-
-    def get_sample_object(self):
-        return Family(
-            name="",
-            description="Sample family",
-            score=0,
-            rank=0,
-        )
-
-
-class FamilyListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
-    """
-    List existing Families
-    """
-    model = Family
-    table_class = FamilyTable
-    extra_context = {"title": _('Families list')}
-
-
-class FamilyDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
-    """
-    Display details of a family
-    """
-    model = Family
-    context_object_name = "family"
-    extra_context = {"title": _('Family detail')}
-
-    def get_context_data(self, **kwargs):
-        """
-        Add members list
-        """
-        context = super().get_context_data(**kwargs)
-
-        family = self.object
-
-        # member list
-        family_member = FamilyMembership.objects.filter(
-            family=family,
-            year=date.today().year,
-        ).filter(PermissionBackend.filter_queryset(self.request, FamilyMembership, "view"))\
-            .order_by("user__username")
-        family_member = family_member.distinct("user__username")\
-            if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else family_member
-
-        membership_table = FamilyMembershipTable(data=family_member, prefix="membership-")
-        membership_table.paginate(per_page=5, page=self.request.GET.get('membership-page', 1))
-        context['member_list'] = membership_table
-
-        # Check if the user has the right to create a membership, to display the button.
-        empty_membership = FamilyMembership(
-            family=family,
-            user=User.objects.first(),
-            year=date.today().year,
-        )
-        context["can_add_members"] = PermissionBackend()\
-            .has_perm(self.request.user, "family.add_membership", empty_membership)
-
-        return context
-
-
-class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    Update the information of a family.
-    """
-    model = Family
-    context_object_name = "family"
-    form_class = FamilyUpdateForm
-    template_name = 'family/family_update.html'
-    extra_context = {"title": _('Update family')}
-
-    def get_success_url(self):
-        return reverse_lazy('family:family_detail', kwargs={'pk': self.object.pk})
-
-
-class FamilyPictureUpdateView(PictureUpdateView):
-    """
-    Update profile picture of the family
-    """
-    model = Family
-    extra_context = {"title": _("Update family picture")}
-    template_name = 'family/picture_update.html'
-
-    def get_success_url(self):
-        """Redirect to family page after upload"""
-        return reverse_lazy('family:family_detail', kwargs={'pk': self.object.id})
-
-    @transaction.atomic
-    def form_valid(self, form):
-        """
-        Save the image
-        """
-        image = form.cleaned_data['image']
-
-        if image is None:
-            image = "pic/default.png"
-        else:
-            # Rename as PNG or GIF
-            extension = image.name.split(".")[-1]
-            if extension == "gif":
-                image.name = "{}_pic.gif".format(self.object.pk)
-            else:
-                image.name = "{}_pic.png".format(self.object.pk)
-
-
-class FamilyAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
-    """
-    Add a membership to a family
-    """
-    model = FamilyMembership
-    form_class = FamilyMembershipForm
-    template_name = 'family/add_member.html'
-    extra_context = {"title": _("Add a new member to the family")}
-
-    def get_sample_object(self):
-        if "family_pk" in self.kwargs:
-            family = Family.objects.get(pk=self.kwargs["family_pk"])
-        else:
-            family = FamilyMembership.objects.get(pk=self.kwargs["pk"]).family
-        return FamilyMembership(
-            user=self.request.user,
-            family=family,
-            year=date.today().year,
-        )
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        form = context['form']
-
-        family = Family.objects.filter(PermissionBackend.filter_queryset(self.request, Family, "view"))\
-            .get(pk=self.kwargs['family_pk'])
-        
-        context['family'] = family
-
-        return context
-
-    @transaction.atomic
-    def form_valid(self, form):
-        """
-        Create family membership, check that everythinf is good
-        """
-        family = Family.objects.filter(PermissionBackend.filter_queryset(self.request, Family, "view")) \
-                .get(pk=self.kwargs["family_pk"])
-
-        form.instance.family = family
-
-        return super().form_valid(form)
-
-    def get_success_url(self):
-        return reverse_lazy('family:family_detail', kwargs={'pk': self.object.family.id})
-
-
-class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView):
-    """
-    Create challenge
-    """
-    model = Challenge
-    extra_context = {"title": _('Create challenge')}
-
-    def get_sample_object(self):
-        return Challenge(
-            name="",
-            description="Sample challenge",
-            points=0,
-        )
-
-    def get_success_url(self):
-        return reverse_lazy('family:challenge_list')
-
-
-class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
-    """
-    List all challenges
-    """
-    model = Challenge
-    table_class = ChallengeTable
-    extra_context = {"title": _('Challenges list')}
-
-
-class ChallengeDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
-    """
-    Display details of a challenge
-    """
-    model = Challenge
-    context_object_name = "challenge"
-    extra_context = {"title": _('Details of:')}
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        fields = ["name", "description", "points",]
-
-        fields = dict([(field, getattr(self.object, field)) for field in fields])
-
-        context["fields"] = [(
-            Challenge._meta.get_field(field).verbose_name.capitalize(),
-            value) for field, value in fields.items()]
-        context["obtained"] = self.object.obtained
-        context["update"] = PermissionBackend.check_perm(self.request, "family.change_challenge")
-
-        return context
-
-
-class ChallengeUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    Update the information of a challenge
-    """
-    model = Challenge
-    context_object_name = "challenge"
-    extra_context = {"title": _('Update challenge')}
-    template_name = 'family/challenge_update.html'
-    form_class = ChallengeUpdateForm
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse_lazy('family:challenge_detail', kwargs={'pk': self.object.pk})
--- a/apps/food/templates/food/food_list.html
+++ b/apps/food/templates/food/food_list.html
@ -7,7 +7,52 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% load i18n %}

 {% block content %}
-{{ block.super }}
+<div class="card bg-light">
+  <h3 class="card-header text-center">
+      {{ title }}
+  </h3>
+  <div class="card-body">
+    <style>
+      input[type=number]::-webkit-inner-spin-button,
+      input[type=number]::-webkit-outer-spin-button {
+          -webkit-appearance: none;
+          margin: 0;
+      }
+      input[type=number] {
+          appearance: textfield;
+          padding: 6px;
+          border: 1px solid #ccc;
+          border-radius: 4px;
+          width: 100px;
+      }
+    </style>
+    <div class="d-flex align-items-center" style="max-width: 300px;">
+      <form method="get" action="{% url 'food:redirect_view' %}" class="d-flex w-100">
+        <input type="number" name="slug" placeholder="QR-code" required class="form-control form-control-sm" style="max-width: 120px;">
+        <button type="submit" class="btn btn-sm btn-primary">{% trans "View food" %}</button>
+      </form>
+    </div>
+  </div>
+  <div class="card-body">
+      <input id="searchbar" type="text" class="form-control"
+          placeholder="{% trans "Search by attribute such as name..." %}">
+  </div>
+
+  {% block extra_inside_card %}
+  {% endblock %}
+
+  <div id="dynamic-table">
+      {% if table.data %}
+      {% render_table table %}
+      {% else %}
+      <div class="card-body">
+          <div class="alert alert-warning">
+              {% trans "There is no results." %}
+          </div>
+      </div>
+      {% endif %}
+  </div>
+</div>
 <br>
 <div class="card bg-light mb-3">
  <h3 class="card-header text-center">
@ -68,4 +113,20 @@ SPDX-License-Identifier: GPL-3.0-or-later
  {% endfor %}
  {% endif %}
 </div>
+
+
+<script>
+  document.addEventListener('DOMContentLoaded', function() {
+      document.getElementById('goButton').addEventListener('click', function(event) {
+          event.preventDefault();
+          const slug = document.getElementById('slugInput').value;
+          if (slug && !isNaN(slug)) {
+              window.location.href = `/food/${slug}/`;
+          } else {
+              alert("Veuillez entrer un nombre valide.");
+          }
+      });
+  });
+  </script>
+
 {% endblock %}
--- a/apps/food/urls.py
+++ b/apps/food/urls.py
@ -18,4 +18,5 @@ urlpatterns = [
    path('detail/basic/<int:pk>', views.BasicFoodDetailView.as_view(), name='basicfood_view'),
    path('detail/transformed/<int:pk>', views.TransformedFoodDetailView.as_view(), name='transformedfood_view'),
    path('add/ingredient/<int:pk>', views.AddIngredientView.as_view(), name='add_ingredient'),
+    path('redirect/', views.QRCodeRedirectView.as_view(), name='redirect_view'),
 ]
--- a/apps/food/views.py
+++ b/apps/food/views.py
@ -10,6 +10,7 @@ from django.db.models import Q
 from django.http import HttpResponseRedirect, Http404
 from django.views.generic import DetailView, UpdateView, CreateView
 from django.views.generic.list import ListView
+from django.views.generic.base import RedirectView
 from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@ -63,7 +64,8 @@ class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, Li
            valid_regex = is_regex(pattern)
            suffix = '__iregex' if valid_regex else '__istartswith'
            prefix = '^' if valid_regex else ''
-            qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern}))
+            qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern})
+                           | Q(**{f'owner__name{suffix}': prefix + pattern}))
        else:
            qs = qs.none()
        search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Food, 'view'))
@ -506,3 +508,14 @@ class TransformedFoodDetailView(FoodDetailView):
        if Food.objects.filter(pk=kwargs['pk']).count() == 1:
            kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'transformedfood')
        return super().get(*args, **kwargs)
+
+
+class QRCodeRedirectView(RedirectView):
+    """
+    Redirects to the QR code creation page from Food List
+    """
+    def get_redirect_url(self, *args, **kwargs):
+        slug = self.request.GET.get('slug')
+        if slug:
+            return reverse_lazy('food:qrcode_create', kwargs={'slug': slug})
+        return reverse_lazy('food:list')
--- a/apps/member/tests/test_login.py
+++ b/apps/member/tests/test_login.py
@ -44,7 +44,7 @@ class TemplateLoggedInTests(TestCase):
        self.assertRedirects(response, settings.LOGIN_REDIRECT_URL, 302, 302)

    def test_logout(self):
-        response = self.client.get(reverse("logout"))
+        response = self.client.post(reverse("logout"))
        self.assertEqual(response.status_code, 200)

    def test_admin_index(self):
--- a/apps/note/api/urls.py
+++ b/apps/note/api/urls.py
@ -13,7 +13,7 @@ def register_note_urls(router, path):
    router.register(path + '/note', NotePolymorphicViewSet)
    router.register(path + '/alias', AliasViewSet)
    router.register(path + '/trust', TrustViewSet)
-    router.register(path + '/consumer', ConsumerViewSet)
+    router.register(path + '/consumer', ConsumerViewSet, basename='alias2')

    router.register(path + '/transaction/category', TemplateCategoryViewSet)
    router.register(path + '/transaction/transaction', TransactionViewSet)
--- a/apps/permission/scopes.py
+++ b/apps/permission/scopes.py
@ -1,8 +1,10 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
+
 from oauth2_provider.oauth2_validators import OAuth2Validator
 from oauth2_provider.scopes import BaseScopes
 from member.models import Club
+from note.models import Alias
 from note_kfet.middlewares import get_current_request

 from .backends import PermissionBackend
@ -16,26 +18,58 @@ class PermissionScopes(BaseScopes):
    and can be useful to make queries through the API with limited privileges.
    """

-    def get_all_scopes(self):
-        return {f"{p.id}_{club.id}": f"{p.description} (club {club.name})"
-                for p in Permission.objects.all() for club in Club.objects.all()}
+    def get_all_scopes(self, **kwargs):
+        scopes = {}
+        if 'scopes' in kwargs:
+            for scope in kwargs['scopes']:
+                if scope == 'openid':
+                    scopes['openid'] = "OpenID Connect"
+                else:
+                    p = Permission.objects.get(id=scope.split('_')[0])
+                    club = Club.objects.get(id=scope.split('_')[1])
+                    scopes[scope] = f"{p.description} (club {club.name})"
+            return scopes
+
+        scopes = {f"{p.id}_{club.id}": f"{p.description} (club {club.name})"
+                  for p in Permission.objects.all() for club in Club.objects.all()}
+        scopes['openid'] = "OpenID Connect"
+        return scopes

    def get_available_scopes(self, application=None, request=None, *args, **kwargs):
        if not application:
            return []
-        return [f"{p.id}_{p.membership.club.id}"
-                for t in Permission.PERMISSION_TYPES
-                for p in PermissionBackend.get_raw_permissions(get_current_request(), t[0])]
+        scopes = [f"{p.id}_{p.membership.club.id}"
+                  for t in Permission.PERMISSION_TYPES
+                  for p in PermissionBackend.get_raw_permissions(get_current_request(), t[0])]
+        scopes.append('openid')
+        return scopes

    def get_default_scopes(self, application=None, request=None, *args, **kwargs):
        if not application:
            return []
-        return [f"{p.id}_{p.membership.club.id}"
-                for p in PermissionBackend.get_raw_permissions(get_current_request(), 'view')]
+        scopes = [f"{p.id}_{p.membership.club.id}"
+                  for p in PermissionBackend.get_raw_permissions(get_current_request(), 'view')]
+        scopes.append('openid')
+        return scopes


 class PermissionOAuth2Validator(OAuth2Validator):
-    oidc_claim_scope = None  # fix breaking change of django-oauth-toolkit 2.0.0
+    oidc_claim_scope = OAuth2Validator.oidc_claim_scope
+    oidc_claim_scope.update({"name": 'openid',
+                             "normalized_name": 'openid',
+                             "email": 'openid',
+                             })
+
+    def get_additional_claims(self, request):
+        return {
+            "name": request.user.username,
+            "normalized_name": Alias.normalize(request.user.username),
+            "email": request.user.email,
+        }
+
+    def get_discovery_claims(self, request):
+        claims = super().get_discovery_claims(self)
+        return claims + ["name", "normalized_name", "email"]

    def validate_scopes(self, client_id, scopes, client, request, *args, **kwargs):
        """
@ -54,6 +88,8 @@ class PermissionOAuth2Validator(OAuth2Validator):
                if scope in scopes:
                    valid_scopes.add(scope)

-        request.scopes = valid_scopes
+        if 'openid' in scopes:
+            valid_scopes.add('openid')

+        request.scopes = valid_scopes
        return valid_scopes
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@ -13,12 +13,14 @@ EXCLUDED = [
    'cas_server.serviceticket',
    'cas_server.user',
    'cas_server.userattributes',
+    'constance.constance',
    'contenttypes.contenttype',
    'logs.changelog',
    'migrations.migration',
    'oauth2_provider.accesstoken',
    'oauth2_provider.grant',
    'oauth2_provider.refreshtoken',
+    'oauth2_provider.idtoken',
    'sessions.session',
 ]

--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@ -164,14 +164,24 @@ class ScopesView(LoginRequiredMixin, TemplateView):
        from oauth2_provider.models import Application
        from .scopes import PermissionScopes

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

--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@ -5,7 +5,7 @@ from bootstrap_datepicker_plus.widgets import DatePickerInput
 from django import forms
 from django.contrib.auth.models import User
 from django.db.models import Q
-from django.forms import CheckboxSelectMultiple
+from django.forms import CheckboxSelectMultiple, RadioSelect
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
 from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget
@ -140,6 +140,19 @@ class WEIMembershipForm(forms.ModelForm):
        required=False,
    )

+    def __init__(self, *args, wei=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if 'bus' in self.fields:
+            if wei is not None:
+                self.fields['bus'].queryset = Bus.objects.filter(wei=wei)
+            else:
+                self.fields['bus'].queryset = Bus.objects.none()
+        if 'team' in self.fields:
+            if wei is not None:
+                self.fields['team'].queryset = BusTeam.objects.filter(bus__wei=wei)
+            else:
+                self.fields['team'].queryset = BusTeam.objects.none()
+
    def clean(self):
        cleaned_data = super().clean()
        if 'team' in cleaned_data and cleaned_data["team"] is not None \
@ -151,21 +164,8 @@ class WEIMembershipForm(forms.ModelForm):
        model = WEIMembership
        fields = ('roles', 'bus', 'team',)
        widgets = {
-            "bus": Autocomplete(
-                Bus,
-                attrs={
-                    'api_url': '/api/wei/bus/',
-                    'placeholder': 'Bus ...',
-                }
-            ),
-            "team": Autocomplete(
-                BusTeam,
-                attrs={
-                    'api_url': '/api/wei/team/',
-                    'placeholder': 'Équipe ...',
-                },
-                resetable=True,
-            ),
+            "bus": RadioSelect(),
+            "team": RadioSelect(),
        }


--- a/apps/wei/templates/wei/weimembership_form.html
+++ b/apps/wei/templates/wei/weimembership_form.html
@ -210,4 +210,27 @@ SPDX-License-Identifier: GPL-3.0-or-later
            }
        }
    </script>
+    <script>
+        $(document).ready(function () {
+            function refreshTeams() {
+                let buses = [];
+                $("input[name='bus']:checked").each(function (ignored) {
+                    buses.push($(this).parent().text().trim());
+                });
+                console.log(buses);
+                $("input[name='team']").each(function () {
+                    let label = $(this).parent();
+                    $(this).parent().addClass('d-none');
+                    buses.forEach(function (bus) {
+                        if (label.text().includes(bus))
+                            label.removeClass('d-none');
+                    });
+                });
+            }
+    
+            $("input[name='bus']").change(refreshTeams);
+    
+            refreshTeams();
+        });
+    </script>
 {% endblock %}
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@ -788,7 +788,8 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
        return form

    def get_membership_form(self, data=None, instance=None):
-        membership_form = WEIMembershipForm(data if data else None, instance=instance)
+        registration = self.get_object()
+        membership_form = WEIMembershipForm(data if data else None, instance=instance, wei=registration.wei)
        del membership_form.fields["credit_type"]
        del membership_form.fields["credit_amount"]
        del membership_form.fields["first_name"]
@ -969,6 +970,13 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
            return WEIMembership1AForm
        return WEIMembershipForm

+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
+        wei = registration.wei
+        kwargs['wei'] = wei
+        return kwargs
+
    def get_form(self, form_class=None):
        form = super().get_form(form_class)
        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
--- a/docs/scripts.rst
+++ b/docs/scripts.rst
@ -136,7 +136,7 @@ de diffusion utiles.
   Faîtes attention, donc où la sortie est stockée.


-Il prend 2 options :
+Il prend 4 options :

 * ``--type``, qui prend en argument ``members`` (défaut), ``clubs``, ``events``, ``art``,
  ``sport``, qui permet respectivement de sortir la liste des adresses mails des adhérent⋅es
@ -149,7 +149,10 @@ Il prend 2 options :
  pour la ML Adhérents, pour exporter les mails des adhérents au BDE pendant n'importe 
  laquelle des ``n+1`` dernières années. 

-Le script sort sur la sortie standard la liste des adresses mails à inscrire.
+* ``--email``, qui prend en argument une chaine de caractère contenant une adresse email.
+  
+Si aucun email n'est renseigné, le script sort sur la sortie standard la liste des adresses mails à inscrire.
+Dans le cas contraire, la liste est envoyée à l'adresse passée en argument.

 Attention : il y a parfois certains cas particuliers à prendre en compte, il n'est
 malheureusement pas aussi simple que de simplement supposer que ces listes sont exhaustives.
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-06-27 19:15+0200\n"
+"POT-Creation-Date: 2025-07-11 16:10+0200\n"
 "PO-Revision-Date: 2022-04-11 22:05+0200\n"
 "Last-Translator: bleizi <bleizi@crans.org>\n"
 "Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
@ -357,7 +357,7 @@ msgstr "Détails de l'activité"
 #: apps/note/models/transactions.py:261
 #: apps/note/templates/note/transaction_form.html:17
 #: apps/note/templates/note/transaction_form.html:152
-#: note_kfet/templates/base.html:78
+#: note_kfet/templates/base.html:79
 msgid "Transfer"
 msgstr "Virement"

@ -474,7 +474,7 @@ msgstr "Inviter"
 msgid "Create new activity"
 msgstr "Créer une nouvelle activité"

-#: apps/activity/views.py:71 note_kfet/templates/base.html:96
+#: apps/activity/views.py:71 note_kfet/templates/base.html:97
 msgid "Activities"
 msgstr "Activités"

@ -563,7 +563,7 @@ msgstr "Nom"
 #, fuzzy
 #| msgid "QR-code number"
 msgid "QR code number"
-msgstr "numéro de QR-code"
+msgstr "Numéro de QR-code"

 #: apps/food/models.py:23
 msgid "Allergen"
@ -597,7 +597,7 @@ msgstr "est prêt"
 msgid "order"
 msgstr "consigne"

-#: apps/food/models.py:107 apps/food/views.py:34
+#: apps/food/models.py:107 apps/food/views.py:35
 #: note_kfet/templates/base.html:72
 msgid "Food"
 msgstr "Bouffe"
@ -657,61 +657,75 @@ msgstr "QR-codes"
 #: apps/food/models.py:286
 #: apps/food/templates/food/transformedfood_update.html:24
 msgid "QR-code number"
-msgstr "numéro de QR-code"
+msgstr "Numéro de QR-code"

-#: apps/food/templates/food/food_detail.html:19
+#: apps/food/templates/food/food_detail.html:22
 msgid "Contained in"
 msgstr "Contenu dans"

-#: apps/food/templates/food/food_detail.html:26
+#: apps/food/templates/food/food_detail.html:29
 msgid "Contain"
 msgstr "Contient"

-#: apps/food/templates/food/food_detail.html:35
+#: apps/food/templates/food/food_detail.html:38
 msgid "Update"
 msgstr "Modifier"

-#: apps/food/templates/food/food_detail.html:40
+#: apps/food/templates/food/food_detail.html:43
 msgid "Add to a meal"
 msgstr "Ajouter à un plat"

-#: apps/food/templates/food/food_detail.html:45
+#: apps/food/templates/food/food_detail.html:48
 msgid "Manage ingredients"
 msgstr "Gérer les ingrédients"

-#: apps/food/templates/food/food_detail.html:49
+#: apps/food/templates/food/food_detail.html:52
 msgid "Return to the food list"
 msgstr "Retour à la liste de nourriture"

-#: apps/food/templates/food/food_list.html:14
+#: apps/food/templates/food/food_list.html:32
+msgid "View food"
+msgstr "Voir l'aliment"
+
+#: apps/food/templates/food/food_list.html:37
+#: note_kfet/templates/base_search.html:15
+msgid "Search by attribute such as name..."
+msgstr "Chercher par un attribut tel que le nom..."
+
+#: apps/food/templates/food/food_list.html:49
+#: note_kfet/templates/base_search.html:23
+msgid "There is no results."
+msgstr "Il n'y a pas de résultat."
+
+#: apps/food/templates/food/food_list.html:58
 msgid "Meal served"
 msgstr "Plat servis"

-#: apps/food/templates/food/food_list.html:19
+#: apps/food/templates/food/food_list.html:63
 msgid "New meal"
 msgstr "Nouveau plat"

-#: apps/food/templates/food/food_list.html:28
+#: apps/food/templates/food/food_list.html:72
 msgid "There is no meal served."
 msgstr "Il n'y a pas de plat servi."

-#: apps/food/templates/food/food_list.html:35
+#: apps/food/templates/food/food_list.html:79
 msgid "Free food"
 msgstr "Open"

-#: apps/food/templates/food/food_list.html:42
+#: apps/food/templates/food/food_list.html:86
 msgid "There is no free food."
 msgstr "Il n'y a pas de bouffe en open"

-#: apps/food/templates/food/food_list.html:50
+#: apps/food/templates/food/food_list.html:94
 msgid "Food of your clubs"
 msgstr "Bouffe de tes clubs"

-#: apps/food/templates/food/food_list.html:56
+#: apps/food/templates/food/food_list.html:100
 msgid "Food of club"
 msgstr "Bouffe du club"

-#: apps/food/templates/food/food_list.html:63
+#: apps/food/templates/food/food_list.html:107
 msgid "Yours club has not food yet."
 msgstr "Ton club n'a pas de bouffe pour l'instant"

@ -785,49 +799,49 @@ msgstr "semaines"
 msgid "and"
 msgstr "et"

-#: apps/food/views.py:118
+#: apps/food/views.py:120
 msgid "Add a new QRCode"
 msgstr "Ajouter un nouveau QR-code"

-#: apps/food/views.py:167
+#: apps/food/views.py:169
 msgid "Add an aliment"
 msgstr "Ajouter un nouvel aliment"

-#: apps/food/views.py:235
+#: apps/food/views.py:228
 msgid "Add a meal"
 msgstr "Ajouter un plat"

-#: apps/food/views.py:275
+#: apps/food/views.py:259
 msgid "Manage ingredients of:"
 msgstr "Gestion des ingrédienrs de :"

-#: apps/food/views.py:289 apps/food/views.py:297
+#: apps/food/views.py:273 apps/food/views.py:281
 #, python-brace-format
 msgid "Fully used in {meal}"
 msgstr "Aliment entièrement utilisé dans : {meal}"

-#: apps/food/views.py:344
+#: apps/food/views.py:320
 msgid "Add the ingredient:"
 msgstr "Ajouter l'ingrédient"

-#: apps/food/views.py:370
+#: apps/food/views.py:346
 #, python-brace-format
 msgid "Food fully used in : {meal.name}"
 msgstr "Aliment entièrement utilisé dans : {meal.name}"

-#: apps/food/views.py:389
+#: apps/food/views.py:365
 msgid "Update an aliment"
 msgstr "Modifier un aliment"

-#: apps/food/views.py:437
+#: apps/food/views.py:413
 msgid "Details of:"
 msgstr "Détails de :"

-#: apps/food/views.py:447 apps/treasury/tables.py:149
+#: apps/food/views.py:423 apps/treasury/tables.py:149
 msgid "Yes"
 msgstr "Oui"

-#: apps/food/views.py:449 apps/member/models.py:99 apps/treasury/tables.py:149
+#: apps/food/views.py:425 apps/member/models.py:99 apps/treasury/tables.py:149
 msgid "No"
 msgstr "Non"

@ -1962,8 +1976,8 @@ msgstr ""
 "mode de paiement et un⋅e utilisateur⋅rice ou un club"

 #: apps/note/models/transactions.py:357 apps/note/models/transactions.py:360
-#: apps/note/models/transactions.py:363 apps/wei/views.py:1097
-#: apps/wei/views.py:1101
+#: apps/note/models/transactions.py:363 apps/wei/views.py:1105
+#: apps/wei/views.py:1109
 msgid "This field is required."
 msgstr "Ce champ est requis."

@ -2065,6 +2079,8 @@ msgstr "Historique des transactions récentes"
 #: apps/note/templates/note/mails/weekly_report.txt:32
 #: apps/registration/templates/registration/mails/email_validation_email.html:40
 #: apps/registration/templates/registration/mails/email_validation_email.txt:16
+#: apps/scripts/templates/scripts/food_report.html:48
+#: apps/scripts/templates/scripts/food_report.txt:14
 msgid "Mail generated by the Note Kfet on the"
 msgstr "Mail généré par la Note Kfet le"

@ -2176,7 +2192,7 @@ msgstr "Chercher un bouton"
 msgid "Update button"
 msgstr "Modifier le bouton"

-#: apps/note/views.py:156 note_kfet/templates/base.html:66
+#: apps/note/views.py:156 note_kfet/templates/base.html:67
 msgid "Consumptions"
 msgstr "Consommations"

@ -2269,7 +2285,7 @@ msgstr "s'applique au club"
 msgid "role permissions"
 msgstr "permissions par rôles"

-#: apps/permission/signals.py:73
+#: apps/permission/signals.py:75
 #, python-brace-format
 msgid ""
 "You don't have the permission to change the field {field} on this instance "
@ -2278,7 +2294,7 @@ msgstr ""
 "Vous n'avez pas la permission de modifier le champ {field} sur l'instance du "
 "modèle {app_label}.{model_name}."

-#: apps/permission/signals.py:83 apps/permission/views.py:104
+#: apps/permission/signals.py:85 apps/permission/views.py:104
 #, python-brace-format
 msgid ""
 "You don't have the permission to add an instance of model {app_label}."
@ -2287,7 +2303,7 @@ msgstr ""
 "Vous n'avez pas la permission d'ajouter une instance du modèle {app_label}."
 "{model_name}."

-#: apps/permission/signals.py:112
+#: apps/permission/signals.py:114
 #, python-brace-format
 msgid ""
 "You don't have the permission to delete this instance of model {app_label}."
@ -2375,7 +2391,7 @@ msgstr ""
 "Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » "
 "avec ces paramètres. Merci de les corriger et de réessayer."

-#: apps/permission/views.py:111 note_kfet/templates/base.html:120
+#: apps/permission/views.py:111 note_kfet/templates/base.html:121
 msgid "Rights"
 msgstr "Droits"

@ -2580,7 +2596,7 @@ msgstr ""
 msgid "Invalidate pre-registration"
 msgstr "Invalider l'inscription"

-#: apps/treasury/apps.py:12 note_kfet/templates/base.html:102
+#: apps/treasury/apps.py:12 note_kfet/templates/base.html:103
 msgid "Treasury"
 msgstr "Trésorerie"

@ -2996,7 +3012,7 @@ msgstr "Gérer les crédits de la Société générale"

 #: apps/wei/apps.py:10 apps/wei/models.py:42 apps/wei/models.py:43
 #: apps/wei/models.py:67 apps/wei/models.py:192
-#: note_kfet/templates/base.html:108
+#: note_kfet/templates/base.html:109
 msgid "WEI"
 msgstr "WEI"

@ -3041,7 +3057,7 @@ msgstr "Rôles au WEI"
 msgid "Select the roles that you are interested in."
 msgstr "Sélectionnez les rôles qui vous intéressent."

-#: apps/wei/forms/registration.py:147
+#: apps/wei/forms/registration.py:160
 msgid "This team doesn't belong to the given bus."
 msgstr "Cette équipe n'appartient pas à ce bus."

@ -3120,7 +3136,7 @@ msgstr "Rôle au WEI"
 msgid "Credit from Société générale"
 msgstr "Crédit de la Société générale"

-#: apps/wei/models.py:202 apps/wei/views.py:984
+#: apps/wei/models.py:202 apps/wei/views.py:992
 msgid "Caution check given"
 msgstr "Chèque de caution donné"

@ -3352,7 +3368,6 @@ msgid "View club"
 msgstr "Voir le club"

 #: apps/wei/templates/wei/bus_detail.html:26
-#| msgid "survey information"
 msgid "Edit information"
 msgstr "Modifier les informations"

@ -3373,8 +3388,8 @@ msgstr "Télécharger au format PDF"

 #: apps/wei/templates/wei/survey.html:11
 #: apps/wei/templates/wei/survey_closed.html:11
-#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:1159
-#: apps/wei/views.py:1214 apps/wei/views.py:1261
+#: apps/wei/templates/wei/survey_end.html:11 apps/wei/views.py:1167
+#: apps/wei/views.py:1222 apps/wei/views.py:1269
 msgid "Survey WEI"
 msgstr "Questionnaire WEI"

@ -3654,51 +3669,51 @@ msgstr ""
 msgid "Update WEI Registration"
 msgstr "Modifier l'inscription WEI"

-#: apps/wei/views.py:810
+#: apps/wei/views.py:811
 msgid "No membership found for this registration"
 msgstr "Pas d'adhésion trouvée pour cette inscription"

-#: apps/wei/views.py:819
+#: apps/wei/views.py:820
 msgid "You don't have the permission to update memberships"
 msgstr ""
 "Vous n'avez pas la permission d'ajouter une instance du modèle {app_label}."
 "{model_name}."

-#: apps/wei/views.py:825
+#: apps/wei/views.py:826
 #, python-format
 msgid "You don't have the permission to update the field %(field)s"
 msgstr "Vous n'avez pas la permission de modifier le champ %(field)s"

-#: apps/wei/views.py:870
+#: apps/wei/views.py:871
 msgid "Delete WEI registration"
 msgstr "Supprimer l'inscription WEI"

-#: apps/wei/views.py:881
+#: apps/wei/views.py:882
 msgid "You don't have the right to delete this WEI registration."
 msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI."

-#: apps/wei/views.py:899
+#: apps/wei/views.py:900
 msgid "Validate WEI registration"
 msgstr "Valider l'inscription WEI"

-#: apps/wei/views.py:985
+#: apps/wei/views.py:993
 msgid "Please make sure the check is given before validating the registration"
 msgstr ""
 "Merci de vous assurer que le chèque a bien été donné avant de valider "
 "l'adhésion"

-#: apps/wei/views.py:991
+#: apps/wei/views.py:999
 msgid "Create deposit transaction"
 msgstr "Créer une transaction de caution"

-#: apps/wei/views.py:992
+#: apps/wei/views.py:1000
 #, python-format
 msgid ""
 "A transaction of %(amount).2f€ will be created from the user's Note account"
 msgstr ""
 "Un transaction de %(amount).2f€ va être créée depuis la note de l'utilisateur"

-#: apps/wei/views.py:1087
+#: apps/wei/views.py:1095
 #, python-format
 msgid ""
 "This user doesn't have enough money to join this club and pay the deposit. "
@ -3708,21 +3723,21 @@ msgstr ""
 "payer la cautionSolde actuel : %(balance)d€, crédit : %(credit)d€, requis : "
 "%(needed)d€"

-#: apps/wei/views.py:1140
+#: apps/wei/views.py:1148
 #, fuzzy, python-format
 #| msgid "total amount"
 msgid "Caution %(name)s"
 msgstr "montant total"

-#: apps/wei/views.py:1354
+#: apps/wei/views.py:1362
 msgid "Attribute buses to first year members"
 msgstr "Répartir les 1A dans les bus"

-#: apps/wei/views.py:1380
+#: apps/wei/views.py:1388
 msgid "Attribute bus"
 msgstr "Attribuer un bus"

-#: apps/wei/views.py:1420
+#: apps/wei/views.py:1428
 msgid ""
 "No first year student without a bus found. Either all of them have a bus, or "
 "none has filled the survey yet."
@ -3746,13 +3761,13 @@ msgstr "bde"

 #: apps/wrapped/models.py:65
 msgid "data json"
-msgstr "donnée json"
+msgstr "données json"

 #: apps/wrapped/models.py:66
 msgid "data in the wrapped and generated by the script generate_wrapped"
 msgstr "donnée dans le wrapped et générée par le script generate_wrapped"

-#: apps/wrapped/models.py:70 note_kfet/templates/base.html:114
+#: apps/wrapped/models.py:70 note_kfet/templates/base.html:115
 msgid "Wrapped"
 msgstr "Wrapped"

@ -3785,7 +3800,7 @@ msgid "Copy link"
 msgstr "Copier le lien"

 #: apps/wrapped/templates/wrapped/1/wrapped_base.html:16
-#: note_kfet/templates/base.html:14
+#: note_kfet/templates/base.html:15
 msgid "The ENS Paris-Saclay BDE note."
 msgstr "La note du BDE de l'ENS Paris-Saclay."

@ -3888,7 +3903,7 @@ msgid ""
 "Do not forget to ask permission to people who are in your wrapped before to "
 "make them public"
 msgstr ""
-"N'oublies pas de demander la permission des personnes apparaissant dans un "
+"N'oublie pas de demander la permission des personnes apparaissant dans un "
 "wrapped avant de le rendre public"

 #: apps/wrapped/templates/wrapped/wrapped_list.html:40
@ -3907,19 +3922,19 @@ msgstr "Le wrapped est public"
 msgid "List of wrapped"
 msgstr "Liste des wrapped"

-#: note_kfet/settings/base.py:177
+#: note_kfet/settings/base.py:180
 msgid "German"
 msgstr "Allemand"

-#: note_kfet/settings/base.py:178
+#: note_kfet/settings/base.py:181
 msgid "English"
 msgstr "Anglais"

-#: note_kfet/settings/base.py:179
+#: note_kfet/settings/base.py:182
 msgid "Spanish"
 msgstr "Espagnol"

-#: note_kfet/settings/base.py:180
+#: note_kfet/settings/base.py:183
 msgid "French"
 msgstr "Français"

@ -3980,34 +3995,34 @@ msgstr ""
 msgid "Reset"
 msgstr "Réinitialiser"

-#: note_kfet/templates/base.html:84
+#: note_kfet/templates/base.html:85
 msgid "Users"
 msgstr "Utilisateur·rices"

-#: note_kfet/templates/base.html:90
+#: note_kfet/templates/base.html:91
 msgid "Clubs"
 msgstr "Clubs"

-#: note_kfet/templates/base.html:125
+#: note_kfet/templates/base.html:126
 msgid "Admin"
 msgstr "Admin"

-#: note_kfet/templates/base.html:139
+#: note_kfet/templates/base.html:140
 msgid "My account"
 msgstr "Mon compte"

-#: note_kfet/templates/base.html:142
+#: note_kfet/templates/base.html:145
 msgid "Log out"
 msgstr "Se déconnecter"

-#: note_kfet/templates/base.html:150
+#: note_kfet/templates/base.html:154
 #: note_kfet/templates/registration/signup.html:6
 #: note_kfet/templates/registration/signup.html:11
 #: note_kfet/templates/registration/signup.html:28
 msgid "Sign up"
 msgstr "Inscription"

-#: note_kfet/templates/base.html:157
+#: note_kfet/templates/base.html:161
 #: note_kfet/templates/registration/login.html:6
 #: note_kfet/templates/registration/login.html:15
 #: note_kfet/templates/registration/login.html:38
@ -4015,7 +4030,7 @@ msgstr "Inscription"
 msgid "Log in"
 msgstr "Se connecter"

-#: note_kfet/templates/base.html:171
+#: note_kfet/templates/base.html:175
 msgid ""
 "You are not a BDE member anymore. Please renew your membership if you want "
 "to use the note."
@ -4023,7 +4038,7 @@ msgstr ""
 "Vous n'êtes plus adhérent·e BDE. Merci de réadhérer si vous voulez profiter "
 "de la note."

-#: note_kfet/templates/base.html:177
+#: note_kfet/templates/base.html:181
 msgid ""
 "Your e-mail address is not validated. Please check your mail inbox and click "
 "on the validation link."
@ -4031,7 +4046,7 @@ msgstr ""
 "Votre adresse e-mail n'est pas validée. Merci de vérifier votre boîte mail "
 "et de cliquer sur le lien de validation."

-#: note_kfet/templates/base.html:183
+#: note_kfet/templates/base.html:187
 msgid ""
 "You declared that you opened a bank account in the Société générale. The "
 "bank did not validate the creation of the account to the BDE, so the "
@ -4045,22 +4060,38 @@ msgstr ""
 "vérification peut durer quelques jours. Merci de vous assurer de bien aller "
 "au bout de vos démarches."

-#: note_kfet/templates/base.html:206
+#: note_kfet/templates/base.html:214
 msgid "Contact us"
 msgstr "Nous contacter"

-#: note_kfet/templates/base.html:208
+#: note_kfet/templates/base.html:216
 msgid "Technical Support"
 msgstr "Support technique"

-#: note_kfet/templates/base.html:210
+#: note_kfet/templates/base.html:218
 msgid "Charte Info (FR)"
 msgstr "Charte Info (FR)"

-#: note_kfet/templates/base.html:212
+#: note_kfet/templates/base.html:220
 msgid "FAQ (FR)"
 msgstr "FAQ (FR)"

+#: note_kfet/templates/base.html:222
+msgid "Managed by BDE"
+msgstr "Géré par le BDE"
+
+#: note_kfet/templates/base.html:224
+msgid "Hosted by Cr@ns"
+msgstr "Hébergé par le Cr@ans"
+
+#: note_kfet/templates/base.html:266
+msgid "The note is not available for now"
+msgstr "La note est indisponible pour le moment"
+
+#: note_kfet/templates/base.html:268
+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..."
@ -4069,6 +4100,41 @@ msgstr "Chercher par un attribut tel que le nom..."
 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 "
+"Authentication Service.<br/>For security reasons, please Log Out and Exit "
+"your web browser when you are done accessing services that require "
+"authentication!"
+msgstr ""
+"<h3>Connection réussie</h3>Vous vous êtes bien connecté au Service Central d'Authentification."
+"<br/>Pour des raisons de sécurité, veuillez vous déconnecter et fermer votre navigateur internet "
+"une fois que vous aurez fini d'accéder aux services qui requiert une authentification !"
+
+#: note_kfet/templates/cas/logged.html:14
+msgid "Log me out from all my sessions"
+msgstr "Me déconnecter de toutes mes sessions"
+
+#: note_kfet/templates/cas/logged.html:20
+msgid "Forget the identity provider"
+msgstr "Oublier le fournisseur d'identité"
+
+#: note_kfet/templates/cas/logged.html:24
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: note_kfet/templates/cas/login.html:11
+msgid "Please log in"
+msgstr "Veuillez vous connecter"
+
+#: note_kfet/templates/cas/login.html:23
+msgid "Login"
+msgstr "Connexion"
+
+#: note_kfet/templates/cas/warn.html:14
+msgid "Connect to the service"
+msgstr "Connexion au service"
+
 #: note_kfet/templates/oauth2_provider/application_confirm_delete.html:8
 msgid "Are you sure to delete the application"
 msgstr "Êtes-vous sûr⋅e de vouloir supprimer l'application"
@ -4289,10 +4355,86 @@ msgstr ""
 "d'adhésion. Vous devez également valider votre adresse email en suivant le "
 "lien que vous avez reçu."

-#, fuzzy, python-format
-#~| msgid "Creation date"
-#~ msgid "Deposit %(name)s"
-#~ msgstr "Caution %(name)s"
+#, fuzzy
+#~| msgid "QR-code"
+#~ msgid "Go to QR-code"
+#~ msgstr "QR-code"
+
+#, python-brace-format
+#~ msgid "QR-code number {qr_code_number}"
+#~ msgstr "Numéro du QR-code {qr_code_number}"
+
+#~ msgid "was eaten"
+#~ msgstr "a été mangé"
+
+#~ msgid "is active"
+#~ msgstr "est en cours"
+
+#~ msgid "foods"
+#~ msgstr "bouffes"
+
+#~ msgid "Arrival date"
+#~ msgstr "Date d'arrivée"
+
+#~ msgid "Active"
+#~ msgstr "Actif"
+
+#~ msgid "Eaten"
+#~ msgstr "Mangé"
+
+#~ msgid "number"
+#~ msgstr "numéro"
+
+#~ msgid "View details"
+#~ msgstr "Voir plus"
+
+#~ msgid "Ready"
+#~ msgstr "Prêt"
+
+#~ msgid "Creation date"
+#~ msgstr "Date de création"
+
+#~ msgid "Ingredients"
+#~ msgstr "Ingrédients"
+
+#~ msgid "Open"
+#~ msgstr "Open"
+
+#~ msgid "All meals"
+#~ msgstr "Tout les plats"
+
+#~ msgid "There is no meal."
+#~ msgstr "Il n'y a pas de plat"
+
+#~ msgid "The product is already prepared"
+#~ msgstr "Le produit est déjà prêt"
+
+#~ msgid "Add a new basic food with QRCode"
+#~ msgstr "Ajouter un nouvel ingrédient avec un QR-code"
+
+#~ msgid "QRCode"
+#~ msgstr "QR-code"
+
+#~ msgid "Add a new meal"
+#~ msgstr "Ajouter un nouveau plat"
+
+#~ msgid "Update a meal"
+#~ msgstr "Modifier le plat"
+
+#, fuzzy
+#~| msgid "invalidate"
+#~ msgid "Enter a valid color."
+#~ msgstr "dévalider"
+
+#, fuzzy
+#~| msgid "invalidate"
+#~ msgid "Enter a valid value."
+#~ msgstr "dévalider"
+
+#, fuzzy
+#~| msgid "Invitation"
+#~ msgid "Syndication"
+#~ msgstr "Invitation"

 #, fuzzy
 #~| msgid "There is no results."
@ -4706,7 +4848,7 @@ msgstr ""

 #, python-brace-format
 #~ msgid "QR-code number {qr_code_number}"
-#~ msgstr "numéro du QR-code {qr_code_number}"
+#~ msgstr "Numéro du QR-code {qr_code_number}"

 #~ msgid "was eaten"
 #~ msgstr "a été mangé"
--- a/note.cron
+++ b/note.cron
@ -27,5 +27,6 @@ MAILTO=notekfet2020@lists.crans.org
 # Vider les tokens Oauth2
 00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
 # Envoyer la liste des abonnés à la NL BDA
- 00  10     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"
- 
+ 00  10    *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"
+# Envoyer la liste de la bouffe au club et aux GCKs
+ 00  8     *   *   1     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_for_food --report --club
--- a/note_kfet/admin.py
+++ b/note_kfet/admin.py
@ -56,3 +56,8 @@ if "cas_server" in settings.INSTALLED_APPS:
    from cas_server.models import *
    admin_site.register(ServicePattern, ServicePatternAdmin)
    admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)
+
+if "constance" in settings.INSTALLED_APPS:
+    from constance.admin import *
+    from constance.models import *
+    admin_site.register([Config], ConstanceAdmin)
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@ -39,7 +39,9 @@ SECURE_HSTS_PRELOAD = True
 INSTALLED_APPS = [
    # External apps
    'bootstrap_datepicker_plus',
+    'cas_server',
    'colorfield',
+    'constance',
    'crispy_bootstrap4',
    'crispy_forms',
 #    'django_htcpcp_tea',
@ -70,7 +72,6 @@ INSTALLED_APPS = [
    # Note apps
    'api',
    'activity',
-    'family',
    'food',
    'logs',
    'member',
@ -112,6 +113,7 @@ TEMPLATES = [
        'APP_DIRS': True,
        'OPTIONS': {
            'context_processors': [
+                'constance.context_processors.config',
                'django.template.context_processors.debug',
                'django.template.context_processors.request',
                'django.contrib.auth.context_processors.auth',
@ -308,6 +310,30 @@ PHONENUMBER_DEFAULT_REGION = 'FR'

 # We add custom information to CAS, in order to give a normalized name to other services
 CAS_AUTH_CLASS = 'member.auth.CustomAuthUser'
+CAS_LOGIN_TEMPLATE = 'cas/login.html'
+CAS_LOGOUT_TEMPLATE = 'cas/logout.html'
+CAS_WARN_TEMPLATE = 'cas/warn.html'
+CAS_LOGGED_TEMPLATE = 'cas/logged.html'

 # Default field for primary key
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
+# Constance settings
+CONSTANCE_ADDITIONAL_FIELDS = {
+    'banner_type': ['django.forms.fields.ChoiceField', {
+        'widget': 'django.forms.Select',
+        'choices': (('info', 'Info'), ('success', 'Success'), ('warning', 'Warning'), ('danger', 'Danger'))
+    }],
+}
+CONSTANCE_CONFIG = {
+    'BANNER_MESSAGE': ('', 'Some message', str),
+    'BANNER_TYPE': ('info', 'Banner type', 'banner_type'),
+    'MAINTENANCE': (False, 'check for mainteance mode', bool),
+    'MAINTENANCE_MESSAGE': ('', 'Some maintenance message', str),
+}
+CONSTANCE_CONFIG_FIELDSETS = {
+    'Maintenance': ('MAINTENANCE_MESSAGE', 'MAINTENANCE'),
+    'Banner': ('BANNER_MESSAGE', 'BANNER_TYPE'),
+}
+CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
+CONSTANCE_SUPERUSER_ONLY = True
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@ -5,6 +5,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html lang="{{ LANGUAGE_CODE|default:"en" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %} class="position-relative h-100">
+{% if not config.MAINTENANCE %}
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@ -78,13 +79,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                            <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %}</a>
                        </li>
                    {% endif %}
-                    {% if user.is_authenticated %}
-                        <li class="nav-item">
-                            {% url 'family:family_list' as url %}
-                            <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-users"></i> {% trans 'Families' %}</a>
-                        </li>
-                    {% endif %}
-
                    {% if "auth.user"|model_list_length >= 2 %}
                        <li class="nav-item">
                            {% url 'member:user_list' as url %}
@ -145,9 +139,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
                                <a class="dropdown-item" href="{% url 'member:user_detail' pk=request.user.pk %}">
                                    <i class="fa fa-user"></i> {% trans "My account" %}
                                </a>
-                                <a class="dropdown-item" href="{% url 'logout' %}">
-                                    <i class="fa fa-sign-out"></i> {% trans "Log out" %}
-                                </a>
+				<form method="post" action="{% url 'logout' %}">
+				    {% csrf_token %}
+				    <button class="dropdown-item" type=submit">
+					<i class="fa fa-sign-out"></i> {% trans "Log out" %}
+				    </button>
+                                </form>
                            </div>
                        </li>
                    {% else %}
@ -195,7 +192,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
                    {% endblocktrans %}
                </div>
            {% endif %}
-            {# TODO Add banners #}
+	    {% if config.BANNER_MESSAGE and user.is_authenticated %}
+	    <div class="alert alert-{{ config.BANNER_TYPE }}">
+	      {{ config.BANNER_MESSAGE }}
+	    </div>
+	    {% endif %}
        </div>
        {% block content %}
            <p>Default content...</p>
@ -217,6 +218,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                           class="text-muted">{% trans "Charte Info (FR)" %}</a> &mdash;
                        <a href="https://note.crans.org/doc/faq/"
                           class="text-muted">{% trans "FAQ (FR)" %}</a> &mdash;
+		   	<a href="https://bde.ens-cachan.fr"
+			   class="text-muted">{% trans "Managed by BDE" %}</a> &mdash;
+		   	<a href="https://crans.org"
+			   class="text-muted">{% trans "Hosted by Cr@ns" %}</a> &mdash;
                    </span>
                    {% csrf_token %}
                    <select title="language" name="language"
@ -253,4 +258,15 @@ SPDX-License-Identifier: GPL-3.0-or-later

 {% block extrajavascript %}{% endblock %}
 </body>
+{% endif %}
+{% if config.MAINTENANCE %}
+<body>
+  <div style="text-align:center">
+    <br />
+    {% trans "The note is not available for now" %}<br /><br />
+    {{ config.MAINTENANCE_MESSAGE }}<br /><br />
+    {% trans "Thank you for your understanding -- The Respos Info of BDE" %}
+  </div>
+</body>
+{% endif %}
 </html>
--- a/note_kfet/templates/cas/logged.html
+++ b/note_kfet/templates/cas/logged.html
@ -0,0 +1,28 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS-Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n %}
+{% block content %}
+<div class="alert alert-success" role="alert">{% blocktrans %}<h3>Log In Successful</h3>You have successfully logged into the Central Authentication Service.<br/>For security reasons, please Log Out and Exit your web browser when you are done accessing services that require authentication!{% endblocktrans %}</div>
+<div class="card bg-light mx-auto" style="max-width:30rem;">
+  <div class="card-body">
+    <form class="form-signin" method="get" action="logout">
+      <div class="checkbox">
+	<label>
+	  <input type="checkbox" name="all" value="1">{% trans "Log me out from all my sessions" %}
+	</label>
+      </div>
+      {% if settings.CAS_FEDERATE and request.COOKIES.remember_provider %}
+      <div class="checkbox">
+	<label>
+	  <input type="checkbox" name="forget_provider" value="1">{% trans "Forget the identity provider" %}
+	</label>
+      </div>
+      {% endif %}
+      <button class="btn btn-danger btn-block btn-lg" type="submit">{% trans "Logout" %}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}
--- a/note_kfet/templates/cas/login.html
+++ b/note_kfet/templates/cas/login.html
@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS-Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n %}
+
+{% block ante_messages %}
+  {% if auto_submit %}<noscript>{% endif %}
+  <div class="card-header text-center">
+    <h2 class="form-signin-heading">{% trans "Please log in" %}</h2>
+  </div>
+  {% if auto_submit %}</noscript>{% endif %}
+{% endblock %}
+
+{% block content %}
+  <div class="card bg-light mx-auto" style="max-width: 30rem;">
+    <div class="card-body">
+	<form class="form-signin" method="post" id="login_form"{% if post_url %} action="{{post_url}}"{% endif %}>
+	  {% csrf_token %}
+	  {% include "cas_server/bs4/form.html" %}
+	  {% if auto_submit %}<noscript>{% endif %}
+	  <button class="btn btn-primary btn-block btn-lg" type="submit">{% trans "Login" %}</button>
+	  {% if auto_submit %}</noscript>{% endif %}
+	</div>
+      </form>
+    </div>
+  </div>
+{% endblock %}
+
+{% block javascript_inline %}
+jQuery(function( $ ){
+  $("#id_warn").click(function(e){
+    if($("#id_warn").is(':checked')){
+      createCookie("warn", "on", 10 * 365);
+    } else {
+      eraseCookie("warn");
+    }
+  });
+});
+{% if auto_submit %}document.getElementById('login_form').submit(); // SUBMIT FORM{% endif %}
+{% endblock %}
--- a/note_kfet/templates/cas/logout.html
+++ b/note_kfet/templates/cas/logout.html
@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS-Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n static %}
+{% block content %}
+    <div class="alert alert-success" role="alert">{{ logout_msg }}</div>
+{% endblock %}
+  
--- a/note_kfet/templates/cas/warn.html
+++ b/note_kfet/templates/cas/warn.html
@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% comment %}
+Copyright (C) by BDE ENS-Paris-Saclay
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n static %}
+
+{% block content %}
+  <div class="card bg-light mx-auto" style="max-width: 30rem;">
+    <div class="card-body">
+      <form class="form-signin" method="post">
+	{% csrf_token %}
+	{% include "cas_server/bs4/form.html" %}
+	<button class="btn btn-primary btn-block btn-lg" type="submit">{% trans "Connect to the service" %}</button>
+      </form>
+    </div>
+  </div>
+{% endblock %}
+  
--- a/note_kfet/urls.py
+++ b/note_kfet/urls.py
@ -21,9 +21,8 @@ urlpatterns = [
    path('activity/', include('activity.urls')),
    path('treasury/', include('treasury.urls')),
    path('wei/', include('wei.urls')),
-    path('food/', include('food.urls')),
-    path('wrapped/', include('wrapped.urls')),
-    path('family/', include('family.urls')),
+    path('food/',include('food.urls')),
+    path('wrapped/',include('wrapped.urls')),

    # Include Django Contrib and Core routers
    path('i18n/', include('django.conf.urls.i18n')),
--- a/requirements.txt
+++ b/requirements.txt
@ -1,20 +1,21 @@
-beautifulsoup4~=4.12.3
-crispy-bootstrap4~=2023.1
-Django~=4.2.9
+beautifulsoup4~=4.13.4
+crispy-bootstrap4~=2025.6
+Django~=5.2.4
 django-bootstrap-datepicker-plus~=5.0.5
-#django-cas-server~=2.0.0
-django-colorfield~=0.11.0
-django-crispy-forms~=2.1.0
-django-extensions>=3.2.3
-django-filter~=23.5
+django-cas-server~=3.1.0
+django-colorfield~=0.14.0
+django-constance~=4.3.2
+django-crispy-forms~=2.4.0
+django-extensions>=4.1.0
+django-filter~=25.1
 #django-htcpcp-tea~=0.8.1
-django-mailer~=2.3.1
-django-oauth-toolkit~=2.3.0
-django-phonenumber-field~=7.3.0
+django-mailer~=2.3.2
+django-oauth-toolkit~=3.0.1
+django-phonenumber-field~=8.1.0
 django-polymorphic~=3.1.0
-djangorestframework~=3.14.0
+djangorestframework~=3.16.0
 django-rest-polymorphic~=0.1.10
-django-tables2~=2.7.0
+django-tables2~=2.7.5
 python-memcached~=1.62
-phonenumbers~=8.13.28
-Pillow>=10.2.0
+phonenumbers~=9.0.8
+Pillow>=11.3.0
--- a/tox.ini
+++ b/tox.ini
@ -1,13 +1,13 @@
 [tox]
 envlist =
    # Ubuntu 22.04 Python
-    py310-django42
+    py310-django52

    # Debian Bookworm Python
-    py311-django42
+    py311-django52

    # Ubuntu 24.04 Python
-    py312-django42
+    py312-django52

    linters
 skipsdist = True
@ -32,8 +32,7 @@ deps =
    pep8-naming
    pyflakes
 commands =
-    flake8 apps --extend-exclude apps/scripts,apps/wrapped/management/commands
-    flake8 apps/wrapped/management/commands --extend-ignore=C901
+    flake8 apps --extend-exclude apps/scripts

 [flake8]
 ignore = W503, I100, I101, B019
Author	SHA1	Message	Date
quark	b97b79e2ea	translation	2025-07-12 14:05:53 +02:00
quark	695ce63e08	Merge branch 'food_traceability' into 'beta' Easier access to food details See merge request bde/nk20!326	2025-07-11 17:15:50 +02:00
ehouarn	79f50c27f1	Merge branch 'beta' into 'food_traceability' # Conflicts: # locale/fr/LC_MESSAGES/django.po	2025-07-11 17:00:45 +02:00
Ehouarn	5989721bc9	Easier access to food details	2025-07-11 16:35:49 +02:00
quark	bcc3e7cc53	Merge branch 'food_traceability' into beta	2025-07-11 12:26:55 +02:00
Ehouarn	608804db30	Bugs fixed	2025-07-10 20:05:27 +02:00
quark	82a06c29dd	linters	2025-07-09 16:12:55 +02:00
quark	cf9d208586	scopes	2025-07-09 15:57:24 +02:00
quark	432f50e49a	propose fix for #134 (partially tested)	2025-07-09 00:15:33 +02:00
quark	883589e08c	django-constance and traduction	2025-07-06 16:17:13 +02:00
quark	c36f8c25a2	Add banner #80 (with django-constance	2025-07-05 18:45:36 +02:00
quark	8783a63d7f	change CAS template for #133	2025-07-05 13:56:43 +02:00
quark	4cc43fe4b6	traduction, resolve #133	2025-07-04 22:11:47 +02:00
quark	b7c0986a5f	cron and linters	2025-07-04 17:14:12 +02:00
quark	85ea43a7cf	change pipeline	2025-07-04 16:27:04 +02:00
quark	f54dd30482	fix logout test	2025-07-03 15:18:29 +02:00
quark	7eafe33945	Merge branch 'main' into django-5.2	2025-07-03 14:24:58 +02:00
quark	6edef619aa	change requirements.txt	2025-07-03 11:37:07 +02:00
ehouarn	8a1f30ebe2	Merge branch 'wei' into 'main' Wei See merge request bde/nk20!325	2025-07-01 18:14:45 +02:00
Ehouarn	b2c6b0e85d	Sélection de bus/équipe plus ergonomique	2025-07-01 17:48:39 +02:00
quark	1567bc6ce5	Merge branch 'oidc' into 'main' Oidc See merge request bde/nk20!324	2025-06-27 22:29:51 +02:00
quark	c411197af3	multiline support for RSA key in env	2025-06-27 22:13:43 +02:00
quark	cdc6f0a3f8	Fix jwks.json	2025-06-27 12:13:54 +02:00
ehouarn	c153d5f10a	Merge branch 'wei' into 'main' Wei See merge request bde/nk20!323	2025-06-26 17:08:27 +02:00
quark	763535bea4	Merge branch 'oidc' into 'main' OIDC 0 Quark 1 See merge request bde/nk20!322	2025-06-17 16:02:40 +02:00
quark	df0d886db9	linters	2025-06-17 11:46:33 +02:00
quark	092cc37320	OIDC 0 Quark 1	2025-06-17 00:38:11 +02:00
thomasl	16b55e23af	Merge branch 'thomasl-main-patch-84944' into 'main' Update doc about scripts See merge request bde/nk20!321	2025-06-14 20:24:49 +02:00
thomasl	97621e8704	Update doc about scripts	2025-06-14 20:07:29 +02:00
quark	cf4c23d1ac	Merge branch 'oidc' into 'main' oidc See merge request bde/nk20!320	2025-06-14 18:36:24 +02:00
quark	d71105976f	oidc	2025-06-14 18:01:42 +02:00
quark	89cc03141b	allow search with club name	2025-06-12 18:48:29 +02:00