Migrate to Django 5.0, change requirements and tests, remove ifnotequal, remove htcpcp and CAS Server, adapt Picker, fix alias (lookup) and logout, change URL to re_path

2025-09-14 06:14:43 +02:00 · 2024-07-11 13:05:43 +02:00
41 changed files with 225 additions and 772 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,25 +7,10 @@ stages:
 variables:
  GIT_SUBMODULE_STRATEGY: recursive

-# Debian Buster
-#  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:
+# Ubuntu 22.04
+py310-django50:
  stage: test
-  image: ubuntu:20.04
+  image: ubuntu:22.04
  before_script:
    # Fix tzdata prompt
    - ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
@@ -37,12 +22,12 @@ py38-django22:
        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 py38-django22
+  script: tox -e py310-django50

-# Debian Bullseye
-py39-django22:
+# Debian Bookworm
+py311-django50:
  stage: test
-  image: debian:bullseye
+  image: debian:bookworm
  before_script:
    - >
        apt-get update &&
@@ -52,7 +37,7 @@ py39-django22:
        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 py39-django22
+  script: tox -e py311-django50

 linters:
  stage: quality-assurance
--- a/apps/activity/api/serializers.py
+++ b/apps/activity/api/serializers.py
@@ -1,11 +1,9 @@
 # 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"))]
--- a/apps/activity/api/urls.py
+++ b/apps/activity/api/urls.py
@@ -1,7 +1,7 @@
 # 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)
--- a/apps/activity/api/views.py
+++ b/apps/activity/api/views.py
@@ -2,14 +2,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 from api.viewsets import ReadProtectedModelViewSet
-from django.core.exceptions import ValidationError
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.filters import SearchFilter
-from rest_framework.response import Response
-from rest_framework import status

-from .serializers import ActivitySerializer, ActivityTypeSerializer, EntrySerializer, GuestSerializer, OpenerSerializer
-from ..models import Activity, ActivityType, Entry, Guest, Opener
+from .serializers import ActivitySerializer, ActivityTypeSerializer, EntrySerializer, GuestSerializer
+from ..models import Activity, ActivityType, Entry, Guest


 class ActivityTypeViewSet(ReadProtectedModelViewSet):
@@ -69,32 +66,3 @@ class EntryViewSet(ReadProtectedModelViewSet):
    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 = [SearchFilter, 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)
--- a/apps/activity/forms.py
+++ b/apps/activity/forms.py
@@ -1,6 +1,8 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

+from bootstrap_datepicker_plus.widgets import DateTimePickerInput
+
 from datetime import timedelta
 from random import shuffle

@@ -10,7 +12,7 @@ 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, DateTimePickerInput
+from note_kfet.inputs import Autocomplete
 from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend

@@ -43,7 +45,7 @@ class ActivityForm(forms.ModelForm):

    class Meta:
        model = Activity
-        exclude = ('creater', 'valid', 'open', 'opener', )
+        exclude = ('creater', 'valid', 'open', )
        widgets = {
            "organizer": Autocomplete(
                model=Club,
--- a/apps/activity/migrations/0004_opener.py
+++ b/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')},
-            },
-        ),
-    ]
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@@ -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


@@ -310,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))
--- a/apps/activity/static/activity/js/opener.js
+++ b/apps/activity/static/activity/js/opener.js
@@ -1,78 +0,0 @@
-/**
- * On form submit, create a new friendship
- */
-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)
-    })
-}
-
-/**
- * Create a trust between users
- * @param trusting:Integer trusting note id
- * @param trusted:Integer trusted 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('Friendship successfully added'), 'success')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}
-
-/**
- * On form submit, create a new friendship
-function create_opener (e) {
-  // Do not submit HTML form
-  e.preventDefault()
-
-  // Get data and send to API
-  const formData = new FormData(e.target)
-  $.post('/api/activity/opener/', {
-    csrfmiddlewaretoken: formData.get('csrfmiddlewaretoken'),
-    activity: formData.get('activity'),
-    opener: formData.get('opener')
-  }).done(function () {
-    // Reload table
-    $('#opener_table').load(location.pathname + ' #opener_table')
-    addMsg(gettext('Alias successfully added'), 'success')
-  }).fail(function (xhr, _textStatus, _error) {
-    errMsg(xhr.responseJSON)
-  })
-}*/
-
-/**
- * On click of "delete", delete the trust
- * @param button_id:Integer Trust 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('Friendship 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)
-})
--- a/apps/activity/tables.py
+++ b/apps/activity/tables.py
@@ -5,13 +5,11 @@ 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):
@@ -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"),)
--- a/apps/activity/templates/activity/activity_detail.html
+++ b/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({
--- a/apps/activity/templates/activity/activity_list.html
+++ b/apps/activity/templates/activity/activity_list.html
@@ -46,4 +46,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
    </h3>
    {% render_table table %}
 </div>
-{% endblock %}
+{% endblock %}
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@@ -17,15 +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 MultiTableMixin
+from django_tables2.views import SingleTableView
 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 .tables import ActivityTable, EntryTable, GuestTable, OpenerTable
+from .models import Activity, Entry, Guest
+from .tables import ActivityTable, EntryTable, GuestTable


 class ActivityCreateView(ProtectQuerysetMixin, ProtectedCreateView):
@@ -58,40 +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 = [ActivityTable, ActivityTable]
+    table_class = ActivityTable
+    ordering = ('-date_start',)
    extra_context = {"title": _("Activities")}

    def get_queryset(self, **kwargs):
        return super().get_queryset(**kwargs).distinct()

-    def get_tables(self):
-        tables = super().get_tables()
-
-        tables[0].prefix = "all-"
-        tables[1].prefix = "upcoming-"
-        return tables
-
-    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"]
-        for name, table in zip(["table", "upcoming"], tables):
-            context[name] = table
+        upcoming_activities = Activity.objects.filter(date_end__gt=timezone.now())
+        context['upcoming'] = ActivityTable(
+            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
@@ -114,24 +100,8 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
                           .filter(PermissionBackend.filter_queryset(self.request, Guest, "view")))
        context["guests"] = table

-        table = OpenerTable(data=self.object.opener.filter(activity=self.object)
-                            .filter(PermissionBackend.filter_queryset(self.request, Opener, "view")))
-        context["opener"] = 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


@@ -346,8 +316,8 @@ X-WR-CALNAME:Kfet Calendar
 NAME:Kfet Calendar
 CALSCALE:GREGORIAN
 BEGIN:VTIMEZONE
-TZID:Europe/Paris
-X-LIC-LOCATION:Europe/Paris
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
 BEGIN:DAYLIGHT
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0200
@@ -369,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)}
-DTEND:{"{:%Y%m%dT%H%M%S}Z".format(activity.date_end)}
+DTSTART;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}
+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
 """
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 from django.conf import settings
-from django.conf.urls import url, include
+from django.urls import include, re_path
 from rest_framework import routers

 from .views import UserInformationView
@@ -47,7 +47,7 @@ app_name = 'api'
 # Wire up our API using automatic URL routing.
 # Additionally, we include login URLs for the browsable API.
 urlpatterns = [
-    url('^', include(router.urls)),
-    url('^me/', UserInformationView.as_view()),
-    url('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    re_path('^', include(router.urls)),
+    re_path('^me/', UserInformationView.as_view()),
+    re_path('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 ]
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -3,6 +3,7 @@

 import io

+from bootstrap_datepicker_plus.widgets import DatePickerInput
 from PIL import Image, ImageSequence
 from django import forms
 from django.conf import settings
@@ -13,7 +14,7 @@ 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, DatePickerInput
+from note_kfet.inputs import Autocomplete, AmountInput
 from permission.models import PermissionMask, Role

 from .models import Profile, Club, Membership
@@ -32,7 +33,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
@@ -138,9 +139,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):
@@ -154,7 +152,7 @@ class ClubForm(forms.ModelForm):

    class Meta:
        model = Club
-        exclude = ("add_registration_form",)
+        fields = '__all__'
        widgets = {
            "membership_fee_paid": AmountInput(),
            "membership_fee_unpaid": AmountInput(),
--- a/apps/member/migrations/0012_club_add_registration_form.py
+++ b/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'),
-        ),
-    ]
--- a/apps/member/migrations/0013_auto_20240801_1436.py
+++ b/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'),
-        ),
-    ]
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -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")
--- a/apps/member/templates/member/picture_update.html
+++ b/apps/member/templates/member/picture_update.html
@@ -14,9 +14,6 @@ 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 -->
--- a/apps/member/tests/test_login.py
+++ b/apps/member/tests/test_login.py
@@ -44,7 +44,7 @@ class TemplateLoggedInTests(TestCase):
        self.assertRedirects(response, settings.LOGIN_REDIRECT_URL, 302, 302)

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

    def test_admin_index(self):
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -326,15 +326,12 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
        """Save image to note"""
        image = form.cleaned_data['image']

-        if image is None:
-            image = "pic/default.png"
+        # Rename as a PNG or GIF
+        extension = image.name.split(".")[-1]
+        if extension == "gif":
+            image.name = "{}_pic.gif".format(self.object.note.pk)
        else:
-            # Rename as a PNG or GIF
-            extension = image.name.split(".")[-1]
-            if extension == "gif":
-                image.name = "{}_pic.gif".format(self.object.note.pk)
-            else:
-                image.name = "{}_pic.png".format(self.object.note.pk)
+            image.name = "{}_pic.png".format(self.object.note.pk)

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

    router.register(path + '/transaction/category', TemplateCategoryViewSet)
    router.register(path + '/transaction/transaction', TransactionViewSet)
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@@ -179,19 +179,10 @@ 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(
-                **{f'name{suffix}': alias_prefix + alias}
-            ).union(
-                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)
+                Q(**{f'name{suffix}': alias_prefix + alias})
+                | Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+                | Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
+            )

        queryset = queryset if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' \
            else queryset.order_by("name")
--- a/apps/note/forms.py
+++ b/apps/note/forms.py
@@ -1,13 +1,15 @@
 # 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, DateTimePickerInput
+from note_kfet.inputs import Autocomplete, AmountInput

 from .models import TransactionTemplate, NoteClub, Alias

--- a/apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py
+++ b/apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 5.0.7 on 2024-07-11 09:24
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('note', '0006_trust'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='note',
+            name='polymorphic_ctype',
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
+        ),
+        migrations.AlterField(
+            model_name='transaction',
+            name='polymorphic_ctype',
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'),
+        ),
+    ]
--- a/apps/note/templates/note/amount_input.html
+++ b/apps/note/templates/note/amount_input.html
@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
           name="{{ widget.name }}"
           {# Other attributes are loaded  #}
           {% for name, value in widget.attrs.items %}
-                {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
+                {% if value != False %}{{ name }}{% if value != True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
            {% endfor %}>
    <div class="input-group-append">
        <span class="input-group-text">€</span>
--- a/apps/note/templates/note/mails/negative_balance.html
+++ b/apps/note/templates/note/mails/negative_balance.html
@@ -23,7 +23,7 @@

 <p>
    Par ailleurs, le BDE ne sert pas d'alcool aux adhérents dont le solde
-    est inférieur à 0 €.
+    est inférieur à 0 € depuis plus de 24h.
 </p>

 <p>
@@ -43,4 +43,4 @@
    {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
 </p>
 </body>
-</html>
+</html>
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2591,12 +2591,12 @@
 				"note",
 				"transaction"
 			],
-			"query": "[\"OR\", {\"source__balance__gte\": 0}, [\"AND\", [\"NOT\", {\"recurrenttransaction__template__category__name\": \"Alcool\"}], {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}], {\"valid\": false}]",
+			"query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]",
 			"type": "add",
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Créer une transaction quelconque tant que la source reste positive s'il s'agit d'alcool, sinon au-dessus de -20€"
+			"description": "Créer une transaction quelconque tant que la source reste au-dessus de -20 €"
 		}
 	},
 	{
@@ -3111,199 +3111,6 @@
 			"description": "Voir ceux nous ayant pour ami, pour toujours"
 		}
 	},
-	{
-		"model": "permission.permission",
-		"pk": 199,
-		"fields": {
-			"model": [
-				"activity",
-				"activity"
-			],
-			"query": "{\"opener__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]], \"open\": true, \"activity_type__manage_entries\":true}",
-			"type": "view",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Voir les activités ouvertes dont l'utilisateur⋅rice est ouvreur⋅se"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 200,
-		"fields": {
-			"model": [
-				"activity",
-				"activity"
-			],
-			"query": "{\"opener__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]], \"open\": true, \"activity_type__manage_entries\":true}",
-			"type": "change",
-			"mask": 2,
-			"field": "open",
-			"permanent": false,
-			"description": "Fermer les activités ouvertes dont l'utilisateur⋅rice est ouvreur⋅se"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 201,
-		"fields": {
-			"model": [
-				"activity",
-				"entry"
-			],
-			"query": "{\"activity__opener__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]], \"activity__open\": true, \"activity__activity_type__manage_entries\":true}",
-			"type": "add",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Faire les entrées des activités ouvertes dont l'utilisateur⋅rice est ouvreur⋅se"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 202,
-		"fields": {
-			"model": [
-				"activity",
-				"entry"
-			],
-			"query": "{\"activity__opener__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]], \"activity__open\": true, \"activity__activity_type__manage_entries\":true}",
-			"type": "view",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Voir les entrées des activités ouvertes dont l'utilisateur⋅rice est ouvreur⋅se"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 203,
-		"fields": {
-			"model": [
-				"activity",
-				"guest"
-			],
-			"query": "{\"activity__pk__in\": [\"user\", \"note\", \"activity_responsible\", [\"all\"]], \"activity__open\": true, \"activity__activity_type__manage_entries\":true}",
-			"type": "view",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Voir les invité⋅es des activités ouvertes dont l'utilisateur⋅rice est ouvreur⋅se"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 204,
-		"fields": {
-			"model": [
-				"activity",
-				"guesttransaction"
-			],
-			"query": "[\"NOT\", {\"pk__isnull\": [\"user\", \"note\", \"activity_responsible\", [\"filter\", {\"activity__open\": true, \"activity__activity_type__manage_entries\":true}], [\"exists\"]]}]",
-			"type": "add",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Créer une transaction d'invitation lorsque l'utilisateur⋅rice est ouvreur⋅se d'une activité ouverte"
-		}
-	},
-	{
-
-		"model": "permission.permission",
-		"pk": 205,
-		"fields": {
-			"model": [
-				"note",
-				"specialtransaction"
-			],
-			"query": "[\"NOT\", {\"pk__isnull\": [\"user\", \"note\", \"activity_responsible\", [\"filter\", {\"activity__open\": true, \"activity__activity_type__manage_entries\":true}], [\"exists\"]]}]",
-			"type": "add",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Créer un crédit ou un retrait quelconque lorsque l'utilisateur⋅rice est ouvreur⋅se d'une activité ouverte"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 206,
-		"fields": {
-			"model": [
-				"note",
-				"notespecial"
-			],
-			"query": "[\"NOT\", {\"pk__isnull\": [\"user\", \"note\", \"activity_responsible\", [\"filter\", {\"activity__open\": true, \"activity__activity_type__manage_entries\":true}], [\"exists\"]]}]",
-			"type": "view",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Afficher l'interface crédit/retrait lorsque l'utilisateur⋅rice est ouvreur⋅se d'une activité ouverte"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 207,
-		"fields": {
-			"model": [
-				"activity",
-				"opener"
-			],
-			"query": "{}",
-			"type": "view",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Voir les ouvreur⋅ses des activités"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 208,
-		"fields": {
-			"model": [
-				"activity",
-				"opener"
-			],
-			"query": "{}",
-			"type": "add",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Ajouter des ouvreur⋅ses aux activités"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 209,
-		"fields": {
-			"model": [
-				"activity",
-				"opener"
-			],
-			"query": "{}",
-			"type": "delete",
-			"mask": 2,
-			"field": "",
-			"permanent": false,
-			"description": "Supprimer des ouvreur⋅ses aux activités"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 210,
-		"fields": {
-			"model": [
-				"activity",
-				"activity"
-			],
-			"query": "{}",
-			"type": "change",
-			"mask": 2,
-			"field": "opener",
-			"permanent": false,
-			"description": "Voir le tableau des ouvreur⋅ses"
-		}
-	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -3341,19 +3148,11 @@
 				187,
 				188,
 				189,
-				190,
-				191,
-				195,
-				196,
-				198,
-				199,
-				200,
-				201,
-				202,
-				203,
-				204,
-				205,
-				206
+                190,
+                191,
+                195,
+                196,
+                198
 			]
 		}
 	},
@@ -3615,11 +3414,7 @@
 				46,
 				148,
 				149,
-				182,
-				207,
-				208,
-				209,
-				210
+				182
 			]
 		}
 	},
--- a/apps/registration/forms.py
+++ b/apps/registration/forms.py
@@ -5,6 +5,7 @@ from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
+# from member.models import Club
 from note.models import NoteSpecial, Alias
 from note_kfet.inputs import AmountInput

@@ -114,3 +115,12 @@ class ValidationForm(forms.Form):
        required=False,
        initial=True,
    )
+
+#     If the bda exists
+#     if Club.objects.filter(name__iexact="bda").exists():
+#         The user can join the bda club at the inscription
+#         join_bda = forms.BooleanField(
+#             label=_("Join BDA Club"),
+#             required=False,
+#             initial=True,
+#         )
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -1,7 +1,6 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

-from django import forms
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
@@ -239,8 +238,9 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid
        kfet = Club.objects.get(name="Kfet")
        fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
-        for club in Club.objects.filter(add_registration_form=True):
-            fee += club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
+        if Club.objects.filter(name__iexact="BDA").exists():
+            bda = Club.objects.get(name__iexact="BDA")
+            fee += bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
        ctx["total_fee"] = "{:.02f}".format(fee / 100, )

 #        ctx["declare_soge_account"] = SogeCredit.objects.filter(user=user).exists()
@@ -249,16 +249,6 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,

    def get_form(self, form_class=None):
        form = super().get_form(form_class)
-
-        # add clubs that are in registration form
-        for club in Club.objects.filter(add_registration_form=True).order_by("name"):
-            form_join_club = forms.BooleanField(
-                label=_("Join %(club)s Club") % {'club': club.name},
-                required=False,
-                initial=False,
-            )
-            form.fields.update({f"join_{club.id}": form_join_club})
-
        user = self.get_object()
        form.fields["last_name"].initial = user.last_name
        form.fields["first_name"].initial = user.first_name
@@ -276,6 +266,11 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
            form.add_error(None, _("An alias with a similar name already exists."))
            return self.form_invalid(form)

+        # Check if BDA exist to propose membership at regisration
+        bda_exists = False
+        if Club.objects.filter(name__iexact="BDA").exists():
+            bda_exists = True
+
        # Get form data
 #        soge = form.cleaned_data["soge"]
        credit_type = form.cleaned_data["credit_type"]
@@ -285,9 +280,8 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        bank = form.cleaned_data["bank"]
        join_bde = form.cleaned_data["join_bde"]
        join_kfet = form.cleaned_data["join_kfet"]
-
-        clubs_registration = Club.objects.filter(add_registration_form=True).order_by("name")
-        join_clubs = [(club, form.cleaned_data[f"join_{club.id}"]) for club in clubs_registration]
+        if bda_exists:
+            join_bda = form.cleaned_data["join_bda"]

 #        if soge:
 #            # If Société Générale pays the inscription, the user automatically joins the two clubs.
@@ -309,12 +303,11 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
        kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid
        # Add extra fee for the full membership
        fee += kfet_fee if join_kfet else 0
-        clubs_fee = dict()
-        for club, join_club in join_clubs:
-            club_fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
-            # Add extra fee for the club membership
-            clubs_fee[club] = club_fee
-            fee += club_fee if join_club else 0
+        if bda_exists:
+            bda = Club.objects.get(name__iexact="BDA")
+            bda_fee = bda.membership_fee_paid if user.profile.paid else bda.membership_fee_unpaid
+            # Add extra fee for the bda membership
+            fee += bda_fee if join_bda else 0

 #        # If the bank pays, then we don't credit now. Treasurers will validate the transaction
 #        # and credit the note later.
@@ -394,18 +387,17 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
            membership.roles.add(Role.objects.get(name="Adhérent Kfet"))
            membership.save()

-        for club, join_club in join_clubs:
-            if join_club:
-                # Create membership for the user to the BDA starting today
-                membership = Membership(
-                    club=club,
-                    user=user,
-                    fee=clubs_fee[club],
-                )
-                membership.save()
-                membership.refresh_from_db()
-                membership.roles.add(Role.objects.get(name="Membre de club"))
-                membership.save()
+        if bda_exists and join_bda:
+            # Create membership for the user to the BDA starting today
+            membership = Membership(
+                club=bda,
+                user=user,
+                fee=bda_fee,
+            )
+            membership.save()
+            membership.refresh_from_db()
+            membership.roles.add(Role.objects.get(name="Membre de club"))
+            membership.save()

 #        if soge:
 #            soge_credit = SogeCredit.objects.get(user=user)
--- a/apps/treasury/migrations/0009_alter_sogecredit_transactions.py
+++ b/apps/treasury/migrations/0009_alter_sogecredit_transactions.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.7 on 2024-07-11 09:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('note', '0007_alter_note_polymorphic_ctype_and_more'),
+        ('treasury', '0008_auto_20240322_0045'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='sogecredit',
+            name='transactions',
+            field=models.ManyToManyField(blank=True, related_name='+', to='note.membershiptransaction', verbose_name='membership transactions'),
+        ),
+    ]
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@@ -1,13 +1,14 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later

+from bootstrap_datepicker_plus.widgets import DatePickerInput
 from django import forms
 from django.contrib.auth.models import User
 from django.db.models import Q
 from django.forms import CheckboxSelectMultiple
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
-from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget
+from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget

 from ..models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership, WEIRole

--- a/apps/wei/tests/test_wei_registration.py
+++ b/apps/wei/tests/test_wei_registration.py
@@ -439,7 +439,7 @@ class TestWEIRegistration(TestCase):
            emergency_contact_phone='+33123456789',
        ))
        self.assertEqual(response.status_code, 200)
-        self.assertTrue("This user can&#39;t be in her/his first year since he/she has already participated to a WEI."
+        self.assertTrue("This user can&#x27;t be in her/his first year since he/she has already participated to a WEI."
                        in str(response.context["form"].errors))

        # Check that if the WEI is started, we can't register anyone
@@ -635,7 +635,7 @@ class TestWEIRegistration(TestCase):
        ))
        self.assertEqual(response.status_code, 200)
        self.assertFalse(response.context["form"].is_valid())
-        self.assertTrue("This team doesn&#39;t belong to the given bus." in str(response.context["form"].errors))
+        self.assertTrue("This team doesn&#x27;t belong to the given bus." in str(response.context["form"].errors))

        response = self.client.post(reverse("wei:validate_registration", kwargs=dict(pk=self.registration.pk)), dict(
            roles=[WEIRole.objects.get(name="GC WEI").id],
--- a/docs/apps/activity.rst
+++ b/docs/apps/activity.rst
@@ -8,7 +8,7 @@ peuvent être diffusées via des calendriers ou la mailing list d'événements.
 Modèles
 -------

-L'application comporte 6 modèles : activités, types d'activité, invités, entrées, transactions d'invitation et les ouvreur⋅ses.
+L'application comporte 5 modèles : activités, types d'activité, invités, entrées et transactions d'invitation.

 Types d'activité
 ~~~~~~~~~~~~~~~~
@@ -71,17 +71,6 @@ comportent qu'un champ supplémentaire, de type ``OneToOneField`` vers ``Guest``
 Ce modèle aurait pu appartenir à l'application ``note``, mais afin de rester modulaire et que l'application ``note``
 ne dépende pas de cette application, on procède de cette manière.

-Ouvreur⋅ses
-~~~~~~~~~~~
-
-Depuis la page d'une activité, il est possible d'ajouter des personnes en tant qu'« ouvreur⋅se ». Cela permet à une
-personne sans aucun droit note de pouvoir faire les entrées d'une ``Activity``. Ce rôle n'est valable que pendant que
-l'activité est ouverte et sur aucune autre activité. Les ouvreur⋅ses ont aussi accès à l'interface des transactions.
-
-Ce modèle regroupe :
-* Activité (clé étrangère)
-* Note (clé étrangère)
-
 Graphe
 ~~~~~~

@@ -119,6 +108,3 @@ apparaîssent, afin de régler la taxe d'invitation : l'un prélève directement
 permettent un paiement par espèces ou par carte bancaire. En réalité, les deux derniers boutons enregistrent
 automatiquement un crédit sur la note de l'hôte, puis une transaction (de type ``GuestTransaction``) est faite depuis
 la note de l'hôte vers la note de l'organisateur de l'événement.
-
-Si une personne souhaite faire les entrées, il est possible de l'ajouter dans la liste des ouvreur⋅ses depuis la page
-de l'activité.
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -20,7 +20,6 @@ msgstr ""

 #: apps/activity/apps.py:10 apps/activity/models.py:127
 #: apps/activity/models.py:167
-#: apps/activity/models.py:323
 msgid "activity"
 msgstr "activité"

@@ -115,7 +114,7 @@ msgstr "Lieu où l'activité est organisée, par exemple la Kfet."
 msgid "type"
 msgstr "type"

-#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:318
+#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:313
 #: apps/note/models/notes.py:148 apps/treasury/models.py:293
 #: apps/wei/models.py:171 apps/wei/templates/wei/attribute_bus_1A.html:13
 #: apps/wei/templates/wei/survey.html:15
@@ -239,16 +238,6 @@ msgstr "invité·e·s"
 msgid "Invitation"
 msgstr "Invitation"

-#: apps/activity/models.py:330
-#: apps/activity/models.py:334
-msgid "Opener"
-msgstr "Ouvreur⋅se"
-
-#: apps/activity/models.py:335
-#: apps/activity/templates/activity_detail.html:16
-msgid "Openers"
-msgstr "Ouvreur⋅ses"
-
 #: apps/activity/tables.py:27
 msgid "The activity is currently open."
 msgstr "Cette activité est actuellement ouverte."
@@ -258,7 +247,6 @@ msgid "The validation of the activity is pending."
 msgstr "La validation de cette activité est en attente."

 #: apps/activity/tables.py:43 apps/treasury/tables.py:107
-#: apps/member/templates/member/picture_update.html:18
 msgid "Remove"
 msgstr "Supprimer"

@@ -274,13 +262,13 @@ msgstr "supprimer"
 msgid "Type"
 msgstr "Type"

-#: apps/activity/tables.py:84 apps/member/forms.py:196
+#: apps/activity/tables.py:84 apps/member/forms.py:193
 #: apps/registration/forms.py:92 apps/treasury/forms.py:131
 #: apps/wei/forms/registration.py:104
 msgid "Last name"
 msgstr "Nom de famille"

-#: apps/activity/tables.py:86 apps/member/forms.py:201
+#: apps/activity/tables.py:86 apps/member/forms.py:198
 #: apps/note/templates/note/transaction_form.html:138
 #: apps/registration/forms.py:97 apps/treasury/forms.py:133
 #: apps/wei/forms/registration.py:109
@@ -412,37 +400,37 @@ msgstr "Inviter"
 msgid "Create new activity"
 msgstr "Créer une nouvelle activité"

-#: apps/activity/views.py:68 note_kfet/templates/base.html:90
+#: apps/activity/views.py:67 note_kfet/templates/base.html:90
 msgid "Activities"
 msgstr "Activités"

-#: apps/activity/views.py:108
+#: apps/activity/views.py:93
 msgid "Activity detail"
 msgstr "Détails de l'activité"

-#: apps/activity/views.py:128
+#: apps/activity/views.py:113
 msgid "Update activity"
 msgstr "Modifier l'activité"

-#: apps/activity/views.py:155
+#: apps/activity/views.py:140
 msgid "Invite guest to the activity \"{}\""
 msgstr "Invitation pour l'activité « {} »"

-#: apps/activity/views.py:193
+#: apps/activity/views.py:178
 msgid "You are not allowed to display the entry interface for this activity."
 msgstr ""
 "Vous n'êtes pas autorisé·e à afficher l'interface des entrées pour cette "
 "activité."

-#: apps/activity/views.py:196
+#: apps/activity/views.py:181
 msgid "This activity does not support activity entries."
 msgstr "Cette activité ne requiert pas d'entrées."

-#: apps/activity/views.py:199
+#: apps/activity/views.py:184
 msgid "This activity is closed."
 msgstr "Cette activité est fermée."

-#: apps/activity/views.py:295
+#: apps/activity/views.py:280
 msgid "Entry for activity \"{}\""
 msgstr "Entrées pour l'activité « {} »"

@@ -519,11 +507,11 @@ msgstr "cotisation pour adhérer (normalien·ne élève)"
 msgid "membership fee (unpaid students)"
 msgstr "cotisation pour adhérer (normalien·ne étudiant·e)"

-#: apps/member/admin.py:65 apps/member/models.py:330
+#: apps/member/admin.py:65 apps/member/models.py:325
 msgid "roles"
 msgstr "rôles"

-#: apps/member/admin.py:66 apps/member/models.py:344
+#: apps/member/admin.py:66 apps/member/models.py:339
 msgid "fee"
 msgstr "cotisation"

@@ -575,29 +563,29 @@ msgid "This image cannot be loaded."
 msgstr "Cette image ne peut pas être chargée."

 #: apps/member/forms.py:148 apps/member/views.py:102
-#: apps/registration/forms.py:34 apps/registration/views.py:276
+#: apps/registration/forms.py:34 apps/registration/views.py:266
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."

-#: apps/member/forms.py:175
+#: apps/member/forms.py:172
 msgid "Inscription paid by Société Générale"
 msgstr "Inscription payée par la Société générale"

-#: apps/member/forms.py:177
+#: apps/member/forms.py:174
 msgid "Check this case if the Société Générale paid the inscription."
 msgstr "Cochez cette case si la Société Générale a payé l'inscription."

-#: apps/member/forms.py:182 apps/registration/forms.py:79
+#: apps/member/forms.py:179 apps/registration/forms.py:79
 #: apps/wei/forms/registration.py:91
 msgid "Credit type"
 msgstr "Type de rechargement"

-#: apps/member/forms.py:183 apps/registration/forms.py:80
+#: apps/member/forms.py:180 apps/registration/forms.py:80
 #: apps/wei/forms/registration.py:92
 msgid "No credit"
 msgstr "Pas de rechargement"

-#: apps/member/forms.py:185
+#: apps/member/forms.py:182
 msgid "You can credit the note of the user."
 msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."

@@ -606,17 +594,17 @@ msgstr "Vous pouvez créditer la note de l'utilisateur·ice avant l'adhésion."
 msgid "Credit amount"
 msgstr "Montant à créditer"

-#: apps/member/forms.py:206 apps/note/templates/note/transaction_form.html:144
+#: apps/member/forms.py:203 apps/note/templates/note/transaction_form.html:144
 #: apps/registration/forms.py:102 apps/treasury/forms.py:135
 #: apps/wei/forms/registration.py:114
 msgid "Bank"
 msgstr "Banque"

-#: apps/member/forms.py:233
+#: apps/member/forms.py:230
 msgid "User"
 msgstr "Utilisateur·ice"

-#: apps/member/forms.py:247
+#: apps/member/forms.py:244
 msgid "Roles"
 msgstr "Rôles"

@@ -864,50 +852,46 @@ msgstr ""
 "Date maximale d'une fin d'adhésion, après laquelle les adhérent·e·s doivent la "
 "renouveler."

-#: apps/member/models.py:263
-msgid "add to registration form"
-msgstr "ajouter au formulaire d'inscription"
-
-#: apps/member/models.py:268 apps/member/models.py:324
+#: apps/member/models.py:263 apps/member/models.py:319
 #: apps/note/models/notes.py:176
 msgid "club"
 msgstr "club"

-#: apps/member/models.py:269
+#: apps/member/models.py:264
 msgid "clubs"
 msgstr "clubs"

-#: apps/member/models.py:335
+#: apps/member/models.py:330
 msgid "membership starts on"
 msgstr "l'adhésion commence le"

-#: apps/member/models.py:339
+#: apps/member/models.py:334
 msgid "membership ends on"
 msgstr "l'adhésion finit le"

-#: apps/member/models.py:348 apps/note/models/transactions.py:385
+#: apps/member/models.py:343 apps/note/models/transactions.py:385
 msgid "membership"
 msgstr "adhésion"

-#: apps/member/models.py:349
+#: apps/member/models.py:344
 msgid "memberships"
 msgstr "adhésions"

-#: apps/member/models.py:353
+#: apps/member/models.py:348
 #, python-brace-format
 msgid "Membership of {user} for the club {club}"
 msgstr "Adhésion de {user} pour le club {club}"

-#: apps/member/models.py:372
+#: apps/member/models.py:367
 #, python-brace-format
 msgid "The role {role} does not apply to the club {club}."
 msgstr "Le rôle {role} ne s'applique pas au club {club}."

-#: apps/member/models.py:381 apps/member/views.py:712
+#: apps/member/models.py:376 apps/member/views.py:712
 msgid "User is already a member of the club"
 msgstr "L'utilisateur·ice est déjà membre du club"

-#: apps/member/models.py:393 apps/member/views.py:721
+#: apps/member/models.py:388 apps/member/views.py:721
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur·ice n'est pas membre du club parent"

@@ -1169,11 +1153,11 @@ msgstr "Introspection :"
 msgid "Show my applications"
 msgstr "Voir mes applications"

-#: apps/member/templates/member/picture_update.html:38
+#: apps/member/templates/member/picture_update.html:35
 msgid "Nevermind"
 msgstr "Annuler"

-#: apps/member/templates/member/picture_update.html:39
+#: apps/member/templates/member/picture_update.html:36
 msgid "Crop and upload"
 msgstr "Recadrer et envoyer"

@@ -2199,23 +2183,18 @@ msgstr "Utilisateur·ice·s en attente d'inscription"
 msgid "Registration detail"
 msgstr "Détails de l'inscription"

-#: apps/registration/views.py:256
-#, python-format
-msgid "Join %(club)s Club"
-msgstr "Adhérer au club %(club)s"
-
-#: apps/registration/views.py:299
+#: apps/registration/views.py:293
 msgid "You must join the BDE."
 msgstr "Vous devez adhérer au BDE."

-#: apps/registration/views.py:330
+#: apps/registration/views.py:323
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 "Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
 "{}"

-#: apps/registration/views.py:425
+#: apps/registration/views.py:417
 msgid "Invalidate pre-registration"
 msgstr "Invalider l'inscription"

@@ -3641,6 +3620,9 @@ msgstr ""
 "d'adhésion. Vous devez également valider votre adresse email en suivant le "
 "lien que vous avez reçu."

+#~ msgid "Join BDA Club"
+#~ msgstr "Adhérer au club BDA"
+
 #, fuzzy
 #~| msgid "People having you as a friend"
 #~ msgid "You already have that person as a friend"
--- a/note_kfet/admin.py
+++ b/note_kfet/admin.py
@@ -25,19 +25,13 @@ admin_site.register(Site, SiteAdmin)

 # Add external apps model
 if "oauth2_provider" in settings.INSTALLED_APPS:
-    from oauth2_provider.admin import Application, ApplicationAdmin, Grant, \
-        GrantAdmin, AccessToken, AccessTokenAdmin, RefreshToken, RefreshTokenAdmin
+    from oauth2_provider.admin import ApplicationAdmin, GrantAdmin, AccessTokenAdmin, RefreshTokenAdmin
+    from oauth2_provider.models import Application, Grant, AccessToken, RefreshToken
    admin_site.register(Application, ApplicationAdmin)
    admin_site.register(Grant, GrantAdmin)
    admin_site.register(AccessToken, AccessTokenAdmin)
    admin_site.register(RefreshToken, RefreshTokenAdmin)

-if "django_htcpcp_tea" in settings.INSTALLED_APPS:
-    from django_htcpcp_tea.admin import *
-    from django_htcpcp_tea.models import *
-    admin_site.register(Pot, PotAdmin)
-    admin_site.register(TeaType, TeaTypeAdmin)
-    admin_site.register(Addition, AdditionAdmin)

 if "mailer" in settings.INSTALLED_APPS:
    from mailer.admin import *
@@ -50,9 +44,3 @@ if "rest_framework" in settings.INSTALLED_APPS:
    from rest_framework.authtoken.admin import *
    from rest_framework.authtoken.models import *
    admin_site.register(Token, TokenAdmin)
-
-if "cas_server" in settings.INSTALLED_APPS:
-    from cas_server.admin import *
-    from cas_server.models import *
-    admin_site.register(ServicePattern, ServicePatternAdmin)
-    admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@@ -41,7 +41,7 @@ INSTALLED_APPS = [
    'bootstrap_datepicker_plus',
    'colorfield',
    'crispy_forms',
-    'django_htcpcp_tea',
+    'crispy_bootstrap4',
    'django_tables2',
    'mailer',
    'phonenumber_field',
@@ -90,7 +90,6 @@ MIDDLEWARE = [
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    'django.middleware.locale.LocaleMiddleware',
    'django.contrib.sites.middleware.CurrentSiteMiddleware',
-    'django_htcpcp_tea.middleware.HTCPCPTeaMiddleware',
    'note_kfet.middlewares.SessionMiddleware',
    'note_kfet.middlewares.LoginByIPMiddleware',
    'note_kfet.middlewares.TurbolinksMiddleware',
@@ -295,3 +294,6 @@ PHONENUMBER_DEFAULT_REGION = 'FR'

 # We add custom information to CAS, in order to give a normalized name to other services
 CAS_AUTH_CLASS = 'member.auth.CustomAuthUser'
+
+# Default field for primary key
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
--- a/note_kfet/templates/autocomplete_model.html
+++ b/note_kfet/templates/autocomplete_model.html
@@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
   {% if widget.value != None and widget.value != "" %}value="{{ widget.value }}"{% endif %}
   name="{{ widget.name }}_name" autocomplete="off"
    {% for name, value in widget.attrs.items %}
-        {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
+        {% if value != False %}{{ name }}{% if value != True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
    {% endfor %}
    aria-describedby="{{widget.attrs.id}}_tooltip">
    {% if widget.resetable %}
--- a/note_kfet/templates/base.html
+++ b/note_kfet/templates/base.html
@@ -126,9 +126,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
                                <a class="dropdown-item" href="{% url 'member:user_detail' pk=request.user.pk %}">
                                    <i class="fa fa-user"></i> {% trans "My account" %}
                                </a>
-                                <a class="dropdown-item" href="{% url 'logout' %}">
+                                <form method="post" action="{% url 'logout' %}">
+                                  {% csrf_token %}
+                                  <button class="dropdown-item" type="submit">
                                    <i class="fa fa-sign-out"></i> {% trans "Log out" %}
-                                </a>
+                                  </button>
+                                </form>
                            </div>
                        </li>
                    {% else %}
--- a/note_kfet/urls.py
+++ b/note_kfet/urls.py
@@ -30,9 +30,6 @@ urlpatterns = [
    path('accounts/', include('django.contrib.auth.urls')),
    path('api/', include('api.urls')),
    path('permission/', include('permission.urls')),
-
-    # Make coffee
-    path('coffee/', include('django_htcpcp_tea.urls')),
 ]

 # During development, serve static and media files
@@ -46,11 +43,6 @@ if "oauth2_provider" in settings.INSTALLED_APPS:
        path('o/', include('oauth2_provider.urls', namespace='oauth2_provider'))
    )

-if "cas_server" in settings.INSTALLED_APPS:
-    urlpatterns.append(
-        path('cas/', include('cas_server.urls', namespace='cas_server'))
-    )
-
 if "debug_toolbar" in settings.INSTALLED_APPS:
    import debug_toolbar
    urlpatterns = [
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,17 @@
-beautifulsoup4~=4.7.1
-Django~=2.2.15
-django-bootstrap-datepicker-plus~=3.0.5
-django-cas-server~=1.2.0
-django-colorfield~=0.3.2
-django-crispy-forms~=1.7.2
-django-extensions>=2.1.4
-django-filter~=2.1
-django-htcpcp-tea~=0.3.1
-django-mailer~=2.0.1
-django-oauth-toolkit~=1.3.3
-django-phonenumber-field~=5.0.0
-django-polymorphic>=2.0.3,<3.0.0
-djangorestframework>=3.9.0,<3.13.0
-django-rest-polymorphic~=0.1.9
-django-tables2~=2.3.1
-python-memcached~=1.59
-phonenumbers~=8.9.10
+beautifulsoup4~=4.12.3
+crispy-bootstrap4~=2024.1
+Django~=5.0.7
+django-bootstrap-datepicker-plus~=5.0.5
+django-colorfield~=0.11.0
+django-crispy-forms~=2.2
+django-extensions~=3.2.3
+django-filter~=24.2
+django-mailer~=2.3.2
+django-oauth-toolkit~=2.4.0
+django-phonenumber-field~=8.0.0
+django-polymorphic~=3.1.0
+django-rest-polymorphic~=0.1.10
+django-tables2~=2.7.0
+djangorestframework~=3.15.2
+phonenumbers~=8.13.40
 Pillow>=5.4.1
--- a/tox.ini
+++ b/tox.ini
@@ -1,13 +1,10 @@
 [tox]
 envlist =
-    # Debian Buster Python
-    py37-django22
-
    # Ubuntu 20.04 Python
-    py38-django22
+    py310-django50

    # Debian Bullseye Python
-    py39-django22
+    py311-django50

    linters
 skipsdist = True
@@ -51,4 +48,4 @@ max-complexity = 15
 max-line-length = 160
 import-order-style = google
 application-import-names = flake8
-format = %(cyan)s%(path)s%(reset)s:%(yellow)s%(bold)s%(row)d%(reset)s:%(green)s%(bold)s%(col)d%(reset)s: %(red)s%(bold)s%(code)s%(reset)s %(text)s
+format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s