Compare commits

..
Author SHA1 Message Date
klmp200 5f3e2d13ba Merge pull request #1482 from ae-utbm/htmx4-aria-busy-plugin
Fix aria-busy during swap and make it a plugin
2026-09-09 08:18:05 +02:00
thomas girod ff72939503 Merge pull request #1484 from ae-utbm/edt-msg
show the broken line on timetable parsing error
2026-09-09 07:19:13 +02:00
imperosol ecaef644b3 show the broken line on timetable parsing error
Certains utilisateurs font remonter régulièrement que le générateur ne marche pas. C'est normal, on n'a pas forcément prévu tous les cas et on n'est pas à l'abri des changements de format de l'UTBM.

Ce qui est très embêtant, dans ces cas-là, c'est qu'on donne très peu d'informations sur ce qui n'a pas marché, et que les utilisateurs peuvent difficilement faire remonter plus que ça.

En décrivant la ligne qui n'a pas pu être parsée, ça devrait déjà rendre la gestion de ce genre de problème un peu plus facile, tout en étant plus transparent pour l'utilisateur
2026-09-08 23:49:04 +02:00
thomas girod 564baf3b56 Merge pull request #1471 from ae-utbm/linked-role-groups
Linked role groups
2026-09-08 12:11:37 +02:00
imperosol d4432a4963 add translations 2026-09-08 11:52:18 +02:00
imperosol 43eedb274a Show linked groups on club role form page 2026-09-08 11:52:18 +02:00
imperosol c4cbcc3560 Allow club role-group m2m links 2026-09-08 11:52:18 +02:00
klmp200 11206fae90 Merge pull request #1483 from ae-utbm/xapian
Upgrade xapian to 2.1.0
2026-09-08 11:47:14 +02:00
klmp200 bacf100f6d Upgrade xapian to 2.1.0 2026-09-08 09:17:04 +02:00
klmp200 cbd80c17a2 Fix aria-busy during swap and make it a plugin 2026-09-07 17:23:23 +02:00
thomas girod 4f885b4ba7 Merge pull request #1479 from ae-utbm/bump-python
python 3.14
2026-09-07 17:03:57 +02:00
imperosol 13ee70afe9 update python deps 2026-09-07 16:16:55 +02:00
imperosol 7bd79d1d55 re-apply ruff TCH rules 2026-09-07 13:32:13 +02:00
imperosol d93afffbc3 python 3.14 2026-09-07 11:48:02 +02:00
76 changed files with 878 additions and 803 deletions
+1 -1
View File
@@ -1 +1 @@
3.12
3.14
+6 -2
View File
@@ -1,11 +1,15 @@
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):
+5 -1
View File
@@ -1,9 +1,13 @@
from django.http import HttpRequest
from typing import TYPE_CHECKING
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."""
+6 -4
View File
@@ -39,15 +39,17 @@ Example:
import operator
from functools import reduce
from typing import Any, Callable
from typing import TYPE_CHECKING, 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."""
+8 -4
View File
@@ -12,12 +12,16 @@
# 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):
@@ -46,8 +50,8 @@ class ClubAdmin(admin.ModelAdmin):
@admin.register(ClubRole)
class ClubRoleAdmin(admin.ModelAdmin):
list_display = ("name", "club", "is_board", "is_presidency")
search_fields = ("name",)
autocomplete_fields = ("club",)
search_fields = ("name", "club__name")
autocomplete_fields = ("club", "linked_groups")
list_select_related = ("club",)
list_filter = (
"is_board",
+7
View File
@@ -479,6 +479,13 @@ class ClubRoleCreateForm(forms.ModelForm):
class ClubRoleBaseFormSet(forms.BaseInlineFormSet):
ordering_widget = forms.HiddenInput()
def __init__(self, *args, queryset=None, **kwargs):
if queryset is None:
queryset = self.model._default_manager
super().__init__(
*args, queryset=queryset.prefetch_related("linked_groups"), **kwargs
)
ClubRoleFormSet = forms.inlineformset_factory(
Club,
@@ -1,12 +1,16 @@
# 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
@@ -1,10 +1,14 @@
# 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 = {
@@ -0,0 +1,26 @@
# Generated by Django 5.2.17 on 2026-09-01 14:36
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("club", "0017_linktype_clublink"),
("core", "0050_alter_sithfile_moderator"),
]
operations = [
migrations.AddField(
model_name="clubrole",
name="linked_groups",
field=models.ManyToManyField(
help_text=(
"Groups that are automatically given or removed "
"to user receiving or losing this club role"
),
related_name="club_roles",
to="core.group",
verbose_name="Linked groups",
),
),
]
+32 -11
View File
@@ -23,6 +23,8 @@
#
from __future__ import annotations
import operator
from functools import reduce
from typing import Iterable, Self
from django.conf import settings
@@ -282,6 +284,15 @@ class ClubRole(OrderedModel):
"If the role is inactive, people joining the club won't be able to get it."
),
)
linked_groups = models.ManyToManyField(
Group,
verbose_name=_("Linked groups"),
help_text=_(
"Groups that are automatically given or removed "
"to user receiving or losing this club role"
),
related_name="linked_roles",
)
order_with_respect_to = "club"
@@ -534,7 +545,7 @@ class Membership(models.Model):
def _remove_club_groups(
memberships: Iterable[Membership],
) -> tuple[int, dict[str, int]]:
"""Remove users of those memberships from the club groups.
"""Remove users of those memberships from the club and club role groups.
For example, if a user is in the Troll club board,
he is in the board group and the members group of the Troll.
@@ -553,15 +564,19 @@ class Membership(models.Model):
clubs = {m.club_id for m in memberships}
users = {m.user_id for m in memberships}
groups = Group.objects.filter(Q(club__in=clubs) | Q(club_board__in=clubs))
role_groups = [
Q(user_id=m.user_id, group__linked_roles=m.role_id) for m in memberships
]
return User.groups.through.objects.filter(
Q(group__in=groups) & Q(user__in=users)
(Q(group__in=groups) & Q(user__in=users))
| reduce(operator.or_, role_groups)
).delete()
@staticmethod
def _add_club_groups(
memberships: Iterable[Membership],
) -> list[User.groups.through]:
"""Add users of those memberships to the club groups.
"""Add users of those memberships to the club and club role groups.
For example, if a user just joined the Troll club board,
he will be added in both the members group and the board group
@@ -582,34 +597,40 @@ class Membership(models.Model):
memberships = [m for m in memberships if m.end_date is None]
if not memberships:
return []
if sum(1 for m in memberships if not hasattr(m, "club")) > 1:
nb_prefetched = sum(
1 for m in memberships if not hasattr(m, "club") or not hasattr(m, "role")
)
if nb_prefetched > 1:
# if more than one membership hasn't its `club` attribute set
# it's less expensive to reload the whole query with
# a select_related than perform a distinct query
# to fetch each club.
ids = {m.id for m in memberships}
memberships = list(
Membership.objects.filter(id__in=ids).select_related("club")
Membership.objects.filter(id__in=ids)
.select_related("club", "role")
.prefetch_related("role__linked_groups")
)
club_groups = []
groups = []
for membership in memberships:
club_groups.append(
groups.append(
User.groups.through(
user_id=membership.user_id,
group_id=membership.club.members_group_id,
)
)
if membership.role.is_board:
club_groups.append(
groups.append(
User.groups.through(
user_id=membership.user_id,
group_id=membership.club.board_group_id,
)
)
return User.groups.through.objects.bulk_create(
club_groups, ignore_conflicts=True
groups.extend(
User.groups.through(user_id=membership.user_id, group_id=g.id)
for g in membership.role.linked_groups.all()
)
return User.groups.through.objects.bulk_create(groups, ignore_conflicts=True)
class Mailing(models.Model):
+14
View File
@@ -49,6 +49,20 @@
{{ subform.is_active.help_text }}
</span>
</div>
{% set groups = subform.instance.linked_groups.all()|list %}
{% if groups %}
<div>
<p>
<strong>{% trans %}Linked groups : {% endtrans %}</strong>
{{ groups|map(attribute="name")|join(", ") }}
</p>
<p class="helptext">
{% trans trimmed %}
Users receiving this role will also be assigned to those groups
{% endtrans %}
</p>
</div>
{% endif %}
</div>
</details>
</div>
+4 -1
View File
@@ -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,6 +14,9 @@ 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():
+4 -1
View File
@@ -1,4 +1,4 @@
from collections.abc import Callable
from typing import TYPE_CHECKING
import pytest
from django.contrib.auth.models import Permission
@@ -14,6 +14,9 @@ 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
+5 -1
View File
@@ -1,5 +1,6 @@
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
@@ -7,6 +8,9 @@ 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):
+28 -2
View File
@@ -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
@@ -17,7 +17,10 @@ from club.forms import ClubAddMemberForm, JoinClubForm
from club.models import Club, ClubRole, Membership
from club.tests.base import TestClub
from core.baker_recipes import subscriber_user
from core.models import AnonymousUser, User
from core.models import AnonymousUser, Group, User
if TYPE_CHECKING:
from collections.abc import Callable
class TestMembershipQuerySet(TestClub):
@@ -500,6 +503,29 @@ class TestMembership(TestClub):
assert self.subscriber.groups.contains(self.club.members_group)
assert self.subscriber.groups.contains(self.club.board_group)
def test_add_to_club_role_group(self):
groups = baker.make(Group, _quantity=4)
self.subscriber.groups.set(groups[:1])
self.board_role.linked_groups.set(groups[1:3])
baker.make(
Membership, club=self.club, user=self.subscriber, role=self.board_role
)
assert set(self.subscriber.groups.all()) == {
*groups[:3],
self.club.board_group,
self.club.members_group,
}
def test_remove_from_club_role_group(self):
groups = baker.make(Group, _quantity=3)
baker.make(
Membership, club=self.club, user=self.subscriber, role=self.board_role
)
self.subscriber.groups.set(groups[:1])
self.board_role.linked_groups.set(groups[1:])
self.subscriber.memberships.update(end_date=localdate())
assert set(self.subscriber.groups.all()) == {groups[0]}
def test_change_position_in_club(self):
"""Test that when moving from board to members, club group change"""
membership = baker.make(
+5 -1
View File
@@ -1,7 +1,8 @@
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
@@ -10,6 +11,9 @@ 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):
+5 -1
View File
@@ -1,5 +1,6 @@
from typing import TYPE_CHECKING
import pytest
from django.test import Client
from django.urls import reverse
from model_bakery import baker
@@ -7,6 +8,9 @@ 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"])
+4 -1
View File
@@ -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,6 +12,9 @@ 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):
+4 -1
View File
@@ -1,4 +1,5 @@
from datetime import date
from typing import TYPE_CHECKING
from dateutil.relativedelta import relativedelta
from django import forms
@@ -9,11 +10,13 @@ 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:
+8 -3
View File
@@ -1,11 +1,10 @@
from pathlib import Path
from typing import TYPE_CHECKING
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
@@ -14,7 +13,13 @@ 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:
+4 -1
View File
@@ -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,6 +16,9 @@ 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", ""))
@@ -1,9 +1,13 @@
# 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`.
@@ -1,10 +1,14 @@
# 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):
@@ -1,11 +1,15 @@
# 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")
+18 -11
View File
@@ -48,19 +48,26 @@ polyfillCountryFlagEmojis();
/**
* HTMX
*/
document.body.addEventListener(
"htmx:before:request" as keyof HTMLElementEventMap,
(event) => {
(event as CustomEvent).detail.ctx.target.ariaBusy = true;
htmx.registerExtension("aria-busy", {
// biome-ignore lint/style/useNamingConvention: api's name
htmx_before_request: (
_: HTMLElement,
detail: { ctx: { target: HTMLElement | undefined } },
) => {
if (detail.ctx.target !== undefined) {
(detail.ctx.target as HTMLElement).ariaBusy = "true";
}
},
);
document.body.addEventListener(
"htmx:before:swap" as keyof HTMLElementEventMap,
(event) => {
(event as CustomEvent).detail.ctx.target.ariaBusy = null;
// biome-ignore lint/style/useNamingConvention: api's name
htmx_after_swap: (
_: HTMLElement,
detail: { ctx: { target: HTMLElement | undefined } },
) => {
if (detail.ctx.target !== undefined) {
(detail.ctx.target as HTMLElement).ariaBusy = null;
}
},
);
});
Object.assign(window, { htmx });
@@ -0,0 +1,54 @@
{% extends "core/file.jinja" %}
{% block title %}
{% trans %}Delete confirmation{% endtrans %}
{% endblock %}
{% if is_fragment %}
{# Don't display tabs and errors #}
{% block tabs %}
{% endblock %}
{% block errors %}
{% endblock %}
{% endif %}
{% block file %}
<h2>{% trans %}Delete confirmation{% endtrans %}</h2>
{% if next %}
{% set action = current + "?next=" + next %}
{% else %}
{% set action = current %}
{% endif %}
<form action="{{ action }}" method="post">
{% csrf_token %}
<p>{% trans obj=object %}Are you sure you want to delete "{{ obj }}"?{% endtrans %}</p>
<button
{% if is_fragment %}
hx-post="{{ action }}"
hx-target="#content"
hx-swap="outerHtml"
{% endif %}
>{% trans %}Confirm{% endtrans %}</button>
<button
{% if is_fragment %}
hx-get="{{ previous }}"
hx-target="#content"
hx-swap="outerHtml"
{% else %}
action="window.history.back()"
{% endif %}
>{% trans %}Cancel{% endtrans %}</button>
</form>
{% endblock %}
+4 -2
View File
@@ -20,13 +20,15 @@
# Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
from typing import Callable
from typing import TYPE_CHECKING, 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):
+4 -1
View File
@@ -23,15 +23,18 @@
#
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()
+4 -1
View File
@@ -1,4 +1,5 @@
from datetime import timedelta
from typing import TYPE_CHECKING
import freezegun
import pytest
@@ -6,7 +7,6 @@ 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,6 +16,9 @@ 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:
+22 -6
View File
@@ -21,7 +21,7 @@
# Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
from django.urls import path, register_converter
from django.urls import path, re_path, register_converter
from django.views.generic import RedirectView
from com.views import NewsListView
@@ -193,11 +193,27 @@ urlpatterns = [
name="user_gift_delete",
),
# File views
path(r"file/", FileListView.as_view(), name="file_list"),
path("file/<int:file_id>/", FileView.as_view(), name="file_detail"),
path("file/<int:file_id>/edit/", FileEditView.as_view(), name="file_edit"),
path("file/<int:file_id>/prop/", FileEditPropView.as_view(), name="file_prop"),
path("file/<int:file_id>/delete/", FileDeleteView.as_view(), name="file_delete"),
re_path(r"^file/$", FileListView.as_view(), name="file_list"),
re_path(
r"^file/(?P<file_id>[0-9]+)/$",
FileView.as_view(),
name="file_detail",
),
re_path(
r"^file/(?P<file_id>[0-9]+)/edit/$",
FileEditView.as_view(),
name="file_edit",
),
re_path(
r"^file/(?P<file_id>[0-9]+)/prop/$",
FileEditPropView.as_view(),
name="file_prop",
),
re_path(
r"^file/(?P<file_id>[0-9]+)/delete/$",
FileDeleteView.as_view(),
name="file_delete",
),
path("file/moderation/", FileModerationView.as_view(), name="file_moderation"),
path(
"file/<int:file_id>/moderate/", FileModerateView.as_view(), name="file_moderate"
+5 -3
View File
@@ -17,16 +17,18 @@ from datetime import date, timedelta
# Image utils
from io import BytesIO
from typing import Final
from typing import TYPE_CHECKING, 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"
+23 -5
View File
@@ -13,7 +13,7 @@
#
#
import mimetypes
from pathlib import Path
from typing import TYPE_CHECKING
from urllib.parse import quote, urljoin
# This file contains all the views that concern the page model
@@ -48,6 +48,9 @@ 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
@@ -342,18 +345,33 @@ class FileView(CanViewMixin, DetailView, FormMixin):
return kwargs
class FileDeleteView(CanEditPropMixin, DeleteView):
class FileDeleteView(AllowFragment, CanEditPropMixin, DeleteView):
model = SithFile
pk_url_kwarg = "file_id"
template_name = "core/delete_confirm.jinja"
template_name = "core/file_delete_confirm.jinja"
context_object_name = "file"
def get_success_url(self):
self.object.file.delete() # Doing it here or overloading delete() is the same, so let's do it here
if "next" in self.request.GET:
return self.request.GET["next"]
if self.object.parent is None:
return reverse("core:file_list")
return reverse("core:file_detail", kwargs={"file_id": self.object.parent.id})
return reverse(
"core:file_list",
)
return reverse(
"core:file_detail",
kwargs={
"file_id": self.object.parent.id,
},
)
def get_context_data(self, **kwargs):
kwargs = super().get_context_data(**kwargs)
kwargs["next"] = self.request.GET.get("next", None)
kwargs["previous"] = self.request.GET.get("previous", None)
kwargs["current"] = self.request.path
return kwargs
class FileModerationView(AllowFragment, ListView):
+4 -1
View File
@@ -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,6 +59,9 @@ from core.views.widgets.ajax_select import (
)
from core.views.widgets.markdown import MarkdownInput
if TYPE_CHECKING:
from datetime import date, datetime
# Widgets
+6 -2
View File
@@ -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,6 +34,10 @@ 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
+5 -3
View File
@@ -1,14 +1,16 @@
import copy
import inspect
from typing import Any, ClassVar, LiteralString, Protocol, Unpack
from typing import TYPE_CHECKING, 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."""
+4 -1
View File
@@ -27,6 +27,7 @@ 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
@@ -43,7 +44,6 @@ 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,6 +73,9 @@ 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."""
+7 -4
View File
@@ -1,15 +1,18 @@
from collections.abc import Collection
from typing import Any
from typing import TYPE_CHECKING, 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"
+4 -2
View File
@@ -3,7 +3,7 @@ import math
import uuid
from collections import defaultdict
from datetime import date, datetime, timezone
from typing import ClassVar
from typing import TYPE_CHECKING, ClassVar
from dateutil.relativedelta import relativedelta
from django import forms
@@ -11,7 +11,6 @@ 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 _
@@ -59,6 +58,9 @@ from counter.widgets.ajax_select import (
AutoCompleteSelectProduct,
)
if TYPE_CHECKING:
from django.http import HttpRequest
class BillingInfoForm(forms.ModelForm):
class Meta:
+4 -1
View File
@@ -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,6 +13,9 @@ 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.
+3 -2
View File
@@ -1,13 +1,14 @@
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"
@@ -1,11 +1,14 @@
# 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.
@@ -1,7 +1,11 @@
# 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):
@@ -1,9 +1,13 @@
# 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
@@ -1,13 +1,16 @@
# 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."""
+5 -1
View File
@@ -1,11 +1,15 @@
# 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")
+4 -1
View File
@@ -1,5 +1,5 @@
from collections.abc import Iterable
from datetime import timedelta
from typing import TYPE_CHECKING
import freezegun
import pytest
@@ -17,6 +17,9 @@ 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
+4 -1
View File
@@ -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,6 +18,9 @@ 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):
+4 -1
View File
@@ -15,6 +15,7 @@
from dataclasses import asdict, dataclass
from datetime import timedelta
from decimal import Decimal
from typing import TYPE_CHECKING
import pytest
from bs4 import BeautifulSoup
@@ -22,7 +23,6 @@ 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,6 +48,9 @@ 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)
+4 -1
View File
@@ -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,6 +16,9 @@ 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(
+5 -1
View File
@@ -1,6 +1,7 @@
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
@@ -8,6 +9,9 @@ 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]:
+4 -1
View File
@@ -1,8 +1,11 @@
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.
+5 -1
View File
@@ -13,6 +13,8 @@
#
#
from typing import TYPE_CHECKING
from django import forms
from django.conf import settings
from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -22,7 +24,6 @@ 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,
@@ -35,6 +36,9 @@ from counter.views.mixins import (
CounterTabsMixin,
)
if TYPE_CHECKING:
from core.models import User
class CashRegisterSummaryForm(forms.Form):
"""Provide the cash summary form."""
+7 -3
View File
@@ -14,6 +14,7 @@
#
import random
from collections import defaultdict
from typing import TYPE_CHECKING
from django.contrib import messages
from django.core.exceptions import PermissionDenied
@@ -22,14 +23,11 @@ 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 (
@@ -44,6 +42,12 @@ 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":
+4 -1
View File
@@ -13,6 +13,7 @@
#
#
from datetime import timedelta
from typing import TYPE_CHECKING
from django.conf import settings
from django.core.exceptions import PermissionDenied
@@ -21,7 +22,6 @@ 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,6 +35,9 @@ 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
+5 -1
View File
@@ -13,11 +13,12 @@
#
#
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
@@ -27,6 +28,9 @@ 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 !"""
+5 -2
View File
@@ -1,13 +1,12 @@
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
@@ -31,6 +30,10 @@ 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():
+4 -2
View File
@@ -1,7 +1,6 @@
from typing import Callable
from typing import TYPE_CHECKING, Callable
import pytest
from django.test import Client
from django.urls import reverse
from model_bakery import baker
from pytest_django.asserts import assertRedirects
@@ -10,6 +9,9 @@ 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:
+4 -1
View File
@@ -1,6 +1,7 @@
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
@@ -13,7 +14,6 @@ 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,6 +23,9 @@ 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."""
+5 -1
View File
@@ -13,15 +13,19 @@
#
#
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:
+32 -1
View File
@@ -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-09-08 23:36+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"
@@ -260,6 +260,18 @@ msgstr ""
"Si ce rôle est inactif, il ne pourra pas être attribué aux gens qui "
"rejoignent le club."
#: club/models.py
msgid "Linked groups"
msgstr "Groupes liés"
#: club/models.py
msgid ""
"Groups that are automatically given or removed to user receiving or losing "
"this club role"
msgstr ""
"Les groupes qui sont automatiquement donnés ou retirés quand l'utilisateur "
"reçoit ou perd ce rôle de club"
#: club/models.py election/models.py
msgid "club role"
msgstr "rôle de club"
@@ -485,6 +497,14 @@ msgstr "Du"
msgid "To"
msgstr "Au"
#: club/templates/club/club_roles.jinja
msgid "Linked groups : "
msgstr "Groupes liés : "
#: club/templates/club/club_roles.jinja
msgid "Users receiving this role will also be assigned to those groups"
msgstr "Les utilisateurs recevant ce rôle seront aussi assignés à ces groupes"
#: club/templates/club/club_roles.jinja
msgid ""
"Roles give rights on the club. Higher roles grant more rights, and the "
@@ -5832,6 +5852,17 @@ msgstr "les groupes pouvant créer des cotisations"
msgid "Timetable generator"
msgstr "Générateur d'emploi du temps"
#: timetable/templates/timetable/generator.jinja
msgid ""
"Wrong timetable format. Make sure you copied if from your student folder."
msgstr ""
"Mauvais format d'emploi du temps. Assurez-vous que vous l'avez copié depuis "
"votre dossier étudiant."
#: timetable/templates/timetable/generator.jinja
msgid "Incorrect row"
msgstr "Ligne incorrecte"
#: timetable/templates/timetable/generator.jinja
msgid "Generate"
msgstr "Générer"
+3 -9
View File
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2026-05-17 10:03+0200\n"
"POT-Creation-Date: 2026-09-08 23:36+0200\n"
"PO-Revision-Date: 2024-09-17 11:54+0200\n"
"Last-Translator: Sli <antoine@bartuccio.fr>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -22,8 +22,8 @@ msgid ""
"You're going to remove your own role from the presidency. You may lock "
"yourself out of this page. Do you want to continue ? "
msgstr ""
"Vous vous apprêtez à retirer votre propre rôle de la présidence. Vous risquez "
"de perdre l'accès à cette page. Voulez-vous continuer ?"
"Vous vous apprêtez à retirer votre propre rôle de la présidence. Vous "
"risquez de perdre l'accès à cette page. Voulez-vous continuer ?"
#: com/static/bundled/com/components/ics-calendar-index.ts
msgid "More info"
@@ -279,9 +279,3 @@ msgstr "Il n'a pas été possible de modérer l'image"
msgid "Couldn't delete picture"
msgstr "Il n'a pas été possible de supprimer l'image"
#: timetable/static/bundled/timetable/generator-index.ts
msgid ""
"Wrong timetable format. Make sure you copied if from your student folder."
msgstr ""
"Mauvais format d'emploi du temps. Assurez-vous que vous l'avez copié depuis "
"votre dossier étudiant."
-1
View File
@@ -91,7 +91,6 @@ 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"))
+24 -17
View File
@@ -17,25 +17,25 @@ authors = [
{ name = "Vial", email = "robin.trioux@utbm.fr" },
]
license = { text = "GPL-3.0-only" }
requires-python = "<4.0,>=3.12"
requires-python = "<4.0,>=3.14"
dependencies = [
"django>=5.2.17,<6.0.0",
"django-ninja>=1.6.3,<2.0.0",
"django-ninja>=1.7.0,<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.0,<51.0.0",
"cryptography>=50.0.1,<51.0.0",
"django-phonenumber-field>=8.5.0,<9.0.0",
"phonenumbers>=9.0.37,<10.0.0",
"phonenumbers>=9.0.38,<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.0",
"sentry-sdk>=2.68.0,<3.0.0",
"python-dateutil>=2.9.0.post0,<3.0.0",
"sentry-sdk>=2.68.1,<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>=12.0.0",
"ical>=14.1.1",
"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.3,<8",
"celery[redis]>=5.6.2,<7",
"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>=7.1.1,<8",
"ipython>=9.16.1,<10.0.0",
"pre-commit>=4.6.0,<5.0.0",
"ruff>=0.16.0,<1.0.0",
"django-debug-toolbar>=8.0.0,<9",
"ipython>=9.17.1,<10.0.0",
"pre-commit>=4.6.1,<5.0.0",
"ruff>=0.16.6,<1.0.0",
"djhtml>=3.0.11,<4.0.0",
"faker>=40.37.0,<41.0.0",
"faker>=40.38.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.2,<7",
"lxml>=6.1.3,<7",
]
docs = [
"mkdocs>=1.6.1,<2.0.0",
@@ -92,11 +92,11 @@ docs = [
default-groups = ["dev", "tests", "docs"]
[tool.xapian]
version = "2.0.0"
version = "2.1.0"
# Those hashes are here to protect against supply chains attacks
# See `https://ae-utbm.github.io/sith/howto/xapian/` for more information
core-sha256 = "6cea3f49952a47224439a40bdb3608f928d121ad8721b9921cc42802d548ecf8"
bindings-sha256 = "9a544b69c31355a92edbcd4102cf0f1ec4407fd0a4645f4870fb52300b736910"
core-sha256 = "8e1259586d342e3d12b5e1f772e9185a10f2ba16e541566b5c3c239f71b8aacc"
bindings-sha256 = "f52ec189f13b4fa66ea625a6eb94bb32dd651b9ec806be6a911dda54cbe3875c"
[tool.ruff]
output-format = "concise" # makes ruff error logs easier to read
@@ -132,6 +132,13 @@ 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"
+4 -1
View File
@@ -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,6 +10,9 @@ 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:
+2 -1
View File
@@ -9,7 +9,6 @@ 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
@@ -20,6 +19,8 @@ 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:
+4 -2
View File
@@ -1,14 +1,13 @@
import random
import string
from pathlib import Path
from typing import Callable
from typing import TYPE_CHECKING, 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
@@ -23,6 +22,9 @@ 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:
+4 -2
View File
@@ -12,7 +12,7 @@
# OR WITHIN THE LOCAL FILE "LICENSE"
#
#
from typing import Any
from typing import TYPE_CHECKING, Any
from django.conf import settings
from django.contrib.auth.mixins import PermissionRequiredMixin
@@ -21,7 +21,6 @@ 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
@@ -40,6 +39,9 @@ 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
+4 -1
View File
@@ -2,12 +2,15 @@ import logging
import signal
import subprocess
import sys
from pathlib import Path
from typing import TYPE_CHECKING
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"""
+5 -2
View File
@@ -1,11 +1,14 @@
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(
+4 -1
View File
@@ -1,14 +1,17 @@
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:
@@ -1,7 +1,11 @@
# 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):
@@ -1,12 +1,16 @@
# 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.migrations.state import StateApps
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")
+4 -2
View File
@@ -1,13 +1,12 @@
"""Tests focused on testing subscription creation"""
from datetime import date, timedelta
from typing import Callable
from typing import TYPE_CHECKING, 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
@@ -19,6 +18,9 @@ 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(
@@ -59,7 +59,7 @@ function parseSlots(s: string): TimetableSlot[] {
.map((row: string) => {
const parsed = TIMETABLE_ROW_RE.exec(row);
if (!parsed?.groups) {
throw new Error(`Couldn't parse row ${row}`);
throw new Error(`Couldn't parse row ${row}`, { cause: { row: row } });
}
const [startHour, startMin] = parsed.groups.startHour
.split(":")
@@ -78,7 +78,7 @@ function parseSlots(s: string): TimetableSlot[] {
document.addEventListener("alpine:init", () => {
Alpine.data("timetableGenerator", () => ({
content: DEFAULT_TIMETABLE,
error: "",
error: null as { incorrectRow?: string },
displayedWeekdays: [] as WeekDay[],
courses: [] as TimetableSlot[],
startSlot: 0,
@@ -106,10 +106,9 @@ document.addEventListener("alpine:init", () => {
generate() {
try {
this.courses = parseSlots(this.content);
} catch {
this.error = gettext(
"Wrong timetable format. Make sure you copied if from your student folder.",
);
this.error = null;
} catch (err) {
this.error = { incorrectRow: err?.cause?.row };
return;
}
+16 -2
View File
@@ -16,9 +16,23 @@
<div x-data="timetableGenerator">
<form @submit.prevent="generate()">
<h1>Générateur d'emploi du temps</h1>
<div class="alert alert-red" x-show="!!error" x-cloak>
<span class="alert-main" x-text="error"></span>
<template x-if="error !== null" x-cloak>
<div class="alert alert-red">
<div class="alert-main">
<p>
{% trans trimmed %}
Wrong timetable format. Make sure you copied if from your student folder.
{% endtrans %}
</p>
<template x-if="!!error.incorrectRow">
<p>
{% trans %}Incorrect row{% endtrans %} :
<code x-text="error.incorrectRow"></code>
</p>
</template>
</div>
</div>
</template>
<div class="form-group">
<label for="timetable-input">Colle ton emploi du temps (sans l'entête)</label>
<textarea id="timetable-input" cols="30" rows="15" x-model="content"></textarea>
Generated
+296 -642
View File
File diff suppressed because it is too large Load Diff