Merge branch 'nix-shell' into 'main'

Nix shell See merge request bde/nk20!201
Merge branch 'options_order' into 'main'
2025-10-26 13:33:19 +01:00 · 2025-04-14 12:49:43 +02:00 · 2025-04-13 23:12:05 +02:00 · 2025-04-13 22:59:04 +02:00 · 2025-04-13 22:32:49 +02:00 · 2025-04-13 20:17:44 +02:00
204 changed files with 3492 additions and 510 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,6 @@ backups/
 env/
 venv/
 db.sqlite3
-shell.nix

 # ansibles customs host
 ansible/host_vars/*.yaml
--- a/README.md
+++ b/README.md
@@ -58,7 +58,13 @@ Bien que cela permette de créer une instance sur toutes les distributions,
    (env)$ ./manage.py createsuperuser  # Création d'un⋅e utilisateur⋅rice initial
    ```

-6.  Enjoy :
+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`).
+
+7.  Enjoy :

    ```bash
    (env)$ ./manage.py runserver 0.0.0.0:8000
@@ -228,7 +234,13 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
        (env)$ ./manage.py check # pas de bêtise qui traine
        (env)$ ./manage.py migrate

-7.  *Enjoy \o/*
+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`).
+
+8.  *Enjoy \o/*

 ### Installation avec Docker

--- a/apps/activity/init.py
+++ b/apps/activity/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'activity.apps.ActivityConfig'
--- a/apps/activity/admin.py
+++ b/apps/activity/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib import admin
@@ -35,7 +35,7 @@ class GuestAdmin(admin.ModelAdmin):
    """
    Admin customisation for Guest
    """
-    list_display = ('last_name', 'first_name', 'activity', 'inviter')
+    list_display = ('last_name', 'first_name', 'school', 'activity', 'inviter')
    form = GuestForm


--- a/apps/activity/api/serializers.py
+++ b/apps/activity/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# 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 _
--- a/apps/activity/api/urls.py
+++ b/apps/activity/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet, OpenerViewSet
--- a/apps/activity/api/views.py
+++ b/apps/activity/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from api.filters import RegexSafeSearchFilter
@@ -51,9 +51,9 @@ class GuestViewSet(ReadProtectedModelViewSet):
    queryset = Guest.objects.order_by('id')
    serializer_class = GuestSerializer
    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
-    filterset_fields = ['activity', 'activity__name', 'last_name', 'first_name', 'inviter', 'inviter__alias__name',
+    filterset_fields = ['activity', 'activity__name', 'last_name', 'first_name', 'school', 'inviter', 'inviter__alias__name',
                        'inviter__alias__normalized_name', ]
-    search_fields = ['$activity__name', '$last_name', '$first_name', '$inviter__user__email', '$inviter__alias__name',
+    search_fields = ['$activity__name', '$last_name', '$first_name', '$school', '$inviter__user__email', '$inviter__alias__name',
                     '$inviter__alias__normalized_name', ]


--- a/apps/activity/apps.py
+++ b/apps/activity/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/activity/forms.py
+++ b/apps/activity/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta
@@ -107,7 +107,7 @@ class GuestForm(forms.ModelForm):

    class Meta:
        model = Guest
-        fields = ('last_name', 'first_name', 'inviter', )
+        fields = ('last_name', 'first_name', 'school', 'inviter', )
        widgets = {
            "inviter": Autocomplete(
                NoteUser,
--- a/apps/activity/migrations/0006_guest_school.py
+++ b/apps/activity/migrations/0006_guest_school.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.20 on 2025-03-25 09:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("activity", "0005_alter_opener_options_alter_opener_opener"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="guest",
+            name="school",
+            field=models.CharField(default="", max_length=255, verbose_name="school"),
+            preserve_default=False,
+        ),
+    ]
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import os
@@ -247,6 +247,11 @@ class Guest(models.Model):
        verbose_name=_("first name"),
    )

+    school = models.CharField(
+        max_length=255,
+        verbose_name=_("school"),
+    )
+
    inviter = models.ForeignKey(
        NoteUser,
        on_delete=models.PROTECT,
--- a/apps/activity/tables.py
+++ b/apps/activity/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.utils import timezone
@@ -51,7 +51,7 @@ class GuestTable(tables.Table):
        }
        model = Guest
        template_name = 'django_tables2/bootstrap4.html'
-        fields = ("last_name", "first_name", "inviter", )
+        fields = ("last_name", "first_name", "inviter", "school")

    def render_entry(self, record):
        if record.has_entry:
--- a/apps/activity/tests/test_activities.py
+++ b/apps/activity/tests/test_activities.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta
@@ -50,6 +50,7 @@ class TestActivities(TestCase):
            inviter=self.user.note,
            last_name="GUEST",
            first_name="Guest",
+            school="School",
        )

    def test_activity_list(self):
@@ -156,6 +157,7 @@ class TestActivities(TestCase):
            inviter=self.user.note.id,
            last_name="GUEST2",
            first_name="Guest",
+            school="School",
        ))
        self.assertEqual(response.status_code, 200)

@@ -167,6 +169,7 @@ class TestActivities(TestCase):
            inviter=self.user.note.id,
            last_name="GUEST2",
            first_name="Guest",
+            school="School",
        ))
        self.assertRedirects(response, reverse("activity:activity_detail", args=(self.activity.pk,)), 302, 200)

@@ -200,6 +203,7 @@ class TestActivityAPI(TestAPI):
            inviter=self.user.note,
            last_name="GUEST",
            first_name="Guest",
+            school="School",
        )

        self.entry = Entry.objects.create(
--- a/apps/activity/urls.py
+++ b/apps/activity/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from hashlib import md5
@@ -168,6 +168,7 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
            activity=activity,
            first_name="",
            last_name="",
+            school="",
            inviter=self.request.user.note,
        )

--- a/apps/api/init.py
+++ b/apps/api/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'api.apps.APIConfig'
--- a/apps/api/apps.py
+++ b/apps/api/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/api/serializers.py
+++ b/apps/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later


--- a/apps/api/tests.py
+++ b/apps/api/tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import json
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
@@ -47,6 +47,10 @@ if "wei" in settings.INSTALLED_APPS:
    from wei.api.urls import register_wei_urls
    register_wei_urls(router, 'wei')

+if "wrapped" in settings.INSTALLED_APPS:
+    from wrapped.api.urls import register_wrapped_urls
+    register_wrapped_urls(router, 'wrapped')
+
 app_name = 'api'

 # Wire up our API using automatic URL routing.
--- a/apps/api/views.py
+++ b/apps/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.auth.models import User
--- a/apps/api/viewsets.py
+++ b/apps/api/viewsets.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import re
--- a/apps/food/admin.py
+++ b/apps/food/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib import admin
--- a/apps/food/api/serializers.py
+++ b/apps/food/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework import serializers
--- a/apps/food/api/urls.py
+++ b/apps/food/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import AllergenViewSet, BasicFoodViewSet, QRCodeViewSet, TransformedFoodViewSet
--- a/apps/food/api/views.py
+++ b/apps/food/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from api.viewsets import ReadProtectedModelViewSet
--- a/apps/food/apps.py
+++ b/apps/food/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later


--- a/apps/food/forms.py
+++ b/apps/food/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from random import shuffle
--- a/apps/food/models.py
+++ b/apps/food/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta
--- a/apps/food/tables.py
+++ b/apps/food/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import django_tables2 as tables
--- a/apps/food/urls.py
+++ b/apps/food/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/food/views.py
+++ b/apps/food/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.db import transaction
--- a/apps/logs/init.py
+++ b/apps/logs/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'logs.apps.LogsConfig'
--- a/apps/logs/api/serializers.py
+++ b/apps/logs/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework import serializers
--- a/apps/logs/api/urls.py
+++ b/apps/logs/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import ChangelogViewSet
--- a/apps/logs/api/views.py
+++ b/apps/logs/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django_filters.rest_framework import DjangoFilterBackend
--- a/apps/logs/apps.py
+++ b/apps/logs/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/logs/models.py
+++ b/apps/logs/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
--- a/apps/logs/signals.py
+++ b/apps/logs/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.contenttypes.models import ContentType
--- a/apps/member/init.py
+++ b/apps/member/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'member.apps.MemberConfig'
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib import admin
--- a/apps/member/api/serializers.py
+++ b/apps/member/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework import serializers
--- a/apps/member/api/urls.py
+++ b/apps/member/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import ProfileViewSet, ClubViewSet, MembershipViewSet
--- a/apps/member/api/views.py
+++ b/apps/member/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django_filters.rest_framework import DjangoFilterBackend
--- a/apps/member/apps.py
+++ b/apps/member/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/member/auth.py
+++ b/apps/member/auth.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from cas_server.auth import DjangoAuthUser  # pragma: no cover
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import io
@@ -23,7 +23,7 @@ from .models import Profile, Club, Membership
 class CustomAuthenticationForm(AuthenticationForm):
    permission_mask = forms.ModelChoiceField(
        label=_("Permission mask"),
-        queryset=PermissionMask.objects.order_by("rank"),
+        queryset=PermissionMask.objects.order_by("-rank"),
        empty_label=None,
    )

--- a/apps/member/hashers.py
+++ b/apps/member/hashers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import hashlib
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import datetime
--- a/apps/member/signals.py
+++ b/apps/member/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later


--- a/apps/member/tables.py
+++ b/apps/member/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import date
--- a/apps/member/templates/member/picture_update.html
+++ b/apps/member/templates/member/picture_update.html
@@ -20,12 +20,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
      </form>
    </div>
    <!-- MODAL TO CROP THE IMAGE -->
-    <div class="modal fade" id="modalCrop">
+    <div class="modal fade" id="modalCrop" data-backdrop="static">
      <div class="modal-dialog">
        <div class="modal-content">
-          <div class="modal-body">
-            <img src="" id="modal-image" style="max-width: 100%;">
-          </div>
+            <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">
--- a/apps/member/templatetags/memberinfo.py
+++ b/apps/member/templatetags/memberinfo.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import date
--- a/apps/member/urls.py
+++ b/apps/member/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta, date
--- a/apps/note/init.py
+++ b/apps/note/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'note.apps.NoteConfig'
--- a/apps/note/admin.py
+++ b/apps/note/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib import admin
--- a/apps/note/api/serializers.py
+++ b/apps/note/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
--- a/apps/note/api/urls.py
+++ b/apps/note/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import NotePolymorphicViewSet, AliasViewSet, ConsumerViewSet, \
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
--- a/apps/note/apps.py
+++ b/apps/note/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/note/forms.py
+++ b/apps/note/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from datetime import datetime

--- a/apps/note/models/init.py
+++ b/apps/note/models/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .notes import Alias, Note, NoteClub, NoteSpecial, NoteUser, Trust
--- a/apps/note/models/notes.py
+++ b/apps/note/models/notes.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import unicodedata
--- a/apps/note/models/transactions.py
+++ b/apps/note/models/transactions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.core.exceptions import ValidationError
--- a/apps/note/signals.py
+++ b/apps/note/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.utils import timezone
--- a/apps/note/static/note/js/consos.js
+++ b/apps/note/static/note/js/consos.js
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+// Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 // SPDX-License-Identifier: GPL-3.0-or-later

 // When a transaction is performed, lock the interface to prevent spam clicks.
@@ -245,7 +245,7 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca
          invalidity_reason: 'Solde insuffisant',
          polymorphic_ctype: type,
          resourcetype: 'RecurrentTransaction',
-          source: source,
+          source: source.id,
          source_alias: source_alias,
          destination: dest,
          template: template
@@ -294,3 +294,10 @@ searchbar.addEventListener("keyup", function (e) {
  if (firstMatch && e.key === "Enter")
    firstMatch.click()
 });
+
+function createshiny() {
+  const list_btn = document.querySelectorAll('.btn-outline-dark')
+  const shiny_class = list_btn[Math.floor(Math.random() * list_btn.length)].classList
+  shiny_class.replace('btn-outline-dark', 'btn-outline-dark-shiny')
+}
+createshiny()
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import html
--- a/apps/note/templates/note/transaction_form.html
+++ b/apps/note/templates/note/transaction_form.html
@@ -89,7 +89,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
                </ul>
                <div class="card-body">
                    <select id="debit_type" class="form-control custom-select d-none">
-                        {% for special_type in special_types %}
+                        {% for special_type in special_types|slice:"::-1" %}
                            <option value="{{ special_type.id }}">{{ special_type.special_type }}</option>
                        {% endfor %}
                    </select>
--- a/apps/note/templatetags/getenv.py
+++ b/apps/note/templatetags/getenv.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django import template
--- a/apps/note/templatetags/pretty_money.py
+++ b/apps/note/templatetags/pretty_money.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django import template
--- a/apps/note/tests/test_transactions.py
+++ b/apps/note/tests/test_transactions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from api.tests import TestAPI
--- a/apps/note/urls.py
+++ b/apps/note/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.urls import path
--- a/apps/note/views.py
+++ b/apps/note/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import json
--- a/apps/permission/init.py
+++ b/apps/permission/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'permission.apps.PermissionConfig'
--- a/apps/permission/admin.py
+++ b/apps/permission/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-lateré

 from django.contrib import admin
--- a/apps/permission/api/serializers.py
+++ b/apps/permission/api/serializers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework import serializers
--- a/apps/permission/api/urls.py
+++ b/apps/permission/api/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from .views import PermissionViewSet, RoleViewSet
--- a/apps/permission/api/views.py
+++ b/apps/permission/api/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django_filters.rest_framework import DjangoFilterBackend
--- a/apps/permission/apps.py
+++ b/apps/permission/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -1,7 +1,7 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from datetime import date
+from datetime import date, timedelta

 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.models import User
@@ -106,6 +106,7 @@ class PermissionBackend(ModelBackend):
                Q=Q,
                now=timezone.now(),
                today=date.today(),
+                week=timedelta(days=7),
            )
            yield permission

--- a/apps/permission/decorators.py
+++ b/apps/permission/decorators.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
 from functools import lru_cache
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -324,7 +324,7 @@
            "mask": 2,
            "field": "",
            "permanent": false,
-            "description": "Créer une transaction de ou vers la note d'un club"
+            "description": "Créer une transaction de ou vers la note d'un club tant que la source reste au dessus de -20 €"
        }
    },
    {
@@ -2591,7 +2591,7 @@
                "note",
                "transaction"
            ],
-            "query": "[\"OR\", {\"source__balance__gte\": 0}, [\"AND\", [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}], {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}], {\"valid\": false}]",
+            "query": "[\"OR\", [\"AND\", [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}], [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}]], [\"AND\", [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 0]}}, {\"valid\": false}], {\"recurrenttransaction__template__category__name\": \"Alcool\"}]]",
            "type": "add",
            "mask": 2,
            "field": "",
@@ -2607,7 +2607,8 @@
                "note",
                "transaction"
            ],
-            "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}]",
+            "query": "[\"AND\", [\"OR\", [\"AND\", [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}], [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}]], [\"AND\", [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 0]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}], {\"recurrenttransaction__template__category__name\": \"Alcool\"}]], {\"created_at__gte\": {\"F\": [\"SUB\", [\"now\"], [\"week\"]]}}]"
+,
            "type": "change",
            "mask": 2,
            "field": "valid",
@@ -2623,7 +2624,8 @@
                "note",
                "transaction"
            ],
-            "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}]",
+            "query": "[\"AND\", [\"OR\", [\"AND\", [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}], [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}]], [\"AND\", [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 0]}, \"valid\": false}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}, \"valid\": true}], {\"recurrenttransaction__template__category__name\": \"Alcool\"}]], {\"created_at__gte\": {\"F\": [\"SUB\", [\"now\"], [\"week\"]]}}]"
+,
            "type": "change",
            "mask": 2,
            "field": "invalidity_reason",
@@ -3813,7 +3815,7 @@
            "mask": 2,
            "field": "",
            "permanent": false,
-            "description": "Créer une transaction vers la note d'un club"
+            "description": "Créer une transaction vers la note d'un club tant que la source reste au dessus de -20 €"
        }
    },
    {
@@ -3829,7 +3831,7 @@
            "mask": 3,
            "field": "",
            "permanent": false,
-            "description": "Voir les profils des membres du club"
+	    "description": "Voir les profils des membres du club"
        }
    },
    {
@@ -3896,6 +3898,374 @@
            "description": "Voir les personnes invitées aux événements organisés par son club"
        }
    },
+    {
+        "model": "permission.permission",
+        "pk": 248,
+        "fields": {
+            "model": [
+                "auth",
+                "user"
+            ],
+            "query": "[\"NOT\", {\"pk__isnull\": [\"user\", \"note\", \"activity_responsible\", [\"filter\", {\"activity__open\": true, \"activity__activity_type__manage_entries\":true}], [\"exists\"]]}]",
+            "type": "view",
+            "mask": 3,
+            "field": "",
+            "permanent": false,
+            "description": "Voir n'importe quel⋅le utilisateur⋅rice pour les ouvreur⋅ses"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 249,
+        "fields": {
+            "model": [
+                "note",
+                "note"
+            ],
+            "query": "[\"NOT\", {\"pk__isnull\": [\"user\", \"note\", \"activity_responsible\", [\"filter\", {\"activity__open\": true, \"activity__activity_type__manage_entries\":true}], [\"exists\"]]}]",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir toutes les notes lorsque utilisateur⋅rice est ouvreur⋅ses"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 250,
+        "fields": {
+            "model": [
+                "activity",
+                "guest"
+            ],
+            "query": "{\"activity__organizer\": [\"club\"]}",
+            "type": "delete",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Supprimer des personnes invitées aux événements organisés par son club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 251,
+        "fields": {
+            "model": [
+                "activity",
+                "opener"
+            ],
+            "query": "{\"activity__organizer\": [\"club\"]}",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les ouvreur⋅ses des activités organisées par son club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 252,
+        "fields": {
+            "model": [
+                "activity",
+                "opener"
+            ],
+            "query": "{\"activity__organizer\": [\"club\"]}",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Ajouter des ouvreur⋅ses aux activités organisées par son club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 253,
+        "fields": {
+            "model": [
+                "activity",
+                "opener"
+            ],
+            "query": "{\"activity__organizer\": [\"club\"]}",
+            "type": "delete",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Supprimer des ouvreur⋅ses aux activités organisées par son club"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 254,
+        "fields": {
+            "model": [
+                "activity",
+                "activity"
+            ],
+            "query": "{\"organizer\": [\"club\"]}",
+            "type": "change",
+            "mask": 2,
+            "field": "opener",
+            "permanent": false,
+            "description": "Voir le tableau des ouvreur⋅ses pour les activités organisées par son club"
+        }
+    },
+    {
+	"model": "permission.permission",
+	"pk": 255,
+	"fields": {
+	    "model": [
+		"wrapped",
+		"wrapped"
+	    ],
+	    "query": "{\"public\": true}",
+	    "type": "view",
+	    "mask": 1,
+	    "field": "",
+	    "permanent": false,
+	    "description": "Voir les wrapped public"
+	}
+    },
+    {
+	"model": "permission.permission",
+	"pk": 256,
+	"fields": {
+	    "model": [
+		"wrapped",
+		"wrapped"
+	    ],
+	    "query": "{\"note__noteuser__user\": [\"user\"]}",
+	    "type": "view",
+	    "mask": 1,
+	    "field": "",
+	    "permanent": true,
+	    "description": "Voir ses propres wrapped, pour toujours"
+	}
+    },
+    {
+	"model": "permission.permission",
+	"pk": 257,
+	"fields": {
+	    "model": [
+		"wrapped",
+		"wrapped"
+	    ],
+	    "query": "{\"note__noteuser__user\": [\"user\"]}",
+	    "type": "change",
+	    "mask": 1,
+	    "field": "public",
+	    "permanent": true,
+	    "description": "Modifier la visibilité de ses wrapped, pour toujours"
+	}
+    },
+    {
+	"model": "permission.permission",
+	"pk": 258,
+	"fields": {
+	    "model": [
+		"wrapped",
+		"wrapped"
+	    ],
+	    "query": "{\"note__noteclub__club\": [\"club\"]}",
+	    "type": "view",
+	    "mask": 1,
+	    "field": "",
+	    "permanent": false,
+	    "description": "Voir les wrapped de son club"
+	}
+    },
+    {
+	"model": "permission.permission",
+	"pk": 259,
+	"fields": {
+	    "model": [
+		"wrapped",
+		"wrapped"
+	    ],
+	    "query": "{\"note__noteclub__club\": [\"club\"]}",
+	    "type": "change",
+	    "mask": 1,
+	    "field": "public",
+	    "permanent": false,
+	    "description": "Modifier la visibilité des wrapped de son club"
+	}
+    },
+    {
+        "model": "permission.permission",
+        "pk": 260,
+        "fields": {
+            "model": [
+                "member",
+                "club"
+            ],
+            "query": "{\"parent_club\": [\"club\"]}",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les informations d'un club enfant"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 261,
+        "fields": {
+            "model": [
+                "member",
+                "club"
+            ],
+            "query": "{\"parent_club\": [\"club\"]}",
+            "type": "change",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Modifier un club enfant"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 262,
+        "fields": {
+            "model": [
+                "member",
+                "membership"
+            ],
+            "query": "{\"club__parent_club\": [\"club\"]}",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Ajouter un⋅e membre à un club enfant"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 263,
+        "fields": {
+            "model": [
+                "member",
+                "membership"
+            ],
+            "query": "{\"club__parent_club\": [\"club\"]}",
+            "type": "view",
+            "mask": 3,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les adhérent⋅es du club enfant"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 264,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source__noteclub__club__parent_club\": [\"club\"]}, {\"destination__noteclub__club__parent_club\": [\"club\"]}]",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les transactions d'un club enfant"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 265,
+        "fields": {
+            "model": [
+                "note",
+                "note"
+            ],
+            "query": "{\"noteclub__club__parent_club\": [\"club\"]}",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir la note d'un club enfant"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 266,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source_alias\": \"Carte bancaire\"}, {\"source_alias\": \"Espèces\"}, {\"source_alias\": \"Chèque\"}, {\"source_alias\": \"Virement bancaire\"}]",
+            "type": "view",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Voir les transactions de rechargement"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 267,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source_alias\": \"Carte bancaire\"}, {\"source_alias\": \"Espèces\"}, {\"source_alias\": \"Chèque\"}, {\"source_alias\": \"Virement bancaire\"}]",
+            "type": "change",
+            "mask": 2,
+            "field": "valid",
+            "permanent": false,
+            "description": "Mettre à jour le statut de validation d'une transaction de rechargement"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 268,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source_alias\": \"Carte bancaire\"}, {\"source_alias\": \"Espèces\"}, {\"source_alias\": \"Chèque\"}, {\"source_alias\": \"Virement bancaire\"}]",
+            "type": "change",
+            "mask": 2,
+            "field": "invalidity_reason",
+            "permanent": false,
+            "description": "Modifier la raison d'invalidité d'une transaction de rechargement"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 269,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"OR\", {\"source_alias\": \"Carte bancaire\"}, {\"source_alias\": \"Espèces\"}, {\"source_alias\": \"Chèque\"}, {\"source_alias\": \"Virement bancaire\"}]",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Créer une transaction de rechargement"
+        }
+    },
+    {
+        "model": "permission.permission",
+        "pk": 270,
+        "fields": {
+            "model": [
+                "note",
+                "transaction"
+            ],
+            "query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}}, {\"valid\": false}]]",
+            "type": "add",
+            "mask": 2,
+            "field": "",
+            "permanent": false,
+            "description": "Créer une transaction de ou vers la note d'un club tant que la source reste au dessus de -50 €"
+        }
+    },
    {
        "model": "permission.role",
        "pk": 1,
@@ -3945,7 +4315,12 @@
                203,
                204,
                205,
-                206
+                206,
+                248,
+                249,
+		255,
+		256,
+		257
            ]
        }
    },
@@ -4034,7 +4409,10 @@
                227,
                233,
                234,
-                237
+                237,
+		247,
+		258,
+		259
            ]
        }
    },
@@ -4446,10 +4824,11 @@
            "for_club": 1,
            "name": "GC anti-VSS",
            "permissions": [
-                150,
+                42,
+		135,
+		150,
                163,
-                164,
-                182
+                164
            ]
        }
    },
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import functools
--- a/apps/permission/permissions.py
+++ b/apps/permission/permissions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from rest_framework.permissions import DjangoObjectPermissions
--- a/apps/permission/scopes.py
+++ b/apps/permission/scopes.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# 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
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.core.exceptions import PermissionDenied
--- a/apps/permission/tables.py
+++ b/apps/permission/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import django_tables2 as tables
--- a/apps/permission/templatetags/perms.py
+++ b/apps/permission/templatetags/perms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.contenttypes.models import ContentType
--- a/apps/permission/tests/test_oauth2.py
+++ b/apps/permission/tests/test_oauth2.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta
--- a/apps/permission/tests/test_permission_denied.py
+++ b/apps/permission/tests/test_permission_denied.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from datetime import timedelta, date
--- a/apps/permission/tests/test_permission_queries.py
+++ b/apps/permission/tests/test_permission_queries.py
@@ -1,7 +1,7 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from datetime import date
+from datetime import date, timedelta
 from json.decoder import JSONDecodeError

 from django.contrib.auth.models import User
@@ -73,6 +73,7 @@ class PermissionQueryTestCase(TestCase):
                    Q=Q,
                    now=timezone.now(),
                    today=date.today(),
+                    week=timedelta(days=7),
                )
                instanced.update_query()
                query = instanced.query
--- a/apps/permission/tests/test_rights_page.py
+++ b/apps/permission/tests/test_rights_page.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.auth.models import User
--- a/apps/permission/urls.py
+++ b/apps/permission/urls.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from collections import OrderedDict
 from datetime import date
--- a/apps/registration/init.py
+++ b/apps/registration/init.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 default_app_config = 'registration.apps.RegistrationConfig'
--- a/apps/registration/apps.py
+++ b/apps/registration/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.apps import AppConfig
--- a/apps/registration/forms.py
+++ b/apps/registration/forms.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django import forms
--- a/apps/registration/tables.py
+++ b/apps/registration/tables.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 import django_tables2 as tables
--- a/apps/registration/tests/test_registration.py
+++ b/apps/registration/tests/test_registration.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.contrib.auth.models import User
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
aeltheos	9f8c4725ee	Merge branch 'nix-shell' into 'main' Nix shell See merge request bde/nk20!201	2025-04-14 12:49:43 +02:00
ehouarn	8e2b24b2da	Merge branch 'options_order' into 'main' Options order See merge request bde/nk20!306	2025-04-13 23:12:05 +02:00
ehouarn	bd76c280ec	Update forms.py	2025-04-13 22:59:04 +02:00
ehouarn	ca0a95ba9e	Update transaction_form.html	2025-04-13 22:32:49 +02:00
alexismdr	614f76e699	Add BDA email as an option to fix NL updates Commit [1] removed default BDA email address from extract_ml_registrations script code. We should now add it to cron. [1] `3dd5f6e3e0` See merge request bde/nk20!305	2025-04-13 20:17:44 +02:00
alexismdr	a5815f0bc7	Add BDA email as an option to fix NL updates Commit [1] removed default BDA email address from extract_ml_registrations script code. We should now add it to cron. [1] `3dd5f6e3e0`	2025-04-13 19:56:20 +02:00
alexismdr	b7a660ee40	bootstrap: fix minor issues with profile picture cropping * Add required [1] "display: block;" style property to img element * Fix image overflow in modal. As cropper size inherits from img's parent element [2] (including padding according to my research), we need to wrap modal body into another div that has the padding we want. * Remove ability [3] to click away to dismiss the modal as it often interfered with user interaction when cropping. [1] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#example [2] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#notes [3] https://getbootstrap.com/docs/4.0/components/modal/#options See merge request bde/nk20!301	2025-04-04 01:14:46 +02:00
quark	7ba5c76a89	Merge branch 'guests_schools' into 'main' add school field to guest See merge request bde/nk20!302	2025-03-25 18:59:46 +01:00
quark	702ddb5679	add school field to guest	2025-03-25 17:39:31 +01:00
Alexis Mercier des Rochettes	93aed87265	bootstrap: fix minor issues with profile picture cropping * Add required [1] "display: block;" style property to img element * Fix image overflow in modal. As cropper size inherits from img's parent element [2] (including padding according to my research), we need to wrap modal body into another div that has the padding we want. * Remove ability [3] to click away to dismiss the modal as it often interfered with user interaction when cropping. [1] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#example [2] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#notes [3] https://getbootstrap.com/docs/4.0/components/modal/#options Signed-off-by: Alexis Mercier des Rochettes <apernouille@gmail.com>	2025-03-24 17:36:30 +01:00
bleizi	60355196ce	Merge branch 'openid-connect' into 'main' Openid connect See merge request bde/nk20!293	2025-03-20 18:42:51 +01:00
bleizi	9bffb32a5e	documentation	2025-03-20 17:36:38 +01:00
quark	5ef019c5c2	Merge branch 'notekfet_wrapped' into 'main' Rewrite script and add test See merge request bde/nk20!300	2025-03-18 16:11:33 +01:00
quark	8da62e62fb	Rewrite script and add test	2025-03-18 15:53:02 +01:00
thomasl	56a43396d4	Merge branch 'Add_some_permissions' into 'main' Add some permissions See merge request bde/nk20!296	2025-03-17 13:16:01 +01:00
thomasl	7966d6f397	Update file initial.json	2025-03-17 13:15:07 +01:00
quark	cb61c511ce	Merge branch 'notekfet_wrapped' into 'main' Another tables and doc See merge request bde/nk20!299	2025-03-14 00:44:57 +01:00
quark	25bfa575ed	Another tables and doc	2025-03-14 00:31:25 +01:00
quark	e21d9fcfbe	Merge branch 'notekfet_wrapped' into 'main' Notekfet wrapped See merge request bde/nk20!298	2025-03-14 00:11:04 +01:00
quark	b293904525	Another tables and doc	2025-03-13 23:56:10 +01:00
quark	bd7e6b8ad4	add table, add some translation	2025-03-13 21:08:52 +01:00
quark	a208a4fa25	Merge branch 'bde_color' into 'main' Resize and compress image, add shiny button See merge request bde/nk20!297	2025-03-13 00:44:45 +01:00
quark	4799b2c52d	Resize and compress image, add shiny button	2025-03-12 23:42:37 +01:00
thomasl	562dcfb908	Update file initial.json	2025-03-11 19:34:56 +01:00
thomasl	12ef258ff0	Update file initial.json	2025-03-11 19:27:02 +01:00
thomasl	2ae32ee3b6	Update file initial.json	2025-03-11 19:26:49 +01:00
thomasl	ec1bd45481	Update file initial.json	2025-03-11 19:14:09 +01:00
quark	370a9a069e	Merge branch 'bde_color' into 'main' Rave Part[list] colors See merge request bde/nk20!295	2025-03-11 10:31:02 +01:00
quark	7f0a3784e9	Rave Part[list] colors	2025-03-11 10:15:11 +01:00
quark	36f4adf2e7	Merge branch 'update_copyright' into 'main' update copyright See merge request bde/nk20!292	2025-03-09 18:35:44 +01:00
quark	ae7d5d5489	update copyright	2025-03-09 18:14:58 +01:00
quark	434097aba4	Merge branch 'nerf_pc_kfet' into 'main' Nerf pc kfet See merge request bde/nk20!291	2025-03-09 17:58:25 +01:00
quark	a0ebf8658d	nerf invalidate perm	2025-03-09 17:34:14 +01:00
quark	423454ba5d	nerf PC Kfet perms	2025-03-09 14:37:35 +01:00
quark	3ccb31639c	Merge branch 'perm_gc_anti_vss' into 'main' improve permissions for GC anti-VSS See merge request bde/nk20!290	2025-03-09 13:28:55 +01:00
quark	5fb12a1388	improve permissions for GC anti-VSS	2025-03-09 13:11:46 +01:00
thomasl	fe029893b0	Merge branch 'permissions_fo_parent_clubs' into 'main' Permissions fo parent clubs See merge request bde/nk20!289	2025-03-08 22:29:07 +01:00
thomasl	767e98c2a3	Update file initial.json	2025-03-08 22:05:22 +01:00
thomasl	1bdad76fe9	Update file initial.json	2025-03-08 22:00:46 +01:00
thomasl	0196db7fff	Update file initial.json	2025-03-08 21:54:28 +01:00
thomasl	1f53ad4407	Update file initial.json	2025-03-08 21:47:21 +01:00
thomasl	018f6e3f13	Update file initial.json	2025-03-08 21:37:53 +01:00
thomasl	9752a030d9	Update file initial.json	2025-03-08 21:30:25 +01:00
thomasl	b27bdb090d	Update file initial.json	2025-03-08 21:30:16 +01:00
thomasl	55a0fbb6cb	Update file initial.json	2025-03-08 21:15:56 +01:00
thomasl	c356534309	Update file initial.json	2025-03-08 20:25:33 +01:00
thomasl	51315a0555	Update file initial.json	2025-03-08 20:25:16 +01:00
thomasl	e5f9fe2cf5	Update file initial.json	2025-03-08 20:00:20 +01:00
Nicolas Margulies	6c63c6417c	Typesetting	2025-03-08 16:08:40 +01:00
Nicolas Margulies	4563b2b640	Added configusation for OpenID support, along with installation information	2025-03-08 16:04:25 +01:00
quark	c630a3fbd5	Merge branch 'change_template' into 'main' Change template See merge request bde/nk20!288	2025-03-07 19:25:27 +01:00
quark	79b8ebeca4	Merge branch 'main' into change_template	2025-03-07 19:09:17 +01:00
quark	dc14ba0101	Suppression article TVA	2025-03-07 18:42:41 +01:00
quark	6028bfeb56	Merge branch 'notekfet_wrapped' into 'main' Notekfet wrapped See merge request bde/nk20!287	2025-03-05 22:03:51 +01:00
quark	bd9773a8af	change icon	2025-03-05 13:28:55 +01:00
quark	cdeb76d9f8	Merge branch 'main' into notekfet_wrapped	2025-03-04 19:08:32 +01:00
quark	ac4574200d	Modify font	2025-03-04 18:45:22 +01:00
quark	b17d31e8ee	translation	2025-02-25 14:11:53 +01:00
quark	30d27459dd	modify tox.ini to use complex script for make wrapped (bypass C901 in linters)	2025-02-25 01:52:13 +01:00
quark	333f7aa284	update font and minor change	2025-02-24 18:37:18 +01:00
quark	587314e03c	linters	2025-02-24 16:10:58 +01:00
thomasl	9f888a5281	Merge branch 'patch_openers_(forgot_something)' into 'main' Patch openers (forgot something) See merge request bde/nk20!286	2025-02-18 21:44:21 +01:00
thomasl	88b1a25ca0	Update file initial.json	2025-02-18 21:26:55 +01:00
thomasl	8cb50f58f2	Merge branch 'Respo_jam_permission' into 'main' Respo jam permission See merge request bde/nk20!285	2025-02-17 14:48:21 +01:00
thomasl	041a8f20a9	A permission was missing	2025-02-17 14:28:00 +01:00
thomasl	b1ffb28532	Update file initial.json	2025-02-17 14:19:00 +01:00
thomasl	6225fb51f1	Add some permissions	2025-02-17 14:10:21 +01:00
thomasl	1dd74e8024	Merge branch 'openers' into 'main' Patch Openers See merge request bde/nk20!284	2025-02-17 02:13:47 +01:00
thomasl	1af9f5f23c	some updates	2025-02-17 02:12:44 +01:00
thomasl	83d5a7ceff	Update file initial.json	2025-02-17 01:58:13 +01:00
thomasl	a7cba0a4a3	Update file initial.json	2025-02-16 23:33:18 +01:00
thomasl	ccd9a66ab9	Update file initial.json	2025-02-16 23:24:39 +01:00
thomasl	c7a92fa4b2	Update file initial.json	2025-02-16 20:49:11 +01:00
quark	5f1b698d58	Finish script, finish view, make some progress on template	2025-02-16 18:10:53 +01:00
thomasl	0a5368d23f	Merge branch 'respo_comm_permissionsV2' into 'main' Respo comm permissions v2 See merge request bde/nk20!283	2025-02-14 18:38:39 +01:00
quark	19d1ecfc66	continue the script and few change to model	2025-02-13 02:39:33 +01:00
quark	b0c3eee699	start to write generate_wrapped script	2025-02-12 00:00:23 +01:00
quark	cd942779ca	Wrapped apps	2025-02-11 18:19:24 +01:00
quark	7ed544b3ac	fix issues with activity entry view	2025-02-09 17:50:15 +01:00
Yoann Beaugnon	dde1baa25c	typo	2022-08-21 19:50:53 +02:00
Yoann Beaugnon	7a7ee47e0b	Add two shell.nix to enable easier development on nixos.	2022-08-21 19:46:11 +02:00