Merge pull request #1463 from ae-utbm/taiste

Pre school year release

.python-version

@@ -1 +1 @@
-3.14
+3.12

api/admin.py

@@ -1,15 +1,11 @@
-from typing import TYPE_CHECKING
-
 from django.contrib import admin, messages
+from django.db.models import QuerySet
+from django.http import HttpRequest
 from django.utils.translation import gettext_lazy as _
 
 from api.hashers import generate_key
 from api.models import ApiClient, ApiKey
 
-if TYPE_CHECKING:
-    from django.db.models import QuerySet
-    from django.http import HttpRequest
-
 
 @admin.register(ApiClient)
 class ApiClientAdmin(admin.ModelAdmin):

api/auth.py

@@ -1,13 +1,9 @@
-from typing import TYPE_CHECKING
+from django.http import HttpRequest
-
 from ninja.security import APIKeyHeader
 
 from api.hashers import get_hasher
 from api.models import ApiClient, ApiKey
 
-if TYPE_CHECKING:
-    from django.http import HttpRequest
-
 
 class ApiKeyAuth(APIKeyHeader):
     """Authentication through client api keys."""

api/permissions.py

@@ -39,17 +39,15 @@ Example:
 
 import operator
 from functools import reduce
-from typing import TYPE_CHECKING, Any, Callable
+from typing import Any, Callable
 
+from django.contrib.auth.models import Permission
+from django.http import HttpRequest
+from ninja_extra import ControllerBase
 from ninja_extra.permissions import BasePermission
 
 from counter.utils import is_logged_in_counter
 
-if TYPE_CHECKING:
-    from django.contrib.auth.models import Permission
-    from django.http import HttpRequest
-    from ninja_extra import ControllerBase
-
 
 class IsInGroup(BasePermission):
     """Check that the user is in the group whose primary key is given."""

club/admin.py

@@ -12,16 +12,12 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from typing import TYPE_CHECKING
-
 from django.contrib import admin
+from django.forms.models import ModelForm
+from django.http import HttpRequest
 
 from club.models import Club, ClubLink, ClubRole, LinkType, Membership
 
-if TYPE_CHECKING:
-    from django.forms.models import ModelForm
-    from django.http import HttpRequest
-
 
 @admin.register(Club)
 class ClubAdmin(admin.ModelAdmin):

club/migrations/0012_club_board_group_club_members_group.py

@@ -1,16 +1,12 @@
 # Generated by Django 4.2.16 on 2024-11-20 17:08
 
-from typing import TYPE_CHECKING
-
 import django.db.models.deletion
 import django.db.models.functions.datetime
 from django.db import migrations, models
+from django.db.migrations.state import StateApps
 from django.db.models import Q
 from django.utils.timezone import localdate
 
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
 # Before the club role rework, the maximum free role
 # was the hardcoded highest non-board role
 MAXIMUM_FREE_ROLE = 1

club/migrations/0015_clubrole_alter_membership_role.py

@@ -1,14 +1,10 @@
 # Generated by Django 5.2.3 on 2025-06-21 21:59
 
-from typing import TYPE_CHECKING
-
 import django.db.models.deletion
 from django.db import migrations, models
+from django.db.migrations.state import StateApps
 from django.db.models import Case, When
 
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
 PRESIDENCY_ROLES = [10, 9]
 MAXIMUM_FREE_ROLE = 1
 SITH_CLUB_ROLES = {

club/templates/club/club_list.jinja

@@ -15,6 +15,9 @@
   {% endblock %}
 {% else %}
   {% extends "core/base.jinja" %}
+  {% block additional_css %}
+    <link rel="stylesheet" href="{{ static("club/list.scss") }}">
+  {% endblock %}
   {% block description -%}
     {% trans %}The list of all clubs existing at UTBM.{% endtrans %}
   {%- endblock %}
@@ -23,12 +26,6 @@
   {%- endblock %}
 {% endif %}
 
-{% block additional_css %}
-  {% if not is_fragment %}
-    <link rel="stylesheet" href="{{ static("club/list.scss") }}">
-  {% endif %}
-{% endblock %}
-
 {% from "core/macros.jinja" import paginate_htmx %}
 
 {% block content %}
@@ -36,17 +33,15 @@
     <h3>{% trans %}Filters{% endtrans %}</h3>
     <form
       id="club-list-filters"
-      method="GET"
+      hx-get="{{ url("club:club_list") }}"
-      hx-action="{{ url("club:club_list") }}"
       hx-target="#content"
-      hx-swap="innerHTML"
+      hx-swap="outerHtml"
       hx-push-url="true"
-      hx-disable="find input, find button"
     >
       <div class="row gap-4x">
         {{ form }}
       </div>
-      <button class="btn btn-blue margin-bottom">
+      <button type="submit" class="btn btn-blue margin-bottom">
         <i class="fa fa-magnifying-glass"></i>{% trans %}Search{% endtrans %}
       </button>
     </form>

club/templates/club/fragments/add_member.jinja

@@ -7,7 +7,7 @@
 
   <form
     hx-post="{{ url('club:club_new_members', club_id=club.id) }}"
-    hx-disable="find input[type='submit']"
+    hx-disabled-elt="find input[type='submit']"
     hx-swap="outerHTML"
     hx-target="#member-fragment-container"
     id="add_club_members_form"

club/tests/test_club.py

@@ -1,9 +1,9 @@
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 import pytest
 from django.conf import settings
 from django.db import ProgrammingError
+from django.test import Client
 from django.urls import reverse
 from django.utils.timezone import localdate
 from model_bakery import baker
@@ -14,9 +14,6 @@ from club.models import Club, ClubRole, Membership
 from core.baker_recipes import subscriber_user
 from core.models import User
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 def test_club_queryset_having_board_member():

club/tests/test_clubrole.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING
+from collections.abc import Callable
 
 import pytest
 from django.contrib.auth.models import Permission
@@ -14,9 +14,6 @@ from club.models import Club, ClubRole, Membership
 from core.baker_recipes import subscriber_user
 from core.models import AnonymousUser, User
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
 
 def make_club():
     # unittest-style tests cannot use fixture, so we create a function

club/tests/test_edit.py

@@ -1,6 +1,5 @@
-from typing import TYPE_CHECKING
-
 import pytest
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 from pytest_django.asserts import assertRedirects
@@ -8,9 +7,6 @@ from pytest_django.asserts import assertRedirects
 from club.models import Club, ClubRole, Membership
 from core.baker_recipes import subscriber_user
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 def test_club_board_member_cannot_edit_club_properties(client: Client):

club/tests/test_membership.py

@@ -1,6 +1,6 @@
 import itertools
+from collections.abc import Callable
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 import pytest
 from bs4 import BeautifulSoup
@@ -19,9 +19,6 @@ from club.tests.base import TestClub
 from core.baker_recipes import subscriber_user
 from core.models import AnonymousUser, User
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
 
 class TestMembershipQuerySet(TestClub):
     def test_ongoing(self):

club/tests/test_page.py

@@ -1,8 +1,7 @@
-from typing import TYPE_CHECKING
-
 import pytest
 from aemark import markdown
 from bs4 import BeautifulSoup
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 from pytest_django.asserts import assertHTMLEqual, assertRedirects
@@ -11,9 +10,6 @@ from club.models import Club, ClubRole, Membership
 from core.baker_recipes import subscriber_user
 from core.models import PageRev, User
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 def test_page_display_on_club_main_page(client: Client):

club/tests/test_posters.py

@@ -1,6 +1,5 @@
-from typing import TYPE_CHECKING
-
 import pytest
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 
@@ -8,9 +7,6 @@ from club.models import Club
 from com.models import Poster
 from core.baker_recipes import subscriber_user
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 @pytest.mark.parametrize("route_url", ["club:poster_list", "club:poster_create"])

club/tests/test_sales.py

@@ -1,8 +1,8 @@
 import csv
 import itertools
-from typing import TYPE_CHECKING
 
 import pytest
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 
@@ -12,9 +12,6 @@ from core.models import User
 from counter.baker_recipes import product_recipe, sale_recipe
 from counter.models import Counter, Customer, Product, Selling
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 def test_sales_page_doesnt_crash(client: Client):

com/forms.py

@@ -1,5 +1,4 @@
 from datetime import date
-from typing import TYPE_CHECKING
 
 from dateutil.relativedelta import relativedelta
 from django import forms
@@ -10,13 +9,11 @@ from django.utils.translation import gettext_lazy as _
 from club.models import Club
 from club.widgets.ajax_select import AutoCompleteSelectClub
 from com.models import News, NewsDate, Poster
+from core.models import User
 from core.utils import get_end_of_semester
 from core.views.forms import SelectDateTime
 from core.views.widgets.markdown import MarkdownInput
 
-if TYPE_CHECKING:
-    from core.models import User
-
 
 class PosterForm(forms.ModelForm):
     class Meta:

com/ics_calendar.py

@@ -1,10 +1,11 @@
-from typing import TYPE_CHECKING
+from pathlib import Path
 
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.contrib.syndication.views import add_domain
 from django.db.models import Count, OuterRef, QuerySet, Subquery
+from django.http import HttpRequest
 from django.urls import reverse
 from django.utils import timezone
 from ical.calendar import Calendar
@@ -13,13 +14,7 @@ from ical.event import Event
 from ical.types import Frequency, Recur
 
 from com.models import News, NewsDate
-
+from core.models import User
-if TYPE_CHECKING:
-    from pathlib import Path
-
-    from django.http import HttpRequest
-
-    from core.models import User
 
 
 def as_absolute_url(url: str, request: HttpRequest | None = None) -> str:

com/tests/test_api.py

@@ -1,11 +1,11 @@
 from datetime import timedelta
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 import pytest
 from aemark import markdown
 from django.conf import settings
 from django.contrib.auth.models import Permission
+from django.http import HttpResponse
 from django.test import Client, TestCase
 from django.urls import reverse
 from django.utils.timezone import now
@@ -16,9 +16,6 @@ from com.ics_calendar import IcsCalendar
 from com.models import News, NewsDate
 from core.models import User
 
-if TYPE_CHECKING:
-    from django.http import HttpResponse
-
 
 def accel_redirect_to_file(response: HttpResponse) -> Path | None:
     redirect = Path(response.headers.get("X-Accel-Redirect", ""))

core/api.py

@@ -3,6 +3,7 @@ from typing import Annotated, Literal
 from annotated_types import Ge, Le, MinLen
 from django.conf import settings
 from django.db.models import F
+from django.http import HttpResponse
 from ninja import File, Query
 from ninja.security import SessionAuth
 from ninja_extra import ControllerBase, api_controller, paginate, route
@@ -17,6 +18,7 @@ from core.models import Group, QuickUploadImage, SithFile, User
 from core.schemas import (
     FamilyGodfatherSchema,
     GroupSchema,
+    MarkdownSchema,
     SithFileSchema,
     UploadedFileSchema,
     UploadedImage,
@@ -26,9 +28,18 @@ from core.schemas import (
     UserSchema,
     ValidationErrorSchema,
 )
+from core.templatetags.renderer import markdown
 from counter.utils import is_logged_in_counter
 
 
+@api_controller("/markdown")
+class MarkdownController(ControllerBase):
+    @route.post("", url_name="markdown")
+    def render_markdown(self, body: MarkdownSchema):
+        """Convert the markdown text into html."""
+        return HttpResponse(markdown(body.text), content_type="text/html")
+
+
 @api_controller("/upload")
 class UploadController(ControllerBase):
     @route.post(

core/migrations/0042_invert_is_manually_manageable_20250104_1742.py

@@ -1,13 +1,9 @@
 # Generated by Django 4.2.17 on 2025-01-04 16:42
 
-from typing import TYPE_CHECKING
-
 from django.db import migrations
+from django.db.migrations.state import StateApps
 from django.db.models import F
 
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
 
 def invert_is_manually_manageable(apps: StateApps, schema_editor):
     """Invert `is_manually_manageable`.

core/migrations/0043_bangroup_alter_group_description_alter_user_groups_and_more.py

@@ -1,14 +1,10 @@
 # Generated by Django 4.2.17 on 2024-12-31 13:30
 
-from typing import TYPE_CHECKING
-
 import django.contrib.auth.models
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
-
+from django.db.migrations.state import StateApps
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
 
 
 def migrate_ban_groups(apps: StateApps, schema_editor):

core/migrations/0050_alter_sithfile_moderator.py

@@ -1,15 +1,11 @@
 # Generated by Django 5.2.12 on 2026-05-01 08:59
 
-from typing import TYPE_CHECKING
-
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
+from django.db.migrations.state import StateApps
 from django.db.models import F
 
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
 
 def set_updated_at(apps: StateApps, schema_editor):
     SithFile = apps.get_model("core", "SithFile")

core/schemas.py

@@ -161,6 +161,10 @@ class UserFilterSchema(FilterSchema):
         return value
 
 
+class MarkdownSchema(Schema):
+    text: str
+
+
 class FamilyGodfatherSchema(Schema):
     godfather: int
     godchild: int

core/static/bundled/base-bundle-index.ts

@@ -6,15 +6,10 @@
  * for more efficient tree-shaking and gzip compression.
  */
 
-// Must be loaded before Apline
-import htmx from "htmx.org";
-import "htmx.org/dist/ext/hx-alpine-compat.js";
-import "htmx.org/dist/ext/hx-prompt.js";
-import "htmx.org/dist/ext/hx-download.js";
-
 import sort from "@alpinejs/sort";
 import Alpine from "alpinejs";
 import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
+import htmx from "htmx.org";
 import { limitedChoices } from "#core:alpine/limited-choices";
 import { expireOldStorage } from "#core:core/localstorage";
 import { default as navbar } from "#core:core/navbar";
@@ -49,20 +44,19 @@ polyfillCountryFlagEmojis();
  * HTMX
  */
 document.body.addEventListener(
-  "htmx:before:request" as keyof HTMLElementEventMap,
+  "htmx:beforeRequest" as keyof HTMLElementEventMap,
   (event) => {
-    (event as CustomEvent).detail.ctx.target.ariaBusy = true;
+    (event as CustomEvent).detail.target.ariaBusy = true;
   },
 );
 
 document.body.addEventListener(
-  "htmx:before:swap" as keyof HTMLElementEventMap,
+  "htmx:beforeSwap" as keyof HTMLElementEventMap,
   (event) => {
-    (event as CustomEvent).detail.ctx.target.ariaBusy = null;
+    (event as CustomEvent).detail.target.ariaBusy = null;
   },
 );
 
-htmx.config.transitions = true;
 Object.assign(window, { htmx });
 
 /**

core/static/bundled/core/components/easymde-index.ts

@@ -3,12 +3,16 @@
 import "codemirror/lib/codemirror.css";
 // @ts-expect-error 2307
 import "easymde/src/css/easymde.css";
-import { markdown } from "@ae_utbm/aemark";
 // biome-ignore lint/correctness/noUndeclaredDependencies: Imported by EasyMDE
-import type CodeMirror from "codemirror"; // biome-ignore lint/style/useNamingConvention: This is how they called their namespace
+import type CodeMirror from "codemirror";
+// biome-ignore lint/style/useNamingConvention: This is how they called their namespace
 import EasyMDE from "easymde";
 import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
-import { type UploadUploadImageErrors, uploadUploadImage } from "#openapi";
+import {
+  markdownRenderMarkdown,
+  type UploadUploadImageErrors,
+  uploadUploadImage,
+} from "#openapi";
 
 const loadEasyMde = (textarea: HTMLTextAreaElement) => {
   const easymde = new EasyMDE({
@@ -60,7 +64,19 @@ const loadEasyMde = (textarea: HTMLTextAreaElement) => {
       });
       easymde.codemirror.replaceSelection("\n");
     },
-    previewRender: (plainText) => markdown(plainText),
+    previewRender: (plainText, preview) => {
+      /* This is wrapped this way to allow time for Alpine to be loaded on the page */
+      return Alpine.debounce(() => {
+        const func = async () => {
+          preview.innerHTML = (
+            await markdownRenderMarkdown({ body: { text: plainText } })
+          ).data as string;
+          return null;
+        };
+        func().then();
+        return null;
+      }, 300)();
+    },
     forceSync: true, // Avoid validation error on generic create view
     imageTexts: {
       sbInit: gettext("Attach files by drag and dropping or pasting from clipboard."),

core/templates/core/404.jinja

@@ -4,10 +4,6 @@
 
   <div id="page">
     <h3>{% trans %}404, Not Found{% endtrans %}</h3>
-
-    <blockquote>
-      {% trans %}Impossible, perhaps the archives are incomplete{% endtrans %}
-    </blockquote>
   </div>
 
 {% endblock %}

core/templates/core/file_delete_confirm.jinja

@@ -31,7 +31,7 @@
       {% if is_fragment %}
         hx-post="{{ action }}"
         hx-target="#content"
-        hx-swap="innerHTML"
+        hx-swap="outerHtml"
       {% endif %}
     >{% trans %}Confirm{% endtrans %}</button>
 
@@ -39,7 +39,7 @@
       {% if is_fragment %}
         hx-get="{{ previous }}"
         hx-target="#content"
-        hx-swap="innerHTML"
+        hx-swap="outerHtml"
       {% else %}
         action="window.history.back()"
       {% endif %}

core/templates/core/file_moderation.jinja

@@ -39,13 +39,13 @@
         <p><button
           hx-get="{{ url('core:file_moderate', file_id=f.id) }}"
           hx-target="#content"
-          hx-swap="innerHTML"
+          hx-swap="outerHtml"
         >{% trans %}Moderate{% endtrans %}</button> -
           {% set current_page = url('core:file_moderation') + "?page=" + page_obj.number | string %}
           <button
             hx-get="{{ url('core:file_delete', file_id=f.id) }}?next={{ current_page | urlencode }}&previous={{ current_page | urlencode }}"
             hx-target="#file-{{ loop.index }}"
-            hx-swap="innerHTML"
+            hx-swap="outerHtml"
           >{% trans %}Delete{% endtrans %}</button></p>
       </div>
     {% endfor %}

core/templates/core/fragment/user_visibility.jinja

@@ -1,6 +1,6 @@
 <form
   hx-post="{{ url("core:user_visibility_fragment", user_id=form.instance.id) }}"
-  hx-disable="find input[type='submit']"
+  hx-disabled-elt="find input[type='submit']"
   hx-swap="outerHTML" x-data="{ isViewable: {{ form.is_viewable.value()|tojson }} }"
 >
   {% for message in messages %}

core/templatetags/extensions.py

@@ -20,15 +20,13 @@
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
-from typing import TYPE_CHECKING, Callable
+from typing import Callable
 
 import honeypot.templatetags.honeypot as honeypot_filters
 from django.template.loader import render_to_string
 from jinja2 import Environment, nodes
 from jinja2.ext import Extension
-
+from jinja2.parser import Parser
-if TYPE_CHECKING:
-    from jinja2.parser import Parser
 
 
 class HoneypotExtension(Extension):

core/templatetags/renderer.py

@@ -23,18 +23,15 @@
 #
 
 import datetime
-from typing import TYPE_CHECKING
 
 import phonenumbers
 from aemark import markdown as md
 from django import template
+from django.forms import BoundField
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
 from django.utils.translation import ngettext
 
-if TYPE_CHECKING:
-    from django.forms import BoundField
-
 register = template.Library()
 
 

core/tests/test_page.py

@@ -1,5 +1,4 @@
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 import freezegun
 import pytest
@@ -7,6 +6,7 @@ from aemark import markdown
 from bs4 import BeautifulSoup
 from django.conf import settings
 from django.contrib.auth.models import Permission
+from django.test import Client
 from django.urls import reverse
 from django.utils.timezone import now
 from model_bakery import baker
@@ -16,9 +16,6 @@ from club.models import Club, Membership
 from core.baker_recipes import board_user, subscriber_user
 from core.models import AnonymousUser, Page, PageRev, User
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 class TestEditPage:

core/tests/test_user.py

@@ -141,22 +141,6 @@ class TestSearchUsersView(TestSearchUsers):
         response = self.client.get(reverse("core:search"))
         assert response.status_code == 200
 
-    def test_search_with_whitelist_unique(self):
-        """Test that when a user has a whitelist and appears in the results,
-        it appears only once.
-
-        This is a regression test (cf #1463)
-        """
-        user = subscriber_user.make(is_viewable=False)
-        user.whitelisted_users.add(
-            *subscriber_user.make(_quantity=4, _bulk_create=True)
-        )
-        self.client.force_login(user)
-        response = self.client.get(
-            reverse("core:search", query={"query": user.last_name})
-        )
-        assert response.context_data["users"] == [user]
-
 
 @pytest.mark.django_db
 def test_user_account_not_found(client: Client):

core/utils.py

@@ -17,18 +17,16 @@ from datetime import date, timedelta
 
 # Image utils
 from io import BytesIO
-from typing import TYPE_CHECKING, Final
+from typing import Final
 
 import PIL
 from django.conf import settings
 from django.core.files.base import ContentFile
+from django.core.files.uploadedfile import UploadedFile
+from django.http import HttpRequest
 from django.utils.timezone import localdate
 from PIL.Image import Image, Resampling
 
-if TYPE_CHECKING:
-    from django.core.files.uploadedfile import UploadedFile
-    from django.http import HttpRequest
-
 RED_PIXEL_PNG: Final[bytes] = (
     b"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52"
     b"\x00\x00\x00\x01\x00\x00\x00\x01\x08\x02\x00\x00\x00\x90\x77\x53"

core/views/files.py

@@ -13,7 +13,7 @@
 #
 #
 import mimetypes
-from typing import TYPE_CHECKING
+from pathlib import Path
 from urllib.parse import quote, urljoin
 
 # This file contains all the views that concern the page model
@@ -48,9 +48,6 @@ from core.views.widgets.ajax_select import (
 )
 from counter.utils import is_logged_in_counter
 
-if TYPE_CHECKING:
-    from pathlib import Path
-
 
 def send_raw_file(path: Path) -> HttpResponse:
     """Send a file located in the MEDIA_ROOT

core/views/forms.py

@@ -22,8 +22,8 @@
 #
 import re
 from copy import copy
+from datetime import date, datetime
 from io import BytesIO
-from typing import TYPE_CHECKING
 
 from captcha.fields import CaptchaField
 from django import forms
@@ -59,9 +59,6 @@ from core.views.widgets.ajax_select import (
 )
 from core.views.widgets.markdown import MarkdownInput
 
-if TYPE_CHECKING:
-    from datetime import date, datetime
-
 # Widgets
 
 

core/views/index.py

@@ -22,11 +22,11 @@
 #
 #
 
-from typing import TYPE_CHECKING
-
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.db.models import F
+from django.db.models.query import QuerySet
+from django.http import HttpRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.views.generic import ListView, TemplateView
 
@@ -34,10 +34,6 @@ from club.models import Club
 from core.models import Notification, User
 from core.schemas import UserFilterSchema
 
-if TYPE_CHECKING:
-    from django.db.models.query import QuerySet
-    from django.http import HttpRequest
-
 
 class NotificationList(LoginRequiredMixin, ListView):
     model = Notification
@@ -69,7 +65,6 @@ class SearchView(LoginRequiredMixin, TemplateView):
                 UserFilterSchema(search=query)
                 .filter(User.objects.viewable_by(self.request.user))
                 .order_by(F("last_login").desc(nulls_last=True))
-                .distinct()
             )
             clubs = list(Club.objects.filter(name__icontains=query)[:5])
         return super().get_context_data(**kwargs) | {"users": users, "clubs": clubs}

core/views/mixins.py

@@ -1,16 +1,14 @@
 import copy
 import inspect
-from typing import TYPE_CHECKING, Any, ClassVar, LiteralString, Protocol, Unpack
+from typing import Any, ClassVar, LiteralString, Protocol, Unpack
 
 from django.core.exceptions import ImproperlyConfigured
+from django.http import HttpRequest, HttpResponse
 from django.template.loader import render_to_string
+from django.utils.safestring import SafeString
 from django.views import View
 from django.views.generic.base import ContextMixin, TemplateResponseMixin
 
-if TYPE_CHECKING:
-    from django.http import HttpRequest, HttpResponse
-    from django.utils.safestring import SafeString
-
 
 class TabedViewMixin(View):
     """Basic functions for displaying tabs in the template."""

core/views/user.py

@@ -27,7 +27,6 @@ from datetime import timedelta
 # This file contains all the views that concern the user model
 from operator import itemgetter
 from smtplib import SMTPException
-from typing import TYPE_CHECKING
 
 from django.contrib import messages
 from django.contrib.auth import login, views
@@ -44,6 +43,7 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.loader import render_to_string
 from django.urls import reverse, reverse_lazy
 from django.utils.decorators import method_decorator
+from django.utils.safestring import SafeString
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_POST
 from django.views.generic import (
@@ -73,9 +73,6 @@ from counter.models import Refilling, Selling
 from eboutic.models import Invoice
 from trombi.views import UserTrombiForm
 
-if TYPE_CHECKING:
-    from django.utils.safestring import SafeString
-
 
 class SithLoginView(views.LoginView):
     """The login View."""

core/views/widgets/ajax_select.py

@@ -1,18 +1,15 @@
-from typing import TYPE_CHECKING, Any
+from collections.abc import Collection
+from typing import Any
 
 from django.contrib.staticfiles.storage import staticfiles_storage
+from django.db.models import Model, QuerySet
 from django.forms import Select, SelectMultiple
+from ninja import ModelSchema
 from pydantic import TypeAdapter
 
 from core.models import Group, SithFile, User
 from core.schemas import GroupSchema, SithFileSchema, UserProfileSchema
 
-if TYPE_CHECKING:
-    from collections.abc import Collection
-
-    from django.db.models import Model, QuerySet
-    from ninja import ModelSchema
-
 
 class AutoCompleteSelectMixin:
     component_name = "autocomplete-select"

counter/forms.py

@@ -3,7 +3,7 @@ import math
 import uuid
 from collections import defaultdict
 from datetime import date, datetime, timezone
-from typing import TYPE_CHECKING, ClassVar
+from typing import ClassVar
 
 from dateutil.relativedelta import relativedelta
 from django import forms
@@ -11,6 +11,7 @@ from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db.models import Exists, OuterRef, Q
 from django.forms import BaseModelFormSet
+from django.http import HttpRequest
 from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
@@ -58,9 +59,6 @@ from counter.widgets.ajax_select import (
     AutoCompleteSelectProduct,
 )
 
-if TYPE_CHECKING:
-    from django.http import HttpRequest
-
 
 class BillingInfoForm(forms.ModelForm):
     class Meta:

counter/management/commands/dump_accounts.py

@@ -1,5 +1,5 @@
+from collections.abc import Iterable
 from operator import attrgetter
-from typing import TYPE_CHECKING
 
 from django.conf import settings
 from django.core.mail import send_mass_mail
@@ -13,9 +13,6 @@ from django.utils.translation import gettext as _
 from core.models import User, UserQuerySet
 from counter.models import AccountDump, Counter, Customer, Product, Selling
 
-if TYPE_CHECKING:
-    from collections.abc import Iterable
-
 
 class Command(BaseCommand):
     """Effectively dump the inactive users.

counter/middleware.py

@@ -1,14 +1,13 @@
 from typing import TYPE_CHECKING, Callable
 
+from django.http import HttpRequest, HttpResponse
 from django.utils.functional import SimpleLazyObject
 
+from core.models import User
 from counter.models import Permanency
 
 if TYPE_CHECKING:
     from django.contrib.sessions.backends.base import SessionBase
-    from django.http import HttpRequest, HttpResponse
-
-    from core.models import User
 
 
 SESSION_PERMANENCES_KEY = "permanence_ids"

counter/migrations/0026_alter_studentcard_customer.py

@@ -1,14 +1,11 @@
 # Generated by Django 4.2.17 on 2024-12-08 13:30
 from operator import attrgetter
-from typing import TYPE_CHECKING
 
 import django.db.models.deletion
 from django.db import migrations, models
+from django.db.migrations.state import StateApps
 from django.db.models import Count
 
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
 
 def delete_duplicates(apps: StateApps, schema_editor):
     """Delete cards of users with more than one student cards.

counter/migrations/0028_alter_producttype_comment_and_more.py

@@ -1,11 +1,7 @@
 # Generated by Django 4.2.17 on 2024-12-15 17:53
 
-from typing import TYPE_CHECKING
-
 from django.db import migrations, models
-
+from django.db.migrations.state import StateApps
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
 
 
 def move_priority_to_order(apps: StateApps, schema_editor):

counter/migrations/0035_remove_selling_is_validated_and_more.py

@@ -1,13 +1,9 @@
 # Generated by Django 5.2.8 on 2025-11-19 17:59
 
-from typing import TYPE_CHECKING
-
 from django.db import migrations, models
+from django.db.migrations.state import StateApps
 from django.db.models import Case, When
 
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
 
 def migrate_selling_payment_method(apps: StateApps, schema_editor):
     # 0 <=> SITH_ACCOUNT is the default value, so no need to migrate it

counter/migrations/0036_product_created_at_product_updated_at.py

@@ -1,16 +1,13 @@
 # Generated by Django 5.2.8 on 2026-02-10 15:40
 from operator import attrgetter
-from typing import TYPE_CHECKING
 
 import django.utils.timezone
 from django.db import migrations, models
+from django.db.migrations.state import StateApps
 from django.db.models import OuterRef, Subquery
 
 from counter.models import Selling
 
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
 
 def apply_product_history_dates(apps: StateApps, schema_editor):
     """Approximate a posteriori the value of created_at and updated_at."""

counter/migrations/0039_price.py

@@ -1,15 +1,11 @@
 # Generated by Django 5.2.11 on 2026-02-18 13:30
 
-from typing import TYPE_CHECKING
-
 import django.db.models.deletion
 from django.db import migrations, models
+from django.db.migrations.state import StateApps
 
 import counter.fields
 
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
 
 def migrate_prices(apps: StateApps, schema_editor):
     Product = apps.get_model("counter", "Product")

counter/static/bundled/counter/components/ajax-select-index.ts

@@ -28,23 +28,18 @@ export class ProductAjaxSelect extends AjaxSelect {
     return [];
   }
 
-  // In the context in which this method is called, `this` might be shadowed
+  private getName(item: SimpleProductSchema, sanitize: typeof escape_html): string {
-  // We need to call it explicitly from the class itself
-  private static getName(
-    item: SimpleProductSchema,
-    sanitize: typeof escape_html,
-  ): string {
     return item.code ? `${sanitize(item.code)} - ${sanitize(item.name)}` : item.name;
   }
 
   protected renderOption(item: SimpleProductSchema, sanitize: typeof escape_html) {
     return `<div class="select-item">
-            <span class="select-item-text">${ProductAjaxSelect.getName(item, sanitize)}</span>
+            <span class="select-item-text">${this.getName(item, sanitize)}</span>
           </div>`;
   }
 
   protected renderItem(item: SimpleProductSchema, sanitize: typeof escape_html) {
-    return `<span>${ProductAjaxSelect.getName(item, sanitize)}</span>`;
+    return `<span>${this.getName(item, sanitize)}</span>`;
   }
 }
 

counter/templates/counter/fragments/delete_student_card.jinja

@@ -1,10 +1,5 @@
 <div id="student_card_form">
-  <form
+  <form hx-post="{{ action }}" hx-swap="outerHTML" hx-target="#student_card_form">
-    hx-post="{{ action }}"
-    hx-swap="outerHTML"
-    hx-target="#student_card_form"
-    hx-disable="input[type='submit']"
-  >
     {% csrf_token %}
     <p>{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}</p>
     <input type="submit" value="{% trans %}Confirm{% endtrans %}" />

counter/tests/test_account_dump.py

@@ -1,5 +1,5 @@
+from collections.abc import Iterable
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 import freezegun
 import pytest
@@ -17,9 +17,6 @@ from counter.management.commands.dump_warning_mail import Command as WarningComm
 from counter.models import AccountDump, Customer, Refilling, Selling
 from subscription.models import Subscription
 
-if TYPE_CHECKING:
-    from collections.abc import Iterable
-
 
 class TestAccountDump(TestCase):
     @classmethod

counter/tests/test_auto_actions.py

@@ -1,9 +1,9 @@
 import json
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 import pytest
 from django.conf import settings
+from django.test import Client
 from django.urls import reverse
 from django.utils.timezone import now
 from django_celery_beat.models import ClockedSchedule
@@ -18,9 +18,6 @@ from counter.forms import (
 )
 from counter.models import Product, ProductType, ScheduledProductAction
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 def test_edit_product(client: Client):

counter/tests/test_counter.py

@@ -15,7 +15,6 @@
 from dataclasses import asdict, dataclass
 from datetime import timedelta
 from decimal import Decimal
-from typing import TYPE_CHECKING
 
 import pytest
 from bs4 import BeautifulSoup
@@ -23,6 +22,7 @@ from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.auth.models import Permission, make_password
 from django.contrib.messages import DEFAULT_LEVELS, get_messages
+from django.http import HttpResponse
 from django.shortcuts import resolve_url
 from django.test import Client, TestCase
 from django.urls import reverse
@@ -48,9 +48,6 @@ from counter.models import (
     Selling,
 )
 
-if TYPE_CHECKING:
-    from django.http import HttpResponse
-
 
 def set_age(user: User, age: int):
     user.date_of_birth = localdate().replace(year=localdate().year - age)

counter/tests/test_invoices.py

@@ -1,10 +1,10 @@
 from datetime import date, datetime
-from typing import TYPE_CHECKING
 
 import pytest
 from dateutil.relativedelta import relativedelta
 from django.contrib.auth.models import Permission
 from django.core.exceptions import ValidationError
+from django.test import Client
 from django.urls import reverse
 from django.utils.timezone import now
 from model_bakery import baker
@@ -16,9 +16,6 @@ from counter.baker_recipes import sale_recipe
 from counter.forms import InvoiceCallForm
 from counter.models import Customer, InvoiceCall, Selling
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 @pytest.mark.parametrize(

counter/tests/test_product_type.py

@@ -1,7 +1,6 @@
-from typing import TYPE_CHECKING
-
 import pytest
 from django.conf import settings
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker, seq
 
@@ -9,9 +8,6 @@ from core.baker_recipes import board_user, subscriber_user
 from core.models import Group, User
 from counter.models import ProductType
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.fixture
 def product_types(db) -> list[ProductType]:

counter/utils.py

@@ -1,11 +1,8 @@
-from typing import TYPE_CHECKING
 from urllib.parse import urlparse
 
+from django.http import HttpRequest
 from django.urls import resolve
 
-if TYPE_CHECKING:
-    from django.http import HttpRequest
-
 
 def is_logged_in_counter(request: HttpRequest) -> bool:
     """Check if the request is sent from a device logged to a counter.

counter/views/cash.py

@@ -13,8 +13,6 @@
 #
 #
 
-from typing import TYPE_CHECKING
-
 from django import forms
 from django.conf import settings
 from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -24,6 +22,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView
 from django.views.generic.edit import BaseFormView, UpdateView
 
+from core.models import User
 from counter.forms import CashSummaryFormBase
 from counter.models import (
     CashRegisterSummary,
@@ -36,9 +35,6 @@ from counter.views.mixins import (
     CounterTabsMixin,
 )
 
-if TYPE_CHECKING:
-    from core.models import User
-
 
 class CashRegisterSummaryForm(forms.Form):
     """Provide the cash summary form."""

counter/views/click.py

@@ -14,7 +14,6 @@
 #
 import random
 from collections import defaultdict
-from typing import TYPE_CHECKING
 
 from django.contrib import messages
 from django.core.exceptions import PermissionDenied
@@ -23,11 +22,14 @@ from django.db.models import Q
 from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, resolve_url
 from django.urls import reverse
+from django.utils.safestring import SafeString
 from django.utils.translation import gettext as _
 from django.views.generic import CreateView, FormView
 from django.views.generic.detail import SingleObjectMixin
+from ninja.main import HttpRequest
 
 from core.auth.mixins import CanViewMixin
+from core.models import User
 from core.views.mixins import FragmentMixin, UseFragmentsMixin
 from counter.forms import BasketForm, RefillForm
 from counter.models import (
@@ -42,12 +44,6 @@ from counter.utils import is_logged_in_counter
 from counter.views.mixins import CounterTabsMixin
 from counter.views.student_card import StudentCardFormFragment
 
-if TYPE_CHECKING:
-    from django.utils.safestring import SafeString
-    from ninja.main import HttpRequest
-
-    from core.models import User
-
 
 def get_operator(request: HttpRequest, counter: Counter, customer: Customer) -> User:
     if counter.type != "BAR":

counter/views/home.py

@@ -13,7 +13,6 @@
 #
 #
 from datetime import timedelta
-from typing import TYPE_CHECKING
 
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
@@ -22,6 +21,7 @@ from django.http import HttpRequest, HttpResponseRedirect
 from django.shortcuts import redirect
 from django.urls import reverse
 from django.utils import timezone
+from django.utils.safestring import SafeString
 from django.views.decorators.http import require_POST
 from django.views.generic import DetailView
 from django.views.generic.detail import SingleObjectMixin
@@ -35,9 +35,6 @@ from counter.models import Counter, Permanency
 from counter.utils import is_logged_in_counter
 from counter.views.mixins import CounterTabsMixin
 
-if TYPE_CHECKING:
-    from django.utils.safestring import SafeString
-
 
 class CounterLoginFragment(FragmentMixin, SingleObjectMixin, FormView):
     model = Counter

counter/views/student_card.py

@@ -13,12 +13,11 @@
 #
 #
 
-from typing import TYPE_CHECKING
-
 from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpRequest, HttpResponse
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
+from django.utils.safestring import SafeString
 from django.utils.translation import gettext as _
 from django.views.generic.edit import DeleteView, FormView
 
@@ -28,9 +27,6 @@ from counter.forms import StudentCardForm
 from counter.models import Customer, StudentCard
 from counter.utils import is_logged_in_counter
 
-if TYPE_CHECKING:
-    from django.utils.safestring import SafeString
-
 
 class StudentCardDeleteView(DeleteView):
     """View used to delete a card from a user. This is a fragment view !"""

docs/explanation/technos.md

@@ -217,7 +217,7 @@ C'est une technologie simple et puissante qui se veut comme le jQuery du web mod
 
 ### Htmx
 
-[Site officiel](https://four.htmx.org/)
+[Site officiel](https://htmx.org/)
 
 En plus de AlpineJS, l’interactivité sur le site est augmentée via Htmx.
 C'est une librairie js qui s'utilise également au moyen d'attributs HTML à

docs/tutorial/markdown.md

@@ -1,51 +0,0 @@
-## syntaxe aemark
-
-Le site AE utilise markdown pour le rendu de la plupart
-des textes saisis par les utilisateurs.
-Cependant, la syntaxe utilisée n'est pas celle officielle
-telle que définie par John Gruber,
-mais est basée sur [CommonMark](https://commonmark.org/),
-avec quelques variations pour les usages particuliers du site AE.
-
-Les deux principaux ajouts sont :
-
-- Les urls commençant par `page://` sont modifiées pour commencer par `/page/`
-- Des modificateurs de taille peuvent être indiqués directement dans la source
-  d'une image
-
-Les variations d'aemark sont documentées sur
-[le site AE](https://ae.utbm.fr/page/Aide_sur_la_syntaxe/).
-
-Le code est hébergé sur le dépôt Git [aemark](https://github.com/ae-utbm/ae-markdown).
-
-## Utiliser aemark
-
-Le code du parser aemark est écrit en Rust dans une librairie
-indépendante, avec des bindings vers différents langages.
-Les librairies mises à disposition exposent une seule fonction,
-qui prend simplement du markdown en entrée et renvoie l'HTML correspondant.
-
-Les librairies pour les différents langages sont toutes
-basées sur le même code Rust.
-La seule différence entre chacune tient uniquement dans la manière
-d'intégrer ce code dans les bindings.
-De cette manière, le comportement est assuré d'être le même
-sur toutes les plateformes disponibles, avec en prime des performances
-respectables.
-
-
-=== ":simple-python: Python"
-
-    ```python
-    from aemark import markdown
-
-    result = markdown("this is some *markdown text* with __formatting__")
-    ```
-
-=== ":simple-javascript: Javascript"
-
-    ```typescript
-    import { markdown } from "@ae_utbm/aemark"
-
-    const result = markdown("this is some *markdown text* with __formatting__");
-    ```

eboutic/tests/test_basket.py

@@ -1,12 +1,13 @@
 import re
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING
 
 import freezegun
 import pytest
 from bs4 import BeautifulSoup
 from django.conf import settings
+from django.http import HttpResponse
 from django.test import TestCase
+from django.test.client import Client
 from django.urls import reverse
 from django.utils.timezone import localdate, now
 from model_bakery import baker
@@ -30,10 +31,6 @@ from counter.models import (
 from counter.tests.test_counter import BasketItem
 from eboutic.models import Basket
 
-if TYPE_CHECKING:
-    from django.http import HttpResponse
-    from django.test.client import Client
-
 
 @pytest.mark.django_db
 def test_get_eboutic():

eboutic/tests/test_billing_info.py

@@ -1,6 +1,7 @@
-from typing import TYPE_CHECKING, Callable
+from typing import Callable
 
 import pytest
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 from pytest_django.asserts import assertRedirects
@@ -9,9 +10,6 @@ from core.baker_recipes import subscriber_user
 from core.models import User
 from counter.models import BillingInfo
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 class TestBillingInfo:

election/forms.py

@@ -1,7 +1,6 @@
 from datetime import timedelta
 from itertools import groupby, islice
 from operator import attrgetter
-from typing import TYPE_CHECKING
 
 from django import forms
 from django.conf import settings
@@ -14,6 +13,7 @@ from django.utils.translation import gettext_lazy as _
 from club.forms import ClubRoleChoiceField
 from club.models import ClubRole, Membership
 from club.widgets.ajax_select import AutoCompleteSelectMultipleClub
+from core.models import User
 from core.views.forms import SelectDateTime
 from core.views.widgets.ajax_select import (
     AutoCompleteSelect,
@@ -23,9 +23,6 @@ from core.views.widgets.ajax_select import (
 from core.views.widgets.markdown import MarkdownInput
 from election.models import Candidature, Election, ElectionList, Role
 
-if TYPE_CHECKING:
-    from core.models import User
-
 
 class LimitedCheckboxField(forms.ModelMultipleChoiceField):
     """A `ModelMultipleChoiceField`, with a max limit of selectable inputs."""

election/templates/election/fragments/apply_result.jinja

@@ -41,7 +41,7 @@
       hx-post="{{ url("election:apply_result", election_id=form.election.id) }}"
       hx-swap="outerHTML"
       hx-target="#apply-election-result-fragment"
-      hx-disable="find input[type='submit']"
+      hx-disabled-elt="find input[type='submit']"
     >
       {% csrf_token %}
       {{ form }}

forum/tests.py

@@ -13,19 +13,15 @@
 #
 #
 
-from typing import TYPE_CHECKING
-
 import pytest
 from django.conf import settings
+from django.test import Client
 from django.urls import reverse
 from pytest_django.asserts import assertRedirects
 
 from core.models import User
 from forum.models import Forum, ForumMessage, ForumTopic
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 class TestTopicCreation:

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-09-04 11:24+0200\n"
+"POT-Creation-Date: 2026-08-21 14:10+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -2049,10 +2049,6 @@ msgstr "403, Non autorisé"
 msgid "404, Not Found"
 msgstr "404. Non trouvé"
 
-#: core/templates/core/404.jinja
-msgid "Impossible, perhaps the archives are incomplete"
-msgstr "Impossible, les archives sont peut-être incomplètes"
-
 #: core/templates/core/500.jinja
 msgid "500, Server Error"
 msgstr "500, Erreur Serveur"
@@ -5093,10 +5089,6 @@ msgstr "signalant"
 msgid "A guide of courses available at UTBM."
 msgstr "Un guide de tous les cours disponibles à l'UTBM."
 
-#: pedagogy/templates/pedagogy/guide.jinja
-msgid "Search UE"
-msgstr "Recherche d'UE"
-
 #: pedagogy/templates/pedagogy/guide.jinja
 #, python-format
 msgid "%(display_name)s"
@@ -5766,18 +5758,6 @@ msgstr "fin de la cotisation"
 msgid "location"
 msgstr "lieu"
 
-#: subscription/models.py
-msgid "created_at"
-msgstr "créé le"
-
-#: subscription/models.py
-msgid ""
-"When this subscription was created. This date may differ from the start of "
-"the subscription."
-msgstr ""
-"Quand la cotisation a été créée. Cette date peut différer du début effectif "
-"de la cotisation."
-
 #: subscription/models.py
 msgid "You can not subscribe many time for the same period"
 msgstr "Vous ne pouvez pas cotiser plusieurs fois pour la même période"

mkdocs.yml

@@ -71,7 +71,6 @@ nav:
     - API:
       - Développement: tutorial/api/dev.md
       - Connexion à l'API: tutorial/api/connect.md
-    - Markdown AE: tutorial/markdown.md
     - Etransactions: tutorial/etransaction.md
   - How-to:
     - L'ORM de Django: howto/querysets.md

package-lock.json

@@ -9,7 +9,6 @@
       "version": "3",
       "license": "GPL-3.0-only",
       "dependencies": {
-        "@ae_utbm/aemark": "^0.1.3",
         "@alpinejs/sort": "^3.16.2",
         "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
         "@floating-ui/dom": "^1.8.0",
@@ -31,7 +30,7 @@
         "easymde": "^2.21.0",
         "glob": "^13.0.6",
         "html2canvas": "^1.4.1",
-        "htmx.org": "^4.0.0",
+        "htmx.org": "^2.0.10",
         "js-cookie": "^3.0.8",
         "lit-html": "^3.3.3",
         "native-file-system-adapter": "^3.0.1",
@@ -57,11 +56,6 @@
         "vite": "^8.2.2"
       }
     },
-    "node_modules/@ae_utbm/aemark": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@ae_utbm/aemark/-/aemark-0.1.3.tgz",
-      "integrity": "sha512-JHb9XDgYxy9J0f7bUWtS7eVptKbeB/4+VQoHO3g1ASwNHZpIpW+RRdJPXA+oi2/RDrdPbEtCMkkVROc+8ifFYQ=="
-    },
     "node_modules/@alpinejs/sort": {
       "version": "3.16.2",
       "resolved": "https://registry.npmjs.org/@alpinejs/sort/-/sort-3.16.2.tgz",
@@ -3807,16 +3801,10 @@
       }
     },
     "node_modules/htmx.org": {
-      "version": "4.0.0",
+      "version": "2.0.10",
-      "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.10.tgz",
-      "integrity": "sha512-T/171FUY93Kdfp8t+DnHdk45QvKRiBhVhhrwSzrXgUi4pHKvhp77dUA/qg8FAjsFWPIHNbmUuIdCrcVHuiZWng==",
+      "integrity": "sha512-kdeJe7ZVwaS6QMz/ebBIVtZdpwen6L0OQ5GOhPV9MKBb196TCZeZu4yA7ZIQsaLKv7EpXz+So7KSXNuHXhj7Cw==",
-      "license": "BSD-0-Clause",
+      "license": "0BSD"
-      "workspaces": [
-        "ext/*"
-      ],
-      "bin": {
-        "upgrade-check": "dist/scripts/upgrade-check.js"
-      }
     },
     "node_modules/ical.js": {
       "version": "1.5.0",

package.json

@@ -34,13 +34,12 @@
     "@types/cytoscape-klay": "^3.1.5",
     "@types/js-cookie": "^3.0.6",
     "@types/node": "^26.2.0",
-    "@typescript/native": "npm:typescript@^7.0.2",
     "rollup-plugin-visualizer": "^7.1.1",
+    "@typescript/native": "npm:typescript@^7.0.2",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
     "vite": "^8.2.2"
   },
   "dependencies": {
-    "@ae_utbm/aemark": "^0.1.3",
     "@alpinejs/sort": "^3.16.2",
     "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
     "@floating-ui/dom": "^1.8.0",
@@ -62,7 +61,7 @@
     "easymde": "^2.21.0",
     "glob": "^13.0.6",
     "html2canvas": "^1.4.1",
-    "htmx.org": "^4.0.0",
+    "htmx.org": "^2.0.10",
     "js-cookie": "^3.0.8",
     "lit-html": "^3.3.3",
     "native-file-system-adapter": "^3.0.1",

pedagogy/models.py

@@ -91,6 +91,7 @@ class UE(models.Model):
 
     # All texts about the UE
     title = models.CharField(_("title"), max_length=300)
+    manager = models.CharField(_("ue manager"), max_length=300)
     objectives = models.TextField(_("objectives"))
     program = models.TextField(_("program"))
     skills = models.TextField(_("skills"))

pedagogy/static/pedagogy/css/pedagogy.scss

@@ -64,23 +64,100 @@ $pedagogy-white-text: #f0f0f0;
   }
 
   #search_form {
+    .search-form-container {
+      display: grid;
+      grid-template-columns: auto auto;
+      grid-template-rows: auto auto auto;
+      grid-template-areas:
+      "action-bar action-bar"
+      "search-bar search-bar"
+      "radio-department radio-department"
+      "radio-credit-type radio-semester";
+    }
 
-    .radio-guide fieldset {
+    .action-bar {
-      input[type="checkbox"] {
+      grid-area: action-bar;
-        display: none;
+      margin-bottom: 10px;
+    }
+
+    .search-bar {
+      grid-area: search-bar;
+      display: grid;
+      grid-template-columns: auto 200px;
+      grid-template-rows: auto;
+      grid-template-areas: "search-bar-input search-bar-button";
+
+      @media screen and (max-width: $medium-devices) {
+        grid-template-columns: auto auto;
+        grid-template-rows: auto;
+        grid-template-areas: "search-bar-input search-bar-button";
       }
+
+      @media screen and (max-width: $small-devices) {
+        grid-template-columns: auto;
+        grid-template-rows: auto;
+        grid-template-areas: "search-bar-input";
+
+        .search-bar-button {
+          display: none;
+        }
+      }
+
+      .search-bar-input {
+        grid-area: search-bar-input;
+        background: $pedagogy-light-blue;
+      }
+
+      .search-bar-button {
+        grid-area: search-bar-button;
+        background: $pedagogy-orange;
+        color: white;
+        font-weight: bold;
+        margin-left: 20px;
+      }
+    }
+
+    .radio-department {
+      grid-area: radio-department;
+    }
+
+    .radio-credit-type {
+      grid-area: radio-credit-type;
+    }
+
+    .radio-semester {
+      grid-area: radio-semester;
+    }
+
+    .radio-guide input[type="radio"],
+    input[type="checkbox"] {
+      display: none;
+    }
+
+    .radio-guide {
       margin-top: 10px;
-      margin-bottom: 0;
       color: white;
+    }
 
-      label {
+    .radio-guide label {
-        padding: 10px 20px;
+      display: inline-block;
-      }
+      background-color: $pedagogy-blue;
+      padding: 10px 20px;
+      font-family: Arial, sans-serif;
+      font-size: 16px;
+      border-radius: 4px;
+    }
 
-      input[type="checkbox"]:checked+label {
+    .radio-guide input[type="radio"]:checked+label {
-        background-color: $pedagogy-orange;
+      background-color: $pedagogy-orange;
-        @include shadow;
+    }
-      }
+
+    .radio-guide input[type="checkbox"]:checked+label {
+      background-color: $pedagogy-orange;
+    }
+
+    .radio-guide label:hover {
+      background-color: $pedagogy-hover-blue;
     }
   }
 

pedagogy/templates/pedagogy/guide.jinja

@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block additional_js %}
-  <script type="module" src="{{ static('bundled/pedagogy/guide-index.ts') }}"></script>
+  <script type="module" src="{{ static('bundled/pedagogy/guide-index.js') }}"></script>
 {% endblock %}
 
 {% block head %}
@@ -24,28 +24,30 @@
 
 {% block content %}
   {% if user.has_perm("pedagogy.add_ue") %}
-    <div class="row gap">
+    <div class="action-bar">
-      <a href="{{ url('pedagogy:ue_create') }}" class="btn btn-blue"><i class="fa fa-plus"></i>{% trans %}Create UE{% endtrans %}</a>
+      <p>
-      <a href="{{ url('pedagogy:moderation') }}" class="btn btn-grey">{% trans %}Moderate comments{% endtrans %}</a>
+        <a href="{{ url('pedagogy:ue_create') }}">{% trans %}Create UE{% endtrans %}</a>
+      </p>
+      <p>
+        <a href="{{ url('pedagogy:moderation') }}">{% trans %}Moderate comments{% endtrans %}</a>
+      </p>
     </div>
     <br/>
   {% endif %}
   <div class="pedagogy" x-data="ue_search" x-cloak>
-    <form id="search_form" class="">
+    <form id="search_form">
       <div class="search-form-container">
-        <fieldset>
+        <div class="search-bar">
-          <label for="search_input">{% trans %}Search UE{% endtrans %}</label>
           <input
             id="search_input"
             class="search-bar-input"
-            type="search"
+            type="text"
             name="search"
-            placeholder=""
             x-model.debounce.500ms="search"
           />
-        </fieldset>
+        </div>
-        <div class="row gap-3x margin-bottom radio-guide">
+        <div class="radio-department">
-          <fieldset>
+          <div class="radio-guide">
             {% set departments = [
             ("EDIM", "EDIM"), ("ENERGIE", "EE"), ("IMSI", "IMSI"),
             ("INFO", "GI"), ("GMC", "MC"), ("HUMA", "HUMA"), ("TC", "TC")
@@ -54,16 +56,16 @@
               <input
                 type="checkbox"
                 name="department"
-                id="radio_{{ real_name }}"
+                id="radio{{ real_name }}"
                 value="{{ real_name }}"
                 x-model="department"
               />
-              <label for="radio_{{ real_name }}" class="btn btn-blue">
+              <label for="radio{{ real_name }}">{% trans %}{{ display_name }}{% endtrans %}</label>
-                {% trans %}{{ display_name }}{% endtrans %}
-              </label>
             {% endfor %}
-          </fieldset>
+          </div>
-          <fieldset>
+        </div>
+        <div class="radio-credit-type">
+          <div class="radio-guide">
             {% for credit_type in ["CS", "TM", "EC", "QC", "OM"] %}
               <input
                 type="checkbox"
@@ -72,21 +74,18 @@
                 value="{{ credit_type }}"
                 x-model="credit_type"
               />
-              <label for="radio{{ credit_type }}" class="btn btn-blue">
+              <label for="radio{{ credit_type }}">{% trans %}{{ credit_type }}{% endtrans %}</label>
-                {% trans %}{{ credit_type }}{% endtrans %}
-              </label>
             {% endfor %}
-          </fieldset>
+          </div>
-          <fieldset>
+        </div>
+
+        <div class="radio-semester">
+          <div class="radio-guide">
             <input type="checkbox" name="semester" id="radioAUTUMN" value="AUTUMN" x-model="semester"/>
-            <label for="radioAUTUMN" class="btn btn-no-text btn-blue">
+            <label for="radioAUTUMN"><i class="fa fa-leaf"></i></label>
-              <i class="fa fa-leaf"></i>
-            </label>
             <input type="checkbox" name="semester" id="radioSPRING" value="SPRING" x-model="semester"/>
-            <label for="radioSPRING" class="btn btn-no-text btn-blue">
+            <label for="radioSPRING"><i class="fa-regular fa-sun"></i></label>
-              <i class="fa-regular fa-sun"></i>
+          </div>
-            </label>
-          </fieldset>
         </div>
       </div>
     </form>

pyproject.toml

@@ -17,25 +17,25 @@ authors = [
     { name = "Vial", email = "robin.trioux@utbm.fr" },
 ]
 license = { text = "GPL-3.0-only" }
-requires-python = "<4.0,>=3.14"
+requires-python = "<4.0,>=3.12"
 dependencies = [
     "django>=5.2.17,<6.0.0",
-    "django-ninja>=1.7.0,<2.0.0",
+    "django-ninja>=1.6.3,<2.0.0",
     "django-ninja-extra>=0.31.7",
     "Pillow>=12.3.0,<13.0.0",
     "aemark>=0.1.1",
     "django-jinja<3.0.0,>=2.11.0",
-    "cryptography>=50.0.1,<51.0.0",
+    "cryptography>=50.0.0,<51.0.0",
     "django-phonenumber-field>=8.5.0,<9.0.0",
-    "phonenumbers>=9.0.38,<10.0.0",
+    "phonenumbers>=9.0.37,<10.0.0",
     "reportlab>=5.0.1,<6.0.0",
     "django-haystack>=3.4.0,<4.0.0",
     "xapian-haystack>=4.0.0,<5.0.0",
     "libsass>=0.23.0,<1.0.0",
     "django-ordered-model>=3.7.4,<4.0.0",
     "django-simple-captcha>=0.7.0,<1.0.0",
-    "python-dateutil>=2.9.0.post0,<3.0.0",
+    "python-dateutil>=2.9.0.post0,<3.0.0.0",
-    "sentry-sdk>=2.68.1,<3.0.0",
+    "sentry-sdk>=2.68.0,<3.0.0",
     "jinja2>=3.1.6,<4.0.0",
     "django-countries>=9.0.0,<10.0.0",
     "dict2xml>=1.7.8,<2.0.0",
@@ -43,13 +43,13 @@ dependencies = [
     "tomli>=2.4.1,<3.0.0",
     "django-honeypot>=1.3.0,<2",
     "pydantic-extra-types>=2.11.1,<3.0.0",
-    "ical>=14.1.1",
+    "ical>=12.0.0",
     "redis[hiredis]>=6.4.0,<9.0.0",
     "environs[django]>=15.1.0,<16",
     "requests>=2.34.2,<3.0.0",
     "honcho>=2.0.0",
     "psutil>=7.2.2,<8.0.0",
-    "celery[redis]>=5.6.2,<7",
+    "celery[redis]>=5.6.3,<8",
     "django-celery-results>=2.6.0",
     "django-celery-beat>=2.9.0",
 ]
@@ -63,12 +63,12 @@ prod = [
     "psycopg[c]>=3.3.4,<4.0.0",
 ]
 dev = [
-    "django-debug-toolbar>=8.0.0,<9",
+    "django-debug-toolbar>=7.1.1,<8",
-    "ipython>=9.17.1,<10.0.0",
+    "ipython>=9.16.1,<10.0.0",
-    "pre-commit>=4.6.1,<5.0.0",
+    "pre-commit>=4.6.0,<5.0.0",
-    "ruff>=0.16.6,<1.0.0",
+    "ruff>=0.16.0,<1.0.0",
     "djhtml>=3.0.11,<4.0.0",
-    "faker>=40.38.0,<41.0.0",
+    "faker>=40.37.0,<41.0.0",
     "rjsmin>=1.2.5,<2.0.0",
 ]
 tests = [
@@ -78,7 +78,7 @@ tests = [
     "pytest-django>=4.14.0,<5.0.0",
     "model-bakery>=1.24.0,<2.0.0",
     "beautifulsoup4>=4.15.0,<5",
-    "lxml>=6.1.3,<7",
+    "lxml>=6.1.2,<7",
 ]
 docs = [
     "mkdocs>=1.6.1,<2.0.0",
@@ -132,13 +132,6 @@ ignore = [
     "RUF012"  # mutable class attributes. This rule doesn't integrate well with django
 ]
 
-[tool.ruff.lint.per-file-ignores]
-# schemas and API routes are built upon ninja and pydantic,
-# which heavily rely on type annotations at runtime.
-# Systematically using TYPE_CHECKING blocks in those files is NOT safe
-"schemas.py" = ["TCH"]
-"api.py" = ["TCH"]
-
 [tool.ruff.lint.pydocstyle]
 convention = "google"
 

rootplace/tests/test_ban.py

@@ -1,8 +1,8 @@
 from datetime import datetime, timedelta
-from typing import TYPE_CHECKING
 
 import pytest
 from django.contrib.auth.models import Permission
+from django.test import Client
 from django.urls import reverse
 from django.utils.timezone import localtime
 from model_bakery import baker
@@ -10,9 +10,6 @@ from pytest_django.asserts import assertRedirects
 
 from core.models import BanGroup, User, UserBan
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.fixture
 def operator(db) -> User:

sas/forms.py

@@ -9,6 +9,7 @@ from django.utils.timezone import get_current_timezone
 from django.utils.translation import gettext_lazy as _
 from PIL import Image
 
+from core.models import User
 from core.utils import resize_image
 from core.views import MultipleImageField
 from core.views.forms import SelectDate
@@ -19,8 +20,6 @@ from sas.widgets.ajax_select import AutoCompleteSelectAlbum
 if TYPE_CHECKING:
     from django.db.models.fields.files import FieldFile
 
-    from core.models import User
-
 
 class AlbumCreateForm(forms.ModelForm):
     class Meta:

sas/tests/test_update_album.py

@@ -1,13 +1,14 @@
 import random
 import string
 from pathlib import Path
-from typing import TYPE_CHECKING, Callable
+from typing import Callable
 from unittest.mock import patch
 
 import pytest
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.test import Client
 from django.urls import reverse
 from django.utils.datastructures import MultiValueDict
 from django.utils.timezone import localdate
@@ -22,9 +23,6 @@ from sas.baker_recipes import picture_recipe
 from sas.forms import AlbumEditForm
 from sas.models import Album
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.fixture
 def sas_root(db) -> Album:

sas/views.py

@@ -12,7 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from django.conf import settings
 from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -21,6 +21,7 @@ from django.db.models import Count, OuterRef, Subquery
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
+from django.utils.safestring import SafeString
 from django.views.generic import CreateView, DetailView, TemplateView
 from django.views.generic.edit import FormView, UpdateView
 
@@ -39,9 +40,6 @@ from sas.forms import (
 )
 from sas.models import Album, PeoplePictureRelation, Picture
 
-if TYPE_CHECKING:
-    from django.utils.safestring import SafeString
-
 
 class AlbumCreateFragment(FragmentMixin, CreateView):
     model = Album

sith/composer.py

@@ -2,15 +2,12 @@ import logging
 import signal
 import subprocess
 import sys
-from typing import TYPE_CHECKING
+from pathlib import Path
 
 import psutil
 
 from sith import settings
 
-if TYPE_CHECKING:
-    from pathlib import Path
-
 
 def get_pid_file(procfile: Path) -> Path:
     """Get the PID file associated with a procfile"""

sith/tests.py

@@ -1,14 +1,11 @@
 from contextlib import nullcontext as does_not_raise
-from typing import TYPE_CHECKING
 
 import pytest
+from _pytest.raises import RaisesExc
+from django.test import Client
 from django.test.utils import override_settings
 from django.urls import reverse
 
-if TYPE_CHECKING:
-    from _pytest.raises import RaisesExc
-    from django.test import Client
-
 
 @pytest.mark.django_db
 @pytest.mark.parametrize(

staticfiles/storage.py

@@ -1,17 +1,14 @@
 from pathlib import Path
-from typing import TYPE_CHECKING
 
 from django.conf import settings
 from django.contrib.staticfiles.finders import find
 from django.contrib.staticfiles.storage import (
     ManifestStaticFilesStorage,
 )
+from django.core.files.storage import Storage
 
 from staticfiles.processors import JS, JSBundler, Scss
 
-if TYPE_CHECKING:
-    from django.core.files.storage import Storage
-
 
 class ManifestPostProcessingStorage(ManifestStaticFilesStorage):
     def url(self, name: str, *, force: bool = False) -> str:

subscription/migrations/0015_alter_subscription_location_and_more.py

@@ -1,11 +1,7 @@
 # Generated by Django 5.2.3 on 2025-09-08 05:38
 
-from typing import TYPE_CHECKING
-
 from django.db import migrations, models
-
+from django.db.migrations.state import StateApps
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
 
 
 def rename_enums(apps: StateApps, schema_editor):

subscription/migrations/0017_subscription_created_at.py

@@ -1,47 +0,0 @@
-# Generated by Django 5.2.17 on 2026-09-01 08:44
-
-from typing import TYPE_CHECKING
-
-import django.utils.timezone
-from django.db import migrations, models
-from django.db.models import F, Value
-from django.db.models.functions import Least
-from django.utils.timezone import now
-
-if TYPE_CHECKING:
-    from django.db.migrations.state import StateApps
-
-
-def make_default_creation_date(apps: StateApps, schema_editor):
-    Subscription = apps.get_model("subscription", "Subscription")
-    Subscription.objects.update(
-        created_at=Least(
-            F("subscription_start"), Value(now()), output_field=models.DateTimeField()
-        )
-    )
-
-
-class Migration(migrations.Migration):
-    dependencies = [("subscription", "0016_alter_subscription_subscription_type")]
-
-    operations = [
-        migrations.AddField(
-            model_name="subscription",
-            name="created_at",
-            field=models.DateTimeField(
-                auto_now_add=True,
-                default=django.utils.timezone.now,
-                help_text=(
-                    "When this subscription was created. "
-                    "This date may differ from the start of the subscription."
-                ),
-                verbose_name="created_at",
-            ),
-            preserve_default=False,
-        ),
-        migrations.RunPython(
-            make_default_creation_date,
-            reverse_code=migrations.RunPython.noop,
-            elidable=True,
-        ),
-    ]

subscription/models.py

@@ -64,14 +64,6 @@ class Subscription(models.Model):
         max_length=20,
         verbose_name=_("location"),
     )
-    created_at = models.DateTimeField(
-        _("created_at"),
-        help_text=_(
-            "When this subscription was created. "
-            "This date may differ from the start of the subscription."
-        ),
-        auto_now_add=True,
-    )
 
     class Meta:
         ordering = ["subscription_start"]

subscription/templates/subscription/fragments/creation_form_existing_user.jinja

@@ -1,7 +1,7 @@
 <form
   hx-post="{{ url("subscription:fragment-existing-user") }}"
   hx-target="this"
-  hx-disable="find input[type='submit']"
+  hx-disabled-elt="find input[type='submit']"
   hx-swap="outerHTML"
 >
   {% csrf_token %}

subscription/templates/subscription/fragments/creation_form_new_user.jinja

@@ -1,7 +1,7 @@
 <form
   hx-post="{{ url("subscription:fragment-new-user") }}"
   hx-target="this"
-  hx-disable="find input[type='submit']"
+  hx-disabled-elt="find input[type='submit']"
   hx-swap="outerHTML"
 >
   {% csrf_token %}

subscription/tests/test_new_subscription.py

@@ -1,12 +1,13 @@
 """Tests focused on testing subscription creation"""
 
 from datetime import date, timedelta
-from typing import TYPE_CHECKING, Callable
+from typing import Callable
 
 import pytest
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.auth.models import Permission
+from django.test import Client
 from django.urls import reverse
 from django.utils.timezone import localdate
 from model_bakery import baker
@@ -18,9 +19,6 @@ from counter.models import Customer
 from subscription.forms import SubscriptionExistingUserForm, SubscriptionNewUserForm
 from subscription.models import Subscription
 
-if TYPE_CHECKING:
-    from django.test import Client
-
 
 @pytest.mark.django_db
 @pytest.mark.parametrize(

timetable/static/bundled/timetable/generator-index.ts

@@ -1,8 +1,8 @@
 import html2canvas from "html2canvas";
 
-// see https://regex101.com/r/QHSaPM/3
+// see https://regex101.com/r/QHSaPM/2
 const TIMETABLE_ROW_RE: RegExp =
-  /^(?<ueCode>\w.+\w)\s+(?<courseType>[A-Z]{2}\d)\s+((?<weekGroup>[AB])\s+)?(?<weekday>(lundi)|(mardi)|(mercredi)|(jeudi)|(vendredi)|(samedi)|(dimanche))\s+(?<startHour>\d{2}:\d{2})\s+(?<endHour>\d{2}:\d{2})\s+[\dA-B]\s+((?<attendance>[\wé]*)\s+)?(?<room>\w+(?:, \w+)*)$/;
+  /^(?<ueCode>\w.+\w)\s+(?<courseType>[A-Z]{2}\d)\s+((?<weekGroup>[AB])\s+)?(?<weekday>(lundi)|(mardi)|(mercredi)|(jeudi)|(vendredi)|(samedi)|(dimanche))\s+(?<startHour>\d{2}:\d{2})\s+(?<endHour>\d{2}:\d{2})\s+[\dA-B]\s+((?<attendance>[\wé]*)\s+)?(?<room>\w+(?:, \w+)?)$/;
 
 const DEFAULT_TIMETABLE: string = `DS52\t\tCM1\t\tlundi\t08:00\t10:00\t1\tPrésentiel\tA113
 DS53\t\tCM1\t\tlundi\t10:15\t12:15\t1\tPrésentiel\tA101

timetable/views.py

@@ -1,6 +1,8 @@
 # Create your views here.
 from django.views.generic import TemplateView
 
+from core.auth.mixins import FormerSubscriberMixin
 
-class GeneratorView(TemplateView):
+
+class GeneratorView(FormerSubscriberMixin, TemplateView):
     template_name = "timetable/generator.jinja"