Implementing QRcode creation, modifying Allergen model and creating of few views

.gitlab-ci.yml

@@ -7,10 +7,25 @@ stages:
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
-# Ubuntu 22.04
+# Debian Buster
-py310-django42:
+# py37-django22:
+#   stage: test
+#   image: debian:buster-backports
+#   before_script:
+#     - >
+#         apt-get update &&
+#         apt-get install --no-install-recommends -t buster-backports -y
+#         python3-django python3-django-crispy-forms
+#         python3-django-extensions python3-django-filters python3-django-polymorphic
+#         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
+#         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
+#         python3-bs4 python3-setuptools tox texlive-xetex
+#   script: tox -e py37-django22
+
+# Ubuntu 20.04
+py38-django22:
   stage: test
-  image: ubuntu:22.04
+  image: ubuntu:20.04
   before_script:
     # Fix tzdata prompt
     - ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
@@ -22,12 +37,12 @@ py310-django42:
         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
         python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py310-django42
+  script: tox -e py38-django22
 
-# Debian Bookworm
+# Debian Bullseye
-py311-django42:
+py39-django22:
   stage: test
-  image: debian:bookworm
+  image: debian:bullseye
   before_script:
     - >
         apt-get update &&
@@ -37,11 +52,11 @@ py311-django42:
         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
         python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py311-django42
+  script: tox -e py39-django22
 
 linters:
   stage: quality-assurance
-  image: debian:bookworm
+  image: debian:bullseye
   before_script:
     - apt-get update && apt-get install -y tox
   script: tox -e linters

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "apps/scripts"]
 	path = apps/scripts
-	url = https://gitlab.crans.org/bde/nk20-scripts
+	url = https://gitlab.crans.org/bde/nk20-scripts.git

README.md

@@ -55,16 +55,10 @@ Bien que cela permette de créer une instance sur toutes les distributions,
     (env)$ ./manage.py makemigrations
     (env)$ ./manage.py migrate
     (env)$ ./manage.py loaddata initial
-    (env)$ ./manage.py createsuperuser  # Création d'un⋅e utilisateur⋅rice initial
+    (env)$ ./manage.py createsuperuser  # Création d'un utilisateur 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,11 +1,11 @@
-# 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
 from note_kfet.admin import admin_site
 
 from .forms import GuestForm
-from .models import Activity, ActivityType, Entry, Guest, Opener
+from .models import Activity, ActivityType, Entry, Guest
 
 
 @admin.register(Activity, site=admin_site)
@@ -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
 
 
@@ -45,11 +45,3 @@ class EntryAdmin(admin.ModelAdmin):
     Admin customisation for Entry
     """
     list_display = ('note', 'activity', 'time', 'guest')
-
-
-@admin.register(Opener, site=admin_site)
-class OpenerAdmin(admin.ModelAdmin):
-    """
-    Admin customisation for Opener
-    """
-    list_display = ('activity', 'opener')

apps/activity/api/serializers.py

@@ -1,11 +1,9 @@
-# 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 _
 from rest_framework import serializers
-from rest_framework.validators import UniqueTogetherValidator
 
-from ..models import Activity, ActivityType, Entry, Guest, GuestTransaction, Opener
+from ..models import Activity, ActivityType, Entry, Guest, GuestTransaction
 
 
 class ActivityTypeSerializer(serializers.ModelSerializer):
@@ -61,17 +59,3 @@ class GuestTransactionSerializer(serializers.ModelSerializer):
     class Meta:
         model = GuestTransaction
         fields = '__all__'
-
-
-class OpenerSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for Openers.
-    The djangorestframework plugin will analyse the model `Opener` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = Opener
-        fields = '__all__'
-        validators = [UniqueTogetherValidator(
-            queryset=Opener.objects.all(), fields=("opener", "activity"),
-            message=_("This opener already exists"))]

apps/activity/api/urls.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 .views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet, OpenerViewSet
+from .views import ActivityTypeViewSet, ActivityViewSet, EntryViewSet, GuestViewSet
 
 
 def register_activity_urls(router, path):
@@ -12,4 +12,3 @@ def register_activity_urls(router, path):
     router.register(path + '/type', ActivityTypeViewSet)
     router.register(path + '/guest', GuestViewSet)
     router.register(path + '/entry', EntryViewSet)
-    router.register(path + '/opener', OpenerViewSet)

apps/activity/api/views.py

@@ -1,15 +1,12 @@
-# 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
 from api.viewsets import ReadProtectedModelViewSet
-from django.core.exceptions import ValidationError
 from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.response import Response
+from rest_framework.filters import SearchFilter
-from rest_framework import status
 
-from .serializers import ActivitySerializer, ActivityTypeSerializer, EntrySerializer, GuestSerializer, OpenerSerializer
+from .serializers import ActivitySerializer, ActivityTypeSerializer, EntrySerializer, GuestSerializer
-from ..models import Activity, ActivityType, Entry, Guest, Opener
+from ..models import Activity, ActivityType, Entry, Guest
 
 
 class ActivityTypeViewSet(ReadProtectedModelViewSet):
@@ -32,7 +29,7 @@ class ActivityViewSet(ReadProtectedModelViewSet):
     """
     queryset = Activity.objects.order_by('id')
     serializer_class = ActivitySerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['name', 'description', 'activity_type', 'location', 'creater', 'organizer', 'attendees_club',
                         'date_start', 'date_end', 'valid', 'open', ]
     search_fields = ['$name', '$description', '$location', '$creater__last_name', '$creater__first_name',
@@ -50,10 +47,10 @@ class GuestViewSet(ReadProtectedModelViewSet):
     """
     queryset = Guest.objects.order_by('id')
     serializer_class = GuestSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter]
-    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', ]
 
 
@@ -65,36 +62,7 @@ class EntryViewSet(ReadProtectedModelViewSet):
     """
     queryset = Entry.objects.order_by('id')
     serializer_class = EntrySerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['activity', 'time', 'note', 'guest', ]
     search_fields = ['$activity__name', '$note__user__email', '$note__alias__name', '$note__alias__normalized_name',
                      '$guest__last_name', '$guest__first_name', ]
-
-
-class OpenerViewSet(ReadProtectedModelViewSet):
-    """
-    REST Opener View set.
-    The djangorestframework plugin will get all `Opener` objects, serialize it to JSON with the given serializer,
-    then render it on /api/activity/opener/
-    """
-    queryset = Opener.objects
-    serializer_class = OpenerSerializer
-    filter_backends = [RegexSafeSearchFilter, DjangoFilterBackend]
-    search_fields = ['$opener__alias__name', '$opener__alias__normalized_name',
-                     '$activity__name']
-    filterset_fields = ['opener', 'opener__noteuser__user', 'activity']
-
-    def get_serializer_class(self):
-        serializer_class = self.serializer_class
-        if self.request.method in ['PUT', 'PATCH']:
-            # opener-activity can't change
-            serializer_class.Meta.read_only_fields = ('opener', 'acitivity',)
-        return serializer_class
-
-    def destroy(self, request, *args, **kwargs):
-        instance = self.get_object()
-        try:
-            self.perform_destroy(instance)
-        except ValidationError as e:
-            return Response({e.code: str(e)}, status.HTTP_400_BAD_REQUEST)
-        return Response(status=status.HTTP_204_NO_CONTENT)

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,17 +1,16 @@
-# 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
 from random import shuffle
 
-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from member.models import Club
 from note.models import Note, NoteUser
-from note_kfet.inputs import Autocomplete
+from note_kfet.inputs import Autocomplete, DateTimePickerInput
 from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend
 
@@ -44,7 +43,7 @@ class ActivityForm(forms.ModelForm):
 
     class Meta:
         model = Activity
-        exclude = ('creater', 'valid', 'open', 'opener', )
+        exclude = ('creater', 'valid', 'open', )
         widgets = {
             "organizer": Autocomplete(
                 model=Club,
@@ -107,7 +106,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/0004_opener.py

@@ -1,28 +0,0 @@
-# Generated by Django 2.2.28 on 2024-08-01 12:36
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0006_trust'),
-        ('activity', '0003_auto_20240323_1422'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Opener',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('activity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='opener', to='activity.Activity', verbose_name='activity')),
-                ('opener', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activity_responsible', to='note.Note', verbose_name='opener')),
-            ],
-            options={
-                'verbose_name': 'opener',
-                'verbose_name_plural': 'openers',
-                'unique_together': {('opener', 'activity')},
-            },
-        ),
-    ]

apps/activity/migrations/0005_alter_opener_options_alter_opener_opener.py

@@ -1,24 +0,0 @@
-# Generated by Django 4.2.15 on 2024-08-28 08:00
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0006_trust'),
-        ('activity', '0004_opener'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='opener',
-            options={'verbose_name': 'Opener', 'verbose_name_plural': 'Openers'},
-        ),
-        migrations.AlterField(
-            model_name='opener',
-            name='opener',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activity_responsible', to='note.note', verbose_name='Opener'),
-        ),
-    ]

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
@@ -11,7 +11,7 @@ from django.db import models, transaction
 from django.db.models import Q
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from note.models import NoteUser, Transaction, Note
+from note.models import NoteUser, Transaction
 from rest_framework.exceptions import ValidationError
 
 
@@ -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,
@@ -316,31 +310,3 @@ class GuestTransaction(Transaction):
     @property
     def type(self):
         return _('Invitation')
-
-
-class Opener(models.Model):
-    """
-    Allow the user to make activity entries without more rights
-    """
-    activity = models.ForeignKey(
-        Activity,
-        on_delete=models.CASCADE,
-        related_name='opener',
-        verbose_name=_('activity')
-    )
-
-    opener = models.ForeignKey(
-        Note,
-        on_delete=models.CASCADE,
-        related_name='activity_responsible',
-        verbose_name=_('Opener')
-    )
-
-    class Meta:
-        verbose_name = _("Opener")
-        verbose_name_plural = _("Openers")
-        unique_together = ("opener", "activity")
-
-    def __str__(self):
-        return _("{opener} is opener of activity {acivity}").format(
-            opener=str(self.opener), acivity=str(self.activity))

apps/activity/static/activity/js/opener.js

@@ -1,57 +0,0 @@
-/**
- * On form submit, add a new opener
- */
-function form_create_opener (e) {
-  // Do not submit HTML form
-  e.preventDefault()
-
-  // Get data and send to API
-  const formData = new FormData(e.target)
-  $.getJSON('/api/note/alias/'+formData.get('opener') + '/',
-    function (opener_alias) {
-      create_opener(formData.get('activity'), opener_alias.note)
-    }).fail(function (xhr, _textStatus, _error) {
-        errMsg(xhr.responseJSON)
-    })
-}
-
-/**
- * Add an opener between an activity and a user
- * @param activity:Integer activity id
- * @param opener:Integer user note id
- */
-function create_opener(activity, opener) {
-  $.post('/api/activity/opener/', {
-      activity: activity,
-      opener: opener,
-      csrfmiddlewaretoken: CSRF_TOKEN
-  }).done(function () {
-  // Reload tables
-  $('#opener_table').load(location.pathname + ' #opener_table')
-    addMsg(gettext('Opener successfully added'), 'success')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}
-
-/**
- * On click of "delete", delete the opener
- * @param button_id:Integer Opener id to remove
- */
-function delete_button (button_id) {
-  $.ajax({
-    url: '/api/activity/opener/' + button_id + '/',
-    method: 'DELETE',
-    headers: { 'X-CSRFTOKEN': CSRF_TOKEN }
-  }).done(function () {
-    addMsg(gettext('Opener successfully deleted'), 'success')
-    $('#opener_table').load(location.pathname + ' #opener_table')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}
-
-$(document).ready(function () {
-  // Attach event
-  document.getElementById('form_opener').addEventListener('submit', form_create_opener)
-})

apps/activity/tables.py

@@ -1,17 +1,15 @@
-# 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
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
-from note_kfet.middlewares import get_current_request
 import django_tables2 as tables
 from django_tables2 import A
-from permission.backends import PermissionBackend
 from note.templatetags.pretty_money import pretty_money
 
-from .models import Activity, Entry, Guest, Opener
+from .models import Activity, Entry, Guest
 
 
 class ActivityTable(tables.Table):
@@ -51,11 +49,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()))
 
@@ -115,34 +113,3 @@ class EntryTable(tables.Table):
             'data-last-name': lambda record: record.last_name,
             'data-first-name': lambda record: record.first_name,
         }
-
-
-# function delete_button(id) provided in template file
-DELETE_TEMPLATE = """
-    <button id="{{ record.pk }}" class="btn btn-danger btn-sm" onclick="delete_button(this.id)"> {{ delete_trans }}</button>
-"""
-
-
-class OpenerTable(tables.Table):
-    class Meta:
-        attrs = {
-            'class': 'table table condensed table-striped',
-            'id': "opener_table"
-        }
-        model = Opener
-        fields = ("opener",)
-        template_name = 'django_tables2/bootstrap4.html'
-
-    show_header = False
-    opener = tables.Column(attrs={'td': {'class': 'text-center'}})
-
-    delete_col = tables.TemplateColumn(
-        template_code=DELETE_TEMPLATE,
-        extra_context={"delete_trans": _('Delete')},
-        attrs={
-            'td': {
-                'class': lambda record: 'col-sm-1'
-                + (' d-none' if not PermissionBackend.check_perm(
-                    get_current_request(), "activity.delete_opener", record)
-                   else '')}},
-        verbose_name=_("Delete"),)

apps/activity/templates/activity/activity_detail.html

@@ -4,31 +4,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n perms %}
 {% load render_table from django_tables2 %}
-{% load static django_tables2 i18n %}
 
 {% block content %}
 <h1 class="text-white">{{ title }}</h1>
 {% include "activity/includes/activity_info.html" %}
 
-{% if activity.activity_type.manage_entries and ".change__opener"|has_perm:activity %}
-    <div class="card bg-white mb-3">
-        <h3 class="card-header text-center">
-            {% trans "Openers" %}
-        </h3>
-        <div class="card-body">
-            <form class="input-group" method="POST" id="form_opener">
-                {% csrf_token %}
-                <input type="hidden" name="activity" value="{{ object.pk }}">
-                {%include "autocomplete_model.html" %}
-                <div class="input-group-append">
-                    <input type="submit" class="btn btn-success" value="{% trans "Add" %}">
-                </div>
-            </form>
-        </div>
-        {% render_table opener %}
-    </div>
-{% endif %}
-
 {% if guests.data %}
 <div class="card bg-white mb-3">
     <h3 class="card-header text-center">
@@ -42,8 +22,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% endblock %}
 
 {% block extrajavascript %}
-<script src="{% static "activity/js/opener.js" %}"></script>
-<script src="{% static "js/autocomplete_model.js" %}"></script>
 <script>
     function remove_guest(guest_id) {
         $.ajax({

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
@@ -17,16 +17,14 @@ from django.utils.translation import gettext_lazy as _
 from django.views import View
 from django.views.decorators.cache import cache_page
 from django.views.generic import DetailView, TemplateView, UpdateView
-from django.views.generic.list import ListView
+from django_tables2.views import SingleTableView
-from django_tables2.views import MultiTableMixin, SingleTableMixin
-from api.viewsets import is_regex
 from note.models import Alias, NoteSpecial, NoteUser
 from permission.backends import PermissionBackend
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
 
 from .forms import ActivityForm, GuestForm
-from .models import Activity, Entry, Guest, Opener
+from .models import Activity, Entry, Guest
-from .tables import ActivityTable, EntryTable, GuestTable, OpenerTable
+from .tables import ActivityTable, EntryTable, GuestTable
 
 
 class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
@@ -59,36 +57,27 @@ class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.object.pk})
 
 
-class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
+class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     """
     Displays all Activities, and classify if they are on-going or upcoming ones.
     """
     model = Activity
-    tables = [
+    table_class = ActivityTable
-        lambda data: ActivityTable(data, prefix="all-"),
+    ordering = ('-date_start',)
-        lambda data: ActivityTable(data, prefix="upcoming-"),
-    ]
     extra_context = {"title": _("Activities")}
 
     def get_queryset(self, **kwargs):
         return super().get_queryset(**kwargs).distinct()
 
-    def get_tables_data(self):
-        # first table = all activities, second table = upcoming
-        return [
-            self.get_queryset().order_by("-date_start"),
-            Activity.objects.filter(date_end__gt=timezone.now())
-                            .filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))
-                            .distinct()
-                            .order_by("date_start")
-        ]
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        tables = context["tables"]
+        upcoming_activities = Activity.objects.filter(date_end__gt=timezone.now())
-        for name, table in zip(["table", "upcoming"], tables):
+        context['upcoming'] = ActivityTable(
-            context[name] = table
+            data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request, Activity, "view")),
+            prefix='upcoming-',
+            order_by='date_start',
+        )
 
         started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all()
         context["started_activities"] = started_activities
@@ -96,7 +85,7 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
         return context
 
 
-class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, DetailView):
+class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
     Shows details about one activity. Add guest to context
     """
@@ -104,40 +93,15 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMix
     context_object_name = "activity"
     extra_context = {"title": _("Activity detail")}
 
-    tables = [
-        lambda data: GuestTable(data, prefix="guests-"),
-        lambda data: OpenerTable(data, prefix="opener-"),
-    ]
-
-    def get_tables_data(self):
-        return [
-            Guest.objects.filter(activity=self.object)
-                         .filter(PermissionBackend.filter_queryset(self.request, Guest, "view")),
-            self.object.opener.filter(activity=self.object)
-                              .filter(PermissionBackend.filter_queryset(self.request, Opener, "view")),
-        ]
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data()
 
-        tables = context["tables"]
+        table = GuestTable(data=Guest.objects.filter(activity=self.object)
-        for name, table in zip(["guests", "opener"], tables):
+                           .filter(PermissionBackend.filter_queryset(self.request, Guest, "view")))
-            context[name] = table
+        context["guests"] = table
 
         context["activity_started"] = timezone.now() > timezone.localtime(self.object.date_start)
 
-        context["widget"] = {
-            "name": "opener",
-            "resetable": True,
-            "attrs": {
-                "class": "autocomplete form-control",
-                "id": "opener",
-                "api_url": "/api/note/alias/?note__polymorphic_ctype__model=noteuser",
-                "name_field": "name",
-                "placeholder": ""
-            }
-        }
-
         return context
 
 
@@ -168,7 +132,6 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
             activity=activity,
             first_name="",
             last_name="",
-            school="",
             inviter=self.request.user.note,
         )
 
@@ -195,14 +158,12 @@ class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
 
 
-class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
+class ActivityEntryView(LoginRequiredMixin, TemplateView):
     """
     Manages entry to an activity
     """
     template_name = "activity/activity_entry.html"
 
-    table_class = EntryTable
-
     def dispatch(self, request, *args, **kwargs):
         """
         Don't display the entry interface if the user has no right to see it (no right to add an entry for itself),
@@ -237,16 +198,13 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
 
         if "search" in self.request.GET and self.request.GET["search"]:
             pattern = self.request.GET["search"]
-
+            if pattern[0] != "^":
-            # Check if this is a valid regex. If not, we won't check regex
+                pattern = "^" + pattern
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__istartswith"
-            pattern = "^" + pattern if valid_regex and pattern[0] != "^" else pattern
             guest_qs = guest_qs.filter(
-                Q(**{f"first_name{suffix}": pattern})
+                Q(first_name__iregex=pattern)
-                | Q(**{f"last_name{suffix}": pattern})
+                | Q(last_name__iregex=pattern)
-                | Q(**{f"inviter__alias__name{suffix}": pattern})
+                | Q(inviter__alias__name__iregex=pattern)
-                | Q(**{f"inviter__alias__normalized_name{suffix}": Alias.normalize(pattern)})
+                | Q(inviter__alias__normalized_name__iregex=Alias.normalize(pattern))
             )
         else:
             guest_qs = guest_qs.none()
@@ -266,26 +224,23 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
         # Keep only users that have a note
         note_qs = note_qs.filter(note__noteuser__isnull=False)
 
-        # Keep only valid members
+        # 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()).exclude(note__inactivity_reason='forced')
+            note__noteuser__user__memberships__date_end__gte=timezone.now(),
+        )
 
         # Filter with permission backend
         note_qs = note_qs.filter(PermissionBackend.filter_queryset(self.request, Alias, "view"))
 
         if "search" in self.request.GET and self.request.GET["search"]:
             pattern = self.request.GET["search"]
-
-            # Check if this is a valid regex. If not, we won't check regex
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__icontains"
             note_qs = note_qs.filter(
-                Q(**{f"note__noteuser__user__first_name{suffix}": pattern})
+                Q(note__noteuser__user__first_name__iregex=pattern)
-                | Q(**{f"note__noteuser__user__last_name{suffix}": pattern})
+                | Q(note__noteuser__user__last_name__iregex=pattern)
-                | Q(**{f"name{suffix}": pattern})
+                | Q(name__iregex=pattern)
-                | Q(**{f"normalized_name{suffix}": Alias.normalize(pattern)})
+                | Q(normalized_name__iregex=Alias.normalize(pattern))
             )
         else:
             note_qs = note_qs.none()
@@ -297,9 +252,15 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
             if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql' else note_qs.distinct()[:20]
         return note_qs
 
-    def get_table_data(self):
+    def get_context_data(self, **kwargs):
+        """
+        Query the list of Guest and Note to the activity and add information to makes entry with JS.
+        """
+        context = super().get_context_data(**kwargs)
+
         activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
             .distinct().get(pk=self.kwargs["pk"])
+        context["activity"] = activity
 
         matched = []
 
@@ -312,17 +273,8 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
             note.activity = activity
             matched.append(note)
 
-        return matched
+        table = EntryTable(data=matched)
-
+        context["table"] = table
-    def get_context_data(self, **kwargs):
-        """
-        Query the list of Guest and Note to the activity and add information to makes entry with JS.
-        """
-        context = super().get_context_data(**kwargs)
-
-        activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request, Activity, "view"))\
-            .distinct().get(pk=self.kwargs["pk"])
-        context["activity"] = activity
 
         context["entries"] = Entry.objects.filter(activity=activity)
 
@@ -330,7 +282,7 @@ class ActivityEntryView(LoginRequiredMixin, SingleTableMixin, TemplateView):
         context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk
         context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk
 
-        activities_open = Activity.objects.filter(open=True, activity_type__manage_entries=True).filter(
+        activities_open = Activity.objects.filter(open=True).filter(
             PermissionBackend.filter_queryset(self.request, Activity, "view")).distinct().all()
         context["activities_open"] = [a for a in activities_open
                                       if PermissionBackend.check_perm(self.request,
@@ -364,8 +316,8 @@ X-WR-CALNAME:Kfet Calendar
 NAME:Kfet Calendar
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
-TZID:Europe/Paris
+TZID:Europe/Berlin
-X-LIC-LOCATION:Europe/Paris
+X-LIC-LOCATION:Europe/Berlin
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
@@ -387,10 +339,10 @@ END:VTIMEZONE
 DTSTAMP:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}Z
 UID:{md5((activity.name + "$" + str(activity.id) + str(activity.date_start)).encode("UTF-8")).hexdigest()}
 SUMMARY;CHARSET=UTF-8:{self.multilines(activity.name, 75, 22)}
-DTSTART:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_start)}
+DTSTART;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}
-DTEND:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_end)}
+DTEND;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_end)}
 LOCATION:{self.multilines(activity.location, 75, 9) if activity.location else "Kfet"}
-DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + f"""
+DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + """
  -- {activity.organizer.name}
 END:VEVENT
 """

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/filters.py

@@ -1,42 +0,0 @@
-import re
-from functools import lru_cache
-
-from rest_framework.filters import SearchFilter
-
-
-class RegexSafeSearchFilter(SearchFilter):
-    @lru_cache
-    def validate_regex(self, search_term) -> bool:
-        try:
-            re.compile(search_term)
-            return True
-        except re.error:
-            return False
-
-    def get_search_fields(self, view, request):
-        """
-        Ensure that given regex are valid.
-        If not, we consider that the user is trying to search by substring.
-        """
-        search_fields = super().get_search_fields(view, request)
-        search_terms = self.get_search_terms(request)
-
-        for search_term in search_terms:
-            if not self.validate_regex(search_term):
-                # Invalid regex. We assume we don't query by regex but by substring.
-                search_fields = [f.replace('$', '') for f in search_fields]
-                break
-
-        return search_fields
-
-    def get_search_terms(self, request):
-        """
-        Ensure that search field is a valid regex query. If not, we remove extra characters.
-        """
-        terms = super().get_search_terms(request)
-        if not all(self.validate_regex(term) for term in terms):
-            # Invalid regex. If a ^ is prefixed to the search term, we remove it.
-            terms = [term[1:] if term[0] == '^' else term for term in terms]
-            # Same for dollars.
-            terms = [term[:-1] if term[-1] == '$' else term for term in terms]
-        return terms

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
@@ -12,12 +12,11 @@ from django.contrib.contenttypes.models import ContentType
 from django.db.models.fields.files import ImageFieldFile
 from django.test import TestCase
 from django_filters.rest_framework import DjangoFilterBackend
-from phonenumbers import PhoneNumber
-from rest_framework.filters import OrderingFilter
-from api.filters import RegexSafeSearchFilter
 from member.models import Membership, Club
 from note.models import NoteClub, NoteUser, Alias, Note
 from permission.models import PermissionMask, Permission, Role
+from phonenumbers import PhoneNumber
+from rest_framework.filters import SearchFilter, OrderingFilter
 
 from .viewsets import ContentTypeViewSet, UserViewSet
 
@@ -88,7 +87,7 @@ class TestAPI(TestCase):
                     resp = self.client.get(url + f"?ordering=-{field}")
                     self.assertEqual(resp.status_code, 200)
 
-            if RegexSafeSearchFilter in backends:
+            if SearchFilter in backends:
                 # Basic search
                 for field in viewset.search_fields:
                     obj = self.fix_note_object(obj, field)

apps/api/urls.py

@@ -1,9 +1,8 @@
-# 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
-from django.conf.urls import include
+from django.conf.urls import url, include
-from django.urls import re_path
 from rest_framework import routers
 
 from .views import UserInformationView
@@ -15,48 +14,40 @@ router = routers.DefaultRouter()
 router.register('models', ContentTypeViewSet)
 router.register('user', UserViewSet)
 
-if "activity" in settings.INSTALLED_APPS:
-    from activity.api.urls import register_activity_urls
-    register_activity_urls(router, 'activity')
-
-if "food" in settings.INSTALLED_APPS:
-    from food.api.urls import register_food_urls
-    register_food_urls(router, 'food')
-
-if "logs" in settings.INSTALLED_APPS:
-    from logs.api.urls import register_logs_urls
-    register_logs_urls(router, 'logs')
-
 if "member" in settings.INSTALLED_APPS:
     from member.api.urls import register_members_urls
     register_members_urls(router, 'members')
 
+if "member" in settings.INSTALLED_APPS:
+    from activity.api.urls import register_activity_urls
+    register_activity_urls(router, 'activity')
+
 if "note" in settings.INSTALLED_APPS:
     from note.api.urls import register_note_urls
     register_note_urls(router, 'note')
 
-if "permission" in settings.INSTALLED_APPS:
-    from permission.api.urls import register_permission_urls
-    register_permission_urls(router, 'permission')
-
 if "treasury" in settings.INSTALLED_APPS:
     from treasury.api.urls import register_treasury_urls
     register_treasury_urls(router, 'treasury')
 
+if "permission" in settings.INSTALLED_APPS:
+    from permission.api.urls import register_permission_urls
+    register_permission_urls(router, 'permission')
+
+if "logs" in settings.INSTALLED_APPS:
+    from logs.api.urls import register_logs_urls
+    register_logs_urls(router, 'logs')
+
 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.
 # Additionally, we include login URLs for the browsable API.
 urlpatterns = [
-    re_path('^', include(router.urls)),
+    url('^', include(router.urls)),
-    re_path('^me/', UserInformationView.as_view()),
+    url('^me/', UserInformationView.as_view()),
-    re_path('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    url('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 ]

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,29 +1,19 @@
-# 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
-
 from django.contrib.contenttypes.models import ContentType
 from django_filters.rest_framework import DjangoFilterBackend
 from django.db.models import Q
 from django.conf import settings
 from django.contrib.auth.models import User
+from rest_framework.filters import SearchFilter
 from rest_framework.viewsets import ReadOnlyModelViewSet, ModelViewSet
 from permission.backends import PermissionBackend
 from note.models import Alias
 
-from .filters import RegexSafeSearchFilter
 from .serializers import UserSerializer, ContentTypeSerializer
 
 
-def is_regex(pattern):
-    try:
-        re.compile(pattern)
-        return True
-    except (re.error, TypeError):
-        return False
-
-
 class ReadProtectedModelViewSet(ModelViewSet):
     """
     Protect a ModelViewSet by filtering the objects that the user cannot see.
@@ -70,38 +60,34 @@ class UserViewSet(ReadProtectedModelViewSet):
 
         if "search" in self.request.GET:
             pattern = self.request.GET["search"]
-            # Check if this is a valid regex. If not, we won't check regex
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__istartswith"
-            prefix = "^" if valid_regex else ""
 
             # Filter with different rules
             # We use union-all to keep each filter rule sorted in result
             queryset = queryset.filter(
                 # Match without normalization
-                Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                note__alias__name__iregex="^" + pattern
             ).union(
                 queryset.filter(
                     # Match with normalization
-                    Q(**{f"note__alias__normalized_name{suffix}": prefix + Alias.normalize(pattern)})
+                    Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                    & ~Q(note__alias__name__iregex="^" + pattern)
                 ),
                 all=True,
             ).union(
                 queryset.filter(
                     # Match on lower pattern
-                    Q(**{f"note__alias__normalized_name{suffix}": prefix + pattern.lower()})
+                    Q(note__alias__normalized_name__iregex="^" + pattern.lower())
-                    & ~Q(**{f"note__alias__normalized_name{suffix}": prefix + Alias.normalize(pattern)})
+                    & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                    & ~Q(note__alias__name__iregex="^" + pattern)
                 ),
                 all=True,
             ).union(
                 queryset.filter(
                     # Match on firstname or lastname
-                    (Q(**{f"last_name{suffix}": prefix + pattern}) | Q(**{f"first_name{suffix}": prefix + pattern}))
+                    (Q(last_name__iregex="^" + pattern) | Q(first_name__iregex="^" + pattern))
-                    & ~Q(**{f"note__alias__normalized_name{suffix}": prefix + pattern.lower()})
+                    & ~Q(note__alias__normalized_name__iregex="^" + pattern.lower())
-                    & ~Q(**{f"note__alias__normalized_name{suffix}": prefix + Alias.normalize(pattern)})
+                    & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
-                    & ~Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                    & ~Q(note__alias__name__iregex="^" + pattern)
                 ),
                 all=True,
             )
@@ -121,6 +107,6 @@ class ContentTypeViewSet(ReadOnlyModelViewSet):
     """
     queryset = ContentType.objects.order_by('id')
     serializer_class = ContentTypeSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['id', 'app_label', 'model', ]
     search_fields = ['$app_label', '$model', ]

apps/food/admin.py

@@ -1,59 +1,35 @@
-# 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
-from polymorphic.admin import PolymorphicChildModelAdmin, PolymorphicParentModelAdmin
 from note_kfet.admin import admin_site
 
-from .models import Allergen, Food, BasicFood, TransformedFood, QRCode
+from .models import Allergen, BasicFood, QRCode, TransformedFood
-
-
-@admin.register(Allergen, site=admin_site)
-class AllergenAdmin(admin.ModelAdmin):
-    """
-    Admin customisation for Allergen
-    """
-    ordering = ['name']
-
-
-@admin.register(Food, site=admin_site)
-class FoodAdmin(PolymorphicParentModelAdmin):
-    """
-    Admin customisation for Food
-    """
-    child_models = (Food, BasicFood, TransformedFood)
-    list_display = ('name', 'expiry_date', 'owner', 'is_ready')
-    list_filter = ('is_ready', 'end_of_life')
-    search_fields = ['name']
-    ordering = ['expiry_date', 'name']
-
-
-@admin.register(BasicFood, site=admin_site)
-class BasicFood(PolymorphicChildModelAdmin):
-    """
-    Admin customisation for BasicFood
-    """
-    list_display = ('name', 'expiry_date', 'date_type', 'owner', 'is_ready')
-    list_filter = ('is_ready', 'date_type', 'end_of_life')
-    search_fields = ['name']
-    ordering = ['expiry_date', 'name']
-
-
-@admin.register(TransformedFood, site=admin_site)
-class TransformedFood(PolymorphicChildModelAdmin):
-    """
-    Admin customisation for TransformedFood
-    """
-    list_display = ('name', 'expiry_date', 'shelf_life', 'owner', 'is_ready')
-    list_filter = ('is_ready', 'end_of_life', 'shelf_life')
-    search_fields = ['name']
-    ordering = ['expiry_date', 'name']
 
 
 @admin.register(QRCode, site=admin_site)
 class QRCodeAdmin(admin.ModelAdmin):
     """
-    Admin customisation for QRCode
+    TEMPORARY
+    """
+
+
+@admin.register(BasicFood, site=admin_site)
+class BasicFoodAdmin(admin.ModelAdmin):
+    """
+    TEMPORARY
+    """
+
+
+@admin.register(TransformedFood, site=admin_site)
+class TransformedFoodAdmin(admin.ModelAdmin):
+    """
+    TEMPORARY
+    """
+
+
+@admin.register(Allergen, site=admin_site)
+class AllergenAdmin(admin.ModelAdmin):
+    """
+    TEMPORARY
     """
-    list_diplay = ('qr_code_number', 'food_container')
-    search_fields = ['food_container__name']

apps/food/api/serializers.py

@@ -1,56 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from rest_framework import serializers
-
-from ..models import Allergen, Food, BasicFood, TransformedFood, QRCode
-
-
-class AllergenSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for Allergen.
-    The djangorestframework plugin will analyse the model `Allergen` and parse all fields in the API.
-    """
-    class Meta:
-        model = Allergen
-        fields = '__all__'
-
-
-class FoodSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for Food.
-    The djangorestframework plugin will analyse the model `Food` and parse all fields in the API.
-    """
-    class Meta:
-        model = Food
-        fields = '__all__'
-
-
-class BasicFoodSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for BasicFood.
-    The djangorestframework plugin will analyse the model `BasicFood` and parse all fields in the API.
-    """
-    class Meta:
-        model = BasicFood
-        fields = '__all__'
-
-
-class TransformedFoodSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for TransformedFood.
-    The djangorestframework plugin will analyse the model `TransformedFood` and parse all fields in the API.
-    """
-    class Meta:
-        model = TransformedFood
-        fields = '__all__'
-
-
-class QRCodeSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for QRCode.
-    The djangorestframework plugin will analyse the model `QRCode` and parse all fields in the API.
-    """
-    class Meta:
-        model = QRCode
-        fields = '__all__'

apps/food/api/urls.py

@@ -1,15 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from .views import AllergenViewSet, FoodViewSet, BasicFoodViewSet, TransformedFoodViewSet, QRCodeViewSet
-
-
-def register_food_urls(router, path):
-    """
-    Configure router for Food REST API.
-    """
-    router.register(path + '/allergen', AllergenViewSet)
-    router.register(path + '/food', FoodViewSet)
-    router.register(path + '/basicfood', BasicFoodViewSet)
-    router.register(path + '/transformedfood', TransformedFoodViewSet)
-    router.register(path + '/qrcode', QRCodeViewSet)

apps/food/api/views.py

@@ -1,74 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from api.viewsets import ReadProtectedModelViewSet
-from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.filters import SearchFilter
-
-from .serializers import AllergenSerializer, FoodSerializer, BasicFoodSerializer, TransformedFoodSerializer, QRCodeSerializer
-from ..models import Allergen, Food, BasicFood, TransformedFood, QRCode
-
-
-class AllergenViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `Allergen` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/allergen/
-    """
-    queryset = Allergen.objects.order_by('id')
-    serializer_class = AllergenSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-class FoodViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `Food` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/food/
-    """
-    queryset = Food.objects.order_by('id')
-    serializer_class = FoodSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-class BasicFoodViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `BasicFood` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/basicfood/
-    """
-    queryset = BasicFood.objects.order_by('id')
-    serializer_class = BasicFoodSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-class TransformedFoodViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `TransformedFood` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/transformedfood/
-    """
-    queryset = TransformedFood.objects.order_by('id')
-    serializer_class = TransformedFoodSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
-class QRCodeViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `QRCode` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/qrcode/
-    """
-    queryset = QRCode.objects.order_by('id')
-    serializer_class = QRCodeSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['qr_code_number', ]
-    search_fields = ['$qr_code_number', ]

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

@@ -3,98 +3,105 @@
         "model": "food.allergen",
         "pk": 1,
         "fields": {
-	    "name": "Lait"
+            "name": "alcohol"
         }
     },
     {
         "model": "food.allergen",
         "pk": 2,
         "fields": {
-	    "name": "Oeufs"
+            "name": "celery"
         }
     },
     {
         "model": "food.allergen",
         "pk": 3,
         "fields": {
-	    "name": "Gluten"
+            "name": "crustecean"
         }
     },
     {
         "model": "food.allergen",
         "pk": 4,
         "fields": {
-	    "name": "Fruits à coques"
+            "name": "egg"
         }
     },
     {
         "model": "food.allergen",
         "pk": 5,
         "fields": {
-	    "name": "Arachides"
+            "name": "fish"
         }
     },
     {
         "model": "food.allergen",
         "pk": 6,
         "fields": {
-	    "name": "Sésame"
+            "name": "gluten"
         }
     },
     {
         "model": "food.allergen",
         "pk": 7,
         "fields": {
-	    "name": "Soja"
+            "name": "groundnut"
         }
     },
     {
         "model": "food.allergen",
         "pk": 8,
         "fields": {
-	    "name": "Céleri"
+            "name": "lupine"
         }
     },
     {
         "model": "food.allergen",
         "pk": 9,
         "fields": {
-	    "name": "Lupin"
+            "name": "milk"
         }
     },
     {
         "model": "food.allergen",
         "pk": 10,
         "fields": {
-	    "name": "Moutarde"
+            "name": "mollusc"
         }
     },
     {
         "model": "food.allergen",
         "pk": 11,
         "fields": {
-	    "name": "Sulfites"
+            "name": "mustard"
         }
     },
     {
         "model": "food.allergen",
         "pk": 12,
         "fields": {
-	    "name": "Crustacés"
+            "name": "nut"
         }
     },
     {
         "model": "food.allergen",
         "pk": 13,
         "fields": {
-	    "name": "Mollusques"
+            "name": "sesame"
         }
     },
     {
         "model": "food.allergen",
         "pk": 14,
         "fields": {
-	    "name": "Poissons"
+            "name": "soy"
+        }
+    },
+    {
+        "model": "food.allergen",
+        "pk": 15,
+        "fields": {
+            "name": "sulphite"
         }
     }
 ]

apps/food/forms.py

@@ -1,43 +1,22 @@
-# 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
 
-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from django import forms
-from django.forms.widgets import NumberInput
 from django.utils.translation import gettext_lazy as _
+from django.utils import timezone
 from member.models import Club
-from note_kfet.inputs import Autocomplete
+from note_kfet.inputs import Autocomplete, DateTimePickerInput
 from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend
 
-from .models import Food, BasicFood, TransformedFood, QRCode
+from .models import BasicFood, TransformedFood
-
-
-class QRCodeForms(forms.ModelForm):
-    """
-    Form for create QRCode for container
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['food_container'].queryset = self.fields['food_container'].queryset.filter(
-            end_of_life__isnull=True,
-            polymorphic_ctype__model='transformedfood',
-        ).filter(PermissionBackend.filter_queryset(
-            get_current_request(),
-            TransformedFood,
-            "view",
-        ))
-
-    class Meta:
-        model = QRCode
-        fields = ('food_container',)
 
 
 class BasicFoodForms(forms.ModelForm):
     """
-    Form for add basicfood
+    Form for add non-transformed food
     """
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -46,21 +25,20 @@ class BasicFoodForms(forms.ModelForm):
         self.fields['owner'].required = True
 
         # Some example
-        self.fields['name'].widget.attrs.update({"placeholder": _("Pasta METRO 5kg")})
+        self.fields['name'].widget.attrs.update({"placeholder": _("pasta")})
         clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
         shuffle(clubs)
         self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
-        self.fields['order'].widget.attrs["placeholder"] = _("Specific order given to GCKs")
 
     class Meta:
         model = BasicFood
-        fields = ('name', 'owner', 'date_type', 'expiry_date', 'allergens', 'order',)
+        fields = ('name', 'owner', 'date_type', 'expiry_date', 'allergens')
         widgets = {
             "owner": Autocomplete(
                 model=Club,
                 attrs={"api_url": "/api/members/club/"},
             ),
-            "expiry_date": DateTimePickerInput(),
+            'expiry_date': DateTimePickerInput(),
         }
 
 
@@ -70,118 +48,26 @@ class TransformedFoodForms(forms.ModelForm):
     """
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
         self.fields['name'].required = True
         self.fields['owner'].required = True
+        self.fields['creation_date'].required = True
+        self.fields['creation_date'].initial = timezone.now
+        self.fields['is_active'].initial = True
 
         # Some example
-        self.fields['name'].widget.attrs.update({"placeholder": _("Lasagna")})
+        self.fields['name'].widget.attrs.update({"placeholder": _("lasagna")})
         clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
         shuffle(clubs)
         self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
-        self.fields['order'].widget.attrs["placeholder"] = _("Specific order given to GCKs")
 
     class Meta:
         model = TransformedFood
-        fields = ('name', 'owner', 'order',)
+        fields = ('name', 'creation_date', 'owner', 'is_active', 'allergens')
         widgets = {
             "owner": Autocomplete(
                 model=Club,
                 attrs={"api_url": "/api/members/club/"},
             ),
+            'creation_date': DateTimePickerInput(),
         }
-
-
-class BasicFoodUpdateForms(forms.ModelForm):
-    """
-    Form for update basicfood object
-    """
-    class Meta:
-        model = BasicFood
-        fields = ('name', 'owner', 'date_type', 'expiry_date', 'end_of_life', 'is_ready', 'order', 'allergens')
-        widgets = {
-            "owner": Autocomplete(
-                model=Club,
-                attrs={"api_url": "/api/members/club/"},
-            ),
-            "expiry_date": DateTimePickerInput(),
-        }
-
-
-class TransformedFoodUpdateForms(forms.ModelForm):
-    """
-    Form for update transformedfood object
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['shelf_life'].label = _('Shelf life (in hours)')
-
-    class Meta:
-        model = TransformedFood
-        fields = ('name', 'owner', 'end_of_life', 'is_ready', 'order', 'shelf_life')
-        widgets = {
-            "owner": Autocomplete(
-                model=Club,
-                attrs={"api_url": "/api/members/club/"},
-            ),
-            "expiry_date": DateTimePickerInput(),
-            "shelf_life": NumberInput(),
-        }
-
-
-class AddIngredientForms(forms.ModelForm):
-    """
-    Form for add an ingredient
-    """
-    fully_used = forms.BooleanField()
-    fully_used.initial = True
-    fully_used.required = False
-    fully_used.label = _("Fully used")
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # TODO find a better way to get pk (be not url scheme dependant)
-        pk = get_current_request().path.split('/')[-1]
-        self.fields['ingredients'].queryset = self.fields['ingredients'].queryset.filter(
-            polymorphic_ctype__model="transformedfood",
-            is_ready=False,
-            end_of_life='',
-        ).filter(PermissionBackend.filter_queryset(get_current_request(), TransformedFood, "change")).exclude(pk=pk)
-
-    class Meta:
-        model = TransformedFood
-        fields = ('ingredients',)
-
-
-class ManageIngredientsForm(forms.Form):
-    """
-    Form to manage ingredient
-    """
-    fully_used = forms.BooleanField()
-    fully_used.initial = True
-    fully_used.required = True
-    fully_used.label = _('Fully used')
-
-    name = forms.CharField()
-    name.widget = Autocomplete(
-        model=Food,
-        resetable=True,
-        attrs={"api_url": "/api/food/food",
-               "class": "autocomplete"},
-    )
-    name.label = _('Name')
-
-    qrcode = forms.IntegerField()
-    qrcode.widget = Autocomplete(
-        model=QRCode,
-        resetable=True,
-        attrs={"api_url": "/api/food/qrcode/",
-               "name_field": "qr_code_number",
-               "class": "autocomplete"},
-    )
-    qrcode.label = _('QR code number')
-
-
-ManageIngredientsFormSet = forms.formset_factory(
-    ManageIngredientsForm,
-    extra=1,
-)

apps/food/migrations/0001_initial.py

@@ -1,199 +1,72 @@
-# Generated by Django 4.2.20 on 2025-04-17 21:43
+# Generated by Django 2.2.28 on 2024-07-03 07:40
 
-import datetime
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
 
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = [
-        ("contenttypes", "0002_remove_content_type_name"),
+        ('member', '0011_profile_vss_charter_read'),
-        ("member", "0013_auto_20240801_1436"),
+        ('contenttypes', '0002_remove_content_type_name'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name="Allergen",
+            name='Allergen',
             fields=[
-                (
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                    "id",
+                ('name', models.CharField(max_length=255, null=True, verbose_name='name')),
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("name", models.CharField(max_length=255, verbose_name="name")),
             ],
             options={
-                "verbose_name": "Allergen",
+                'verbose_name': 'Allergen',
-                "verbose_name_plural": "Allergens",
+                'verbose_name_plural': 'Allergens',
             },
         ),
         migrations.CreateModel(
-            name="Food",
+            name='Food',
             fields=[
-                (
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                    "id",
+                ('name', models.CharField(max_length=255, verbose_name='name')),
-                    models.AutoField(
+                ('expiry_date', models.DateTimeField(verbose_name='expiry date')),
-                        auto_created=True,
+                ('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')),
-                        primary_key=True,
+                ('code', models.IntegerField(unique=True, verbose_name='code')),
-                        serialize=False,
+                ('allergens', models.ManyToManyField(blank=True, to='food.Allergen', verbose_name='allergen')),
-                        verbose_name="ID",
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='owner')),
-                    ),
+                ('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_food.food_set+', to='contenttypes.ContentType')),
-                ),
-                ("name", models.CharField(max_length=255, verbose_name="name")),
-                ("expiry_date", models.DateTimeField(verbose_name="expiry date")),
-                (
-                    "end_of_life",
-                    models.CharField(max_length=255, verbose_name="end of life"),
-                ),
-                (
-                    "is_ready",
-                    models.BooleanField(max_length=255, verbose_name="is ready"),
-                ),
-                ("order", models.CharField(max_length=255, verbose_name="order")),
-                (
-                    "allergens",
-                    models.ManyToManyField(
-                        blank=True, to="food.allergen", verbose_name="allergens"
-                    ),
-                ),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.PROTECT,
-                        related_name="+",
-                        to="member.club",
-                        verbose_name="owner",
-                    ),
-                ),
-                (
-                    "polymorphic_ctype",
-                    models.ForeignKey(
-                        editable=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="polymorphic_%(app_label)s.%(class)s_set+",
-                        to="contenttypes.contenttype",
-                    ),
-                ),
             ],
             options={
-                "verbose_name": "Food",
+                'verbose_name': 'foods',
-                "verbose_name_plural": "Foods",
             },
         ),
         migrations.CreateModel(
-            name="BasicFood",
+            name='BasicFood',
             fields=[
-                (
+                ('food_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='food.Food')),
-                    "food_ptr",
+                ('date_type', models.CharField(choices=[('DLC', 'DLC'), ('DDM', 'DDM')], max_length=255)),
-                    models.OneToOneField(
+                ('arrival_date', models.DateTimeField(blank=True, default=django.utils.timezone.now, verbose_name='arrival date')),
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="food.food",
-                    ),
-                ),
-                (
-                    "arrival_date",
-                    models.DateTimeField(
-                        default=django.utils.timezone.now, verbose_name="arrival date"
-                    ),
-                ),
-                (
-                    "date_type",
-                    models.CharField(
-                        choices=[("DLC", "DLC"), ("DDM", "DDM")], max_length=255
-                    ),
-                ),
             ],
             options={
-                "verbose_name": "Basic food",
+                'verbose_name': 'Basic food',
-                "verbose_name_plural": "Basic foods",
+                'verbose_name_plural': 'Basic foods',
             },
-            bases=("food.food",),
+            bases=('food.food',),
         ),
         migrations.CreateModel(
-            name="QRCode",
+            name='TransformedFood',
             fields=[
-                (
+                ('food_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='food.Food')),
-                    "id",
+                ('creation_date', models.DateTimeField(verbose_name='creation date')),
-                    models.AutoField(
+                ('is_active', models.BooleanField(default=True, verbose_name='is active')),
-                        auto_created=True,
+                ('ingredient', models.ManyToManyField(blank=True, related_name='transformed_ingredient_inv', to='food.Food', verbose_name='transformed ingredient')),
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "qr_code_number",
-                    models.PositiveIntegerField(
-                        unique=True, verbose_name="qr code number"
-                    ),
-                ),
-                (
-                    "food_container",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="QR_code",
-                        to="food.food",
-                        verbose_name="food container",
-                    ),
-                ),
             ],
             options={
-                "verbose_name": "QR-code",
+                'verbose_name': 'Transformed food',
-                "verbose_name_plural": "QR-codes",
+                'verbose_name_plural': 'Transformed foods',
             },
-        ),
+            bases=('food.food',),
-        migrations.CreateModel(
-            name="TransformedFood",
-            fields=[
-                (
-                    "food_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="food.food",
-                    ),
-                ),
-                (
-                    "creation_date",
-                    models.DateTimeField(
-                        default=django.utils.timezone.now, verbose_name="creation date"
-                    ),
-                ),
-                (
-                    "shelf_life",
-                    models.DurationField(
-                        default=datetime.timedelta(days=3), verbose_name="shelf life"
-                    ),
-                ),
-                (
-                    "ingredients",
-                    models.ManyToManyField(
-                        blank=True,
-                        related_name="transformed_ingredient_inv",
-                        to="food.food",
-                        verbose_name="transformed ingredient",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Transformed food",
-                "verbose_name_plural": "Transformed foods",
-            },
-            bases=("food.food",),
         ),
     ]

apps/food/migrations/0002_auto_20240703_1549.py

@@ -0,0 +1,30 @@
+# Generated by Django 2.2.28 on 2024-07-03 13:49
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('food', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='food',
+            name='code',
+        ),
+        migrations.CreateModel(
+            name='QRCode',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('qr_code_number', models.PositiveIntegerField(verbose_name='QR-code number')),
+                ('food_container', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.Food', unique=True, verbose_name='food container')),
+            ],
+            options={
+                'verbose_name': 'QR-code',
+                'verbose_name_plural': 'QR-codes',
+            },
+        ),
+    ]

apps/food/models.py

@@ -1,18 +1,47 @@
-# 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
-
 from django.db import models, transaction
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from polymorphic.models import PolymorphicModel
 from member.models import Club
+from polymorphic.models import PolymorphicModel
+
+#################################################################
+# TO DO
+# - link allergen with one food (basic or transformed) with check
+# - check on basic food
+# - check on transformed food
+#################################################################
+
+
+class QRCode(models.Model):
+    """
+    An QRCode model
+    """
+    qr_code_number = models.PositiveIntegerField(
+        verbose_name=_("QR-code number"),
+    )
+
+    food_container = models.ForeignKey(
+        'Food',
+        on_delete=models.PROTECT,
+        related_name='QR_code',
+        unique=True,
+        verbose_name=_('food container'),
+    )
+
+    class Meta:
+        verbose_name = _("QR-code")
+        verbose_name_plural = _("QR-codes")
+
+    def __str__(self):
+        return _("QR-code number {qr_code_number}").format(qr_code_number=self.qr_code_number)
 
 
 class Allergen(models.Model):
     """
-    Allergen and alimentary restrictions
+    A list of allergen and alimentary restrictions
     """
     name = models.CharField(
         verbose_name=_('name'),
@@ -20,19 +49,16 @@ class Allergen(models.Model):
     )
 
     class Meta:
-        verbose_name = _("Allergen")
+        verbose_name = _('Allergen')
-        verbose_name_plural = _("Allergens")
+        verbose_name_plural = _('Allergens')
 
     def __str__(self):
         return self.name
 
 
 class Food(PolymorphicModel):
-    """
-    Describe any type of food
-    """
     name = models.CharField(
-        verbose_name=_("name"),
+        verbose_name=_('name'),
         max_length=255,
     )
 
@@ -46,77 +72,34 @@ class Food(PolymorphicModel):
     allergens = models.ManyToManyField(
         Allergen,
         blank=True,
-        verbose_name=_('allergens'),
+        verbose_name=_('allergen'),
     )
 
     expiry_date = models.DateTimeField(
         verbose_name=_('expiry date'),
-        null=False,
     )
 
-    end_of_life = models.CharField(
+    was_eaten = models.BooleanField(
-        blank=True,
+        default=False,
-        verbose_name=_('end of life'),
+        verbose_name=_('was eaten'),
-        max_length=255,
-    )
-
-    is_ready = models.BooleanField(
-        verbose_name=_('is ready'),
-        max_length=255,
-    )
-
-    order = models.CharField(
-        blank=True,
-        verbose_name=_('order'),
-        max_length=255,
     )
 
     def __str__(self):
         return self.name
 
     @transaction.atomic
-    def update_allergens(self):
+    def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
-        # update parents
+        return super().save(force_insert, force_update, using, update_fields)
-        for parent in self.transformed_ingredient_inv.iterator():
-            old_allergens = list(parent.allergens.all()).copy()
-            parent.allergens.clear()
-            for child in parent.ingredients.iterator():
-                if child.pk != self.pk:
-                    parent.allergens.set(parent.allergens.union(child.allergens.all()))
-            parent.allergens.set(parent.allergens.union(self.allergens.all()))
-            if old_allergens != list(parent.allergens.all()):
-                parent.save(old_allergens=old_allergens)
-
-    def update_expiry_date(self):
-        # update parents
-        for parent in self.transformed_ingredient_inv.iterator():
-            old_expiry_date = parent.expiry_date
-            parent.expiry_date = parent.shelf_life + parent.creation_date
-            for child in parent.ingredients.iterator():
-                if (child.pk != self.pk
-                    and not (child.polymorphic_ctype.model == 'basicfood'
-                             and child.date_type == 'DDM')):
-                    parent.expiry_date = min(parent.expiry_date, child.expiry_date)
-
-            if self.polymorphic_ctype.model == 'basicfood' and self.date_type == 'DLC':
-                parent.expiry_date = min(parent.expiry_date, self.expiry_date)
-            if old_expiry_date != parent.expiry_date:
-                parent.save()
 
     class Meta:
-        verbose_name = _('Food')
+        verbose_name = _('food')
-        verbose_name_plural = _('Foods')
+        verbose_name = _('foods')
 
 
 class BasicFood(Food):
     """
-    A basic food is a food directly buy and stored
+    Food which has been directly buy on supermarket
     """
-    arrival_date = models.DateTimeField(
-        default=timezone.now,
-        verbose_name=_('arrival date'),
-    )
-
     date_type = models.CharField(
         max_length=255,
         choices=(
@@ -125,70 +108,34 @@ class BasicFood(Food):
         )
     )
 
-    @transaction.atomic
+    arrival_date = models.DateTimeField(
-    def save(self, force_insert=False, force_update=False, using=None, update_fields=None, **kwargs):
+        verbose_name=_('arrival date'),
-        created = self.pk is None
+        default=timezone.now,
-        if not created:
+        blank=True,  # TEMPORARY
-            # Check if important fields are updated
+    )
-            old_food = Food.objects.select_for_update().get(pk=self.pk)
-            if not hasattr(self, "_force_save"):
-                # Allergens
 
-                if ('old_allergens' in kwargs
+    # label = models.ImageField(
-                        and list(self.allergens.all()) != kwargs['old_allergens']):
+    #     verbose_name=_('food label'),
-                    self.update_allergens()
+    #     max_length=255,
-
+    #     blank=False,
-                # Expiry date
+    #     null=False,
-                if ((self.expiry_date != old_food.expiry_date
+    #     upload_to='label/',
-                        and self.date_type == 'DLC')
+    # )
-                        or old_food.date_type != self.date_type):
-                    self.update_expiry_date()
-
-        return super().save(force_insert, force_update, using, update_fields)
-
-    @staticmethod
-    def get_lastests_objects(number, distinct_field, order_by_field):
-        """
-        Get the last object with distinct field and ranked with order_by
-        This methods exist because we can't distinct with one field and
-        order with another
-        """
-        foods = BasicFood.objects.order_by(order_by_field).all()
-        field = []
-        for food in foods:
-            if getattr(food, distinct_field) in field:
-                continue
-            else:
-                field.append(getattr(food, distinct_field))
-                number -= 1
-                yield food
-            if not number:
-                return
 
     class Meta:
         verbose_name = _('Basic food')
         verbose_name_plural = _('Basic foods')
 
-    def __str__(self):
-        return self.name
-
 
 class TransformedFood(Food):
     """
-    A transformed food is a food with ingredients
+    Transformed food  are a mix between basic food and meal
     """
     creation_date = models.DateTimeField(
-        default=timezone.now,
         verbose_name=_('creation date'),
     )
 
-    # Without microbiological analyzes, the storage time is 3 days
+    ingredient = models.ManyToManyField(
-    shelf_life = models.DurationField(
-        default=timedelta(days=3),
-        verbose_name=_('shelf life'),
-    )
-
-    ingredients = models.ManyToManyField(
         Food,
         blank=True,
         symmetrical=False,
@@ -196,91 +143,11 @@ class TransformedFood(Food):
         verbose_name=_('transformed ingredient'),
     )
 
-    def check_cycle(self, ingredients, origin, checked):
+    is_active = models.BooleanField(
-        for ingredient in ingredients:
+        default=True,
-            if ingredient == origin:
+        verbose_name=_('is active'),
-                # We break the cycle
+    )
-                self.ingredients.remove(ingredient)
-            if ingredient.polymorphic_ctype.model == 'transformedfood' and ingredient not in checked:
-                ingredient.check_cycle(ingredient.ingredients.all(), origin, checked)
-                checked.append(ingredient)
-
-    @transaction.atomic
-    def save(self, force_insert=False, force_update=False, using=None, update_fields=None, **kwargs):
-        created = self.pk is None
-        if not created:
-            # Check if important fields are updated
-            update = {'allergens': False, 'expiry_date': False}
-            old_food = Food.objects.select_for_update().get(pk=self.pk)
-            if not hasattr(self, "_force_save"):
-                # Allergens
-                # Unfortunately with the many-to-many relation we can't access
-                # to old allergens
-                if ('old_allergens' in kwargs
-                        and list(self.allergens.all()) != kwargs['old_allergens']):
-                    update['allergens'] = True
-
-                # Expiry date
-                update['expiry_date'] = (self.shelf_life != old_food.shelf_life
-                                         or self.creation_date != old_food.creation_date)
-                if update['expiry_date']:
-                    self.expiry_date = self.creation_date + self.shelf_life
-                # Unfortunately with the set method ingredients are already save,
-                # we check cycle after if possible
-                if ('old_ingredients' in kwargs
-                        and list(self.ingredients.all()) != list(kwargs['old_ingredients'])):
-                    update['allergens'] = True
-                    update['expiry_date'] = True
-
-                    # it's preferable to keep a queryset but we allow list too
-                    if type(kwargs['old_ingredients']) is list:
-                        kwargs['old_ingredients'] = Food.objects.filter(
-                            pk__in=[food.pk for food in kwargs['old_ingredients']])
-                    self.check_cycle(self.ingredients.all().difference(kwargs['old_ingredients']), self, [])
-                if update['allergens']:
-                    self.update_allergens()
-                if update['expiry_date']:
-                    self.update_expiry_date()
-
-        if created:
-            self.expiry_date = self.shelf_life + self.creation_date
-
-            # We save here because we need pk for many-to-many relation
-            super().save(force_insert, force_update, using, update_fields)
-
-            for child in self.ingredients.iterator():
-                self.allergens.set(self.allergens.union(child.allergens.all()))
-                if not (child.polymorphic_ctype.model == 'basicfood' and child.date_type == 'DDM'):
-                    self.expiry_date = min(self.expiry_date, child.expiry_date)
-        return super().save(force_insert, force_update, using, update_fields)
 
     class Meta:
         verbose_name = _('Transformed food')
         verbose_name_plural = _('Transformed foods')
-
-    def __str__(self):
-        return self.name
-
-
-class QRCode(models.Model):
-    """
-    QR-code for register food
-    """
-    qr_code_number = models.PositiveIntegerField(
-        unique=True,
-        verbose_name=_('qr code number'),
-    )
-
-    food_container = models.ForeignKey(
-        Food,
-        on_delete=models.CASCADE,
-        related_name='QR_code',
-        verbose_name=_('food container'),
-    )
-
-    class Meta:
-        verbose_name = _('QR-code')
-        verbose_name_plural = _('QR-codes')
-
-    def __str__(self):
-        return _('QR-code number') + ' ' + str(self.qr_code_number)

apps/food/static/food/js/food.js

@@ -0,0 +1,422 @@
+var LOCK = false
+
+sources = []
+sources_notes_display = []
+dests = []
+dests_notes_display = []
+
+function refreshHistory () {
+  $('#history').load('/note/transfer/ #history')
+}
+
+function reset (refresh = true) {
+  sources_notes_display.length = 0
+  sources.length = 0
+  dests_notes_display.length = 0
+  dests.length = 0
+  $('#source_note_list').html('')
+  $('#dest_note_list').html('')
+  const source_field = $('#source_note')
+  source_field.val('')
+  const event = jQuery.Event('keyup')
+  event.originalEvent = { charCode: 97 }
+  source_field.trigger(event)
+  source_field.removeClass('is-invalid')
+  source_field.attr('data-original-title', '').tooltip('hide')
+  const dest_field = $('#dest_note')
+  dest_field.val('')
+  dest_field.trigger(event)
+  dest_field.removeClass('is-invalid')
+  dest_field.attr('data-original-title', '').tooltip('hide')
+  const amount_field = $('#amount')
+  amount_field.val('')
+  amount_field.removeClass('is-invalid')
+  $('#amount-required').html('')
+  const reason_field = $('#reason')
+  reason_field.val('')
+  reason_field.removeClass('is-invalid')
+  $('#reason-required').html('')
+  $('#last_name').val('')
+  $('#first_name').val('')
+  $('#bank').val('')
+  $('#user_note').val('')
+  $('#profile_pic').attr('src', '/static/member/img/default_picture.png')
+  $('#profile_pic_link').attr('href', '#')
+  if (refresh) {
+    refreshBalance()
+    refreshHistory()
+  }
+
+  LOCK = false
+}
+
+$(document).ready(function () {
+  /**
+     * If we are in credit/debit mode, check that only one note is entered.
+     * More over, get first name and last name to autocomplete fields.
+     */
+  function checkUniqueNote () {
+    if ($('#type_credit').is(':checked') || $('#type_debit').is(':checked')) {
+      const arr = $('#type_credit').is(':checked') ? dests_notes_display : sources_notes_display
+
+      if (arr.length === 0) { return }
+
+      const last = arr[arr.length - 1]
+      arr.length = 0
+      arr.push(last)
+
+      last.quantity = 1
+
+      if (last.note.club) {
+        $('#last_name').val(last.note.name)
+        $('#first_name').val(last.note.name)
+      }
+      else if (!last.note.user) {
+        $.getJSON('/api/note/note/' + last.note.id + '/?format=json', function (note) {
+          last.note.user = note.user
+          $.getJSON('/api/user/' + last.note.user + '/', function (user) {
+            $('#last_name').val(user.last_name)
+            $('#first_name').val(user.first_name)
+          })
+        })
+      } else {
+        $.getJSON('/api/user/' + last.note.user + '/', function (user) {
+          $('#last_name').val(user.last_name)
+          $('#first_name').val(user.first_name)
+        })
+      }
+    }
+
+    return true
+  }
+
+  autoCompleteNote('source_note', 'source_note_list', sources, sources_notes_display,
+    'source_alias', 'source_note', 'user_note', 'profile_pic', checkUniqueNote)
+  autoCompleteNote('dest_note', 'dest_note_list', dests, dests_notes_display,
+    'dest_alias', 'dest_note', 'user_note', 'profile_pic', checkUniqueNote)
+
+  const source = $('#source_note')
+  const dest = $('#dest_note')
+
+  $('#type_transfer').change(function () {
+    if (LOCK) { return }
+
+    $('#source_me_div').removeClass('d-none')
+    $('#source_note').removeClass('is-invalid')
+    $('#dest_note').removeClass('is-invalid')
+    $('#special_transaction_div').addClass('d-none')
+    source.removeClass('d-none')
+    $('#source_note_list').removeClass('d-none')
+    $('#credit_type').addClass('d-none')
+    dest.removeClass('d-none')
+    $('#dest_note_list').removeClass('d-none')
+    $('#debit_type').addClass('d-none')
+
+    $('#source_note_label').text(select_emitters_label)
+    $('#dest_note_label').text(select_receveirs_label)
+
+    location.hash = 'transfer'
+  })
+
+  $('#type_credit').change(function () {
+    if (LOCK) { return }
+
+    $('#source_me_div').addClass('d-none')
+    $('#source_note').removeClass('is-invalid')
+    $('#dest_note').removeClass('is-invalid')
+    $('#special_transaction_div').removeClass('d-none')
+    $('#source_note_list').addClass('d-none')
+    $('#dest_note_list').removeClass('d-none')
+    source.addClass('d-none')
+    source.tooltip('hide')
+    $('#credit_type').removeClass('d-none')
+    dest.removeClass('d-none')
+    dest.val('')
+    dest.tooltip('hide')
+    $('#debit_type').addClass('d-none')
+
+    $('#source_note_label').text(transfer_type_label)
+    $('#dest_note_label').text(select_receveir_label)
+
+    if (dests_notes_display.length > 1) {
+      $('#dest_note_list').html('')
+      dests_notes_display.length = 0
+    }
+
+    location.hash = 'credit'
+  })
+
+  $('#type_debit').change(function () {
+    if (LOCK) { return }
+
+    $('#source_me_div').addClass('d-none')
+    $('#source_note').removeClass('is-invalid')
+    $('#dest_note').removeClass('is-invalid')
+    $('#special_transaction_div').removeClass('d-none')
+    $('#source_note_list').removeClass('d-none')
+    $('#dest_note_list').addClass('d-none')
+    source.removeClass('d-none')
+    source.val('')
+    source.tooltip('hide')
+    $('#credit_type').addClass('d-none')
+    dest.addClass('d-none')
+    dest.tooltip('hide')
+    $('#debit_type').removeClass('d-none')
+
+    $('#source_note_label').text(select_emitter_label)
+    $('#dest_note_label').text(transfer_type_label)
+
+    if (sources_notes_display.length > 1) {
+      $('#source_note_list').html('')
+      sources_notes_display.length = 0
+    }
+
+    location.hash = 'debit'
+  })
+
+  $('#credit_type').change(function () {
+    const type = $('#credit_type option:selected').text()
+    if ($('#type_credit').is(':checked')) { source.val(type) } else { dest.val(type) }
+  })
+
+  // Ensure we begin in transfer mode. Removing these lines may cause problems when reloading.
+  const type_transfer = $('#type_transfer') // Default mode
+  type_transfer.removeAttr('checked')
+  $('#type_credit').removeAttr('checked')
+  $('#type_debit').removeAttr('checked')
+
+  if (location.hash) { $('#type_' + location.hash.substr(1)).click() } else { type_transfer.click() }
+
+  $('#source_me').click(function () {
+    if (LOCK) { return }
+
+    // Shortcut to set the current user as the only emitter
+    sources_notes_display.length = 0
+    sources.length = 0
+    $('#source_note_list').html('')
+
+    const source_note = $('#source_note')
+    source_note.focus()
+    source_note.val('')
+    let event = jQuery.Event('keyup')
+    event.originalEvent = { charCode: 97 }
+    source_note.trigger(event)
+    source_note.val(username)
+    event = jQuery.Event('keyup')
+    event.originalEvent = { charCode: 97 }
+    source_note.trigger(event)
+    const fill_note = function () {
+      if (sources.length === 0) {
+        setTimeout(fill_note, 100)
+        return
+      }
+      event = jQuery.Event('keypress')
+      event.originalEvent = { charCode: 13 }
+      source_note.trigger(event)
+
+      source_note.tooltip('hide')
+      source_note.val('')
+      $('#dest_note').focus()
+    }
+    fill_note()
+  })
+})
+
+// Make transfer when pressing Enter on the amount section
+$('#amount, #reason, #last_name, #first_name, #bank').keypress((event) => {
+  if (event.originalEvent.charCode === 13) {
+    $('#btn_transfer').click()
+  }
+})
+
+$('#btn_transfer').click(function () {
+  if (LOCK) { return }
+
+  LOCK = true
+
+  let error = false
+
+  const amount_field = $('#amount')
+  amount_field.removeClass('is-invalid')
+  $('#amount-required').html('')
+
+  const reason_field = $('#reason')
+  reason_field.removeClass('is-invalid')
+  $('#reason-required').html('')
+
+  if (!amount_field.val() || isNaN(amount_field.val()) || amount_field.val() <= 0) {
+    amount_field.addClass('is-invalid')
+    $('#amount-required').html('<strong>' + gettext('This field is required and must contain a decimal positive number.') + '</strong>')
+    error = true
+  }
+
+  const amount = Math.round(100 * amount_field.val())
+  if (amount > 2147483647) {
+    amount_field.addClass('is-invalid')
+    $('#amount-required').html('<strong>' + gettext('The amount must stay under 21,474,836.47 €.') + '</strong>')
+    error = true
+  }
+
+  if (!reason_field.val() && $('#type_transfer').is(':checked')) {
+    reason_field.addClass('is-invalid')
+    $('#reason-required').html('<strong>' + gettext('This field is required.') + '</strong>')
+    error = true
+  }
+
+  if (!sources_notes_display.length && !$('#type_credit').is(':checked')) {
+    $('#source_note').addClass('is-invalid')
+    error = true
+  }
+
+  if (!dests_notes_display.length && !$('#type_debit').is(':checked')) {
+    $('#dest_note').addClass('is-invalid')
+    error = true
+  }
+
+  if (error) {
+    LOCK = false
+    return
+  }
+
+  let reason = reason_field.val()
+
+  if ($('#type_transfer').is(':checked')) {
+    // We copy the arrays to ensure that transactions are well-processed even if the form is reset
+    [...sources_notes_display].forEach(function (source) {
+      [...dests_notes_display].forEach(function (dest) {
+        if (source.note.id === dest.note.id) {
+          addMsg(interpolate(gettext('Warning: the transaction of %s from %s to %s was not made because ' +
+              'it is the same source and destination note.'), [pretty_money(amount), source.name, dest.name]), 'warning', 10000)
+          LOCK = false
+          return
+        }
+
+        $.post('/api/note/transaction/transaction/',
+          {
+            csrfmiddlewaretoken: CSRF_TOKEN,
+            quantity: source.quantity * dest.quantity,
+            amount: amount,
+            reason: reason,
+            valid: true,
+            polymorphic_ctype: TRANSFER_POLYMORPHIC_CTYPE,
+            resourcetype: 'Transaction',
+            source: source.note.id,
+            source_alias: source.name,
+            destination: dest.note.id,
+            destination_alias: dest.name
+          }).done(function () {
+          if (source.note.membership && source.note.membership.date_end < new Date().toISOString()) {
+            addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.'), [source.name]), 'danger', 30000)
+          }
+          if (dest.note.membership && dest.note.membership.date_end < new Date().toISOString()) {
+            addMsg(interpolate(gettext('Warning, the destination note %s is no more a BDE member.'), [dest.name]), 'danger', 30000)
+          }
+
+          if (!isNaN(source.note.balance)) {
+            const newBalance = source.note.balance - source.quantity * dest.quantity * amount
+            if (newBalance <= -2000) {
+              addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is very negative.'),
+                  [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000)
+              reset()
+              return
+            } else if (newBalance < 0) {
+              addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is negative.'),
+                  [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000)
+              reset()
+              return
+            }
+          }
+          addMsg(interpolate(gettext('Transfer of %s from %s to %s succeed!'),
+              [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name]), 'success', 10000)
+
+          reset()
+        }).fail(function (err) { // do it again but valid = false
+          const errObj = JSON.parse(err.responseText)
+          if (errObj.non_field_errors) {
+            addMsg(interpolate(gettext('Transfer of %s from %s to %s failed: %s'),
+                [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, errObj.non_field_errors]), 'danger')
+            LOCK = false
+            return
+          }
+
+          $.post('/api/note/transaction/transaction/',
+            {
+              csrfmiddlewaretoken: CSRF_TOKEN,
+              quantity: source.quantity * dest.quantity,
+              amount: amount,
+              reason: reason,
+              valid: false,
+              invalidity_reason: 'Solde insuffisant',
+              polymorphic_ctype: TRANSFER_POLYMORPHIC_CTYPE,
+              resourcetype: 'Transaction',
+              source: source.note.id,
+              source_alias: source.name,
+              destination: dest.note.id,
+              destination_alias: dest.name
+            }).done(function () {
+            addMsg(interpolate(gettext('Transfer of %s from %s to %s failed: %s'),
+                [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, gettext('insufficient funds')]), 'danger', 10000)
+            reset()
+          }).fail(function (err) {
+            const errObj = JSON.parse(err.responseText)
+            let error = errObj.detail ? errObj.detail : errObj.non_field_errors
+            if (!error) { error = err.responseText }
+            addMsg(interpolate(gettext('Transfer of %s from %s to %s failed: %s'),
+                [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, error]), 'danger')
+            LOCK = false
+          })
+        })
+      })
+    })
+  } else if ($('#type_credit').is(':checked') || $('#type_debit').is(':checked')) {
+    let special_note
+    let user_note
+    let alias
+    const given_reason = reason
+    let source_id, dest_id
+    if ($('#type_credit').is(':checked')) {
+      special_note = $('#credit_type').val()
+      user_note = dests_notes_display[0].note
+      alias = dests_notes_display[0].name
+      source_id = special_note
+      dest_id = user_note.id
+      reason = 'Crédit ' + $('#credit_type option:selected').text().toLowerCase()
+      if (given_reason.length > 0) { reason += ' (' + given_reason + ')' }
+    } else {
+      special_note = $('#debit_type').val()
+      user_note = sources_notes_display[0].note
+      alias = sources_notes_display[0].name
+      source_id = user_note.id
+      dest_id = special_note
+      reason = 'Retrait ' + $('#debit_type option:selected').text().toLowerCase()
+      if (given_reason.length > 0) { reason += ' (' + given_reason + ')' }
+    }
+    $.post('/api/note/transaction/transaction/',
+      {
+        csrfmiddlewaretoken: CSRF_TOKEN,
+        quantity: 1,
+        amount: amount,
+        reason: reason,
+        valid: true,
+        polymorphic_ctype: SPECIAL_TRANSFER_POLYMORPHIC_CTYPE,
+        resourcetype: 'SpecialTransaction',
+        source: source_id,
+        source_alias: sources_notes_display.length ? alias : null,
+        destination: dest_id,
+        destination_alias: dests_notes_display.length ? alias : null,
+        last_name: $('#last_name').val(),
+        first_name: $('#first_name').val(),
+        bank: $('#bank').val()
+      }).done(function () {
+      addMsg(gettext('Credit/debit succeed!'), 'success', 10000)
+      if (user_note.membership && user_note.membership.date_end < new Date().toISOString()) { addMsg(gettext('Warning, the emitter note %s is no more a BDE member.'), 'danger', 10000) }
+      reset()
+    }).fail(function (err) {
+      const errObj = JSON.parse(err.responseText)
+      let error = errObj.detail ? errObj.detail : errObj.non_field_errors
+      if (!error) { error = err.responseText }
+      addMsg(interpolate(gettext('Credit/debit failed: %s'), [error]), 'danger', 10000)
+      LOCK = false
+    })
+  }
+})

apps/food/tables.py

@@ -1,21 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import django_tables2 as tables
-
-from .models import Food
-
-
-class FoodTable(tables.Table):
-    """
-    List all foods.
-    """
-    class Meta:
-        model = Food
-        template_name = 'django_tables2/bootstrap4.html'
-        fields = ('name', 'owner', 'allergens', 'expiry_date')
-        row_attrs = {
-            'class': 'table-row',
-            'data-href': lambda record: 'detail/' + str(record.pk),
-            'style': 'cursor:pointer',
-        }

apps/food/templates/food/basic_food_form.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}
@@ -8,6 +7,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% block content %}
 <div class="card bg-white mb-3">
   <h3 class="card-header text-center">
+    HTML not finished <br>
     {{ title }}
   </h3>
   <div class="card-body" id="form">

apps/food/templates/food/basicfood_detail.html

@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    HTML not finished <br>
+    {{ title }}
+  </h3>
+  <div class="card-body">
+      <p>name : {{ food.name }}</p>
+      <a href="{% url "food:basic_update" pk=food.pk %}">Update</a>
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/create_food_form.html

@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    HTML not finished <br>
+    {{ title }}
+  </h3>
+    <div class="row">
+        <div class="col-xl-12">
+            <div class="btn-group btn-block">
+                <a href="{% url "food:basic_create" %}" class="btn btn-sm btn-outline-primary">Basic</a>
+                <a href="{% url "food:transformed_create" %}" class="btn btn-sm btn-outline-primary">Transformed</a>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

apps/food/templates/food/create_qrcode_form.html

@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    HTML not finished <br>
+    {{ title }}
+  </h3>
+    <div class="row">
+        <div class="col-xl-12">
+            <div class="btn-group btn-block">
+                <a href="{% url "food:qrcode_basic_create" slug=slug %}" class="btn btn-sm btn-outline-primary">Basic</a>
+                <a href="{% url "food:qrcode_transformed_create" slug=slug %}" class="btn btn-sm btn-outline-primary">Transformed</a>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}

apps/food/templates/food/food_detail.html

@@ -1,53 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }} {{ food.name }}
-  </h3>
-  <div class="card-body">
-    <ul>
-      {% for field, value in fields %}
-      <li> {{ field }} : {{ value }}</li>
-      {% endfor %}
-      {% if meals %}
-      <li> {% trans "Contained in" %} : 
-      {% for meal in meals %}
-      <a href="{% url "food:transformedfood_view" pk=meal.pk %}">{{ meal.name }}</a>{% if not forloop.last %},{% endif %} 
-      {% endfor %}
-      </li>
-      {% endif %}
-      {% if foods %}
-      <li> {% trans "Contain" %} : 
-      {% for food in foods %}
-        <a href="{% url "food:food_view" pk=food.pk %}">{{ food.name }}</a>{% if not forloop.last %},{% endif %}
-      {% endfor %}
-      </li>
-      {% endif %}
-    </ul>
-      {% if update %}
-	<a class="btn btn-sm btn-secondary" href="{% url "food:food_update" pk=food.pk %}">
-	  {% trans "Update" %}
-	</a>
-      {% endif %}
-      {% if add_ingredient %}
-	<a class="btn btn-sm btn-primary" href="{% url "food:add_ingredient" pk=food.pk %}">
-	  {% trans "Add to a meal" %}
-	</a>
-      {% endif %}
-      {% if manage_ingredients %}
-        <a class="btn btn-sm btn-secondary" href="{% url "food:manage_ingredients" pk=food.pk %}">
-	  {% trans "Manage ingredients" %}
-	</a>
-      {% endif %}
-	<a class="btn btn-sm btn-primary" href="{% url "food:food_list" %}">
-	  {% trans "Return to the food list" %}
-	</a>
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/food_list.html

@@ -1,71 +0,0 @@
-{% extends "base_search.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load render_table from django_tables2 %}
-{% load i18n %}
-
-{% block content %}
-{{ block.super }}
-<br>
-<div class="card bg-light mb-3">
-  <h3 class="card-header text-center">
-    {% trans "Meal served" %}
-  </h3>
-  {% if can_add_meal %}
-  <div class="card-footer">
-    <a class="btn btn-sm btn-primary" href="{% url 'food:transformedfood_create' %}">
-      {% trans "New meal" %}
-    </a>
-  </div>
-  {% endif %}
-  {% if served.data %}
-  {% render_table served %}
-  {% else %}
-  <div class="card-body">
-    <div class="alert alert-warning">
-      {% trans "There is no meal served." %}
-    </div>
-  </div>
-</div>
-  {% endif %}
-<div class="card bg-light mb-3">
-  <h3 class="card-header text-center">
-    {% trans "Free food" %}
-  </h3>
-  {% if open.data %}
-  {% render_table open %}
-  {% else %}
-  <div class="card-body">
-    <div class="alert alert-warning">
-      {% trans "There is no free food." %}
-    </div>
-  </div>
-  {% endif %}
-</div>
-{% if club_tables %}
-<div class="card bg-light mb-3">
-  <h3 class="card-header text-center">
-    {% trans "Food of your clubs" %}
-  </h3>
-</div>
-  {% for table in club_tables %}
-<div class="card bg-light mb-3">
-  <h3 class="card-header text-center">
-    {% trans "Food of club" %} {{ table.prefix }} 
-  </h3>
-  {% if table.data %}
-    {% render_table table %}
-  {% else %}
-  <div class="card-body">
-    <div class="alert alert-warning">
-      {% trans "Yours club has not food yet." %}
-    </div>
-  </div>
-  {% endif %}
-</div>
-  {% endfor %}
-  {% endif %}
-</div>
-{% endblock %}

apps/food/templates/food/manage_ingredients.html

@@ -1,116 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form"></div>
-  <form method="post" action="">
-    {% csrf_token %}
-    <table class="table table-condensed table-striped">
-      {# Fill initial data #}
-      {% for display, form in formset %}
-      {% if forloop.first %}
-      <thead>
-	<tr>
-	  <th>{{ form.name.label }}</th>
-	  <th>{{ form.qrcode.label }}</th>
-	  <th>{{ form.fully_used.label }}</th>
-	</tr>
-      </thead>
-      <tbody id="form_body">
-	{% endif %}
-	{% if display %}
-	<tr class="row-formset ingredients">
-	{% else %}
-	<tr class="row-formset ingredients" style="display: none">
-	{% endif %}
-	  <td>{{ form.name }}</td>
-	  <td>{{ form.qrcode }}</td>
-	  <td>{{ form.fully_used }}</td>
-	</tr>
-      {% endfor %}
-      </tbody>
-    </table>
-
-    {# Display buttons to add and remove ingredients #}
-    <div class="card-body">
-      <div class="btn-group btn-block" role="group">
-	<button type="button" id="add_more" class="btn btn-success">{% trans "Add ingredient" %}</button>
-	<button type="button" id="remove_one" class="btn btn-danger">{% trans "Remove ingredient" %}</button>
-      </div>
-    <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </div>
-  </form>
-</div>
-
-{% endblock %}
-{% block extrajavascript %} 
-<script>
-/* script that handles add and remove lines */
-
-const foods = {{ ingredients | safe }};
-
-function set_ingredient_id () {
-	let ingredients = document.getElementsByClassName('ingredients');
-	for (var i = 0; i < ingredients.length; i++) {
-		ingredients[i].id = 'ingredients-' + parseInt(i);
-	};
-}
-set_ingredient_id();
-
-function prepopulate () {
-	for (var i = 0; i < {{ ingredients_count }}; i++) {
-		let prefix = 'id_form-' + parseInt(i) + '-';
-		document.getElementById(prefix + 'name_pk').value = parseInt(foods[i]['food_pk']);
-		document.getElementById(prefix + 'name').value = foods[i]['food_name'];
-		document.getElementById(prefix + 'qrcode_pk').value = parseInt(foods[i]['qr_pk']);
-		if (foods[i]['qr_number'] === '') {
-			document.getElementById(prefix + 'qrcode').value = '';
-		}
-		else {
-		document.getElementById(prefix + 'qrcode').value = parseInt(foods[i]['qr_number']);
-		};
-		document.getElementById(prefix + 'fully_used').checked = Boolean(foods[i]['fully_used']);
-	};
-}
-prepopulate();
-
-function delete_form_data (form_id) {
-	let prefix = "id_form-" + parseInt(form_id) + "-";
-	document.getElementById(prefix + "name_pk").value = "";
-	document.getElementById(prefix + "name").value = "";
-	document.getElementById(prefix + "qrcode_pk").value = "";
-	document.getElementById(prefix + "qrcode").value = "";
-	document.getElementById(prefix + "fully_used").checked = true;
-}
-var form_count = {{ ingredients_count }} + 1;
-
-$('#add_more').click(function () {
-	let ingredient_form = document.getElementById('ingredients-' + parseInt(form_count));
-	if (ingredient_form === null) {
-		addMsg(gettext("You can't add more ingredient"), "danger",  5000);
-		return;};
-	ingredient_form.style = "display: true";
-	form_count += 1;
-});
-  
-$('#remove_one').click(function () {
-	let ingredient_form = document.getElementById('ingredients-' + parseInt(form_count - 1));
-	if (ingredient_form === null) {
-		return;};
-	ingredient_form.style = "display: none";
-	delete_form_data(form_count - 1);
-	form_count -= 1;
-});
-
-addMsg(gettext("Add ingredient with their name or their qrcode, if two different priority is given to qrcode"), "warning"); 
-
-</script>
-{% endblock %}

apps/food/templates/food/qrcode.html

@@ -1,52 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-{% load render_table from django_tables2 %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {% csrf_token %}
-      {{ form | crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-    <div class="card-body">
-    <h4>
-      {% trans "Copy constructor" %}
-      <a class="btn btn-secondary" href="{% url "food:basicfood_create" slug=slug %}">{% trans "New food" %}</a>
-    </h4>
-      <table class="table">
-	<thead>
-	  <tr>
-	    <th class="orderable">
-	      {% trans "Name" %}
-	    </th>
-	    <th class="orderable">
-	      {% trans "Owner" %}
-	    </th>
-	    <th class="orderable">
-	      {% trans "Expiry date" %}
-	    </th>
-	  </tr>
-	</thead>
-	<tbody>
-	  {% for food in last_items %}
-	    <tr>
-		    <td><a href="{% url "food:basicfood_create" slug=slug %}?copy={{ food.pk }}">{{ food.name }}</a></td>
-	      <td>{{ food.owner }}</td>
-	      <td>{{ food.expiry_date }}</td>
-	    </tr>
-	  {% endfor %}
-	</tbody>
-      </table>
-    </div>
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/qrcode_detail.html

@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    HTML not finished <br>
+    {{ title }}
+  </h3>
+  <div class="card-body">
+      <p>qrcode : {{ qrcode.qr_code_number }}</p>
+      <p>name : {{ qrcode.food_container.name }}</p>
+      {% if qrcode.food_container.polymorphic_ctype.name == 'Basic food' %}
+          <a href="{% url "food:basic_update" pk=qrcode.food_container.pk %}">Update</a>
+      {% else %}
+          <a href="{% url "food:transformed_update" pk=qrcode.food_container.pk %}">Update</a>
+      {% endif %}
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/transformed_food_form.html

@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    HTML not finished <br>
+    {{ title }}
+  </h3>
+  <div class="card-body" id="form">
+    <form method="post">
+      {%  csrf_token %}
+      {{ form|crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/transformedfood_detail.html

@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    HTML not finished <br>
+    {{ title }}
+  </h3>
+  <div class="card-body">
+    <p>name : {{ food.name }}</p>
+    <p>owner : {{ food.owner }}</p>
+    <a href="{% url "food:transformed_update" pk=food.pk %}">Update</a>
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/transformedfood_update.html

@@ -1,87 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {% csrf_token %}
-      {{ form | crispy }}
-      <table class="table table-condensed table-striped">
-        {# Fill initial data #}
-        {% for ingredient_form in formset %}
-        {% if forloop.first %}
-        <thead>
-          <tr>
-	    <th>{% trans "Name" %}</th>
-	    <th>{% trans "QR-code number" %}</th>
-	    <th>{% trans "Fully used" %}<th>
-          </tr>
-        </thead>
-        <tbody id="form_body">
-        {% endif %}
-        <tr class="row-formset">
-		{{ ingredient_form | crispy }}
-          <td>{{ ingredient_form.name }}</td>
-	  <td>{{ ingredient_form.qrcode }}</td>
-	  <td>{{ ingredient_form.fully_used }}</td>
-        </tr>
-        {% endfor %}
-        </tbody>
-      </table>
-      {# Display buttons to add and remove products #}
-      <div class="card-body">
-        <div class="btn-group btn-block" role="group">
-          <button type="button" id="add_more" class="btn btn-success">{% trans "Add ingredient" %}</button>
-	  <button type="button" id="remove_one" class="btn btn-danger">{% trans "Remove ingredient" %}</button>
-        </div>
-        <button type="submit" class="btn btn-block btn-primary">{% trans "Submit" %}</button>
-      </div>
-    </form>
-  </div>
-</div>
-
-{# Hidden div that store an empty product form, to be copied into new forms #}
-<div id="empty_form" style="display: none;">
-    <table class='no_error'>
-        <tbody id="for_real">
-            <tr class="row-formset">
-                <td>{{ formset.empty_form.name }}</td>
-		<td>{{ formset.empty_form.qrcode }}</td>
-		<td>{{ formset.empty_form.fully_used }}</td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-{% endblock %}
-{% block extrajavascript %}
-<script>
-    /* script that handles add and remove lines */
-    IDS = {};
-
-    $("#id_form-TOTAL_FORMS").val($(".row-formset").length - 1);
-
-    $('#add_more').click(function () {
-        let form_idx = $('#id_form-TOTAL_FORMS').val();
-        $('#form_body').append($('#for_real').html().replace(/__prefix__/g, form_idx));
-        $('#id_form-TOTAL_FORMS').val(parseInt(form_idx) + 1);
-        $('#id_form-' + parseInt(form_idx) + '-id').val(IDS[parseInt(form_idx)]);
-    });
-
-    $('#remove_one').click(function () {
-        let form_idx = $('#id_form-TOTAL_FORMS').val();
-        if (form_idx > 0) {
-            IDS[parseInt(form_idx) - 1] = $('#id_form-' + (parseInt(form_idx) - 1) + '-id').val();
-            $('#form_body tr:last-child').remove();
-            $('#id_form-TOTAL_FORMS').val(parseInt(form_idx) - 1);
-        }
-    });
-</script>
-{% endblock %}

apps/food/tests.py

@@ -0,0 +1,3 @@
+# from django.test import TestCase
+
+# Create your tests here.

apps/food/tests/test_food.py

@@ -1,170 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from api.tests import TestAPI
-from django.contrib.auth.models import User
-from django.test import TestCase
-from django.urls import reverse
-from django.utils import timezone
-
-from ..api.views import AllergenViewSet, BasicFoodViewSet, TransformedFoodViewSet, QRCodeViewSet
-from ..models import Allergen, BasicFood, TransformedFood, QRCode
-
-
-class TestFood(TestCase):
-    """
-    Test food
-    """
-    fixtures = ('initial',)
-
-    def setUp(self):
-        self.user = User.objects.create_superuser(
-            username='admintoto',
-            password='toto1234',
-            email='toto@example.com'
-        )
-        self.client.force_login(self.user)
-
-        sess = self.client.session
-        sess['permission_mask'] = 42
-        sess.save()
-
-        self.allergen = Allergen.objects.create(
-            name='allergen',
-        )
-
-        self.basicfood = BasicFood.objects.create(
-            name='basicfood',
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=False,
-            date_type='DLC',
-        )
-
-        self.transformedfood = TransformedFood.objects.create(
-            name='transformedfood',
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=False,
-        )
-
-        self.qrcode = QRCode.objects.create(
-            qr_code_number=1,
-            food_container=self.basicfood,
-        )
-
-        def test_food_list(self):
-            """
-            Display food list
-            """
-            response = self.client.get(reverse('food:food_list'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_qrcode_create(self):
-            """
-            Display QRCode creation
-            """
-            response = self.client.get(reverse('food:qrcode_create'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_basicfood_create(self):
-            """
-            Display BasicFood creation
-            """
-            response = self.client.get(reverse('food:basicfood_create'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_transformedfood_create(self):
-            """
-            Display TransformedFood creation
-            """
-            response = self.client.get(reverse('food:transformedfood_create'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_food_create(self):
-            """
-            Display Food update
-            """
-            response = self.client.get(reverse('food:food_update'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_food_view(self):
-            """
-            Display Food detail
-            """
-            response = self.client.get(reverse('food:food_view'))
-            self.assertEqual(response.status_code, 302)
-
-        def test_basicfood_view(self):
-            """
-            Display BasicFood detail
-            """
-            response = self.client.get(reverse('food:basicfood_view'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_transformedfood_view(self):
-            """
-            Display TransformedFood detail
-            """
-            response = self.client.get(reverse('food:transformedfood_view'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_add_ingredient(self):
-            """
-            Display add ingredient view
-            """
-            response = self.client.get(reverse('food:add_ingredient'))
-            self.assertEqual(response.status_code, 200)
-
-
-class TestFoodAPI(TestAPI):
-    def setUp(self) -> None:
-        super().setUP()
-
-        self.allergen = Allergen.objects.create(
-            name='name',
-        )
-
-        self.basicfood = BasicFood.objects.create(
-            name='basicfood',
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=False,
-            date_type='DLC',
-        )
-
-        self.transformedfood = TransformedFood.objects.create(
-            name='transformedfood',
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=False,
-        )
-
-        self.qrcode = QRCode.objects.create(
-            qr_code_number=1,
-            food_container=self.basicfood,
-        )
-
-        def test_allergen_api(self):
-            """
-            Load Allergen API page and test all filters and permissions
-            """
-            self.check_viewset(AllergenViewSet, '/api/food/allergen/')
-
-        def test_basicfood_api(self):
-            """
-            Load BasicFood API page and test all filters and permissions
-            """
-            self.check_viewset(BasicFoodViewSet, '/api/food/basicfood/')
-
-        def test_transformedfood_api(self):
-            """
-            Load TransformedFood API page and test all filters and permissions
-            """
-            self.check_viewset(TransformedFoodViewSet, '/api/food/transformedfood/')
-
-        def test_qrcode_api(self):
-            """
-            Load QRCode API page and test all filters and permissions
-            """
-            self.check_viewset(QRCodeViewSet, '/api/food/qrcode/')

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
@@ -8,14 +8,16 @@ from . import views
 app_name = 'food'
 
 urlpatterns = [
-    path('', views.FoodListView.as_view(), name='food_list'),
+    path('<int:slug>', views.QRCodeView.as_view(), name='qrcode_view'),
-    path('<int:slug>', views.QRCodeCreateView.as_view(), name='qrcode_create'),
+    path('detail/<int:pk>', views.FoodView.as_view(), name='food_view'),
-    path('<int:slug>/add/basic', views.BasicFoodCreateView.as_view(), name='basicfood_create'),
+
-    path('add/transformed', views.TransformedFoodCreateView.as_view(), name='transformedfood_create'),
+    path('<int:slug>/create_qrcode', views.QRCodeCreateView.as_view(), name='qrcode_create'),
-    path('update/<int:pk>', views.FoodUpdateView.as_view(), name='food_update'),
+    path('create', views.FoodCreateView.as_view(), name='food_create'),
-    path('update/ingredients/<int:pk>', views.ManageIngredientsView.as_view(), name='manage_ingredients'),
+    path('<int:slug>/create_qrcode/basic', views.QRCodeBasicFoodCreateView.as_view(), name='qrcode_basic_create'),
-    path('detail/<int:pk>', views.FoodDetailView.as_view(), name='food_view'),
+    path('<int:slug>/create_qrcode/transformed', views.QRCodeTransformedFoodCreateView.as_view(), name='qrcode_transformed_create'),
-    path('detail/basic/<int:pk>', views.BasicFoodDetailView.as_view(), name='basicfood_view'),
+    path('create/basic', views.BasicFoodCreateView.as_view(), name='basic_create'),
-    path('detail/transformed/<int:pk>', views.TransformedFoodDetailView.as_view(), name='transformedfood_view'),
+    path('create/transformed', views.TransformedFoodCreateView.as_view(), name='transformed_create'),
-    path('add/ingredient/<int:pk>', views.AddIngredientView.as_view(), name='add_ingredient'),
+
+    path('update/basic/<int:pk>', views.BasicFoodUpdateView.as_view(), name='basic_update'),
+    path('update/transformed/<int:pk>', views.TransformedFoodUpdateView.as_view(), name='transformed_update'),
 ]

apps/food/utils.py

@@ -1,53 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.utils.translation import gettext_lazy as _
-
-seconds = (_('second'), _('seconds'))
-minutes = (_('minute'), _('minutes'))
-hours = (_('hour'), _('hours'))
-days = (_('day'), _('days'))
-weeks = (_('week'), _('weeks'))
-
-
-def plural(x):
-    if x == 1:
-        return 0
-    return 1
-
-
-def pretty_duration(duration):
-    """
-    I receive datetime.timedelta object
-    You receive string object
-    """
-    text = []
-    sec = duration.seconds
-    d = duration.days
-
-    if d >= 7:
-        w = d // 7
-        text.append(str(w) + ' ' + weeks[plural(w)])
-        d -= w * 7
-    if d > 0:
-        text.append(str(d) + ' ' + days[plural(d)])
-
-    if sec >= 3600:
-        h = sec // 3600
-        text.append(str(h) + ' ' + hours[plural(h)])
-        sec -= h * 3600
-
-    if sec >= 60:
-        m = sec // 60
-        text.append(str(m) + ' ' + minutes[plural(m)])
-        sec -= m * 60
-
-    if sec > 0:
-        text.append(str(sec) + ' ' + seconds[plural(sec)])
-
-    if len(text) == 0:
-        return ''
-    if len(text) == 1:
-        return text[0]
-    if len(text) >= 2:
-        return ', '.join(t for t in text[:-1]) + ' ' + _('and') + ' ' + text[-1]

apps/food/views.py

@@ -1,483 +1,251 @@
-# 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
 
-from api.viewsets import is_regex
-from django_tables2.views import MultiTableMixin
 from django.db import transaction
-from django.db.models import Q
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponseRedirect, Http404
+from django.http import HttpResponseRedirect
-from django.views.generic import DetailView, UpdateView, CreateView
+from django.urls import reverse
-from django.views.generic.list import ListView
-from django.urls import reverse_lazy
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from member.models import Club, Membership
+from django.utils import timezone
-from permission.backends import PermissionBackend
+from django.views.generic import DetailView, UpdateView, TemplateView
-from permission.views import ProtectQuerysetMixin, ProtectedCreateView, LoginRequiredMixin
+from permission.views import ProtectQuerysetMixin, ProtectedCreateView
 
-from .models import Food, BasicFood, TransformedFood, QRCode
+from .forms import BasicFoodForms, TransformedFoodForms
-from .forms import QRCodeForms, BasicFoodForms, TransformedFoodForms, \
+from .models import BasicFood, Food, QRCode, TransformedFood
-    ManageIngredientsForm, ManageIngredientsFormSet, AddIngredientForms, \
-    BasicFoodUpdateForms, TransformedFoodUpdateForms
-from .tables import FoodTable
-from .utils import pretty_duration
 
 
-class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
+class QRCodeView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
-    Display Food
+    A view to add a basic food
-    """
-    model = Food
-    tables = [FoodTable, FoodTable, FoodTable, ]
-    extra_context = {"title": _('Food')}
-    template_name = 'food/food_list.html'
-
-    def get_queryset(self, **kwargs):
-        return super().get_queryset(**kwargs).distinct()
-
-    def get_tables(self):
-        bureau_role_pk = 4
-        clubs = Club.objects.filter(membership__in=Membership.objects.filter(
-            user=self.request.user, roles=bureau_role_pk).filter(
-                date_end__gte=timezone.now()))
-
-        tables = [FoodTable] * (clubs.count() + 3)
-        self.tables = tables
-        tables = super().get_tables()
-        tables[0].prefix = 'search-'
-        tables[1].prefix = 'open-'
-        tables[2].prefix = 'served-'
-        for i in range(clubs.count()):
-            tables[i + 3].prefix = clubs[i].name
-        return tables
-
-    def get_tables_data(self):
-        # table search
-        qs = self.get_queryset().order_by('name')
-        if "search" in self.request.GET and self.request.GET['search']:
-            pattern = self.request.GET['search']
-
-            # check regex
-            valid_regex = is_regex(pattern)
-            suffix = '__iregex' if valid_regex else '__istartswith'
-            prefix = '^' if valid_regex else ''
-            qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern})
-                           | Q(**{f'owner__name{suffix}': prefix + pattern}))
-        else:
-            qs = qs.none()
-        search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Food, 'view'))
-        # table open
-        open_table = self.get_queryset().order_by('expiry_date').filter(
-            Q(polymorphic_ctype__model='transformedfood')
-            | Q(polymorphic_ctype__model='basicfood', basicfood__date_type='DLC')).filter(
-                expiry_date__lt=timezone.now(), end_of_life='').filter(
-                    PermissionBackend.filter_queryset(self.request, Food, 'view'))
-        # table served
-        served_table = self.get_queryset().order_by('-pk').filter(
-            end_of_life='', is_ready=True).exclude(
-                Q(polymorphic_ctype__model='basicfood',
-                  basicfood__date_type='DLC',
-                  expiry_date__lte=timezone.now(),)
-                | Q(polymorphic_ctype__model='transformedfood',
-                    expiry_date__lte=timezone.now(),
-                    ))
-        # tables club
-        bureau_role_pk = 4
-        clubs = Club.objects.filter(membership__in=Membership.objects.filter(
-            user=self.request.user, roles=bureau_role_pk).filter(
-                date_end__gte=timezone.now()))
-        club_table = []
-        for club in clubs:
-            club_table.append(self.get_queryset().order_by('expiry_date').filter(
-                owner=club, end_of_life='').filter(
-                    PermissionBackend.filter_queryset(self.request, Food, 'view')
-            ))
-        return [search_table, open_table, served_table] + club_table
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        tables = context['tables']
-        # for extends base_search.html we need to name 'search_table' in 'table'
-        for name, table in zip(['table', 'open', 'served'], tables):
-            context[name] = table
-        context['club_tables'] = tables[3:]
-
-        context['can_add_meal'] = PermissionBackend.check_perm(self.request, 'food.transformedfood_add')
-        return context
-
-
-class QRCodeCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
-    """
-    A view to add qrcode
     """
     model = QRCode
-    template_name = 'food/qrcode.html'
+    extra_context = {"title": _("Add a new meal")}
-    form_class = QRCodeForms
+    context_object_name = "qrcode"
-    extra_context = {"title": _("Add a new QRCode")}
+    slug_field = "qr_code_number"
 
     def get(self, *args, **kwargs):
         qrcode = kwargs["slug"]
         if self.model.objects.filter(qr_code_number=qrcode).count() > 0:
-            pk = self.model.objects.get(qr_code_number=qrcode).food_container.pk
-            return HttpResponseRedirect(reverse_lazy("food:food_view", kwargs={"pk": pk}))
-        else:
             return super().get(*args, **kwargs)
+        else:
+            return HttpResponseRedirect(reverse("food:qrcode_create", kwargs=kwargs))
 
-    @transaction.atomic
-    def form_valid(self, form):
-        qrcode_food_form = QRCodeForms(data=self.request.POST)
-        if not qrcode_food_form.is_valid():
-            return self.form_invalid(form)
 
-        qrcode = form.save(commit=False)
+class QRCodeCreateView(ProtectQuerysetMixin, LoginRequiredMixin, TemplateView):
-        qrcode.qr_code_number = self.kwargs['slug']
+    """
-        qrcode._force_save = True
+    A view to add a basic food
-        qrcode.save()
+    """
-        qrcode.refresh_from_db()
+    template_name = 'food/create_qrcode_form.html'
-        return super().form_valid(form)
+    extra_context = {"title": _("Add a new aliment")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['slug'] = self.kwargs['slug']
+        context["slug"] = kwargs["slug"]
-
-        # get last 10 BasicFood objects with distincts 'name' ordered by '-pk'
-        # we can't use .distinct and .order_by with differents columns hence the generator
-        context['last_items'] = [food for food in BasicFood.get_lastests_objects(10, 'name', '-pk')]
         return context
 
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse_lazy('food:food_view', kwargs={'pk': self.object.food_container.pk})
 
-    def get_sample_object(self):
+class FoodView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
-        return QRCode(
-            qr_code_number=self.kwargs['slug'],
-            food_container_id=1,
-        )
-
-
-class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
     """
-    A view to add basicfood
+    A view to add a basic food
+    """
+    model = Food
+    extra_context = {"title": _("Add a new meal")}
+    context_object_name = "food"
+
+
+class FoodCreateView(ProtectQuerysetMixin, LoginRequiredMixin, TemplateView):
+    """
+    A view to add a basic food
+    """
+    template_name = 'food/create_food_form.html'
+    extra_context = {"title": _("Add a new aliment")}
+
+
+class BasicFoodFormView(ProtectQuerysetMixin):
+    #####################################################################
+    # TO DO
+    # - fix picture save
+    # - implement solution crop and convert image (reuse or recode ImageForm from members apps)
+    #####################################################################
+    """
+    A view to add a basic food
     """
     model = BasicFood
     form_class = BasicFoodForms
-    extra_context = {"title": _("Add an aliment")}
+    template_name = 'food/basic_food_form.html'
-    template_name = "food/food_update.html"
+    extra_context = {"title": _("Add a new aliment")}
-
-    def get_sample_object(self):
-        return BasicFood(
-            name="",
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=True,
-            arrival_date=timezone.now(),
-            date_type='DLC',
-        )
-
-    @transaction.atomic
-    def form_valid(self, form):
-        if QRCode.objects.filter(qr_code_number=self.kwargs['slug']).count() > 0:
-            return HttpResponseRedirect(reverse_lazy('food:qrcode_create', kwargs={'slug': self.kwargs['slug']}))
-        food_form = BasicFoodForms(data=self.request.POST)
-        if not food_form.is_valid():
-            return self.form_invalid(form)
-
-        food = form.save(commit=False)
-        food.is_ready = False
-        food.save()
-        food.refresh_from_db()
-
-        qrcode = QRCode()
-        qrcode.qr_code_number = self.kwargs['slug']
-        qrcode.food_container = food
-        qrcode.save()
-
-        return super().form_valid(form)
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse_lazy('food:basicfood_view', kwargs={"pk": self.object.pk})
-
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-
-        copy = self.request.GET.get('copy', None)
-        if copy is not None:
-            food = BasicFood.objects.get(pk=copy)
-            print(context['form'].fields)
-            for field in context['form'].fields:
-                if field == 'allergens':
-                    context['form'].fields[field].initial = getattr(food, field).all()
-                else:
-                    context['form'].fields[field].initial = getattr(food, field)
-
-        return context
-
-
-class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
-    """
-    A view to add transformedfood
-    """
-    model = TransformedFood
-    form_class = TransformedFoodForms
-    extra_context = {"title": _("Add a meal")}
-    template_name = "food/food_update.html"
-
-    def get_sample_object(self):
-        return TransformedFood(
-            name="",
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=True,
-        )
-
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.expiry_date = timezone.now() + timedelta(days=3)
-        form.instance.is_ready = False
-        return super().form_valid(form)
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse_lazy('food:transformedfood_view', kwargs={"pk": self.object.pk})
-
-
-MAX_FORMS = 10
-
-
-class ManageIngredientsView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    A view to manage ingredient for a transformed food
-    """
-    model = TransformedFood
-    fields = ['ingredients']
-    extra_context = {"title": _("Manage ingredients of:")}
-    template_name = 'food/manage_ingredients.html'
-
-    @transaction.atomic
-    def form_valid(self, form):
-        old_ingredients = list(self.object.ingredients.all()).copy()
-        old_allergens = list(self.object.allergens.all()).copy()
-        self.object.ingredients.clear()
-        for i in range(self.object.ingredients.all().count() + 1 + MAX_FORMS):
-            prefix = 'form-' + str(i) + '-'
-            if form.data[prefix + 'qrcode'] not in ['0', '']:
-                ingredient = QRCode.objects.get(pk=form.data[prefix + 'qrcode']).food_container
-                self.object.ingredients.add(ingredient)
-                if (prefix + 'fully_used') in form.data and form.data[prefix + 'fully_used'] == 'on':
-                    ingredient.end_of_life = _('Fully used in {meal}'.format(
-                        meal=self.object.name))
-                    ingredient.save()
-
-            elif form.data[prefix + 'name'] != '':
-                ingredient = Food.objects.get(pk=form.data[prefix + 'name'])
-                self.object.ingredients.add(ingredient)
-                if (prefix + 'fully_used') in form.data and form.data[prefix + 'fully_used'] == 'on':
-                    ingredient.end_of_life = _('Fully used in {meal}'.format(
-                        meal=self.object.name))
-                    ingredient.save()
-
-        self.object.save(old_ingredients=old_ingredients, old_allergens=old_allergens)
-        return HttpResponseRedirect(self.get_success_url())
-
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context['title'] += ' ' + self.object.name
-        formset = ManageIngredientsFormSet()
-        ingredients = self.object.ingredients.all()
-        formset.extra += ingredients.count() + MAX_FORMS
-        context['form'] = ManageIngredientsForm()
-        context['ingredients_count'] = ingredients.count()
-        display = [True] * (1 + ingredients.count()) + [False] * (formset.extra - ingredients.count() - 1)
-        context['formset'] = zip(display, formset)
-        context['ingredients'] = []
-        for ingredient in ingredients:
-            qr = QRCode.objects.filter(food_container=ingredient)
-
-            context['ingredients'].append({
-                'food_pk': ingredient.pk,
-                'food_name': ingredient.name,
-                'qr_pk': '' if qr.count() == 0 else qr[0].pk,
-                'qr_number': '' if qr.count() == 0 else qr[0].qr_code_number,
-                'fully_used': 'true' if ingredient.end_of_life else '',
-            })
-        return context
-
-    def get_success_url(self, **kwargs):
-        return reverse_lazy('food:transformedfood_view', kwargs={"pk": self.object.pk})
-
-
-class AddIngredientView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    A view to add ingredient to a meal
-    """
-    model = Food
-    extra_context = {"title": _("Add the ingredient:")}
-    form_class = AddIngredientForms
-    template_name = 'food/food_update.html'
-
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context['title'] += ' ' + self.object.name
-        return context
-
-    @transaction.atomic
-    def form_valid(self, form):
-        meals = TransformedFood.objects.filter(pk__in=form.data.getlist('ingredients')).all()
-        if not meals:
-            return HttpResponseRedirect(reverse_lazy('food:food_view', kwargs={"pk": self.object.pk}))
-        for meal in meals:
-            old_ingredients = list(meal.ingredients.all()).copy()
-            old_allergens = list(meal.allergens.all()).copy()
-            meal.ingredients.add(self.object.pk)
-            # update allergen and expiry date if necessary
-            if not (self.object.polymorphic_ctype.model == 'basicfood'
-                    and self.object.date_type == 'DDM'):
-                meal.expiry_date = min(meal.expiry_date, self.object.expiry_date)
-            meal.allergens.set(meal.allergens.union(self.object.allergens.all()))
-            meal.save(old_ingredients=old_ingredients, old_allergens=old_allergens)
-            if 'fully_used' in form.data:
-                if not self.object.end_of_life:
-                    self.object.end_of_life = _(f'Food fully used in : {meal.name}')
-                else:
-                    self.object.end_of_life += ', ' + meal.name
-        if 'fully_used' in form.data:
-            self.object.is_ready = False
-        self.object.save()
-        # We redirect only the first parent
-        parent_pk = meals[0].pk
-        return HttpResponseRedirect(self.get_success_url(parent_pk=parent_pk))
-
-    def get_success_url(self, **kwargs):
-        return reverse_lazy('food:transformedfood_view', kwargs={"pk": kwargs['parent_pk']})
-
-
-class FoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    A view to update Food
-    """
-    model = Food
-    extra_context = {"title": _("Update an aliment")}
-    template_name = 'food/food_update.html'
 
     @transaction.atomic
     def form_valid(self, form):
         form.instance.creater = self.request.user
-        food = Food.objects.get(pk=self.kwargs['pk'])
+        basic_food_form = BasicFoodForms(data=self.request.POST)
-        old_allergens = list(food.allergens.all()).copy()
+        if not basic_food_form.is_valid():
-
-        if food.polymorphic_ctype.model == 'transformedfood':
-            old_ingredients = food.ingredients.all()
-            form.instance.shelf_life = timedelta(
-                seconds=int(form.data['shelf_life']) * 60 * 60)
-
-        food_form = self.get_form_class()(data=self.request.POST)
-        if not food_form.is_valid():
             return self.form_invalid(form)
-        ans = super().form_valid(form)
-        if food.polymorphic_ctype.model == 'transformedfood':
-            form.instance.save(old_ingredients=old_ingredients)
-        else:
-            form.instance.save(old_allergens=old_allergens)
-        return ans
 
-    def get_form_class(self, **kwargs):
+        # Save the aliment and the allergens associed
-        food = Food.objects.get(pk=self.kwargs['pk'])
+        basic_food = form.save(commit=False)
-        if food.polymorphic_ctype.model == 'basicfood':
+        # We assume the date of labeling and the same as the date of arrival
-            return BasicFoodUpdateForms
+        basic_food.arrival_date = timezone.now()
-        else:
+        basic_food._force_save = True
-            return TransformedFoodUpdateForms
+        basic_food.save()
-
+        basic_food.refresh_from_db()
-    def get_form(self, **kwargs):
+        return super().form_valid(form)
-        form = super().get_form(**kwargs)
-        if 'shelf_life' in form.initial:
-            hours = form.initial['shelf_life'].days * 24 + form.initial['shelf_life'].seconds // 3600
-            form.initial['shelf_life'] = hours
-        return form
 
     def get_success_url(self, **kwargs):
         self.object.refresh_from_db()
-        return reverse_lazy('food:food_view', kwargs={"pk": self.object.pk})
+        return reverse('food:food_view', kwargs={"pk": self.object.pk})
 
 
-class FoodDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+class BasicFoodUpdateView(BasicFoodFormView, LoginRequiredMixin, UpdateView):
+    pass
+
+
+class BasicFoodCreateView(BasicFoodFormView, ProtectedCreateView):
+    def get_sample_object(self):
+        return BasicFood(
+            name="",
+            expiry_date=timezone.now(),
+        )
+
+
+class QRCodeBasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+    #####################################################################
+    # TO DO
+    # - fix picture save
+    # - implement solution crop and convert image (reuse or recode ImageForm from members apps)
+    #####################################################################
     """
-    A view to see a food
+    A view to add a basic food
     """
-    model = Food
+    model = BasicFood
-    extra_context = {"title": _('Details of:')}
+    form_class = BasicFoodForms
-    context_object_name = "food"
+    template_name = 'food/basic_food_form.html'
-    template_name = "food/food_detail.html"
+    extra_context = {"title": _("Add a new aliment")}
 
-    def get_context_data(self, **kwargs):
+    @transaction.atomic
-        context = super().get_context_data(**kwargs)
+    def form_valid(self, form):
-        fields = ["name", "owner", "expiry_date", "allergens", "is_ready", "end_of_life", "order"]
+        form.instance.creater = self.request.user
+        basic_food_form = BasicFoodForms(data=self.request.POST)
+        if not basic_food_form.is_valid():
+            return self.form_invalid(form)
 
-        fields = dict([(field, getattr(self.object, field)) for field in fields])
+        # Save the aliment and the allergens associed
-        if fields["is_ready"]:
+        basic_food = form.save(commit=False)
-            fields["is_ready"] = _("Yes")
+        # We assume the date of labeling and the same as the date of arrival
-        else:
+        basic_food.arrival_date = timezone.now()
-            fields["is_ready"] = _("No")
+        basic_food._force_save = True
-        fields["allergens"] = ", ".join(
+        basic_food.save()
-            allergen.name for allergen in fields["allergens"].all())
+        basic_food.refresh_from_db()
 
-        context["fields"] = [(
+        qrcode = QRCode()
-            Food._meta.get_field(field).verbose_name.capitalize(),
+        qrcode.qr_code_number = self.kwargs['slug']
-            value) for field, value in fields.items()]
+        qrcode.food_container = basic_food
-        context["meals"] = self.object.transformed_ingredient_inv.all()
+        qrcode.save()
-        context["update"] = PermissionBackend.check_perm(self.request, "food.change_food")
-        context["add_ingredient"] = (self.object.end_of_life == '' and PermissionBackend.check_perm(self.request, "food.change_transformedfood"))
-        return context
 
-    def get(self, *args, **kwargs):
+        return super().form_valid(form)
-        if Food.objects.filter(pk=kwargs['pk']).count() != 1:
+
-            return Http404
+    def get_success_url(self, **kwargs):
-        model = Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model
+        self.object.refresh_from_db()
-        if 'stop_redirect' in kwargs and kwargs['stop_redirect']:
+        return reverse('food:food_view', kwargs={"pk": self.object.pk})
-            return super().get(*args, **kwargs)
+
-        kwargs = {'pk': kwargs['pk']}
+    def get_sample_object(self):
-        if model == 'basicfood':
+        return BasicFood(
-            return HttpResponseRedirect(reverse_lazy("food:basicfood_view", kwargs=kwargs))
+            name="",
-        return HttpResponseRedirect(reverse_lazy("food:transformedfood_view", kwargs=kwargs))
+            expiry_date=timezone.now(),
+        )
 
 
-class BasicFoodDetailView(FoodDetailView):
+class TransformedFoodFormView(ProtectQuerysetMixin):
-    def get_context_data(self, **kwargs):
+    #####################################################################
-        context = super().get_context_data(**kwargs)
+    # TO DO
-        fields = ['arrival_date', 'date_type']
+    # - fix picture save
-        for field in fields:
+    # - implement solution crop and convert image (reuse or recode ImageForm from members apps)
-            context["fields"].append((
+    #####################################################################
-                BasicFood._meta.get_field(field).verbose_name.capitalize(),
+    """
-                getattr(self.object, field)
+    A view to add a tranformed food
-            ))
+    """
-        return context
+    model = TransformedFood
+    template_name = 'food/transformed_food_form.html'
+    form_class = TransformedFoodForms
+    extra_context = {"title": _("Add a new meal")}
 
-    def get(self, *args, **kwargs):
+    @transaction.atomic
-        if Food.objects.filter(pk=kwargs['pk']).count() == 1:
+    def form_valid(self, form):
-            kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'basicfood')
+        form.instance.creater = self.request.user
-        return super().get(*args, **kwargs)
+        transformed_food_form = TransformedFoodForms(data=self.request.POST)
+        if not transformed_food_form.is_valid():
+            return self.form_invalid(form)
+
+        # Save the aliment and allergens associated
+        transformed_food = form.save(commit=False)
+        # Without microbiological analyzes, the storage time is 3 days
+        transformed_food.expiry_date = transformed_food.creation_date + timedelta(days=3)
+        transformed_food._force_save = True
+        transformed_food.save()
+        transformed_food.refresh_from_db()
+        return super().form_valid(form)
+
+    def get_success_url(self, **kwargs):
+        self.object.refresh_from_db()
+        return reverse('food:food_view', kwargs={"pk": self.object.pk})
 
 
-class TransformedFoodDetailView(FoodDetailView):
+class TransformedFoodUpdateView(TransformedFoodFormView, LoginRequiredMixin, UpdateView):
-    def get_context_data(self, **kwargs):
+    pass
-        context = super().get_context_data(**kwargs)
-        context["fields"].append((
-            TransformedFood._meta.get_field("creation_date").verbose_name.capitalize(),
-            self.object.creation_date
-        ))
-        context["fields"].append((
-            TransformedFood._meta.get_field("shelf_life").verbose_name.capitalize(),
-            pretty_duration(self.object.shelf_life)
-        ))
-        context["foods"] = self.object.ingredients.all()
-        context["manage_ingredients"] = True
-        return context
 
-    def get(self, *args, **kwargs):
+
-        if Food.objects.filter(pk=kwargs['pk']).count() == 1:
+class TransformedFoodCreateView(TransformedFoodFormView, ProtectedCreateView):
-            kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'transformedfood')
+    def get_sample_object(self):
-        return super().get(*args, **kwargs)
+        return TransformedFood(
+            name="",
+            creation_date=timezone.now(),
+        )
+
+
+class QRCodeTransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+    #####################################################################
+    # TO DO
+    # - fix picture save
+    # - implement solution crop and convert image (reuse or recode ImageForm from members apps)
+    #####################################################################
+    """
+    A view to add a basic food
+    """
+    model = TransformedFood
+    template_name = 'food/transformed_food_form.html'
+    form_class = TransformedFoodForms
+    extra_context = {"title": _("Add a new meal")}
+
+    @transaction.atomic
+    def form_valid(self, form):
+        form.instance.creater = self.request.user
+        transformed_food_form = TransformedFoodForms(data=self.request.POST)
+        if not transformed_food_form.is_valid():
+            return self.form_invalid(form)
+
+        # Save the aliment and allergens associated
+        transformed_food = form.save(commit=False)
+        # Without microbiological analyzes, the storage time is 3 days
+        transformed_food.expiry_date = transformed_food.creation_date + timedelta(days=3)
+        transformed_food._force_save = True
+        transformed_food.save()
+        transformed_food.refresh_from_db()
+
+        qrcode = QRCode()
+        qrcode.qr_code_number = self.kwargs['slug']
+        qrcode.food_container = transformed_food
+        qrcode.save()
+
+        return super().form_valid(form)
+
+    def get_success_url(self, **kwargs):
+        self.object.refresh_from_db()
+        return reverse('food:food_view', kwargs={"pk": self.object.pk})
+
+    def get_sample_object(self):
+        return BasicFood(
+            name="",
+            expiry_date=timezone.now(),
+        )

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
@@ -56,13 +56,13 @@ def save_object(sender, instance, **kwargs):
     # noinspection PyProtectedMember
     previous = instance._previous
 
-    # Si un⋅e utilisateur⋅rice est connecté⋅e, on récupère l'utilisateur⋅rice courant⋅e ainsi que son adresse IP
+    # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP
     request = get_current_request()
 
     if request is None:
         # Si la modification n'a pas été faite via le client Web, on suppose que c'est du à `manage.py`
         # On récupère alors l'utilisateur·trice connecté·e à la VM, et on récupère la note associée
-        # IMPORTANT : l'utilisateur⋅rice dans la VM doit être un des alias note du respo info
+        # IMPORTANT : l'utilisateur dans la VM doit être un des alias note du respo info
         ip = "127.0.0.1"
         username = Alias.normalize(getpass.getuser())
         note = NoteUser.objects.filter(alias__normalized_name=username)
@@ -134,13 +134,13 @@ def delete_object(sender, instance, **kwargs):
     if instance._meta.label_lower in EXCLUDED or hasattr(instance, "_no_signal"):
         return
 
-    # Si un⋅e utilisateur⋅rice est connecté⋅e, on récupère l'utilisateur⋅rice courant⋅e ainsi que son adresse IP
+    # Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP
     request = get_current_request()
 
     if request is None:
         # Si la modification n'a pas été faite via le client Web, on suppose que c'est du à `manage.py`
         # On récupère alors l'utilisateur·trice connecté·e à la VM, et on récupère la note associée
-        # IMPORTANT : l'utilisateur⋅rice dans la VM doit être un des alias note du respo info
+        # IMPORTANT : l'utilisateur dans la VM doit être un des alias note du respo info
         ip = "127.0.0.1"
         username = Alias.normalize(getpass.getuser())
         note = NoteUser.objects.filter(alias__normalized_name=username)

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,9 +1,8 @@
-# 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
-from rest_framework.filters import OrderingFilter
+from rest_framework.filters import OrderingFilter, SearchFilter
-from api.filters import RegexSafeSearchFilter
 from api.viewsets import ReadProtectedModelViewSet
 
 from .serializers import ProfileSerializer, ClubSerializer, MembershipSerializer
@@ -18,7 +17,7 @@ class ProfileViewSet(ReadProtectedModelViewSet):
     """
     queryset = Profile.objects.order_by('id')
     serializer_class = ProfileSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['user', 'user__first_name', 'user__last_name', 'user__username', 'user__email',
                         'user__note__alias__name', 'user__note__alias__normalized_name', 'phone_number', "section",
                         'department', 'promotion', 'address', 'paid', 'ml_events_registration', 'ml_sport_registration',
@@ -35,7 +34,7 @@ class ClubViewSet(ReadProtectedModelViewSet):
     """
     queryset = Club.objects.order_by('id')
     serializer_class = ClubSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['name', 'email', 'note__alias__name', 'note__alias__normalized_name', 'parent_club',
                         'parent_club__name', 'require_memberships', 'membership_fee_paid', 'membership_fee_unpaid',
                         'membership_duration', 'membership_start', 'membership_end', ]
@@ -50,7 +49,7 @@ class MembershipViewSet(ReadProtectedModelViewSet):
     """
     queryset = Membership.objects.order_by('id')
     serializer_class = MembershipSerializer
-    filter_backends = [DjangoFilterBackend, OrderingFilter, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend, OrderingFilter, SearchFilter]
     filterset_fields = ['club__name', 'club__email', 'club__note__alias__name', 'club__note__alias__normalized_name',
                         'user__username', 'user__last_name', 'user__first_name', 'user__email',
                         'user__note__alias__name', 'user__note__alias__normalized_name',

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,9 +1,9 @@
-# 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
 
-from bootstrap_datepicker_plus.widgets import DatePickerInput
+from PIL import Image, ImageSequence
 from django import forms
 from django.conf import settings
 from django.contrib.auth.forms import AuthenticationForm
@@ -13,9 +13,8 @@ from django.forms import CheckboxSelectMultiple
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, Alias
-from note_kfet.inputs import Autocomplete, AmountInput
+from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
 from permission.models import PermissionMask, Role
-from PIL import Image, ImageSequence
 
 from .models import Profile, Club, Membership
 
@@ -23,7 +22,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,
     )
 
@@ -33,7 +32,7 @@ class UserForm(forms.ModelForm):
         # Django usernames can only contain letters, numbers, @, ., +, - and _.
         # We want to allow users to have uncommon and unpractical usernames:
         # That is their problem, and we have normalized aliases for us.
-        return super()._get_validation_exclusions() | {"username"}
+        return super()._get_validation_exclusions() + ["username"]
 
     class Meta:
         model = User
@@ -44,7 +43,6 @@ 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"))
 
     last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date"))
@@ -77,8 +75,7 @@ class ProfileForm(forms.ModelForm):
     class Meta:
         model = Profile
         fields = '__all__'
-        # Remove ml_[asso]_registration from exclude if the concerned association uses nk20 to manage its mailing list.
+        exclude = ('user', 'email_confirmed', 'registration_valid', )
-        exclude = ('user', 'email_confirmed', 'registration_valid', 'ml_sport_registration', )
 
 
 class ImageForm(forms.Form):
@@ -141,9 +138,6 @@ class ImageForm(forms.Form):
 
         return cleaned_data
 
-    def is_valid(self):
-        return super().is_valid() or super().clean().get('image') is None
-
 
 class ClubForm(forms.ModelForm):
     def clean(self):
@@ -157,7 +151,7 @@ class ClubForm(forms.ModelForm):
 
     class Meta:
         model = Club
-        exclude = ("add_registration_form",)
+        fields = '__all__'
         widgets = {
             "membership_fee_paid": AmountInput(),
             "membership_fee_unpaid": AmountInput(),
@@ -213,9 +207,9 @@ class MembershipForm(forms.ModelForm):
     class Meta:
         model = Membership
         fields = ('user', 'date_start')
-        # Le champ d'utilisateur⋅rice est remplacé par un champ d'auto-complétion.
+        # Le champ d'utilisateur est remplacé par un champ d'auto-complétion.
         # Quand des lettres sont tapées, une requête est envoyée sur l'API d'auto-complétion
-        # et récupère les noms d'utilisateur⋅rices valides
+        # et récupère les noms d'utilisateur valides
         widgets = {
             'user':
                 Autocomplete(

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/migrations/0012_club_add_registration_form.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2024-07-15 09:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0011_profile_vss_charter_read'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='club',
-            name='add_registration_form',
-            field=models.BooleanField(default=False, verbose_name='add to registration form'),
-        ),
-    ]

apps/member/migrations/0013_auto_20240801_1436.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2024-08-01 12:36
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0012_club_add_registration_form'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='promotion',
-            field=models.PositiveSmallIntegerField(default=2024, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
-        ),
-    ]

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
@@ -259,11 +259,6 @@ class Club(models.Model):
         help_text=_('Maximal date of a membership, after which members must renew it.'),
     )
 
-    add_registration_form = models.BooleanField(
-        verbose_name=_("add to registration form"),
-        default=False,
-    )
-
     class Meta:
         verbose_name = _("club")
         verbose_name_plural = _("clubs")
@@ -295,14 +290,7 @@ class Club(models.Model):
 
         today = datetime.date.today()
 
-        # Avoid any problems on February 29
+        while (today - self.membership_start).days >= 365:
-        if self.membership_start.month == 2 and self.membership_start.day == 29:
-            self.membership_start -= datetime.timedelta(days=1)
-        if self.membership_end.month == 2 and self.membership_end.day == 29:
-            self.membership_end += datetime.timedelta(days=1)
-
-        while today >= datetime.date(self.membership_start.year + 1,
-                                     self.membership_start.month, self.membership_start.day):
             if self.membership_start:
                 self.membership_start = datetime.date(self.membership_start.year + 1,
                                                       self.membership_start.month, self.membership_start.day)
@@ -480,10 +468,10 @@ class Membership(models.Model):
 
             if self.club.parent_club.name == "BDE":
                 parent_membership.roles.set(
-                    Role.objects.filter(Q(name="Adhérent⋅e BDE") | Q(name="Membre de club")).all())
+                    Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all())
             elif self.club.parent_club.name == "Kfet":
                 parent_membership.roles.set(
-                    Role.objects.filter(Q(name="Adhérent⋅e Kfet") | Q(name="Membre de club")).all())
+                    Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all())
             else:
                 parent_membership.roles.set(Role.objects.filter(name="Membre de club").all())
             parent_membership.save()

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
@@ -42,12 +42,12 @@ class UserTable(tables.Table):
     """
     alias = tables.Column()
 
-    section = tables.Column(accessor='profile__section', orderable=False)
+    section = tables.Column(accessor='profile__section')
 
     # Override the column to let replace the URL
     email = tables.EmailColumn(linkify=lambda record: "mailto:{}".format(record.email))
 
-    balance = tables.Column(accessor='note__balance', verbose_name=_("Balance"), orderable=False)
+    balance = tables.Column(accessor='note__balance', verbose_name=_("Balance"))
 
     def render_email(self, record, value):
         # Replace the email by a dash if the user can't see the profile detail

apps/member/templates/member/club_members.html

@@ -11,7 +11,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
         {{ title }}
     </h3>
     <div class="card-body">
-        <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note...">
+        <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note…">
         <div class="form-check">
             <label class="form-check-label" for="only_active">
                 <input type="checkbox" class="checkboxinput form-check-input" id="only_active"

apps/member/templates/member/picture_update.html

@@ -14,19 +14,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
       <form method="post" enctype="multipart/form-data" id="formUpload">
         {% csrf_token %}
         {{ form |crispy }}
-        {% if user.note.display_image != "pic/default.png" %}
-          <input type="submit" class="btn btn-primary" value="{% trans "Remove" %}">
-        {% endif %}
       </form>
     </div>
     <!-- MODAL TO CROP THE IMAGE -->
-    <div class="modal fade" id="modalCrop" data-backdrop="static">
+    <div class="modal 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 class="modal-footer">
             <div class="btn-group pull-left" role="group">

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/tests/test_memberships.py

@@ -291,7 +291,7 @@ class TestMemberships(TestCase):
 
         response = self.client.post(reverse("member:club_manage_roles", args=(self.membership.pk,)), data=dict(
             roles=[role.id for role in Role.objects.filter(
-                Q(name="Membre de club") | Q(name="Trésorièr⋅e de club") | Q(name="Bureau de club")).all()],
+                Q(name="Membre de club") | Q(name="Trésorier·ère de club") | Q(name="Bureau de club")).all()],
         ))
         self.assertRedirects(response, self.user.profile.get_absolute_url(), 302, 200)
         self.membership.refresh_from_db()

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

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
@@ -16,9 +16,8 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, UpdateView, TemplateView
 from django.views.generic.edit import FormMixin
-from django_tables2.views import MultiTableMixin, SingleTableMixin, SingleTableView
+from django_tables2.views import SingleTableView
 from rest_framework.authtoken.models import Token
-from api.viewsets import is_regex
 from note.models import Alias, NoteClub, NoteUser, Trust
 from note.models.transactions import Transaction, SpecialTransaction
 from note.tables import HistoryTable, AliasTable, TrustTable, TrustedTable
@@ -26,7 +25,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 +71,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):
+            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:
-            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
 
@@ -234,20 +219,16 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         if "search" in self.request.GET and self.request.GET["search"]:
             pattern = self.request.GET["search"]
 
-            # Check if this is a valid regex. If not, we won't check regex
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__istartswith"
-            prefix = "^" if valid_regex else ""
             qs = qs.filter(
-                Q(**{f"username{suffix}": prefix + pattern})
+                username__iregex="^" + pattern
             ).union(
                 qs.filter(
-                    (Q(**{f"alias{suffix}": prefix + pattern})
+                    (Q(alias__iregex="^" + pattern)
-                     | Q(**{f"normalized_alias{suffix}": prefix + Alias.normalize(pattern)})
+                     | Q(normalized_alias__iregex="^" + Alias.normalize(pattern))
-                     | Q(**{f"last_name{suffix}": prefix + pattern})
+                     | Q(last_name__iregex="^" + pattern)
-                     | Q(**{f"first_name{suffix}": prefix + pattern})
+                     | Q(first_name__iregex="^" + pattern)
                      | Q(email__istartswith=pattern))
-                    & ~Q(**{f"username{suffix}": prefix + pattern})
+                    & ~Q(username__iregex="^" + pattern)
                 ), all=True)
         else:
             qs = qs.none()
@@ -262,7 +243,7 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         return context
 
 
-class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, DetailView):
+class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
     View and manage user trust relationships
     """
@@ -271,25 +252,13 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
     context_object_name = 'user_object'
     extra_context = {"title": _("Note friendships")}
 
-    tables = [
-        lambda data: TrustTable(data, prefix="trust-"),
-        lambda data: TrustedTable(data, prefix="trusted-"),
-    ]
-
-    def get_tables_data(self):
-        note = self.object.note
-        return [
-            note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct(),
-            note.trusted.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct(),
-        ]
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-
+        note = context['object'].note
-        tables = context["tables"]
+        context["trusting"] = TrustTable(
-        for name, table in zip(["trusting", "trusted_by"], tables):
+            note.trusting.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
-            context[name] = table
+        context["trusted_by"] = TrustedTable(
-
+            note.trusted.filter(PermissionBackend.filter_queryset(self.request, Trust, "view")).distinct().all())
         context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_trust", Trust(
             trusting=context["object"].note,
             trusted=context["object"].note
@@ -308,7 +277,7 @@ class ProfileTrustView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin
         return context
 
 
-class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, DetailView):
+class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
     View and manage user aliases.
     """
@@ -317,15 +286,12 @@ class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixi
     context_object_name = 'user_object'
     extra_context = {"title": _("Note aliases")}
 
-    table_class = AliasTable
-    context_table_name = "aliases"
-
-    def get_table_data(self):
-        return self.object.note.alias.filter(PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct() \
-                                     .order_by('normalized_name')
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
+        note = context['object'].note
+        context["aliases"] = AliasTable(
+            note.alias.filter(PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct()
+            .order_by('normalized_name').all())
         context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_alias", Alias(
             note=context["object"].note,
             name="",
@@ -360,9 +326,6 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
         """Save image to note"""
         image = form.cleaned_data['image']
 
-        if image is None:
-            image = "pic/default.png"
-        else:
         # Rename as a PNG or GIF
         extension = image.name.split(".")[-1]
         if extension == "gif":
@@ -444,15 +407,10 @@ class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         if "search" in self.request.GET:
             pattern = self.request.GET["search"]
 
-            # Check if this is a valid regex. If not, we won't check regex
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__istartswith"
-            prefix = "^" if valid_regex else ""
-
             qs = qs.filter(
-                Q(**{f"name{suffix}": prefix + pattern})
+                Q(name__iregex=pattern)
-                | Q(**{f"note__alias__name{suffix}": prefix + pattern})
+                | Q(note__alias__name__iregex=pattern)
-                | Q(**{f"note__alias__normalized_name{suffix}": prefix + Alias.normalize(pattern)})
+                | Q(note__alias__normalized_name__iregex=Alias.normalize(pattern))
             )
 
         return qs
@@ -549,7 +507,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         return context
 
 
-class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin, DetailView):
+class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
     Manage aliases of a club.
     """
@@ -558,16 +516,11 @@ class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableMixin,
     context_object_name = 'club'
     extra_context = {"title": _("Note aliases")}
 
-    table_class = AliasTable
-    context_table_name = "aliases"
-
-    def get_table_data(self):
-        return self.object.note.alias.filter(
-            PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct()
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-
+        note = context['object'].note
+        context["aliases"] = AliasTable(note.alias.filter(
+            PermissionBackend.filter_queryset(self.request, Alias, "view")).distinct().all())
         context["can_create"] = PermissionBackend.check_perm(self.request, "note.add_alias", Alias(
             note=context["object"].note,
             name="",
@@ -871,8 +824,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
 
         ret = super().form_valid(form)
 
-        member_role = Role.objects.filter(Q(name="Adhérent⋅e BDE") | Q(name="Membre de club")).all() \
+        member_role = Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all() \
-            if club.name == "BDE" else Role.objects.filter(Q(name="Adhérent⋅e Kfet") | Q(name="Membre de club")).all() \
+            if club.name == "BDE" else Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all() \
             if club.name == "Kfet"else Role.objects.filter(name="Membre de club").all()
         # Set the same roles as before
         if old_membership:
@@ -908,7 +861,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
                 membership.refresh_from_db()
                 if old_membership.exists():
                     membership.roles.set(old_membership.get().roles.all())
-                membership.roles.set(Role.objects.filter(Q(name="Adhérent⋅e Kfet") | Q(name="Membre de club")).all())
+                membership.roles.set(Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all())
                 membership.save()
 
         return ret
@@ -956,15 +909,10 @@ class ClubMembersListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableV
 
         if 'search' in self.request.GET:
             pattern = self.request.GET['search']
-
-            # Check if this is a valid regex. If not, we won't check regex
-            valid_regex = is_regex(pattern)
-            suffix = "__iregex" if valid_regex else "__istartswith"
-            prefix = "^" if valid_regex else ""
             qs = qs.filter(
-                Q(**{f"user__first_name{suffix}": prefix + pattern})
+                Q(user__first_name__iregex='^' + pattern)
-                | Q(**{f"user__last_name{suffix}": prefix + pattern})
+                | Q(user__last_name__iregex='^' + pattern)
-                | Q(**{f"user__note__alias__normalized_name{suffix}": prefix + Alias.normalize(pattern)})
+                | Q(user__note__alias__normalized_name__iregex='^' + Alias.normalize(pattern))
             )
 
         only_active = "only_active" not in self.request.GET or self.request.GET["only_active"] != '0'

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,16 +1,16 @@
-# 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
 
 from django.conf import settings
 from django.db.models import Q
 from django.core.exceptions import ValidationError
 from django_filters.rest_framework import DjangoFilterBackend
-from rest_framework.filters import OrderingFilter
+from rest_framework.filters import OrderingFilter, SearchFilter
-from rest_framework import status, viewsets
+from rest_framework import viewsets
 from rest_framework.response import Response
-from api.filters import RegexSafeSearchFilter
+from rest_framework import status
-from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet, \
+from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet
-    is_regex
 from permission.backends import PermissionBackend
 
 from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer, \
@@ -29,7 +29,7 @@ class NotePolymorphicViewSet(ReadProtectedModelViewSet):
     """
     queryset = Note.objects.order_by('id')
     serializer_class = NotePolymorphicSerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter, OrderingFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     filterset_fields = ['alias__name', 'polymorphic_ctype', 'is_active', 'balance', 'last_negative', 'created_at', ]
     search_fields = ['$alias__normalized_name', '$alias__name', '$polymorphic_ctype__model',
                      '$noteuser__user__last_name', '$noteuser__user__first_name', '$noteuser__user__email',
@@ -48,14 +48,10 @@ class NotePolymorphicViewSet(ReadProtectedModelViewSet):
             .distinct()
 
         alias = self.request.query_params.get("alias", ".*")
-        # Check if this is a valid regex. If not, we won't check regex
-        valid_regex = is_regex(alias)
-        suffix = '__iregex' if valid_regex else '__istartswith'
-        alias_prefix = '^' if valid_regex else ''
         queryset = queryset.filter(
-            Q(**{f"alias__name{suffix}": alias_prefix + alias})
+            Q(alias__name__iregex="^" + alias)
-            | Q(**{f"alias__normalized_name{suffix}": alias_prefix + Alias.normalize(alias)})
+            | Q(alias__normalized_name__iregex="^" + Alias.normalize(alias))
-            | Q(**{f"alias__normalized_name{suffix}": alias_prefix + alias.lower()})
+            | Q(alias__normalized_name__iregex="^" + alias.lower())
         )
 
         return queryset.order_by("id")
@@ -69,7 +65,7 @@ class TrustViewSet(ReadProtectedModelViewSet):
     """
     queryset = Trust.objects
     serializer_class = TrustSerializer
-    filter_backends = [RegexSafeSearchFilter, DjangoFilterBackend, OrderingFilter]
+    filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter]
     search_fields = ['$trusting__alias__name', '$trusting__alias__normalized_name',
                      '$trusted__alias__name', '$trusted__alias__normalized_name']
     filterset_fields = ['trusting', 'trusting__noteuser__user', 'trusted', 'trusted__noteuser__user']
@@ -95,11 +91,11 @@ class AliasViewSet(ReadProtectedModelViewSet):
     """
     REST API View set.
     The djangorestframework plugin will get all `Alias` objects, serialize it to JSON with the given serializer,
-    then render it on /api/note/alias/
+    then render it on /api/note/aliases/
     """
     queryset = Alias.objects
     serializer_class = AliasSerializer
-    filter_backends = [RegexSafeSearchFilter, DjangoFilterBackend, OrderingFilter]
+    filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter]
     search_fields = ['$normalized_name', '$name', '$note__polymorphic_ctype__model', ]
     filterset_fields = ['name', 'normalized_name', 'note', 'note__noteuser__user',
                         'note__noteclub__club', 'note__polymorphic_ctype__model', ]
@@ -130,22 +126,18 @@ class AliasViewSet(ReadProtectedModelViewSet):
 
         alias = self.request.query_params.get("alias", None)
         if alias:
-            # Check if this is a valid regex. If not, we won't check regex
-            valid_regex = is_regex(alias)
-            suffix = '__iregex' if valid_regex else '__istartswith'
-            alias_prefix = '^' if valid_regex else ''
             queryset = queryset.filter(
-                **{f"name{suffix}": alias_prefix + alias}
+                name__iregex="^" + alias
             ).union(
                 queryset.filter(
-                    Q(**{f"normalized_name{suffix}": alias_prefix + Alias.normalize(alias)})
+                    Q(normalized_name__iregex="^" + Alias.normalize(alias))
-                    & ~Q(**{f"name{suffix}": alias_prefix + alias})
+                    & ~Q(name__iregex="^" + alias)
                 ),
                 all=True).union(
                 queryset.filter(
-                    Q(**{f"normalized_name{suffix}": "^" + alias.lower()})
+                    Q(normalized_name__iregex="^" + alias.lower())
-                    & ~Q(**{f"normalized_name{suffix}": "^" + Alias.normalize(alias)})
+                    & ~Q(normalized_name__iregex="^" + Alias.normalize(alias))
-                    & ~Q(**{f"name{suffix}": "^" + alias})
+                    & ~Q(name__iregex="^" + alias)
                 ),
                 all=True)
 
@@ -155,7 +147,7 @@ class AliasViewSet(ReadProtectedModelViewSet):
 class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
     queryset = Alias.objects
     serializer_class = ConsumerSerializer
-    filter_backends = [RegexSafeSearchFilter, OrderingFilter, DjangoFilterBackend]
+    filter_backends = [SearchFilter, OrderingFilter, DjangoFilterBackend]
     search_fields = ['$normalized_name', '$name', '$note__polymorphic_ctype__model', ]
     filterset_fields = ['name', 'normalized_name', 'note', 'note__noteuser__user',
                         'note__noteclub__club', 'note__polymorphic_ctype__model', ]
@@ -174,7 +166,11 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
 
         alias = self.request.query_params.get("alias", None)
         # Check if this is a valid regex. If not, we won't check regex
-        valid_regex = is_regex(alias)
+        try:
+            re.compile(alias)
+            valid_regex = True
+        except (re.error, TypeError):
+            valid_regex = False
         suffix = '__iregex' if valid_regex else '__istartswith'
         alias_prefix = '^' if valid_regex else ''
         queryset = queryset.prefetch_related('note')
@@ -183,10 +179,19 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
             # We match first an alias if it is matched without normalization,
             # then if the normalized pattern matches a normalized alias.
             queryset = queryset.filter(
-                Q(**{f'name{suffix}': alias_prefix + alias})
+                **{f'name{suffix}': alias_prefix + alias}
-                | Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+            ).union(
-                | Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
+                queryset.filter(
-            )
+                    Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+                    & ~Q(**{f'name{suffix}': alias_prefix + alias})
+                ),
+                all=True).union(
+                queryset.filter(
+                    Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
+                    & ~Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+                    & ~Q(**{f'name{suffix}': alias_prefix + alias})
+                ),
+                all=True)
 
         queryset = queryset if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' \
             else queryset.order_by("name")
@@ -202,7 +207,7 @@ class TemplateCategoryViewSet(ReadProtectedModelViewSet):
     """
     queryset = TemplateCategory.objects.order_by('name')
     serializer_class = TemplateCategorySerializer
-    filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['name', 'templates', 'templates__name']
     search_fields = ['$name', '$templates__name', ]
 
@@ -215,7 +220,7 @@ class TransactionTemplateViewSet(viewsets.ModelViewSet):
     """
     queryset = TransactionTemplate.objects.order_by('name')
     serializer_class = TransactionTemplateSerializer
-    filter_backends = [RegexSafeSearchFilter, DjangoFilterBackend, OrderingFilter]
+    filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter]
     filterset_fields = ['name', 'amount', 'display', 'category', 'category__name', ]
     search_fields = ['$name', '$category__name', ]
     ordering_fields = ['amount', ]
@@ -229,7 +234,7 @@ class TransactionViewSet(ReadProtectedModelViewSet):
     """
     queryset = Transaction.objects.order_by('-created_at')
     serializer_class = TransactionPolymorphicSerializer
-    filter_backends = [RegexSafeSearchFilter, DjangoFilterBackend, OrderingFilter]
+    filter_backends = [SearchFilter, DjangoFilterBackend, OrderingFilter]
     filterset_fields = ['source', 'source_alias', 'source__alias__name', 'source__alias__normalized_name',
                         'destination', 'destination_alias', 'destination__alias__name',
                         'destination__alias__normalized_name', 'quantity', 'polymorphic_ctype', 'amount',

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,14 +1,13 @@
-# 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
 
-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.forms import CheckboxSelectMultiple
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext_lazy as _
-from note_kfet.inputs import Autocomplete, AmountInput
+from note_kfet.inputs import Autocomplete, AmountInput, DateTimePickerInput
 
 from .models import TransactionTemplate, NoteClub, Alias
 

apps/note/migrations/0002_create_special_notes.py

@@ -18,7 +18,6 @@ def create_special_notes(apps, schema_editor):
 class Migration(migrations.Migration):
     dependencies = [
         ('note', '0001_initial'),
-        ('logs', '0001_initial'),
     ]
 
     operations = [

apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py

@@ -1,25 +0,0 @@
-# Generated by Django 4.2.15 on 2024-08-28 08:00
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('note', '0006_trust'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='note',
-            name='polymorphic_ctype',
-            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
-        ),
-        migrations.AlterField(
-            model_name='transaction',
-            name='polymorphic_ctype',
-            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
-        ),
-    ]

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
@@ -260,13 +260,11 @@ class ButtonTable(tables.Table):
         text=_('edit'),
         accessor='pk',
         verbose_name=_("Edit"),
-        orderable=False,
     )
 
     hideshow = tables.Column(
         verbose_name=_("Hide/Show"),
         accessor="pk",
-        orderable=False,
         attrs={
             'td': {
                 'class': 'col-sm-1',
@@ -278,8 +276,7 @@ class ButtonTable(tables.Table):
     delete_col = tables.TemplateColumn(template_code=DELETE_TEMPLATE,
                                        extra_context={"delete_trans": _('delete')},
                                        attrs={'td': {'class': 'col-sm-1'}},
-                                       verbose_name=_("Delete"),
+                                       verbose_name=_("Delete"), )
-                                       orderable=False, )
 
     def render_amount(self, value):
         return pretty_money(value)