Merge branch 'qrcode' into 'main'

Draft: Qrcode

See merge request bde/nk20!196

README.md

@@ -58,13 +58,7 @@ 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. (Optionnel) **Création d'une clé privée OpenID Connect**
+6.  Enjoy :
-
-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
@@ -234,13 +228,7 @@ 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. **Création d'une clé privée OpenID Connect**
+7.  *Enjoy \o/*
-
-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
 

apps/activity/__init__.py

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

apps/activity/admin.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 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', 'school', 'activity', 'inviter')
+    list_display = ('last_name', 'first_name', 'activity', 'inviter')
     form = GuestForm
 
 

apps/activity/api/serializers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.utils.translation import gettext_lazy as _

apps/activity/api/urls.py

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

apps/activity/api/views.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 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', 'school', 'inviter', 'inviter__alias__name',
+    filterset_fields = ['activity', 'activity__name', 'last_name', 'first_name', 'inviter', 'inviter__alias__name',
                         'inviter__alias__normalized_name', ]
-    search_fields = ['$activity__name', '$last_name', '$first_name', '$school', '$inviter__user__email', '$inviter__alias__name',
+    search_fields = ['$activity__name', '$last_name', '$first_name', '$inviter__user__email', '$inviter__alias__name',
                      '$inviter__alias__normalized_name', ]
 
 

apps/activity/apps.py

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

apps/activity/forms.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 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', 'school', 'inviter', )
+        fields = ('last_name', 'first_name', 'inviter', )
         widgets = {
             "inviter": Autocomplete(
                 NoteUser,

apps/activity/migrations/0006_guest_school.py

@@ -1,18 +0,0 @@
-# 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,
-        ),
-    ]

apps/activity/models.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
@@ -201,8 +201,7 @@ class Entry(models.Model):
     def save(self, *args, **kwargs):
         qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest)
         if qs.exists():
-            raise ValidationError(_("Already entered on ")
+            raise ValidationError(_("Already entered on ") + _("{:%Y-%m-%d %H:%M:%S}").format(qs.get().time, ))
-                                  + _("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(qs.get().time), ))
 
         if self.guest:
             self.note = self.guest.inviter
@@ -248,11 +247,6 @@ 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,

apps/activity/tables.py

@@ -1,8 +1,6 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-import datetime
-
 from django.utils import timezone
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
@@ -53,11 +51,11 @@ class GuestTable(tables.Table):
         }
         model = Guest
         template_name = 'django_tables2/bootstrap4.html'
-        fields = ("last_name", "first_name", "inviter", "school")
+        fields = ("last_name", "first_name", "inviter", )
 
     def render_entry(self, record):
         if record.has_entry:
-            return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(record.entry.time))))
+            return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, )))
         return mark_safe('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
                          '{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
 
@@ -79,9 +77,6 @@ def get_row_class(record):
             c += " table-info"
         elif record.note.balance < 0:
             c += " table-danger"
-        # MODE VIEUXCON=ON
-        if (datetime.datetime.utcnow().timestamp() - record.note.created_at.timestamp()) > 3600 * 24 * 365 * 2.5:
-            c += " font-weight-bold underline"
     return c
 
 

apps/activity/templates/activity/activity_entry.html

@@ -38,6 +38,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </a>
 
 <input id="alias" type="text" class="form-control" placeholder="Nom/note ...">
+<button id="trigger" class="btn btn-secondary">Click me !</button>
 
 <hr>
 
@@ -63,15 +64,46 @@ SPDX-License-Identifier: GPL-3.0-or-later
         refreshBalance();
     }
 
+    function process_qrcode() {
+        let name = alias_obj.val();
+        $.get("/api/note/note?search=" + name + "&format=json").done(
+            function (res) {
+                let note = res.results[0];
+                $.post("/api/activity/entry/?format=json", {
+                    csrfmiddlewaretoken: CSRF_TOKEN,
+                    activity: {{ activity.id }},
+                    note: note.id,
+                    guest: null
+                }).done(function () {
+                    addMsg(interpolate(gettext(
+                        "Entry made for %s whose balance is %s €"),
+                        [note.name, note.balance / 100]), "success", 4000);
+                    reloadTable(true);
+                }).fail(function (xhr) {
+                    errMsg(xhr.responseJSON, 4000);
+                });
+            }).fail(function (xhr) {
+                errMsg(xhr.responseJSON, 4000);
+            });
+    }
+
     alias_obj.keyup(function(event) {
         let code = event.originalEvent.keyCode
         if (65 <= code <= 122 || code === 13) {
             debounce(reloadTable)()
         }
+        if (code === 0)
+            process_qrcode();
     });
 
     $(document).ready(init);
 
+    alias_obj2 = document.getElementById("alias");
+    $("#trigger").click(function (e) {
+        addMsg("Clicked", "success", 1000);
+        alias_obj.val(alias_obj.val() + "\0");
+        alias_obj2.dispatchEvent(new KeyboardEvent('keyup'));
+    })
     function init() {
         $(".table-row").click(function (e) {
             let target = e.target.parentElement;
@@ -168,4 +200,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
         });
     }
 </script>
-{% endblock %}
+{% endblock %}

apps/activity/tests/test_activities.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import timedelta
@@ -50,7 +50,6 @@ class TestActivities(TestCase):
             inviter=self.user.note,
             last_name="GUEST",
             first_name="Guest",
-            school="School",
         )
 
     def test_activity_list(self):
@@ -157,7 +156,6 @@ class TestActivities(TestCase):
             inviter=self.user.note.id,
             last_name="GUEST2",
             first_name="Guest",
-            school="School",
         ))
         self.assertEqual(response.status_code, 200)
 
@@ -169,7 +167,6 @@ 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)
 
@@ -203,7 +200,6 @@ class TestActivityAPI(TestAPI):
             inviter=self.user.note,
             last_name="GUEST",
             first_name="Guest",
-            school="School",
         )
 
         self.entry = Entry.objects.create(

apps/activity/urls.py

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

apps/activity/views.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from hashlib import md5
@@ -168,7 +168,6 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
             activity=activity,
             first_name="",
             last_name="",
-            school="",
             inviter=self.request.user.note,
         )
 
@@ -264,22 +263,13 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
                                          balance=F("note__balance"))
 
         # Keep only users that have a note
-        note_qs = note_qs.filter(note__noteuser__isnull=False).exclude(note__inactivity_reason='forced')
+        note_qs = note_qs.filter(note__noteuser__isnull=False)
-
-        if activity.activity_type.name != "Pot Vieux":
-            # Keep only members
-            note_qs = note_qs.filter(
-                note__noteuser__user__memberships__club=activity.attendees_club,
-                note__noteuser__user__memberships__date_start__lte=timezone.now(),
-                note__noteuser__user__memberships__date_end__gte=timezone.now(),
-            )
 
         # Keep only valid members
-#        note_qs = note_qs.filter(
+        note_qs = note_qs.filter(
-#            note__noteuser__user__memberships__club=activity.attendees_club,
+            note__noteuser__user__memberships__club=activity.attendees_club,
-#            note__noteuser__user__memberships__date_start__lte=timezone.now(),
+            note__noteuser__user__memberships__date_start__lte=timezone.now(),
-#            note__noteuser__user__memberships__date_end__gte=timezone.now(),
+            note__noteuser__user__memberships__date_end__gte=timezone.now()).exclude(note__inactivity_reason='forced')
-#       )
 
         # Filter with permission backend
         note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))

apps/api/__init__.py

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

apps/api/apps.py

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

apps/api/serializers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 

apps/api/tests.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import json

apps/api/urls.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.conf import settings
@@ -47,10 +47,6 @@ 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.

apps/api/views.py

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

apps/api/viewsets.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import re

apps/food/admin.py

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

apps/food/api/serializers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from rest_framework import serializers

apps/food/api/urls.py

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

apps/food/api/views.py

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

apps/food/apps.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 

apps/food/forms.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from random import shuffle

apps/food/models.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import timedelta

apps/food/tables.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import django_tables2 as tables

apps/food/urls.py

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

apps/food/views.py

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

apps/logs/__init__.py

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

apps/logs/api/serializers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from rest_framework import serializers

apps/logs/api/urls.py

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

apps/logs/api/views.py

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

apps/logs/apps.py

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

apps/logs/models.py

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

apps/logs/signals.py

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

apps/member/__init__.py

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

apps/member/admin.py

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

apps/member/api/serializers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from rest_framework import serializers

apps/member/api/urls.py

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

apps/member/api/views.py

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

apps/member/apps.py

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

apps/member/auth.py

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

apps/member/forms.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 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,
     )
 
@@ -45,7 +45,7 @@ class ProfileForm(forms.ModelForm):
     A form for the extras field provided by the :model:`member.Profile` model.
     """
     # Remove widget=forms.HiddenInput() if you want to use report frequency.
-    report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"))
+    report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"), widget=forms.HiddenInput())
 
     last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
 

apps/member/hashers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import hashlib

apps/member/models.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import datetime

apps/member/signals.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 

apps/member/tables.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import date

apps/member/templates/member/includes/profile_info.html

@@ -60,7 +60,10 @@
 {% if user_object.pk == user.pk %}
     <div class="text-center">
         <a class="small badge badge-secondary" href="{% url 'member:auth_token' %}">
-            <i class="fa fa-cogs"></i>{% trans 'API token' %}
+            <i class="fa fa-cogs"></i>&nbsp;{% trans 'API token' %}
+        </a>
+        <a class="small badge badge-secondary" href="{% url 'member:qr_code' user_object.pk %}">
+            <i class="fa fa-qrcode"></i>&nbsp;{% trans 'QR Code' %}
         </a>
     </div>
 {% endif %}

apps/member/templates/member/picture_update.html

@@ -20,14 +20,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
       </form>
     </div>
     <!-- MODAL TO CROP THE IMAGE -->
-    <div class="modal fade" id="modalCrop" data-backdrop="static">
+    <div class="modal fade" id="modalCrop">
       <div class="modal-dialog">
         <div class="modal-content">
-            <div class="modal-body-wrapper" style="width: 500px; height: 500px; padding: 16px;">
+          <div class="modal-body">
-              <div class="modal-body" style="width: 100%; height: 100%; padding: 0">
+            <img src="" id="modal-image" style="max-width: 100%;">
-                <img src="" id="modal-image" style="display: block; max-width: 100%;">
+          </div>
-              </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">

apps/member/templates/member/qr_code.html

@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n %}
+
+{% block content %}
+<div class="card bg-light">
+  	<h3 class="card-header text-center">
+		{% trans "QR Code for" %} {{ user_object.username }} ({{ user_object.first_name }} {{user_object.last_name }})
+  	</h3>
+  	<div class="text-center" id="qrcode">
+  	</div>
+</div>
+
+
+{% endblock %}
+
+{% block extrajavascript %}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.min.js" integrity="sha512-CNgIRecGo7nphbeZ04Sc13ka07paqdeTu0WR1IM4kNcpmBAUSHSQX0FslNhTDadL4O5SAGapGt4FodqL8My0mA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script>
+	var qrc = new QRCode(document.getElementById("qrcode"), {
+		text: "{{ user_object.pk }}\0",
+		width: 1024,
+		height: 1024
+	});
+</script>
+{% endblock %}
+
+{% block extracss %}
+<style>
+img {
+    width: 100%
+}
+</style>
+{% endblock %}

apps/member/templatetags/memberinfo.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import date

apps/member/urls.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.urls import path
@@ -25,4 +25,5 @@ urlpatterns = [
     path('user/<int:pk>/aliases/', views.ProfileAliasView.as_view(), name="user_alias"),
     path('user/<int:pk>/trust', views.ProfileTrustView.as_view(), name="user_trust"),
     path('manage-auth-token/', views.ManageAuthTokens.as_view(), name='auth_token'),
+    path('user/<int:pk>/qr_code/', views.QRCodeView.as_view(), name='qr_code'),
 ]

apps/member/views.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import timedelta, date
@@ -26,7 +26,6 @@ from note_kfet.middlewares import _set_current_request
 from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
-from django import forms
 
 from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \
     CustomAuthenticationForm, MembershipRolesForm
@@ -73,24 +72,11 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         form.fields['email'].required = True
         form.fields['email'].help_text = _("This address must be valid.")
 
-        profile_form = self.profile_form(instance=context['user_object'].profile,
+        if PermissionBackend.check_perm(self.request, "member.change_profile", context['user_object'].profile):
-                                         data=self.request.POST if self.request.POST else None)
+            context['profile_form'] = self.profile_form(instance=context['user_object'].profile,
-
+                                                        data=self.request.POST if self.request.POST else None)
-        if not self.object.profile.report_frequency:
+            if not self.object.profile.report_frequency:
-            del profile_form.fields["last_report"]
+                del context['profile_form'].fields["last_report"]
-
-        fields_to_check = list(profile_form.fields.keys())
-        fields_modifiable = False
-
-        # Delete the fields for which the user does not have the permission to modify
-        for field_name in fields_to_check:
-            if not PermissionBackend.check_perm(self.request, f"member.change_profile_{field_name}", context['user_object'].profile):
-                profile_form.fields[field_name].widget = forms.HiddenInput()
-            else:
-                fields_modifiable = True
-
-        if fields_modifiable:
-            context['profile_form'] = profile_form
 
         return context
 
@@ -402,6 +388,14 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView):
         context['token'] = Token.objects.get_or_create(user=self.request.user)[0]
         return context
 
+class QRCodeView(LoginRequiredMixin, DetailView):
+    """
+    Affiche le QR Code
+    """
+    model = User
+    context_object_name = "user_object"
+    template_name = "member/qr_code.html"
+    extra_context = {"title": _("QR Code")}
 
 # ******************************* #
 #              CLUB               #

apps/note/__init__.py

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

apps/note/admin.py

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

apps/note/api/serializers.py

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

apps/note/api/urls.py

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

apps/note/api/views.py

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

apps/note/apps.py

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

apps/note/forms.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from datetime import datetime
 

apps/note/models/__init__.py

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

apps/note/models/notes.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import unicodedata

apps/note/models/transactions.py

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

apps/note/signals.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.utils import timezone

apps/note/static/note/js/consos.js

@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+// Copyright (C) 2018-2024 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.id,
+          source: source,
           source_alias: source_alias,
           destination: dest,
           template: template
@@ -294,10 +294,3 @@ 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()

apps/note/tables.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import html

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|slice:"::-1" %}
+                        {% for special_type in special_types %}
                             <option value="{{ special_type.id }}">{{ special_type.special_type }}</option>
                         {% endfor %}
                     </select>

apps/note/templatetags/getenv.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django import template

apps/note/templatetags/pretty_money.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django import template

apps/note/tests/test_transactions.py

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

apps/note/urls.py

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

apps/note/views.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import json

apps/permission/__init__.py

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

apps/permission/admin.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-lateré
 
 from django.contrib import admin

apps/permission/api/serializers.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from rest_framework import serializers

apps/permission/api/urls.py

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

apps/permission/api/views.py

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

apps/permission/apps.py

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

apps/permission/backends.py

@@ -1,7 +1,7 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from datetime import date, timedelta
+from datetime import date
 
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.models import User
@@ -106,7 +106,6 @@ class PermissionBackend(ModelBackend):
                 Q=Q,
                 now=timezone.now(),
                 today=date.today(),
-                week=timedelta(days=7),
             )
             yield permission
 

apps/permission/decorators.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 import sys
 from functools import lru_cache

apps/permission/fixtures/initial.json

@@ -127,7 +127,7 @@
                 "auth",
                 "user"
             ],
-            "query": "[\"AND\", {\"pk\": [\"user\", \"pk\"]}, {\"memberships__club__parent_club__isnull\": true}]",
+            "query": "{\"pk\": [\"user\", \"pk\"]}",
             "type": "change",
             "mask": 1,
             "field": "last_login",
@@ -324,7 +324,7 @@
             "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 -20 €"
+            "description": "Créer une transaction de ou vers la note d'un club"
         }
     },
     {
@@ -2591,7 +2591,7 @@
                 "note",
                 "transaction"
             ],
-            "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\"}]]",
+            "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}]",
             "type": "add",
             "mask": 2,
             "field": "",
@@ -2607,8 +2607,7 @@
                 "note",
                 "transaction"
             ],
-            "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\"]]}}]"
+            "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}]",
-,
             "type": "change",
             "mask": 2,
             "field": "valid",
@@ -2624,8 +2623,7 @@
                 "note",
                 "transaction"
             ],
-            "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\"]]}}]"
+            "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}]",
-,
             "type": "change",
             "mask": 2,
             "field": "invalidity_reason",
@@ -3816,7 +3814,7 @@
             "field": "",
             "permanent": false,
             "description": "Créer une transaction vers la note d'un club"
-	}
+        }
     },
     {
         "model": "permission.permission",
@@ -3831,439 +3829,7 @@
             "mask": 3,
             "field": "",
             "permanent": false,
-	    "description": "Voir les profils des membres du club"
+            "description": "Voir les profils des membres du club"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 244,
-        "fields": {
-            "model": [
-                "member",
-                "profile"
-            ],
-            "query": "{}",
-            "type": "change",
-            "mask": 3,
-            "field": "ml_events_registration",
-            "permanent": false,
-            "description": "Modifier l'abonnement à la Newsletter BDE pour n'importe quel profil"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 245,
-        "fields": {
-            "model": [
-                "member",
-                "profile"
-            ],
-            "query": "{}",
-            "type": "change",
-            "mask": 3,
-            "field": "ml_art_registration",
-            "permanent": false,
-            "description": "Modifier l'abonnement à la Newsletter Art pour n'importe quel profil"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 246,
-        "fields": {
-            "model": [
-                "member",
-                "profile"
-            ],
-            "query": "{}",
-            "type": "change",
-            "mask": 3,
-            "field": "ml_sport_registration",
-            "permanent": false,
-            "description": "Modifier l'abonnement à la Newsletter Sport pour n'importe quel profil"
-        }
-    },
-    {
-        "model": "permission.permission",
-        "pk": 247,
-        "fields": {
-            "model": [
-                "activity",
-                "guest"
-            ],
-            "query": "{\"activity__organizer\": [\"club\"]}",
-            "type": "view",
-            "mask": 2,
-            "field": "",
-            "permanent": false,
-            "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 €"
         }
     },
     {
@@ -4315,12 +3881,7 @@
                 203,
                 204,
                 205,
-                206,
+                206
-                248,
-                249,
-		255,
-		256,
-		257
             ]
         }
     },
@@ -4409,10 +3970,7 @@
                 227,
                 233,
                 234,
-                237,
+                237
-		247,
-		258,
-		259
             ]
         }
     },
@@ -4812,10 +4370,8 @@
                 168,
                 176,
                 177,
-		178,
                 197,
-                211,
+                211
-		244
             ]
         }
     },
@@ -4826,11 +4382,10 @@
             "for_club": 1,
             "name": "GC anti-VSS",
             "permissions": [
-                42,
+                150,
-		135,
-		150,
                 163,
-                164
+                164,
+                182
             ]
         }
     },

apps/permission/models.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import functools

apps/permission/permissions.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from rest_framework.permissions import DjangoObjectPermissions

apps/permission/scopes.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 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

apps/permission/signals.py

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

apps/permission/tables.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import django_tables2 as tables

apps/permission/templatetags/perms.py

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

apps/permission/tests/test_oauth2.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from datetime import timedelta

apps/permission/tests/test_permission_denied.py

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

apps/permission/tests/test_permission_queries.py

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

apps/permission/tests/test_rights_page.py

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

apps/permission/urls.py

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

apps/permission/views.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 from collections import OrderedDict
 from datetime import date

apps/registration/__init__.py

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

apps/registration/apps.py

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

apps/registration/forms.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django import forms