add feedback when moving reservation slot

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.14.4
+    rev: v0.11.13
     hooks:
       - id: ruff-check  # just check the code, and print the errors
       - id: ruff-check  # actually fix the fixable errors, but print nothing
@@ -14,7 +14,7 @@ repos:
       - id: biome-check
         additional_dependencies: ["@biomejs/biome@1.9.4"]
   - repo: https://github.com/rtts/djhtml
-    rev: 3.0.10
+    rev: 3.0.7
     hooks:
       - id: djhtml
         name: format templates

api/admin.py

@@ -17,15 +17,6 @@ class ApiClientAdmin(admin.ModelAdmin):
         "owner__nick_name",
     )
     autocomplete_fields = ("owner", "groups", "client_permissions")
-    readonly_fields = ("hmac_key",)
-    actions = ("reset_hmac_key",)
-
-    @admin.action(permissions=["change"], description=_("Reset HMAC key"))
-    def reset_hmac_key(self, _request: HttpRequest, queryset: QuerySet[ApiClient]):
-        objs = list(queryset)
-        for obj in objs:
-            obj.reset_hmac(commit=False)
-        ApiClient.objects.bulk_update(objs, fields=["hmac_key"])
 
 
 @admin.register(ApiKey)

api/api.py

@@ -1,16 +0,0 @@
-from ninja_extra import ControllerBase, api_controller, route
-
-from api.auth import ApiKeyAuth
-from api.schemas import ApiClientSchema
-
-
-@api_controller("/client")
-class ApiClientController(ControllerBase):
-    @route.get(
-        "/me",
-        auth=[ApiKeyAuth()],
-        response=ApiClientSchema,
-        url_name="api-client-infos",
-    )
-    def get_client_info(self):
-        return self.context.request.auth

api/forms.py

@@ -1,35 +0,0 @@
-from django import forms
-from django.forms import HiddenInput
-from django.utils.translation import gettext_lazy as _
-
-
-class ThirdPartyAuthForm(forms.Form):
-    """Form to complete to authenticate on the sith from a third-party app.
-
-    For the form to be valid, the user approve the EULA (french: CGU)
-    and give its username from the third-party app.
-    """
-
-    cgu_accepted = forms.BooleanField(
-        required=True,
-        label=_("I have read and I accept the terms and conditions of use"),
-        error_messages={
-            "required": _("You must approve the terms and conditions of use.")
-        },
-    )
-    is_username_valid = forms.BooleanField(
-        required=True,
-        error_messages={"required": _("You must confirm that this is your username.")},
-    )
-    client_id = forms.IntegerField(widget=HiddenInput())
-    third_party_app = forms.CharField(widget=HiddenInput())
-    privacy_link = forms.URLField(widget=HiddenInput())
-    username = forms.CharField(widget=HiddenInput())
-    callback_url = forms.URLField(widget=HiddenInput())
-    signature = forms.CharField(widget=HiddenInput())
-
-    def __init__(self, *args, label_suffix: str = "", initial, **kwargs):
-        super().__init__(*args, label_suffix=label_suffix, initial=initial, **kwargs)
-        self.fields["is_username_valid"].label = _(
-            "I confirm that %(username)s is my username on %(app)s"
-        ) % {"username": initial.get("username"), "app": initial.get("third_party_app")}

api/migrations/0002_apiclient_hmac_key.py

@@ -1,19 +0,0 @@
-# Generated by Django 5.2.3 on 2025-10-26 10:15
-
-from django.db import migrations, models
-
-import api.models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("api", "0001_initial")]
-
-    operations = [
-        migrations.AddField(
-            model_name="apiclient",
-            name="hmac_key",
-            field=models.CharField(
-                default=api.models.get_hmac_key, max_length=128, verbose_name="HMAC Key"
-            ),
-        ),
-    ]

api/models.py

@@ -1,20 +1,13 @@
-import secrets
 from typing import Iterable
 
 from django.contrib.auth.models import Permission
 from django.db import models
-from django.db.models import Q
-from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
 
 from core.models import Group, User
 
 
-def get_hmac_key():
-    return secrets.token_hex(64)
-
-
 class ApiClient(models.Model):
     name = models.CharField(_("name"), max_length=64)
     owner = models.ForeignKey(
@@ -33,10 +26,11 @@ class ApiClient(models.Model):
         help_text=_("Specific permissions for this api client."),
         related_name="clients",
     )
-    hmac_key = models.CharField(_("HMAC Key"), max_length=128, default=get_hmac_key)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    _perm_cache: set[str] | None = None
+
     class Meta:
         verbose_name = _("api client")
         verbose_name_plural = _("api clients")
@@ -44,38 +38,33 @@ class ApiClient(models.Model):
     def __str__(self):
         return self.name
 
-    @cached_property
-    def all_permissions(self) -> set[str]:
-        permissions = (
-            Permission.objects.filter(
-                Q(group__group__in=self.groups.all()) | Q(clients=self)
-            )
-            .values_list("content_type__app_label", "codename")
-            .order_by()
-        )
-        return {f"{content_type}.{name}" for content_type, name in permissions}
-
     def has_perm(self, perm: str):
         """Return True if the client has the specified permission."""
-        return perm in self.all_permissions
 
-    def has_perms(self, perm_list: Iterable[str]) -> bool:
-        """Return True if the client has each of the specified permissions."""
+        if self._perm_cache is None:
+            group_permissions = (
+                Permission.objects.filter(group__group__in=self.groups.all())
+                .values_list("content_type__app_label", "codename")
+                .order_by()
+            )
+            client_permissions = self.client_permissions.values_list(
+                "content_type__app_label", "codename"
+            ).order_by()
+            self._perm_cache = {
+                f"{content_type}.{name}"
+                for content_type, name in (*group_permissions, *client_permissions)
+            }
+        return perm in self._perm_cache
+
+    def has_perms(self, perm_list):
+        """
+        Return True if the client has each of the specified permissions. If
+        object is passed, check if the client has all required perms for it.
+        """
         if not isinstance(perm_list, Iterable) or isinstance(perm_list, str):
             raise ValueError("perm_list must be an iterable of permissions.")
         return all(self.has_perm(perm) for perm in perm_list)
 
-    def reset_hmac(self, *, commit: bool = True) -> str:
-        """Reset and return the HMAC key for this client.
-
-        Args:
-            commit: if True (the default), persist the new hmac in db.
-        """
-        self.hmac_key = get_hmac_key()
-        if commit:
-            self.save()
-        return self.hmac_key
-
 
 class ApiKey(models.Model):
     PREFIX_LENGTH = 5

api/schemas.py

@@ -1,23 +0,0 @@
-from ninja import ModelSchema, Schema
-from pydantic import Field, HttpUrl
-
-from api.models import ApiClient
-from core.schemas import SimpleUserSchema
-
-
-class ApiClientSchema(ModelSchema):
-    class Meta:
-        model = ApiClient
-        fields = ["id", "name"]
-
-    owner: SimpleUserSchema
-    permissions: list[str] = Field(alias="all_permissions")
-
-
-class ThirdPartyAuthParamsSchema(Schema):
-    client_id: int
-    third_party_app: str
-    privacy_link: HttpUrl
-    username: str
-    callback_url: HttpUrl
-    signature: str

api/templates/api/third_party/auth.jinja

@@ -1,32 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% block content %}
-  <form method="post">
-    {% csrf_token %}
-    <h3>{% trans %}Confidentiality{% endtrans %}</h3>
-    <p>
-      {% trans trimmed app=third_party_app %}
-        By ticking this box and clicking on the send button, you
-        acknowledge and agree to provide {{ app }} with your
-        first name, last name, nickname and any other information
-        that was the third party app was explicitly authorized to fetch
-        and that it must have acknowledged to you, in a complete and accurate manner.
-      {% endtrans %}
-    </p>
-    <p class="margin-bottom">
-      {% trans trimmed app=third_party_app, privacy_link=third_party_cgu, sith_cgu_link=sith_cgu %}
-        The privacy policies of <a href="{{ privacy_link }}">{{ app }}</a>
-        and of <a href="{{ sith_cgu_link }}">the Students' Association</a>
-        applies as soon as the form is submitted.
-      {% endtrans %}
-    </p>
-    <div class="row">{{ form.cgu_accepted }} {{ form.cgu_accepted.label_tag() }}</div>
-    <br>
-    <h3 class="margin-bottom">{% trans %}Confirmation of identity{% endtrans %}</h3>
-    <div class="row margin-bottom">
-      {{ form.is_username_valid }} {{ form.is_username_valid.label_tag() }}
-    </div>
-    {% for field in form.hidden_fields() %}{{ field }}{% endfor %}
-    <input type="submit" class="btn btn-blue">
-  </form>
-{% endblock %}

api/tests/test_admin.py

@@ -1,24 +0,0 @@
-import pytest
-from django.contrib.admin import AdminSite
-from django.http import HttpRequest
-from model_bakery import baker
-from pytest_django.asserts import assertNumQueries
-
-from api.admin import ApiClientAdmin
-from api.models import ApiClient
-
-
-@pytest.mark.django_db
-def test_reset_hmac_action():
-    client_admin = ApiClientAdmin(ApiClient, AdminSite())
-    api_clients = baker.make(ApiClient, _quantity=4, _bulk_create=True)
-    old_hmac_keys = [c.hmac_key for c in api_clients]
-    with assertNumQueries(2):
-        qs = ApiClient.objects.filter(id__in=[c.id for c in api_clients[2:4]])
-        client_admin.reset_hmac_key(HttpRequest(), qs)
-    for c in api_clients:
-        c.refresh_from_db()
-    assert api_clients[0].hmac_key == old_hmac_keys[0]
-    assert api_clients[1].hmac_key == old_hmac_keys[1]
-    assert api_clients[2].hmac_key != old_hmac_keys[2]
-    assert api_clients[3].hmac_key != old_hmac_keys[3]

api/tests/test_api_client_controller.py

@@ -1,18 +0,0 @@
-import pytest
-from django.test import Client
-from django.urls import reverse
-from model_bakery import baker
-
-from api.hashers import generate_key
-from api.models import ApiClient, ApiKey
-from api.schemas import ApiClientSchema
-
-
-@pytest.mark.django_db
-def test_api_client_controller(client: Client):
-    key, hashed = generate_key()
-    api_client = baker.make(ApiClient)
-    baker.make(ApiKey, client=api_client, hashed_key=hashed)
-    res = client.get(reverse("api:api-client-infos"), headers={"X-APIKey": key})
-    assert res.status_code == 200
-    assert res.json() == ApiClientSchema.from_orm(api_client).model_dump()

api/tests/test_client.py

@@ -1,59 +0,0 @@
-import pytest
-from django.contrib.auth.models import Permission
-from django.test import TestCase
-from model_bakery import baker
-
-from api.models import ApiClient
-from core.models import Group
-
-
-class TestClientPermissions(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.api_client = baker.make(ApiClient)
-        cls.perms = baker.make(Permission, _quantity=10, _bulk_create=True)
-        cls.api_client.groups.set(
-            [
-                baker.make(Group, permissions=cls.perms[0:3]),
-                baker.make(Group, permissions=cls.perms[3:5]),
-            ]
-        )
-        cls.api_client.client_permissions.set(
-            [cls.perms[3], cls.perms[5], cls.perms[6], cls.perms[7]]
-        )
-
-    def test_all_permissions(self):
-        assert self.api_client.all_permissions == {
-            f"{p.content_type.app_label}.{p.codename}" for p in self.perms[0:8]
-        }
-
-    def test_has_perm(self):
-        assert self.api_client.has_perm(
-            f"{self.perms[1].content_type.app_label}.{self.perms[1].codename}"
-        )
-        assert not self.api_client.has_perm(
-            f"{self.perms[9].content_type.app_label}.{self.perms[9].codename}"
-        )
-
-    def test_has_perms(self):
-        assert self.api_client.has_perms(
-            [
-                f"{self.perms[1].content_type.app_label}.{self.perms[1].codename}",
-                f"{self.perms[2].content_type.app_label}.{self.perms[2].codename}",
-            ]
-        )
-        assert not self.api_client.has_perms(
-            [
-                f"{self.perms[1].content_type.app_label}.{self.perms[1].codename}",
-                f"{self.perms[9].content_type.app_label}.{self.perms[9].codename}",
-            ],
-        )
-
-
-@pytest.mark.django_db
-def test_reset_hmac_key():
-    client = baker.make(ApiClient)
-    original_key = client.hmac_key
-    client.reset_hmac(commit=True)
-    assert len(client.hmac_key) == len(original_key)
-    assert client.hmac_key != original_key

api/tests/test_third_party_auth.py

@@ -1,114 +0,0 @@
-from unittest import mock
-from unittest.mock import Mock
-
-from django.db.models import Max
-from django.test import TestCase
-from django.urls import reverse
-from model_bakery import baker
-from pytest_django.asserts import assertRedirects
-
-from api.models import ApiClient, get_hmac_key
-from core.baker_recipes import subscriber_user
-from core.schemas import UserProfileSchema
-from core.utils import hmac_hexdigest
-
-
-def mocked_post(*, ok: bool):
-    class MockedResponse(Mock):
-        @property
-        def ok(self):
-            return ok
-
-    def mocked():
-        return MockedResponse()
-
-    return mocked
-
-
-class TestThirdPartyAuth(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.user = subscriber_user.make()
-        cls.api_client = baker.make(ApiClient)
-
-    def setUp(self):
-        self.query = {
-            "client_id": self.api_client.id,
-            "third_party_app": "app",
-            "privacy_link": "https://foobar.fr/",
-            "username": "bibou",
-            "callback_url": "https://callback.fr/",
-        }
-        self.query["signature"] = hmac_hexdigest(self.api_client.hmac_key, self.query)
-        self.callback_data = {
-            "user": UserProfileSchema.from_orm(self.user).model_dump()
-        }
-        self.callback_data["signature"] = hmac_hexdigest(
-            self.api_client.hmac_key, self.callback_data["user"]
-        )
-
-    def test_auth_ok(self):
-        self.client.force_login(self.user)
-        res = self.client.get(reverse("api-link:third-party-auth", query=self.query))
-        assert res.status_code == 200
-        with mock.patch("requests.post", new_callable=mocked_post(ok=True)) as mocked:
-            res = self.client.post(
-                reverse("api-link:third-party-auth"),
-                data={"cgu_accepted": True, "is_username_valid": True, **self.query},
-            )
-            mocked.assert_called_once_with(
-                self.query["callback_url"], data=self.callback_data
-            )
-        assertRedirects(
-            res,
-            reverse("api-link:third-party-auth-result", kwargs={"result": "success"}),
-        )
-
-    def test_callback_error(self):
-        """Test that the user see the failure page if the callback request failed."""
-        self.client.force_login(self.user)
-        with mock.patch("requests.post", new_callable=mocked_post(ok=False)) as mocked:
-            res = self.client.post(
-                reverse("api-link:third-party-auth"),
-                data={"cgu_accepted": True, "is_username_valid": True, **self.query},
-            )
-            mocked.assert_called_once_with(
-                self.query["callback_url"], data=self.callback_data
-            )
-        assertRedirects(
-            res,
-            reverse("api-link:third-party-auth-result", kwargs={"result": "failure"}),
-        )
-
-    def test_wrong_signature(self):
-        """Test that a 403 is raised if the signature of the query is wrong."""
-        self.client.force_login(subscriber_user.make())
-        new_key = get_hmac_key()
-        del self.query["signature"]
-        self.query["signature"] = hmac_hexdigest(new_key, self.query)
-        res = self.client.get(reverse("api-link:third-party-auth", query=self.query))
-        assert res.status_code == 403
-
-    def test_cgu_not_accepted(self):
-        self.client.force_login(self.user)
-        res = self.client.get(reverse("api-link:third-party-auth", query=self.query))
-        assert res.status_code == 200
-        res = self.client.post(reverse("api-link:third-party-auth"), data=self.query)
-        assert res.status_code == 200  # no redirect means invalid form
-        res = self.client.post(
-            reverse("api-link:third-party-auth"),
-            data={"cgu_accepted": False, "is_username_valid": False, **self.query},
-        )
-        assert res.status_code == 200
-
-    def test_invalid_client(self):
-        self.query["client_id"] = ApiClient.objects.aggregate(res=Max("id"))["res"] + 1
-        res = self.client.get(reverse("api-link:third-party-auth", query=self.query))
-        assert res.status_code == 403
-
-    def test_missing_parameter(self):
-        """Test that a 403 is raised if there is a missing parameter."""
-        del self.query["username"]
-        self.query["signature"] = hmac_hexdigest(self.api_client.hmac_key, self.query)
-        res = self.client.get(reverse("api-link:third-party-auth", query=self.query))
-        assert res.status_code == 403

api/urls.py

@@ -1,9 +1,5 @@
-from django.urls import path, register_converter
 from ninja_extra import NinjaExtraAPI
 
-from api.views import ThirdPartyAuthResultView, ThirdPartyAuthView
-from core.converters import ResultConverter
-
 api = NinjaExtraAPI(
     title="PICON",
     description="Portail Interactif de Communication avec les Outils Numériques",
@@ -12,14 +8,3 @@ api = NinjaExtraAPI(
     csrf=True,
 )
 api.auto_discover_controllers()
-
-register_converter(ResultConverter, "res")
-
-urlpatterns = [
-    path("auth/", ThirdPartyAuthView.as_view(), name="third-party-auth"),
-    path(
-        "auth/<res:result>/",
-        ThirdPartyAuthResultView.as_view(),
-        name="third-party-auth-result",
-    ),
-]

api/views.py

@@ -1,119 +0,0 @@
-import hmac
-from urllib.parse import unquote
-
-import pydantic
-import requests
-from django.conf import settings
-from django.contrib import messages
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core.exceptions import PermissionDenied
-from django.urls import reverse, reverse_lazy
-from django.utils.translation import gettext as _
-from django.views.generic import FormView, TemplateView
-from ninja_extra.shortcuts import get_object_or_none
-
-from api.forms import ThirdPartyAuthForm
-from api.models import ApiClient
-from api.schemas import ThirdPartyAuthParamsSchema
-from core.models import SithFile
-from core.schemas import UserProfileSchema
-from core.utils import hmac_hexdigest
-
-
-class ThirdPartyAuthView(LoginRequiredMixin, FormView):
-    form_class = ThirdPartyAuthForm
-    template_name = "api/third_party/auth.jinja"
-    success_url = reverse_lazy("core:index")
-
-    def parse_params(self) -> ThirdPartyAuthParamsSchema:
-        """Parse and check the authentication parameters.
-
-        Raises:
-            PermissionDenied: if the verification failed.
-        """
-        # This is here rather than in ThirdPartyAuthForm because
-        # the given parameters and their signature are checked during both
-        # POST (for obvious reasons) and GET (in order not to make
-        # the user fill a form just to get an error he won't understand)
-        params = self.request.GET or self.request.POST
-        params = {key: unquote(val) for key, val in params.items()}
-        try:
-            params = ThirdPartyAuthParamsSchema(**params)
-        except pydantic.ValidationError as e:
-            raise PermissionDenied("Wrong data format") from e
-        client: ApiClient = get_object_or_none(ApiClient, id=params.client_id)
-        if not client:
-            raise PermissionDenied
-        if not hmac.compare_digest(
-            hmac_hexdigest(client.hmac_key, params.model_dump(exclude={"signature"})),
-            params.signature,
-        ):
-            raise PermissionDenied("Bad signature")
-        return params
-
-    def dispatch(self, request, *args, **kwargs):
-        self.params = self.parse_params()
-        return super().dispatch(request, *args, **kwargs)
-
-    def get(self, *args, **kwargs):
-        messages.warning(
-            self.request,
-            _(
-                "You are going to link your AE account and your %(app)s account. "
-                "Continue only if this page was opened from %(app)s."
-            )
-            % {"app": self.params.third_party_app},
-        )
-        return super().get(*args, **kwargs)
-
-    def get_initial(self):
-        return self.params.model_dump()
-
-    def form_valid(self, form):
-        client = ApiClient.objects.get(id=form.cleaned_data["client_id"])
-        user = UserProfileSchema.from_orm(self.request.user).model_dump()
-        data = {"user": user, "signature": hmac_hexdigest(client.hmac_key, user)}
-        response = requests.post(form.cleaned_data["callback_url"], data=data)
-        self.success_url = reverse(
-            "api-link:third-party-auth-result",
-            kwargs={"result": "success" if response.ok else "failure"},
-        )
-        return super().form_valid(form)
-
-    def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {
-            "third_party_app": self.params.third_party_app,
-            "third_party_cgu": self.params.privacy_link,
-            "sith_cgu": SithFile.objects.get(id=settings.SITH_CGU_FILE_ID),
-        }
-
-
-class ThirdPartyAuthResultView(LoginRequiredMixin, TemplateView):
-    """View that the user will see if its authentication on sith was successful.
-
-    This can show either a success or a failure message :
-    - success : everything is good, the user is successfully authenticated
-      and can close the page
-    - failure : the authentication has been processed on the sith side,
-      but the request to the callback url received an error.
-      In such a case, there is nothing much we can do but to advice
-      the user to contact the developers of the third-party app.
-    """
-
-    template_name = "core/base.jinja"
-    success_message = _(
-        "You have been successfully authenticated. You can now close this page."
-    )
-    error_message = _(
-        "Your authentication on the AE website was successful, "
-        "but an error happened during the interaction "
-        "with the third-party application. "
-        "Please contact the managers of the latter."
-    )
-
-    def get(self, request, *args, **kwargs):
-        if self.kwargs.get("result") == "success":
-            messages.success(request, self.success_message)
-        else:
-            messages.error(request, self.error_message)
-        return super().get(request, *args, **kwargs)

club/api.py

@@ -1,5 +1,7 @@
+from typing import Annotated
+
+from annotated_types import MinLen
 from django.db.models import Prefetch
-from ninja import Query
 from ninja.security import SessionAuth
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.pagination import PageNumberPaginationExtra
@@ -8,7 +10,7 @@ from ninja_extra.schemas import PaginatedResponseSchema
 from api.auth import ApiKeyAuth
 from api.permissions import CanAccessLookup, HasPerm
 from club.models import Club, Membership
-from club.schemas import ClubSchema, ClubSearchFilterSchema, SimpleClubSchema
+from club.schemas import ClubSchema, SimpleClubSchema
 
 
 @api_controller("/club")
@@ -21,8 +23,8 @@ class ClubController(ControllerBase):
         url_name="search_club",
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
-    def search_club(self, filters: Query[ClubSearchFilterSchema]):
-        return filters.filter(Club.objects.all())
+    def search_club(self, search: Annotated[str, MinLen(1)]):
+        return Club.objects.filter(name__icontains=search).values()
 
     @route.get(
         "/{int:club_id}",

club/forms.py

@@ -252,7 +252,7 @@ class ClubAddMemberForm(ClubMemberForm):
         Board members can attribute roles lower than their own.
         Other users cannot attribute roles with this form
         """
-        if self.request_user.has_perm("club.add_membership"):
+        if self.request_user.has_perm("club.add_subscription"):
             return settings.SITH_CLUB_ROLES_ID["President"]
         membership = self.request_user_membership
         if membership is None or membership.role <= settings.SITH_MAXIMUM_FREE_ROLE:

club/schemas.py

@@ -1,26 +1,9 @@
-from typing import Annotated
-
-from annotated_types import MinLen
-from django.db.models import Q
-from ninja import Field, FilterSchema, ModelSchema
+from ninja import ModelSchema
 
 from club.models import Club, Membership
 from core.schemas import SimpleUserSchema
 
 
-class ClubSearchFilterSchema(FilterSchema):
-    search: Annotated[str, MinLen(1)] | None = Field(None, q="name__icontains")
-    is_active: bool | None = None
-    parent_id: int | None = None
-    parent_name: str | None = Field(None, q="parent__name__icontains")
-    exclude_ids: set[int] | None = None
-
-    def filter_exclude_ids(self, value: set[int] | None):
-        if value is None:
-            return Q()
-        return ~Q(id__in=value)
-
-
 class SimpleClubSchema(ModelSchema):
     class Meta:
         model = Club

club/templates/club/club_sellings.jinja

@@ -6,11 +6,11 @@ because it works with a somewhat dynamic form,
 but was written before Alpine was introduced in the project.
 TODO : rewrite the pagination used in this template an Alpine one
 #}
-{% macro paginate(page_obj, paginator) %}
-  {% set js = "formPagination(this)" %}
+{% macro paginate(page_obj, paginator, js_action) %}
+  {% set js = js_action|default('') %}
   {% if page_obj.has_previous() or page_obj.has_next() %}
     {% if page_obj.has_previous() %}
-      <a type="submit" onclick="{{ js }}" href="?page={{ page_obj.previous_page_number() }}">{% trans %}Previous{% endtrans %}</a>
+      <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ page_obj.previous_page_number() }}">{% trans %}Previous{% endtrans %}</a>
     {% else %}
       <span class="disabled">{% trans %}Previous{% endtrans %}</span>
     {% endif %}
@@ -18,11 +18,11 @@ TODO : rewrite the pagination used in this template an Alpine one
       {% if page_obj.number == i %}
         <span class="active">{{ i }} <span class="sr-only">({% trans %}current{% endtrans %})</span></span>
       {% else %}
-        <a type="submit" onclick="{{ js }}" href="?page={{ i }}">{{ i }}</a>
+        <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ i }}">{{ i }}</a>
       {% endif %}
     {% endfor %}
     {% if page_obj.has_next() %}
-      <a type="submit" onclick="{{ js }}" href="?page={{ page_obj.next_page_number() }}">{% trans %}Next{% endtrans %}</a>
+      <a {% if js %} type="submit" onclick="{{ js }}" {% endif %} href="?page={{ page_obj.next_page_number() }}">{% trans %}Next{% endtrans %}</a>
     {% else %}
       <span class="disabled">{% trans %}Next{% endtrans %}</span>
     {% endif %}
@@ -81,10 +81,6 @@ TODO : rewrite the pagination used in this template an Alpine one
       {% endfor %}
     </tbody>
   </table>
-  {{ paginate(paginated_result, paginator) }}
-{% endblock %}
-
-{% block script %}
   <script type="text/javascript">
     function formPagination(link){
       const form = document.getElementById("form")
@@ -93,6 +89,7 @@ TODO : rewrite the pagination used in this template an Alpine one
       form.submit();
     }
   </script>
+  {{ paginate(paginated_result, paginator, "formPagination(this)") }}
 {% endblock %}
 
 

club/templates/club/club_tools.jinja

@@ -1,25 +1,63 @@
 {% extends "core/base.jinja" %}
+{% from "reservation/macros.jinja" import room_detail %}
+
+{% block additional_css %}
+  <link rel="stylesheet" href="{{ static("core/components/card.scss") }}">
+{% endblock %}
 
 {% block content %}
-  <h3>{% trans %}Club tools{% endtrans %}</h3>
+  <h3>{% trans %}Club tools{% endtrans %} ({{ club.name }})</h3>
   <div>
     <h4>{% trans %}Communication:{% endtrans %}</h4>
     <ul>
-      <li> <a href="{{ url('com:news_new') }}?club={{ object.id }}">{% trans %}Create a news{% endtrans %}</a></li>
-      <li> <a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">{% trans %}Post in the Weekmail{% endtrans %}</a></li>
+      <li>
+        <a href="{{ url('com:news_new') }}?club={{ object.id }}">
+          {% trans %}Create a news{% endtrans %}
+        </a>
+      </li>
+      <li>
+        <a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">
+          {% trans %}Post in the Weekmail{% endtrans %}
+        </a>
+      </li>
       {% if object.trombi %}
-        <li> <a href="{{ url('trombi:detail', trombi_id=object.trombi.id) }}">{% trans %}Edit Trombi{% endtrans %}</a></li>
+        <li>
+          <a href="{{ url('trombi:detail', trombi_id=object.trombi.id) }}">
+            {% trans %}Edit Trombi{% endtrans %}</a>
+        </li>
       {% else %}
-        <li> <a href="{{ url('trombi:create', club_id=object.id) }}">{% trans %}New Trombi{% endtrans %}</a></li>
-        <li> <a href="{{ url('club:poster_list', club_id=object.id) }}">{% trans %}Posters{% endtrans %}</a></li>
+        <li><a href="{{ url('trombi:create', club_id=object.id) }}">{% trans %}New Trombi{% endtrans %}</a></li>
+        <li><a href="{{ url('club:poster_list', club_id=object.id) }}">{% trans %}Posters{% endtrans %}</a></li>
       {% endif %}
     </ul>
+    <h4>{% trans %}Reservable rooms{% endtrans %}</h4>
+    <a
+      href="{{ url("reservation:room_create") }}?club={{ object.id }}"
+      class="btn btn-blue"
+    >
+      {% trans %}Add a room{% endtrans %}
+    </a>
+    {%- if reservable_rooms|length > 0 -%}
+      <ul class="card-group">
+        {%- for room in reservable_rooms -%}
+          {{ room_detail(
+          room,
+          can_edit=user.can_edit(room),
+          can_delete=request.user.has_perm("reservation.delete_room")
+          ) }}
+        {%- endfor -%}
+      </ul>
+    {%- else -%}
+      <p>
+        {% trans %}This club manages no reservable room{% endtrans %}
+      </p>
+    {%- endif -%}
     <h4>{% trans %}Counters:{% endtrans %}</h4>
     <ul>
-      {% for c in object.counters.filter(type="OFFICE") %}
-        <li>{{ c }}:
-          <a href="{{ url('counter:details', counter_id=c.id) }}">View</a>
-          <a href="{{ url('counter:admin', counter_id=c.id) }}">Edit</a>
+      {% for counter in counters %}
+        <li>{{ counter }}:
+          <a href="{{ url('counter:details', counter_id=counter.id) }}">View</a>
+          <a href="{{ url('counter:admin', counter_id=counter.id) }}">Edit</a>
         </li>
       {% endfor %}
     </ul>

club/tests/test_club_controller.py

@@ -1,8 +1,7 @@
 from datetime import date, timedelta
 
 import pytest
-from django.contrib.auth.models import Permission
-from django.test import Client, TestCase
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 from model_bakery.recipe import Recipe
@@ -10,54 +9,6 @@ from pytest_django.asserts import assertNumQueries
 
 from club.models import Club, Membership
 from core.baker_recipes import subscriber_user
-from core.models import Group, Page, User
-
-
-class TestClubSearch(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.url = reverse("api:search_club")
-        cls.user = baker.make(
-            User, user_permissions=[Permission.objects.get(codename="access_lookup")]
-        )
-        # delete existing clubs to avoid side effect
-        groups = list(
-            Group.objects.exclude(club=None, club_board=None).values_list(
-                "id", flat=True
-            )
-        )
-        Page.objects.exclude(club=None).delete()
-        Club.objects.all().delete()
-        Group.objects.filter(id__in=groups).delete()
-
-        cls.clubs = baker.make(
-            Club,
-            _quantity=5,
-            name=iter(["AE", "ae 1", "Troll", "Dev AE", "pdf"]),
-            is_active=True,
-        )
-
-    def test_inactive_club(self):
-        self.client.force_login(self.user)
-        inactive_ids = {self.clubs[0].id, self.clubs[2].id}
-        Club.objects.filter(id__in=inactive_ids).update(is_active=False)
-        response = self.client.get(self.url, {"is_active": False})
-        assert response.status_code == 200
-        assert {d["id"] for d in response.json()["results"]} == inactive_ids
-
-    def test_excluded_id(self):
-        self.client.force_login(self.user)
-        response = self.client.get(self.url, {"exclude_ids": [self.clubs[1].id]})
-        assert response.status_code == 200
-        ids = {d["id"] for d in response.json()["results"]}
-        assert ids == {c.id for c in [self.clubs[0], *self.clubs[2:]]}
-
-    def test_club_search(self):
-        self.client.force_login(self.user)
-        response = self.client.get(self.url, {"search": "AE"})
-        assert response.status_code == 200
-        ids = {d["id"] for d in response.json()["results"]}
-        assert ids == {c.id for c in [self.clubs[0], self.clubs[1], self.clubs[3]]}
 
 
 @pytest.mark.django_db

club/views.py

@@ -23,7 +23,6 @@
 #
 
 import csv
-import itertools
 from typing import Any
 
 from django.conf import settings
@@ -31,14 +30,18 @@ from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.core.exceptions import NON_FIELD_ERRORS, PermissionDenied, ValidationError
 from django.core.paginator import InvalidPage, Paginator
-from django.db.models import F, Q, Sum
-from django.http import Http404, HttpResponseRedirect, StreamingHttpResponse
+from django.db.models import Q, Sum
+from django.http import (
+    Http404,
+    HttpResponseRedirect,
+    StreamingHttpResponse,
+)
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse, reverse_lazy
 from django.utils import timezone
 from django.utils.safestring import SafeString
 from django.utils.timezone import now
-from django.utils.translation import gettext
+from django.utils.translation import gettext as _t
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView, View
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
@@ -52,7 +55,12 @@ from club.forms import (
     MailingForm,
     SellingsForm,
 )
-from club.models import Club, Mailing, MailingSubscription, Membership
+from club.models import (
+    Club,
+    Mailing,
+    MailingSubscription,
+    Membership,
+)
 from com.models import Poster
 from com.views import (
     PosterCreateBaseView,
@@ -60,7 +68,9 @@ from com.views import (
     PosterEditBaseView,
     PosterListBaseView,
 )
-from core.auth.mixins import CanEditMixin, PermissionOrClubBoardRequiredMixin
+from core.auth.mixins import (
+    CanEditMixin,
+)
 from core.models import PageRev
 from core.views import DetailFormView, PageEditViewBase, UseFragmentsMixin
 from core.views.mixins import FragmentMixin, FragmentRenderer, TabedViewMixin
@@ -252,6 +262,12 @@ class ClubToolsView(ClubTabsMixin, CanEditMixin, DetailView):
     template_name = "club/club_tools.jinja"
     current_tab = "tools"
 
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(**kwargs) | {
+            "reservable_rooms": list(self.object.reservable_rooms.all()),
+            "counters": list(self.object.counters.filter(type="OFFICE")),
+        }
+
 
 class ClubAddMembersFragment(
     FragmentMixin, PermissionRequiredMixin, SuccessMessageMixin, CreateView
@@ -371,7 +387,7 @@ class ClubOldMembersView(ClubTabsMixin, PermissionRequiredMixin, DetailView):
 
 
 class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
-    """Sales of a club."""
+    """Sellings of a club."""
 
     model = Club
     pk_url_kwarg = "club_id"
@@ -397,8 +413,9 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
+        qs = Selling.objects.filter(club=self.object)
 
-        kwargs["result"] = Selling.objects.none()
+        kwargs["result"] = qs[:0]
         kwargs["paginated_result"] = kwargs["result"]
         kwargs["total"] = 0
         kwargs["total_quantity"] = 0
@@ -406,7 +423,6 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
 
         form = self.get_form()
         if form.is_valid():
-            qs = Selling.objects.filter(club=self.object)
             if not len([v for v in form.cleaned_data.values() if v is not None]):
                 qs = Selling.objects.none()
             if form.cleaned_data["begin_date"]:
@@ -426,18 +442,18 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
             if len(selected_products) > 0:
                 qs = qs.filter(product__in=selected_products)
 
-            kwargs["total"] = qs.annotate(
-                price=F("quantity") * F("unit_price")
-            ).aggregate(total=Sum("price", default=0))["total"]
             kwargs["result"] = qs.select_related(
                 "counter", "counter__club", "customer", "customer__user", "seller"
             ).order_by("-id")
-            kwargs["total_quantity"] = qs.aggregate(total=Sum("quantity", default=0))[
-                "total"
-            ]
-            kwargs["benefit"] = qs.exclude(product=None).aggregate(
-                res=Sum("product__purchase_price", default=0)
-            )["res"]
+            kwargs["total"] = sum([s.quantity * s.unit_price for s in kwargs["result"]])
+            total_quantity = qs.all().aggregate(Sum("quantity"))
+            if total_quantity["quantity__sum"]:
+                kwargs["total_quantity"] = total_quantity["quantity__sum"]
+            benefit = (
+                qs.exclude(product=None).all().aggregate(Sum("product__purchase_price"))
+            )
+            if benefit["product__purchase_price__sum"]:
+                kwargs["benefit"] = benefit["product__purchase_price__sum"]
 
         kwargs["paginator"] = Paginator(kwargs["result"], self.paginate_by)
         try:
@@ -488,40 +504,40 @@ class ClubSellingCSVView(ClubSellingView):
         kwargs = self.get_context_data(**kwargs)
 
         # Use the StreamWriter class instead of request for streaming
-        writer = csv.writer(self.StreamWriter())
+        pseudo_buffer = self.StreamWriter()
+        writer = csv.writer(
+            pseudo_buffer, delimiter=";", lineterminator="\n", quoting=csv.QUOTE_ALL
+        )
 
-        first_rows = [
-            [gettext("Quantity"), kwargs["total_quantity"]],
-            [gettext("Total"), kwargs["total"]],
-            [gettext("Benefit"), kwargs["benefit"]],
+        writer.writerow([_t("Quantity"), kwargs["total_quantity"]])
+        writer.writerow([_t("Total"), kwargs["total"]])
+        writer.writerow([_t("Benefit"), kwargs["benefit"]])
+        writer.writerow(
             [
-                gettext("Date"),
-                gettext("Counter"),
-                gettext("Barman"),
-                gettext("Customer"),
-                gettext("Label"),
-                gettext("Quantity"),
-                gettext("Total"),
-                gettext("Payment method"),
-                gettext("Selling price"),
-                gettext("Purchase price"),
-                gettext("Benefit"),
-            ],
-        ]
+                _t("Date"),
+                _t("Counter"),
+                _t("Barman"),
+                _t("Customer"),
+                _t("Label"),
+                _t("Quantity"),
+                _t("Total"),
+                _t("Payment method"),
+                _t("Selling price"),
+                _t("Purchase price"),
+                _t("Benefit"),
+            ]
+        )
 
         # Stream response
         response = StreamingHttpResponse(
-            itertools.chain(
-                (writer.writerow(r) for r in first_rows),
-                (
-                    writer.writerow(self.write_selling(selling))
-                    for selling in kwargs["result"]
-                ),
+            (
+                writer.writerow(self.write_selling(selling))
+                for selling in kwargs["result"]
             ),
             content_type="text/csv",
         )
-        name = f"{gettext('Sellings')}_{self.object.name}.csv"
-        response["Content-Disposition"] = f"attachment; filename={name}"
+        name = _("Sellings") + "_" + self.object.name + ".csv"
+        response["Content-Disposition"] = "filename=" + name
 
         return response
 
@@ -759,13 +775,11 @@ class MailingAutoGenerationView(View):
         return redirect("club:mailing", club_id=club.id)
 
 
-class PosterListView(
-    PermissionOrClubBoardRequiredMixin, ClubTabsMixin, PosterListBaseView
-):
+class PosterListView(ClubTabsMixin, PosterListBaseView):
     """List communication posters."""
 
     current_tab = "posters"
-    permission_required = "com.view_poster"
+    extra_context = {"app": "club"}
 
     def get_queryset(self):
         return super().get_queryset().filter(club=self.club.id)
@@ -773,17 +787,6 @@ class PosterListView(
     def get_object(self):
         return self.club
 
-    def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {
-            "create_url": reverse_lazy(
-                "club:poster_create", kwargs={"club_id": self.club.id}
-            ),
-            "get_edit_url": lambda poster: reverse(
-                "club:poster_edit",
-                kwargs={"club_id": self.club.id, "poster_id": poster.id},
-            ),
-        }
-
 
 class PosterCreateView(ClubTabsMixin, PosterCreateBaseView):
     """Create communication poster."""

com/models.py

@@ -144,7 +144,7 @@ class News(models.Model):
                 ),
                 groups__id=settings.SITH_GROUP_COM_ADMIN_ID,
             )
-            notif_url = reverse("com:news_admin_list", fragment="moderation")
+            notif_url = reverse("com:news_admin_list")
             new_notifs = [
                 Notification(user=user, url=notif_url, type="NEWS_MODERATION")
                 for user in admins_without_notif
@@ -402,7 +402,9 @@ class Poster(models.Model):
                 groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID]
             ):
                 Notification.objects.create(
-                    user=user, url=reverse("com:poster_list"), type="POSTER_MODERATION"
+                    user=user,
+                    url=reverse("com:poster_moderate_list"),
+                    type="POSTER_MODERATION",
                 )
         return super().save(*args, **kwargs)
 

com/static/com/css/news-list.scss

@@ -81,7 +81,6 @@
     }
 
     #links_content {
-      overflow: auto;
       box-shadow: $shadow-color 1px 1px 1px;
       min-height: 20em;
       padding-bottom: 1em;

com/static/com/css/posters.scss

@@ -20,7 +20,33 @@
       position: absolute;
       display: flex;
       bottom: 5px;
-      left: 0;
+
+      &.left {
+        left: 0;
+      }
+
+      &.right {
+        right: 0;
+      }
+
+      .link {
+        padding: 5px;
+        padding-left: 20px;
+        padding-right: 20px;
+        margin-left: 5px;
+        border-radius: 20px;
+        background-color: hsl(40, 100%, 50%);
+        color: black;
+
+        &:hover {
+          color: black;
+          background-color: hsl(40, 58%, 50%);
+        }
+
+        &.delete {
+          background-color: hsl(0, 100%, 40%);
+        }
+      }
     }
   }
 
@@ -117,15 +143,43 @@
         }
       }
 
-      .actions {
-        display: flex;
-        flex-direction: column;
-        align-items: stretch;
-        form {
-          margin: unset;
-          padding: unset;
-          button {
-            width: 100%;
+      .edit,
+      .moderate,
+      .slideshow {
+        padding: 5px;
+        border-radius: 20px;
+        background-color: hsl(40, 100%, 50%);
+        color: black;
+
+        &:hover {
+          color: black;
+          background-color: hsl(40, 58%, 50%);
+        }
+
+        &:nth-child(2n) {
+          margin-top: 5px;
+          margin-bottom: 5px;
+        }
+      }
+
+      .tooltip {
+        visibility: hidden;
+        width: 120px;
+        background-color: hsl(210, 20%, 98%);
+        color: hsl(0, 0%, 0%);
+        text-align: center;
+        padding: 5px 0;
+        border-radius: 6px;
+        position: absolute;
+        z-index: 10;
+
+        ul {
+          margin-left: 0;
+          display: inline-block;
+
+          li {
+            display: list-item;
+            list-style-type: none;
           }
         }
       }

com/templates/com/news_admin_list.jinja

@@ -131,7 +131,7 @@
       {% endfor %}
     </tbody>
   </table>
-  <h5 id="moderation">{% trans %}Events to moderate{% endtrans %}</h5>
+  <h5>{% trans %}Events to moderate{% endtrans %}</h5>
   <table>
     <thead>
       <tr>
@@ -165,3 +165,6 @@
     </tbody>
   </table>
 {% endblock %}
+
+
+

com/templates/com/news_list.jinja

@@ -1,9 +1,11 @@
 {% extends "core/base.jinja" %}
 {% from "com/macros.jinja" import news_moderation_alert %}
 
+{% block title %}AE UTBM{% endblock %}
+
 {% block additional_css %}
   <link rel="stylesheet" href="{{ static('com/css/news-list.scss') }}">
-  <link rel="stylesheet" href="{{ static('com/components/ics-calendar.scss') }}">
+  <link rel="stylesheet" href="{{ static('core/components/calendar.scss') }}">
 
   {# Atom feed discovery, not really css but also goes there #}
   <link rel="alternate" type="application/rss+xml" title="{% trans %}News feed{% endtrans %}" href="{{ url("com:news_feed") }}">
@@ -213,6 +215,12 @@
               <i class="fa-solid fa-magnifying-glass fa-xl"></i>
               <a href="{{ url("matmat:search_clear") }}">{% trans %}Matmatronch{% endtrans %}</a>
             </li>
+            {% if user.has_perm("reservation.view_reservationslot") %}
+              <li>
+                <i class="fa-solid fa-thumbtack fa-xl"></i>
+                <a href="{{ url("reservation:main") }}">{% trans %}Room reservation{% endtrans %}</a>
+              </li>
+            {% endif %}
             <li>
               <i class="fa-solid fa-check-to-slot fa-xl"></i>
               <a href="{{ url("election:list") }}">{% trans %}Elections{% endtrans %}</a>

com/templates/com/poster_list.jinja

@@ -13,53 +13,53 @@
 
     <div id="title">
       <h3>{% trans %}Posters{% endtrans %}</h3>
-      <div id="links">
-        <a id="create" class="btn btn-blue" href="{{ create_url }}">
-          <i class="fa fa-plus"></i>
-          {% trans %}Create{% endtrans %}
-        </a>
+      <div id="links" class="right">
+        {% if app == "com" %}
+          <a id="create" class="link" href="{{ url(app + ":poster_create") }}">{% trans %}Create{% endtrans %}</a>
+          <a id="moderation" class="link" href="{{ url("com:poster_moderate_list") }}">{% trans %}Moderation{% endtrans %}</a>
+        {% elif app == "club" %}
+          <a id="create" class="link" href="{{ url(app + ":poster_create", club.id) }}">{% trans %}Create{% endtrans %}</a>
+        {% endif %}
       </div>
     </div>
 
     <div id="posters">
-      {% for poster in poster_list %}
-        <div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
-          <div class="name">{{ poster.name }}</div>
-          <div
-            class="image"
-            hover="{% trans %}Click to expand{% endtrans %}"
-            @click="active = $el.firstElementChild"
-            tooltip="{%- for screen in poster.screens.all() -%}
-                       {{ screen }}
-                     {% endfor %}"
-          >
-            <img src="{{ poster.file.url }}" alt="{{ poster.name }}">
-          </div>
-          <div class="dates">
-            <div class="begin">{{ poster.date_begin | localtime | date("d/M/Y H:m") }}</div>
-            <div class="end">{{ poster.date_end | localtime | date("d/M/Y H:m") }}</div>
-          </div>
-          <div class="actions">
-            {% if poster.is_editable %}
-              <a class="btn btn-blue" href="{{ get_edit_url(poster) }}">
-                <i class="fa fa-pen-to-square"></i>
-                {% trans %}Edit{% endtrans %}
-              </a>
-            {% endif %}
-            {% if not poster.is_moderated and user.has_perm("com.moderate_poster") %}
-              <form action="{{ url("com:poster_moderate", object_id=poster.id) }}" method="post">
-                {% csrf_token %}
-                <button type="submit" class="btn btn-green">
-                  <i class="fa fa-check"></i>
-                  {% trans %}Moderate{% endtrans %}
-                </button>
-              </form>
-            {% endif %}
-          </div>
-        </div>
-      {% else %}
+
+      {% if poster_list.count() == 0 %}
         <div id="no-posters">{% trans %}No posters{% endtrans %}</div>
-      {% endfor %}
+      {% else %}
+
+        {% for poster in poster_list %}
+          <div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
+            <div class="name">{{ poster.name }}</div>
+            <div
+              class="image"
+              hover="{% trans %}Click to expand{% endtrans %}"
+              @click="active = $el.firstElementChild"
+            >
+              <img src="{{ poster.file.url }}"></img>
+            </div>
+            <div class="dates">
+              <div class="begin">{{ poster.date_begin | localtime | date("d/M/Y H:m") }}</div>
+              <div class="end">{{ poster.date_end | localtime | date("d/M/Y H:m") }}</div>
+            </div>
+            {% if app == "com" %}
+              <a class="edit" href="{{ url(app + ":poster_edit", poster.id) }}">{% trans %}Edit{% endtrans %}</a>
+            {% elif app == "club" %}
+              <a class="edit" href="{{ url(app + ":poster_edit", club.id, poster.id) }}">{% trans %}Edit{% endtrans %}</a>
+            {% endif %}
+            <div class="tooltip">
+              <ul>
+                {% for screen in poster.screens.all() %}
+                  <li>{{ screen }}</li>
+                {% endfor %}
+              </ul>
+            </div>
+          </div>
+        {% endfor %}
+
+      {% endif %}
+
     </div>
 
     <div
@@ -68,9 +68,7 @@
       @click="active = null"
       :class="{active: active !== null}"
     >
-      <div id="placeholder">
-        <img :src="active?.src" :alt="active?.name">
-      </div>
+      <div id="placeholder"><img :src="active?.src"></div>
     </div>
 
   </div>

com/templates/com/poster_moderate.jinja

@@ -0,0 +1,43 @@
+{% extends "core/base.jinja" %}
+
+{% block script %}
+  {{ super() }}
+  <script src="{{ static('com/js/poster_list.js') }}"></script>
+{% endblock %}
+
+{% block additional_css %}
+  <link rel="stylesheet" href="{{ static('com/css/posters.scss') }}">
+{% endblock %}
+
+{% block content %}
+  <div id="poster_list">
+
+    <div id="title">
+      <div id="links" class="left">
+        <a id="list" class="link" href="{{ url("com:poster_list") }}">{% trans %}List{% endtrans %}</a>
+      </div>
+      <h3>{% trans %}Posters - moderation{% endtrans %}</h3>
+    </div>
+
+    <div id="posters">
+
+      {% if object_list.count == 0 %}
+        <div id="no-posters">{% trans %}No objects{% endtrans %}</div>
+      {% else %}
+
+        {% for poster in object_list %}
+          <div class="poster{% if not poster.is_moderated %} not_moderated{% endif %}">
+            <div class="name"> {{ poster.name }} </div>
+            <div class="image"> <img src="{{ poster.file.url }}"></img> </div>
+            <a class="moderate" href="{{ url("com:poster_moderate", object_id=poster.id) }}">Moderate</a>
+          </div>
+        {% endfor %}
+
+      {% endif %}
+
+    </div>
+
+    <div id="view"><div id="placeholder"></div></div>
+
+  </div>
+{% endblock %}

com/tests/test_views.py

@@ -17,9 +17,7 @@ from unittest.mock import patch
 
 import pytest
 from django.conf import settings
-from django.contrib.auth.models import Permission
 from django.contrib.sites.models import Site
-from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import Client, TestCase
 from django.urls import reverse
 from django.utils import html
@@ -29,10 +27,9 @@ from model_bakery import baker
 from pytest_django.asserts import assertNumQueries, assertRedirects
 
 from club.models import Club, Membership
-from com.models import News, NewsDate, Poster, Sith, Weekmail, WeekmailArticle
+from com.models import News, NewsDate, Sith, Weekmail, WeekmailArticle
 from core.baker_recipes import subscriber_user
 from core.models import AnonymousUser, Group, User
-from core.utils import RED_PIXEL_PNG
 
 
 @pytest.fixture()
@@ -317,6 +314,7 @@ def test_feed(client: Client):
     [
         reverse("com:poster_list"),
         reverse("com:poster_create"),
+        reverse("com:poster_moderate_list"),
     ],
 )
 def test_poster_management_views_crash_test(client: Client, url: str):
@@ -327,37 +325,3 @@ def test_poster_management_views_crash_test(client: Client, url: str):
     client.force_login(user)
     res = client.get(url)
     assert res.status_code == 200
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize(
-    "referer",
-    [
-        None,
-        reverse("com:poster_list"),
-        reverse("club:poster_list", kwargs={"club_id": settings.SITH_MAIN_CLUB_ID}),
-    ],
-)
-def test_moderate_poster(client: Client, referer: str | None):
-    poster = baker.make(
-        Poster,
-        is_moderated=False,
-        file=SimpleUploadedFile("test.png", content=RED_PIXEL_PNG),
-        club_id=settings.SITH_MAIN_CLUB_ID,
-    )
-    user = baker.make(
-        User,
-        user_permissions=Permission.objects.filter(
-            codename__in=["view_poster", "moderate_poster"]
-        ),
-    )
-    client.force_login(user)
-    headers = {"REFERER": f"https://{settings.SITH_URL}{referer}"} if referer else {}
-    response = client.post(
-        reverse("com:poster_moderate", kwargs={"object_id": poster.id}), headers=headers
-    )
-    result_url = referer or reverse("com:poster_list")
-    assertRedirects(response, result_url)
-    poster.refresh_from_db()
-    assert poster.is_moderated
-    assert poster.moderator == user

com/urls.py

@@ -33,6 +33,7 @@ from com.views import (
     PosterDeleteView,
     PosterEditView,
     PosterListView,
+    PosterModerateListView,
     PosterModerateView,
     ScreenCreateView,
     ScreenDeleteView,
@@ -101,6 +102,11 @@ urlpatterns = [
         PosterDeleteView.as_view(),
         name="poster_delete",
     ),
+    path(
+        "poster/moderate/",
+        PosterModerateListView.as_view(),
+        name="poster_moderate_list",
+    ),
     path(
         "poster/<int:object_id>/moderate/",
         PosterModerateView.as_view(),

com/views.py

@@ -25,7 +25,6 @@ import itertools
 from datetime import date, timedelta
 from smtplib import SMTPRecipientsRefused
 from typing import Any
-from urllib.parse import urlparse
 
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
@@ -35,7 +34,7 @@ from django.contrib.auth.mixins import (
 )
 from django.contrib.syndication.views import Feed
 from django.core.exceptions import PermissionDenied, ValidationError
-from django.db.models import Exists, Max, OuterRef, Value
+from django.db.models import Max
 from django.forms.models import modelform_factory
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, redirect
@@ -46,7 +45,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView, TemplateView, View
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 
-from club.models import Club, Mailing, Membership
+from club.models import Club, Mailing
 from com.forms import NewsDateForm, NewsForm, PosterForm
 from com.ics_calendar import IcsCalendar
 from com.models import News, NewsDate, Poster, Screen, Sith, Weekmail, WeekmailArticle
@@ -562,26 +561,16 @@ class MailingModerateView(View):
         raise PermissionDenied
 
 
-class PosterListBaseView(ListView):
+class PosterListBaseView(PermissionOrClubBoardRequiredMixin, ListView):
     """List communication posters."""
 
     model = Poster
     template_name = "com/poster_list.jinja"
     permission_required = "com.view_poster"
+    ordering = ["-date_begin"]
 
-    def get_queryset(self):
-        qs = Poster.objects.prefetch_related("screens")
-        if self.request.user.has_perm("com.edit_poster"):
-            qs = qs.annotate(is_editable=Value(value=True))
-        else:
-            qs = qs.annotate(
-                is_editable=Exists(
-                    Membership.objects.ongoing()
-                    .board()
-                    .filter(user=self.request.user, club=OuterRef("club_id"))
-                )
-            )
-        return qs.order_by("-date_begin")
+    def get_context_data(self, **kwargs):
+        return super().get_context_data(**kwargs) | {"club": self.club}
 
 
 class PosterCreateBaseView(PermissionOrClubBoardRequiredMixin, CreateView):
@@ -644,17 +633,21 @@ class PosterDeleteBaseView(
     permission_required = "com.delete_poster"
 
 
-class PosterListView(PermissionRequiredMixin, ComTabsMixin, PosterListBaseView):
+class PosterListView(ComTabsMixin, PosterListBaseView):
     """List communication posters."""
 
     current_tab = "posters"
-    extra_context = {
-        "create_url": reverse_lazy("com:poster_create"),
-        "get_edit_url": lambda poster: reverse(
-            "com:poster_edit", kwargs={"poster_id": poster.id}
-        ),
-    }
-    permission_required = "com.view_poster"
+
+    def get_queryset(self):
+        qs = super().get_queryset()
+        if self.request.user.has_perm("com.view_poster"):
+            return qs
+        return qs.filter(club=self.club.id)
+
+    def get_context_data(self, **kwargs):
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["app"] = "com"
+        return kwargs
 
 
 class PosterCreateView(ComTabsMixin, PosterCreateBaseView):
@@ -679,6 +672,17 @@ class PosterDeleteView(PosterDeleteBaseView):
     success_url = reverse_lazy("com:poster_list")
 
 
+class PosterModerateListView(PermissionRequiredMixin, ComTabsMixin, ListView):
+    """Moderate list communication poster."""
+
+    current_tab = "posters"
+    model = Poster
+    template_name = "com/poster_moderate.jinja"
+    queryset = Poster.objects.filter(is_moderated=False).all()
+    permission_required = "com.moderate_poster"
+    extra_context = {"app": "com"}
+
+
 class PosterModerateView(PermissionRequiredMixin, ComTabsMixin, View):
     """Moderate communication poster."""
 
@@ -686,21 +690,12 @@ class PosterModerateView(PermissionRequiredMixin, ComTabsMixin, View):
     permission_required = "com.moderate_poster"
     extra_context = {"app": "com"}
 
-    def post(self, request, *args, **kwargs):
+    def get(self, request, *args, **kwargs):
         obj = get_object_or_404(Poster, pk=kwargs["object_id"])
         obj.is_moderated = True
         obj.moderator = request.user
         obj.save()
-        # The moderation request may be originated from a club context (/club/poster)
-        # or a global context (/com/poster),
-        # so the redirection URL will be the URL of the page that called this view,
-        # as long as the latter belongs to the sith.
-        referer = self.request.META.get("HTTP_REFERER")
-        if referer:
-            parsed = urlparse(referer)
-            if parsed.netloc == settings.SITH_URL:
-                return redirect(parsed.path)
-        return redirect(reverse("com:poster_list"))
+        return redirect("com:poster_moderate_list")
 
 
 class ScreenListView(PermissionRequiredMixin, ComTabsMixin, ListView):

core/converters.py

@@ -1,16 +1,19 @@
-from django.urls.converters import IntConverter, StringConverter
-
-
-class FourDigitYearConverter(IntConverter):
+class FourDigitYearConverter:
     regex = "[0-9]{4}"
 
+    def to_python(self, value):
+        return int(value)
+
     def to_url(self, value):
         return str(value).zfill(4)
 
 
-class TwoDigitMonthConverter(IntConverter):
+class TwoDigitMonthConverter:
     regex = "[0-9]{2}"
 
+    def to_python(self, value):
+        return int(value)
+
     def to_url(self, value):
         return str(value).zfill(2)
 
@@ -25,9 +28,3 @@ class BooleanStringConverter:
 
     def to_url(self, value):
         return str(value)
-
-
-class ResultConverter(StringConverter):
-    """Converter whose regex match either "success" or "failure"."""
-
-    regex = "(success|failure)"

core/management/commands/populate.py

@@ -28,7 +28,6 @@ from typing import ClassVar, NamedTuple
 from django.conf import settings
 from django.contrib.auth.models import Permission
 from django.contrib.sites.models import Site
-from django.core.files.base import ContentFile
 from django.core.management import call_command
 from django.core.management.base import BaseCommand
 from django.db import connection
@@ -105,21 +104,13 @@ class Command(BaseCommand):
         )
         self.profiles_root = SithFile.objects.create(name="profiles", owner=root)
         home_root = SithFile.objects.create(name="users", owner=root)
-        club_root = SithFile.objects.create(name="clubs", owner=root)
-        sas = SithFile.objects.create(name="SAS", owner=root)
-        SithFile.objects.create(
-            name="CGU",
-            is_folder=False,
-            file=ContentFile(
-                content="Conditions générales d'utilisation", name="cgu.txt"
-            ),
-            owner=root,
-        )
 
         # Page needed for club creation
         p = Page(name=settings.SITH_CLUB_ROOT_PAGE)
         p.save(force_lock=True)
 
+        club_root = SithFile.objects.create(name="clubs", owner=root)
+        sas = SithFile.objects.create(name="SAS", owner=root)
         main_club = Club.objects.create(
             id=1, name="AE", address="6 Boulevard Anatole France, 90000 Belfort"
         )
@@ -798,7 +789,11 @@ class Command(BaseCommand):
 
         subscribers = Group.objects.create(name="Cotisants")
         subscribers.permissions.add(
-            *list(perms.filter(codename__in=["add_news", "add_uvcomment"]))
+            *list(
+                perms.filter(
+                    codename__in=["add_news", "add_uvcomment", "view_reservationslot"]
+                )
+            )
         )
         old_subscribers = Group.objects.create(name="Anciens cotisants")
         old_subscribers.permissions.add(

core/management/commands/populate_more.py

@@ -1,7 +1,7 @@
-import math
 import random
 from datetime import date, timedelta
 from datetime import timezone as tz
+from math import ceil
 from typing import Iterator
 
 from dateutil.relativedelta import relativedelta
@@ -25,6 +25,7 @@ from counter.models import (
 )
 from forum.models import Forum, ForumMessage, ForumTopic
 from pedagogy.models import UV
+from reservation.models import ReservationSlot, Room
 from subscription.models import Subscription
 
 
@@ -35,56 +36,26 @@ class Command(BaseCommand):
         super().__init__(*args, **kwargs)
         self.faker = Faker("fr_FR")
 
-    def add_arguments(self, parser):
-        parser.add_argument(
-            "-n", "--nb-users", help="Number of users to create", type=int, default=600
-        )
-
     def handle(self, *args, **options):
         if not settings.DEBUG:
             raise Exception("Never call this command in prod. Never.")
 
         self.stdout.write("Creating users...")
-        users = self.create_users(options["nb_users"])
+        users = self.create_users()
+        # len(subscribers) is approximately 480
         subscribers = random.sample(users, k=int(0.8 * len(users)))
         self.stdout.write("Creating subscriptions...")
         self.create_subscriptions(subscribers)
         self.stdout.write("Creating club memberships...")
-        users_qs = User.objects.filter(id__in=[s.id for s in subscribers])
-        subscribers_now = list(
-            users_qs.annotate(
-                filter=Exists(
-                    Subscription.objects.filter(
-                        member_id=OuterRef("pk"), subscription_end__gte=now()
-                    )
-                )
-            )
-        )
-        old_subscribers = list(
-            users_qs.annotate(
-                filter=Exists(
-                    Subscription.objects.filter(
-                        member_id=OuterRef("pk"), subscription_end__lt=now()
-                    )
-                )
-            )
-        )
-        self.make_club(
-            Club.objects.get(id=settings.SITH_MAIN_CLUB_ID),
-            random.sample(subscribers_now, k=min(30, len(subscribers_now))),
-            random.sample(old_subscribers, k=min(60, len(old_subscribers))),
-        )
-        self.make_club(
-            Club.objects.get(name="Troll Penché"),
-            random.sample(subscribers_now, k=min(20, len(subscribers_now))),
-            random.sample(old_subscribers, k=min(80, len(old_subscribers))),
-        )
+        self.create_club_memberships(subscribers)
+        self.stdout.write("Creating rooms and reservation...")
+        self.create_resources_and_reservations(random.sample(subscribers, k=40))
         self.stdout.write("Creating uvs...")
         self.create_uvs()
         self.stdout.write("Creating products...")
         self.create_products()
         self.stdout.write("Creating sales and refills...")
-        sellers = random.sample(users, len(users) // 10)
+        sellers = list(User.objects.order_by("?")[:100])
         self.create_sales(sellers)
         self.stdout.write("Creating permanences...")
         self.create_permanences(sellers)
@@ -93,7 +64,7 @@ class Command(BaseCommand):
 
         self.stdout.write("Done")
 
-    def create_users(self, nb_users: int = 600) -> list[User]:
+    def create_users(self) -> list[User]:
         password = make_password("plop")
         users = [
             User(
@@ -110,7 +81,7 @@ class Command(BaseCommand):
                 address=self.faker.address(),
                 password=password,
             )
-            for _ in range(nb_users)
+            for _ in range(600)
         ]
         # there may a duplicate or two
         # Not a problem, we will just have 599 users instead of 600
@@ -198,6 +169,97 @@ class Command(BaseCommand):
         memberships = Membership.objects.bulk_create(memberships)
         Membership._add_club_groups(memberships)
 
+    def create_club_memberships(self, users: list[User]):
+        users_qs = User.objects.filter(id__in=[s.id for s in users])
+        subscribers_now = list(
+            users_qs.annotate(
+                filter=Exists(
+                    Subscription.objects.filter(
+                        member_id=OuterRef("pk"), subscription_end__gte=now()
+                    )
+                )
+            )
+        )
+        old_subscribers = list(
+            users_qs.annotate(
+                filter=Exists(
+                    Subscription.objects.filter(
+                        member_id=OuterRef("pk"), subscription_end__lt=now()
+                    )
+                )
+            )
+        )
+        self.make_club(
+            Club.objects.get(id=settings.SITH_MAIN_CLUB_ID),
+            random.sample(subscribers_now, k=min(30, len(subscribers_now))),
+            random.sample(old_subscribers, k=min(60, len(old_subscribers))),
+        )
+        self.make_club(
+            Club.objects.get(name="Troll Penché"),
+            random.sample(subscribers_now, k=min(20, len(subscribers_now))),
+            random.sample(old_subscribers, k=min(80, len(old_subscribers))),
+        )
+
+    def create_resources_and_reservations(self, users: list[User]):
+        """Generate reservable rooms and reservations slots for those rooms.
+
+        Contrary to the other data generator,
+        this one generates more data than what is expected on the real db.
+        """
+        ae = Club.objects.get(id=settings.SITH_MAIN_CLUB_ID)
+        pdf = Club.objects.get(id=settings.SITH_PDF_CLUB_ID)
+        troll = Club.objects.get(name="Troll Penché")
+        rooms = [
+            Room(
+                name=name,
+                club=club,
+                location=location,
+                description=self.faker.text(100),
+            )
+            for name, club, location in [
+                ("Champi", ae, "BELFORT"),
+                ("Muzik", ae, "BELFORT"),
+                ("Pôle Tech", ae, "BELFORT"),
+                ("Jolly", troll, "BELFORT"),
+                ("Cookut", pdf, "BELFORT"),
+                ("Lucky", pdf, "BELFORT"),
+                ("Potards", pdf, "SEVENANS"),
+                ("Bureau AE", ae, "SEVENANS"),
+            ]
+        ]
+        rooms = Room.objects.bulk_create(rooms)
+        reservations = []
+        for room in rooms:
+            # how much people use this room.
+            # The higher the number, the more reservations exist,
+            # the smaller the interval between two slot is,
+            # and the more future reservations have already been made ahead of time
+            affluence = random.randint(2, 6)
+            slot_start = make_aware(self.faker.past_datetime("-5y").replace(minute=0))
+            generate_until = make_aware(
+                self.faker.future_datetime(timedelta(days=1) * affluence**2)
+            )
+            while slot_start < generate_until:
+                if slot_start.hour < 8:
+                    # if a reservation would start in the middle of the night
+                    # make it start the next morning instead
+                    slot_start += timedelta(hours=10 - slot_start.hour)
+                duration = timedelta(minutes=15) * (1 + int(random.gammavariate(3, 2)))
+                reservations.append(
+                    ReservationSlot(
+                        room=room,
+                        author=random.choice(users),
+                        start_at=slot_start,
+                        end_at=slot_start + duration,
+                        created_at=slot_start - self.faker.time_delta("+7d"),
+                    )
+                )
+                slot_start += duration + (
+                    timedelta(minutes=15) * ceil(random.expovariate(affluence / 192))
+                )
+        reservations.sort(key=lambda slot: slot.created_at)
+        ReservationSlot.objects.bulk_create(reservations)
+
     def create_uvs(self):
         root = User.objects.get(username="root")
         categories = ["CS", "TM", "OM", "QC", "EC"]
@@ -395,9 +457,8 @@ class Command(BaseCommand):
         Permanency.objects.bulk_create(perms)
 
     def create_forums(self):
-        users = list(User.objects.all())
-        forumers = random.sample(users, math.ceil(len(users) / 10))
-        most_actives = random.sample(forumers, math.ceil(len(forumers) / 6))
+        forumers = list(User.objects.order_by("?")[:100])
+        most_actives = random.sample(forumers, 10)
         categories = list(Forum.objects.filter(is_category=True))
         new_forums = [
             Forum(name=self.faker.text(20), parent=random.choice(categories))
@@ -414,7 +475,7 @@ class Command(BaseCommand):
             for _ in range(100)
         ]
         ForumTopic.objects.bulk_create(new_topics)
-        topics = list(ForumTopic.objects.all())
+        topics = list(ForumTopic.objects.values_list("id", flat=True))
 
         def get_author():
             if random.random() > 0.5:
@@ -422,7 +483,7 @@ class Command(BaseCommand):
             return random.choice(forumers)
 
         messages = []
-        for t in topics:
+        for topic_id in topics:
             nb_messages = max(1, int(random.normalvariate(mu=90, sigma=50)))
             dates = sorted(
                 [
@@ -434,7 +495,7 @@ class Command(BaseCommand):
             messages.extend(
                 [
                     ForumMessage(
-                        topic=t,
+                        topic_id=topic_id,
                         author=get_author(),
                         date=d,
                         message="\n\n".join(

core/models.py

@@ -1157,6 +1157,8 @@ class QuickUploadImage(models.Model):
         identifier = str(uuid4())
         name = Path(image.name).stem[: cls.IMAGE_NAME_SIZE - 1]
         file = File(convert_image(image), name=f"{identifier}.webp")
+        width, height = Image.open(file).size
+
         return cls.objects.create(
             uuid=identifier,
             name=name,

core/static/bundled/alpine-index.js

@@ -1,10 +1,10 @@
-import { limitedChoices } from "#core:alpine/limited-choices";
-import { alpinePlugin as notificationPlugin } from "#core:utils/notifications";
+import { alpinePlugin } from "#core:utils/notifications";
+import { morph } from "@alpinejs/morph";
 import sort from "@alpinejs/sort";
 import Alpine from "alpinejs";
 
-Alpine.plugin([sort, limitedChoices]);
-Alpine.magic("notifications", notificationPlugin);
+Alpine.plugin([sort, morph]);
+Alpine.magic("notifications", alpinePlugin);
 window.Alpine = Alpine;
 
 window.addEventListener("DOMContentLoaded", () => {

core/static/bundled/alpine/limited-choices.ts

@@ -1,69 +0,0 @@
-import type { Alpine as AlpineType } from "alpinejs";
-
-export function limitedChoices(Alpine: AlpineType) {
-  /**
-   * Directive to limit the number of elements
-   * that can be selected in a group of checkboxes.
-   *
-   * When the max numbers of selectable elements is reached,
-   * new elements will still be inserted, but oldest ones will be deselected.
-   * For example, if checkboxes A, B and C have been selected and the max
-   * number of selections is 3, then selecting D will result in having
-   * B, C and D selected.
-   *
-   * # Example in template
-   * ```html
-   * <div x-data="{nbMax: 2}", x-limited-choices="nbMax">
-   *   <button @click="nbMax += 1">Click me to increase the limit</button>
-   *   <input type="checkbox" value="A" name="foo">
-   *   <input type="checkbox" value="B" name="foo">
-   *   <input type="checkbox" value="C" name="foo">
-   *   <input type="checkbox" value="D" name="foo">
-   * </div>
-   * ```
-   */
-  Alpine.directive(
-    "limited-choices",
-    (el, { expression }, { evaluateLater, effect }) => {
-      const getMaxChoices = evaluateLater(expression);
-      let maxChoices: number;
-      const inputs: HTMLInputElement[] = Array.from(
-        el.querySelectorAll("input[type='checkbox']"),
-      );
-      const checked = [] as HTMLInputElement[];
-
-      const manageDequeue = () => {
-        if (checked.length <= maxChoices) {
-          // There isn't too many checkboxes selected. Nothing to do
-          return;
-        }
-        const popped = checked.splice(0, checked.length - maxChoices);
-        for (const p of popped) {
-          p.checked = false;
-        }
-      };
-
-      for (const input of inputs) {
-        input.addEventListener("change", (_e) => {
-          if (input.checked) {
-            checked.push(input);
-          } else {
-            checked.splice(checked.indexOf(input), 1);
-          }
-          manageDequeue();
-        });
-      }
-      effect(() => {
-        getMaxChoices((value: string) => {
-          const previousValue = maxChoices;
-          maxChoices = Number.parseInt(value);
-          if (maxChoices < previousValue) {
-            // The maximum number of selectable items has been lowered.
-            // Some currently selected elements may need to be removed
-            manageDequeue();
-          }
-        });
-      });
-    },
-  );
-}

core/static/bundled/htmx-index.js

@@ -1,4 +1,5 @@
 import htmx from "htmx.org";
+import "htmx-ext-alpine-morph";
 
 document.body.addEventListener("htmx:beforeRequest", (event) => {
   event.target.ariaBusy = true;

core/static/core/components/calendar.scss

@@ -16,14 +16,74 @@
   --event-details-padding: 20px;
   --event-details-border: 1px solid #EEEEEE;
   --event-details-border-radius: 4px;
-  --event-details-box-shadow: 0px 6px 20px 4px rgb(0 0 0 / 16%);
+  --event-details-box-shadow: 0 6px 20px 4px rgb(0 0 0 / 16%);
   --event-details-max-width: 600px;
 }
 
-ics-calendar {
+ics-calendar,
+room-scheduler {
   border: none;
   box-shadow: none;
 
+  a.fc-col-header-cell-cushion,
+  a.fc-col-header-cell-cushion:hover {
+    color: black;
+  }
+
+  a.fc-daygrid-day-number,
+  a.fc-daygrid-day-number:hover {
+    color: rgb(34, 34, 34);
+  }
+
+  td {
+    overflow: visible; // Show events on multiple days
+  }
+
+  td, th {
+    text-align: unset;
+  }
+
+  //Reset from style.scss
+  table {
+    box-shadow: none;
+    border-radius: 0;
+    -moz-border-radius: 0;
+    margin: 0;
+  }
+
+  // Reset from style.scss
+  thead {
+    background-color: white;
+    color: black;
+  }
+
+  // Reset from style.scss
+  tbody > tr {
+    &:nth-child(even):not(.highlight) {
+      background: white;
+    }
+  }
+
+  .fc .fc-toolbar.fc-footer-toolbar {
+    margin-bottom: 0.5em;
+  }
+
+  button.text-copy,
+  button.text-copy:focus,
+  button.text-copy:hover {
+    background-color: #67AE6E !important;
+    transition: 500ms ease-in;
+  }
+
+  button.text-copied,
+  button.text-copied:focus,
+  button.text-copied:hover {
+    transition: 500ms ease-out;
+  }
+
+}
+
+ics-calendar {
   #event-details {
     z-index: 10;
     max-width: 1151px;
@@ -60,82 +120,60 @@ ics-calendar {
       align-items: start;
       flex-direction: row;
       background-color: var(--event-details-background-color);
-      margin-top: 0px;
+      margin-top: 0;
       margin-bottom: 4px;
     }
   }
+}
 
-  a.fc-col-header-cell-cushion,
-  a.fc-col-header-cell-cushion:hover {
-    color: black;
+// Reset from style.scss
+thead {
+  background-color: white;
+  color: black;
+}
+
+// Reset from style.scss
+tbody > tr {
+  &:nth-child(even):not(.highlight) {
+    background: white;
   }
+}
 
-  a.fc-daygrid-day-number,
-  a.fc-daygrid-day-number:hover {
-    color: rgb(34, 34, 34);
-  }
+.fc .fc-toolbar.fc-footer-toolbar {
+  margin-bottom: 0.5em;
+}
 
-  td {
-    overflow: visible; // Show events on multiple days
-  }
+button.text-copy,
+button.text-copy:focus,
+button.text-copy:hover {
+  background-color: #67AE6E !important;
+  transition: 500ms ease-in;
+}
 
-  //Reset from style.scss
-  table {
-    box-shadow: none;
-    border-radius: 0px;
-    -moz-border-radius: 0px;
-    margin: 0px;
-  }
+button.text-copied,
+button.text-copied:focus,
+button.text-copied:hover {
+  transition: 500ms ease-out;
+}
 
-  // Reset from style.scss
-  thead {
-    background-color: white;
-    color: black;
-  }
+.fc .fc-getCalendarLink-button {
+  margin-right: 0.5rem;
+}
 
-  // Reset from style.scss
-  tbody>tr {
-    &:nth-child(even):not(.highlight) {
-      background: white;
-    }
-  }
-
-  .fc .fc-toolbar.fc-footer-toolbar {
-    margin-bottom: 0.5em;
-  }
-
-  button.text-copy,
-  button.text-copy:focus,
-  button.text-copy:hover {
-    background-color: #67AE6E !important;
-    transition: 500ms ease-in;
-  }
-
-  button.text-copied,
-  button.text-copied:focus,
-  button.text-copied:hover {
-    transition: 500ms ease-out;
-  }
-
-  .fc .fc-getCalendarLink-button {
-    margin-right: 0.5rem;
-  }
-
-  .fc .fc-helpButton-button {
-    border-radius: 70%;
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
-    background-color: rgba(0, 0, 0, 0.8);
-    transition: 100ms ease-out;
-    width: 30px;
-    height: 30px;
-    font-size: 11px;
-  }
+.fc .fc-helpButton-button {
+  border-radius: 70%;
+  padding-left: 0.5rem;
+  padding-right: 0.5rem;
+  background-color: rgba(0, 0, 0, 0.8);
+  transition: 100ms ease-out;
+  width: 30px;
+  height: 30px;
+  font-size: 11px;
+}
 
 
-  .fc .fc-helpButton-button:hover {
-    background-color: rgba(20, 20, 20, 0.6);
-  }
+.fc .fc-helpButton-button:hover {
+  background-color: rgba(20, 20, 20, 0.6);
 }
 
 .tooltip.calendar-copy-tooltip {

core/static/core/components/card.scss

@@ -16,6 +16,13 @@
   }
 }
 
+.card-group {
+  display: flex;
+  gap: 15px;
+  margin-bottom: 30px;
+  flex-wrap: wrap;
+}
+
 .card {
   background-color: $primary-neutral-light-color;
   border-radius: 5px;
@@ -92,13 +99,23 @@
   }
 
   @media screen and (max-width: 765px) {
-    @include row-layout
+    @include row-layout;
   }
 
   // When combined with card, card-row display the card in a row layout,
   // whatever the size of the screen.
   &.card-row {
-    @include row-layout
+    @include row-layout;
+
+    &.card-row-m {
+      //width: 50%;
+      max-width: 50%;
+    }
+
+    &.card-row-s {
+      //width: 33%;
+      max-width: 33%;
+    }
   }
 }
 

core/static/core/forms.scss

@@ -141,6 +141,7 @@ form {
   display: block;
   margin: calc(var(--nf-input-size) * 1.5) auto 10px;
   line-height: 1;
+  white-space: nowrap;
 
   .helptext {
     margin-top: .25rem;
@@ -153,8 +154,10 @@ form {
     margin-bottom: 1rem;
   }
 
-  .row > label {
-    margin: unset;
+  .row {
+    label {
+      margin: unset;
+    }
   }
 
   // ------------- LABEL

core/static/core/style.scss

@@ -503,10 +503,6 @@ th {
   text-align: center;
   padding: 5px 10px;
 
-  >input[type="checkbox"] {
-    padding: unset;
-  }
-
   >ul {
     margin-top: 0;
   }

core/static/core/tooltips.scss

@@ -10,10 +10,9 @@
   border-radius: 5px;
   padding: 5px 10px;
   position: absolute;
-  white-space: nowrap;
   opacity: 0;
   transition: opacity 500ms ease-out;
-
+  width: max-content;
   white-space: normal;
 
   left: 0;

core/templates/core/base/notifications.jinja

@@ -1,19 +1,22 @@
 <div id="quick-notifications"
      x-data="{
              messages: [
-             {%- if messages -%}
-               {%- for message in messages -%}
-                 { tag: '{{ message.tags }}', text: '{{ message }}' },
-               {%- endfor -%}
-             {%- endif -%}
+             {% if messages %}
+               {% for message in messages %}
+                 {
+                 tag: '{{ message.tags }}',
+                 text: '{{ message }}',
+                 },
+               {% endfor %}
+             {% endif %}
              ]
              }"
      @quick-notification-add="(e) => messages.push(e?.detail)"
      @quick-notification-delete="messages = []">
-  <template x-for="(message, index) in messages">
-    <div class="alert" :class="`alert-${message.tag}`" x-transition>
+  <template x-for="message in messages">
+    <div x-data="{show: true}" class="alert" :class="`alert-${message.tag}`" x-show="show" x-transition>
       <span class="alert-main" x-text="message.text"></span>
-      <span class="clickable" @click="messages = messages.filter((item, i) => i !== index)">
+      <span class="clickable" @click="show = false">
         <i class="fa fa-close"></i>
       </span>
     </div>

core/templates/core/macros.jinja

@@ -153,7 +153,7 @@
         current_page (django.core.paginator.Page): the current page object
         paginator (django.core.paginator.Paginator): the paginator object
     #}
-  {{ paginate_server_side(current_page, paginator, False) }}
+  {{  paginate_server_side(current_page, paginator, False) }}
 {% endmacro %}
 
 {% macro paginate_htmx(current_page, paginator) %}
@@ -168,7 +168,7 @@
         current_page (django.core.paginator.Page): the current page object
         paginator (django.core.paginator.Paginator): the paginator object
     #}
-  {{ paginate_server_side(current_page, paginator, True) }}
+  {{  paginate_server_side(current_page, paginator, True) }}
 {% endmacro %}
 
 {% macro paginate_server_side(current_page, paginator, use_htmx) %}
@@ -245,26 +245,3 @@
   <button type="button" onclick="checkbox_{{form_id}}(true);">{% trans %}Select All{% endtrans %}</button>
   <button type="button" onclick="checkbox_{{form_id}}(false);">{% trans %}Unselect All{% endtrans %}</button>
 {% endmacro %}
-
-{% macro update_notifications(messages, clear) %}
-  {# Update notification area from new messages sent by django backend
-     This is useful when performing fragment swaps to keep messages up to date
-     Without this, the fragment would need to take control of the notification area and
-     this would be an issue when having more than one fragment
-
-     Parameters:
-      messages: messages from django.contrib
-      clear   : optional boolean that controls if notifications should be cleared first. True is the default
-  #}
-  {% set clear = clear|default(true) %}
-  {% if messages %}
-    <div x-init="() => {
-                 {% if clear %}
-                   $notifications.clear()
-                 {% endif %}
-                 {% for message in messages %}
-                   $notifications.{{ message.tags }}('{{ message }}')
-                 {% endfor %}
-                 }"></div>
-  {% endif %}
-{% endmacro %}

core/tests/test_commands.py

@@ -1,13 +0,0 @@
-import contextlib
-import os
-
-import pytest
-from django.core.management import call_command
-
-
-@pytest.mark.django_db
-def test_populate_more(settings):
-    """Just check that populate more doesn't crash"""
-    settings.DEBUG = True
-    with open(os.devnull, "w") as devnull, contextlib.redirect_stdout(devnull):
-        call_command("populate_more", "--nb-users", "50")

core/utils.py

@@ -12,32 +12,22 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from __future__ import annotations
 
-import hmac
 from datetime import date, timedelta
 
 # Image utils
 from io import BytesIO
-from typing import TYPE_CHECKING
-from urllib.parse import urlencode
+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 import ExifTags
 from PIL.Image import Image, Resampling
 
-if TYPE_CHECKING:
-    from _hashlib import HASH
-    from collections.abc import Buffer, Mapping, Sequence
-    from typing import Any, Callable, Final
-
-    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"
@@ -196,7 +186,7 @@ def exif_auto_rotate(image):
 
 def get_client_ip(request: HttpRequest) -> str | None:
     headers = (
-        "X_FORWARDED_FOR",  # Common header for proxies
+        "X_FORWARDED_FOR",  # Common header for proixes
         "FORWARDED",  # Standard header defined by RFC 7239.
         "REMOTE_ADDR",  # Default IP Address (direct connection)
     )
@@ -205,30 +195,3 @@ def get_client_ip(request: HttpRequest) -> str | None:
             return ip
 
     return None
-
-
-def hmac_hexdigest(
-    key: str | bytes,
-    data: Mapping[str, Any] | Sequence[tuple[str, Any]],
-    digest: str | Callable[[Buffer], HASH] = "sha512",
-) -> str:
-    """Return the hexdigest of the signature of the given data.
-
-    Args:
-        key: the HMAC key used for the signature
-        data: the data to sign
-        digest: a PEP247 hashing algorithm (by default, sha512)
-
-    Examples:
-        ```python
-        data = {
-            "foo": 5,
-            "bar": "somevalue",
-        }
-        hmac_key = secrets.token_hex(64)
-        signature = hmac_hexdigest(hmac_key, data, "sha256")
-        ```
-    """
-    if isinstance(key, str):
-        key = key.encode()
-    return hmac.digest(key, urlencode(data).encode(), digest).hex()

core/views/forms.py

@@ -39,9 +39,8 @@ from django.forms import (
     DateInput,
     DateTimeInput,
     TextInput,
-    Widget,
 )
-from django.utils.timezone import now
+from django.utils.timezone import localtime, now
 from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
@@ -123,8 +122,8 @@ class FutureDateTimeField(forms.DateTimeField):
 
     default_validators = [validate_future_timestamp]
 
-    def widget_attrs(self, widget: Widget) -> dict[str, str]:
-        return {"min": widget.format_value(now())}
+    def widget_attrs(self, widget: forms.Widget) -> dict[str, str]:
+        return {"min": widget.format_value(localtime())}
 
 
 # Forms

core/views/mixins.py

@@ -78,7 +78,7 @@ class FragmentMixin(TemplateResponseMixin, ContextMixin):
             return render(
                 request,
                 "app/template.jinja",
-                context={"fragment": fragment(request)
+                context={"fragment": fragment(request)}
             }
 
         # in urls.py

counter/admin.py

@@ -22,7 +22,6 @@ from counter.models import (
     Counter,
     Customer,
     Eticket,
-    InvoiceCall,
     Permanency,
     Product,
     ProductType,
@@ -161,11 +160,3 @@ class CashRegisterSummaryAdmin(SearchModelAdmin):
 class EticketAdmin(SearchModelAdmin):
     list_display = ("product", "event_date", "event_title")
     search_fields = ("product__name", "event_title")
-
-
-@admin.register(InvoiceCall)
-class InvoiceCallAdmin(SearchModelAdmin):
-    list_display = ("club", "month", "is_validated")
-    search_fields = ("club__name",)
-    list_filter = (("club", admin.RelatedOnlyFieldListFilter),)
-    date_hierarchy = "month"

counter/forms.py

@@ -1,26 +1,13 @@
-import json
 import math
-import uuid
-from datetime import date
 
-from dateutil.relativedelta import relativedelta
 from django import forms
-from django.db.models import Exists, OuterRef, Q
-from django.forms import BaseModelFormSet
-from django.utils.timezone import now
+from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
-from django_celery_beat.models import ClockedSchedule
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
-from club.models import Club
 from club.widgets.ajax_select import AutoCompleteSelectClub
 from core.models import User
-from core.views.forms import (
-    FutureDateTimeField,
-    NFCTextInput,
-    SelectDate,
-    SelectDateTime,
-)
+from core.views.forms import NFCTextInput, SelectDate, SelectDateTime
 from core.views.widgets.ajax_select import (
     AutoCompleteSelect,
     AutoCompleteSelectMultipleGroup,
@@ -32,14 +19,10 @@ from counter.models import (
     Counter,
     Customer,
     Eticket,
-    InvoiceCall,
     Product,
     Refilling,
     ReturnableProduct,
-    ScheduledProductAction,
-    Selling,
     StudentCard,
-    get_product_actions,
 )
 from counter.widgets.ajax_select import (
     AutoCompleteSelectMultipleCounter,
@@ -175,101 +158,7 @@ class CounterEditForm(forms.ModelForm):
         }
 
 
-class ScheduledProductActionForm(forms.ModelForm):
-    """Form for automatic product archiving.
-
-    The `save` method will update or create tasks using celery-beat.
-    """
-
-    required_css_class = "required"
-    prefix = "scheduled"
-
-    class Meta:
-        model = ScheduledProductAction
-        fields = ["task"]
-        widgets = {"task": forms.RadioSelect(choices=get_product_actions)}
-        labels = {"task": _("Action")}
-        help_texts = {"task": ""}
-
-    trigger_at = FutureDateTimeField(
-        label=_("Date and time of action"), widget=SelectDateTime
-    )
-    counters = forms.ModelMultipleChoiceField(
-        label=_("New counters"),
-        help_text=_("The selected counters will replace the current ones"),
-        required=False,
-        widget=AutoCompleteSelectMultipleCounter,
-        queryset=Counter.objects.all(),
-    )
-
-    def __init__(self, *args, product: Product, **kwargs):
-        self.product = product
-        super().__init__(*args, **kwargs)
-        if not self.instance._state.adding:
-            self.fields["trigger_at"].initial = self.instance.clocked.clocked_time
-            self.fields["counters"].initial = json.loads(self.instance.kwargs).get(
-                "counters"
-            )
-
-    def clean(self):
-        if not self.changed_data or "trigger_at" in self.errors:
-            return super().clean()
-        if "trigger_at" in self.changed_data:
-            if not self.instance.clocked_id:
-                self.instance.clocked = ClockedSchedule(
-                    clocked_time=self.cleaned_data["trigger_at"]
-                )
-            else:
-                self.instance.clocked.clocked_time = self.cleaned_data["trigger_at"]
-            self.instance.clocked.save()
-        task_kwargs = {"product_id": self.product.id}
-        if (
-            self.cleaned_data["task"] == "counter.tasks.change_counters"
-            and "counters" in self.changed_data
-        ):
-            task_kwargs["counters"] = [c.id for c in self.cleaned_data["counters"]]
-        self.instance.product = self.product
-        self.instance.kwargs = json.dumps(task_kwargs)
-        self.instance.name = (
-            f"{self.cleaned_data['task']} - {self.product} - {uuid.uuid4()}"
-        )
-        return super().clean()
-
-
-class BaseScheduledProductActionFormSet(BaseModelFormSet):
-    def __init__(self, *args, product: Product, **kwargs):
-        if product.id:
-            queryset = (
-                product.scheduled_actions.filter(
-                    enabled=True, clocked__clocked_time__gt=now()
-                )
-                .order_by("clocked__clocked_time")
-                .select_related("clocked")
-            )
-        else:
-            queryset = ScheduledProductAction.objects.none()
-        form_kwargs = {"product": product}
-        super().__init__(*args, queryset=queryset, form_kwargs=form_kwargs, **kwargs)
-
-    def delete_existing(self, obj: ScheduledProductAction, commit: bool = True):  # noqa FBT001
-        clocked = obj.clocked
-        super().delete_existing(obj, commit=commit)
-        if commit:
-            clocked.delete()
-
-
-ScheduledProductActionFormSet = forms.modelformset_factory(
-    ScheduledProductAction,
-    ScheduledProductActionForm,
-    formset=BaseScheduledProductActionFormSet,
-    absolute_max=None,
-    can_delete=True,
-    can_delete_extra=False,
-    extra=2,
-)
-
-
-class ProductForm(forms.ModelForm):
+class ProductEditForm(forms.ModelForm):
     error_css_class = "error"
     required_css_class = "required"
 
@@ -310,21 +199,22 @@ class ProductForm(forms.ModelForm):
         queryset=Counter.objects.all(),
     )
 
-    def __init__(self, *args, instance=None, **kwargs):
-        super().__init__(*args, instance=instance, **kwargs)
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         if self.instance.id:
             self.fields["counters"].initial = self.instance.counters.all()
-        self.action_formset = ScheduledProductActionFormSet(
-            *args, product=self.instance, **kwargs
-        )
-
-    def is_valid(self):
-        return super().is_valid() and self.action_formset.is_valid()
 
     def save(self, *args, **kwargs):
         ret = super().save(*args, **kwargs)
-        self.instance.counters.set(self.cleaned_data["counters"])
-        self.action_formset.save()
+        if self.fields["counters"].initial:
+            # Remove the product from all counter it was added to
+            # It will then only be added to selected counters
+            for counter in self.fields["counters"].initial:
+                counter.products.remove(self.instance)
+                counter.save()
+        for counter in self.cleaned_data["counters"]:
+            counter.products.add(self.instance)
+            counter.save()
         return ret
 
 
@@ -376,7 +266,7 @@ class CloseCustomerAccountForm(forms.Form):
     )
 
 
-class BasketProductForm(forms.Form):
+class ProductForm(forms.Form):
     quantity = forms.IntegerField(min_value=1, required=True)
     id = forms.IntegerField(min_value=0, required=True)
 
@@ -481,50 +371,5 @@ class BaseBasketForm(forms.BaseFormSet):
 
 
 BasketForm = forms.formset_factory(
-    BasketProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
+    ProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
 )
-
-
-class InvoiceCallForm(forms.Form):
-    def __init__(self, *args, month: date, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.month = month
-        self.clubs = list(
-            Club.objects.filter(
-                Exists(
-                    Selling.objects.filter(
-                        club=OuterRef("pk"),
-                        date__gte=month,
-                        date__lte=month + relativedelta(months=1),
-                    )
-                )
-            ).annotate(
-                validated_invoice=Exists(
-                    InvoiceCall.objects.filter(
-                        club=OuterRef("pk"), month=month, is_validated=True
-                    )
-                )
-            )
-        )
-        self.fields = {
-            str(club.id): forms.BooleanField(
-                required=False, initial=club.validated_invoice
-            )
-            for club in self.clubs
-        }
-
-    def save(self):
-        invoice_calls = [
-            InvoiceCall(
-                month=self.month,
-                club_id=club.id,
-                is_validated=self.cleaned_data.get(str(club.id), False),
-            )
-            for club in self.clubs
-        ]
-        InvoiceCall.objects.bulk_create(
-            invoice_calls,
-            update_conflicts=True,
-            update_fields=["is_validated"],
-            unique_fields=["month", "club"],
-        )

counter/migrations/0032_scheduledproductaction.py

@@ -1,40 +0,0 @@
-# Generated by Django 5.2.3 on 2025-09-14 11:29
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("counter", "0031_alter_counter_options"),
-        ("django_celery_beat", "0019_alter_periodictasks_options"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="ScheduledProductAction",
-            fields=[
-                (
-                    "periodictask_ptr",
-                    models.OneToOneField(
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="django_celery_beat.periodictask",
-                    ),
-                ),
-                (
-                    "product",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="scheduled_actions",
-                        to="counter.product",
-                    ),
-                ),
-            ],
-            options={"verbose_name": "Product scheduled action"},
-            bases=("django_celery_beat.periodictask",),
-        ),
-    ]

counter/migrations/0033_invoicecall.py

@@ -1,51 +0,0 @@
-# Generated by Django 5.2.3 on 2025-10-15 21:54
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-import counter.models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("club", "0014_alter_club_options_rename_unix_name_club_slug_name_and_more"),
-        ("counter", "0032_scheduledproductaction"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="InvoiceCall",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "is_validated",
-                    models.BooleanField(default=False, verbose_name="is validated"),
-                ),
-                ("month", counter.models.MonthField(verbose_name="invoice date")),
-                (
-                    "club",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="club.club"
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Invoice call",
-                "verbose_name_plural": "Invoice calls",
-                "constraints": [
-                    models.UniqueConstraint(
-                        fields=("club", "month"),
-                        name="counter_invoicecall_unique_club_month",
-                    )
-                ],
-            },
-        ),
-    ]

counter/migrations/0034_alter_selling_date_selling_date_month_idx.py

@@ -1,15 +0,0 @@
-# Generated by Django 5.2.3 on 2025-11-05 08:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("counter", "0033_invoicecall")]
-
-    operations = [
-        migrations.AlterField(
-            model_name="selling",
-            name="date",
-            field=models.DateTimeField(db_index=True, verbose_name="date"),
-        ),
-    ]

counter/models.py

@@ -15,7 +15,6 @@
 from __future__ import annotations
 
 import base64
-import contextlib
 import os
 import random
 import string
@@ -35,7 +34,6 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
-from django_celery_beat.models import PeriodicTask
 from django_countries.fields import CountryField
 from ordered_model.models import OrderedModel
 from phonenumber_field.modelfields import PhoneNumberField
@@ -86,7 +84,7 @@ class CustomerQuerySet(models.QuerySet):
             .annotate(res=Sum(F("unit_price") * F("quantity"), default=0))
             .values("res")
         )
-        return self.update(amount=Coalesce(money_in - money_out, Decimal(0)))
+        return self.update(amount=Coalesce(money_in - money_out, Decimal("0")))
 
 
 class Customer(models.Model):
@@ -447,8 +445,7 @@ class Product(models.Model):
         buying_groups = list(self.buying_groups.all())
         if not buying_groups:
             return True
-        res = any(user.is_in_group(pk=group.id) for group in buying_groups)
-        return res
+        return any(user.is_in_group(pk=group.id) for group in buying_groups)
 
     @property
     def profit(self):
@@ -482,7 +479,7 @@ class CounterQuerySet(models.QuerySet):
         return self.annotate(has_annotated_barman=Exists(subquery))
 
     def annotate_is_open(self) -> Self:
-        """Annotate the queryset with the `is_open` field.
+        """Annotate tue queryset with the `is_open` field.
 
         For each counter, if `is_open=True`, then the counter is currently opened.
         Else the counter is closed.
@@ -849,7 +846,7 @@ class Selling(models.Model):
         blank=False,
         on_delete=models.SET_NULL,
     )
-    date = models.DateTimeField(_("date"), db_index=True)
+    date = models.DateTimeField(_("date"))
     payment_method = models.CharField(
         _("payment method"),
         max_length=255,
@@ -1360,85 +1357,3 @@ class ReturnableProductBalance(models.Model):
             f"return balance of {self.customer} "
             f"for {self.returnable.product_id} : {self.balance}"
         )
-
-
-def get_product_actions():
-    return [
-        ("counter.tasks.archive_product", _("Archiving")),
-        ("counter.tasks.change_counters", _("Counters change")),
-    ]
-
-
-class ScheduledProductAction(PeriodicTask):
-    """Extension of celery-beat tasks dedicated to perform actions on Product."""
-
-    product = models.ForeignKey(
-        Product, related_name="scheduled_actions", on_delete=models.CASCADE
-    )
-
-    class Meta:
-        verbose_name = _("Product scheduled action")
-
-    def __init__(self, *args, **kwargs):
-        self._meta.get_field("task").choices = get_product_actions()
-        super().__init__(*args, **kwargs)
-
-    def full_clean(self, *args, **kwargs):
-        self.one_off = True  # A product action should occur one time only
-        return super().full_clean(*args, **kwargs)
-
-    def clean_clocked(self):
-        if not self.clocked:
-            raise ValidationError(_("Product actions must declare a clocked schedule."))
-
-    def validate_unique(self, *args, **kwargs):
-        # The checks done in PeriodicTask.validate_unique aren't
-        # adapted in the case of scheduled product action,
-        # so we skip it and execute directly Model.validate_unique
-        return super(PeriodicTask, self).validate_unique(*args, **kwargs)
-
-
-class MonthField(models.DateField):
-    description = _("Year + month field (day forced to 1)")
-    default_error_messages = {
-        "invalid": _(
-            "“%(value)s” value has an invalid date format. It must be "
-            "in YYYY-MM format."
-        ),
-        "invalid_date": _(
-            "“%(value)s” value has the correct format (YYYY-MM) "
-            "but it is an invalid date."
-        ),
-    }
-
-    def to_python(self, value):
-        if isinstance(value, str):
-            with contextlib.suppress(ValueError):
-                # If the string is given as YYYY-mm, try to parse it.
-                # If it fails, it means that the string may be in the form YYYY-mm-dd
-                # or in an invalid format.
-                # Whatever the case, we let Django deal with it
-                # and raise an error if needed
-                value = datetime.strptime(value, "%Y-%m")
-        value = super().to_python(value)
-        if value is None:
-            return None
-        return value.replace(day=1)
-
-
-class InvoiceCall(models.Model):
-    is_validated = models.BooleanField(verbose_name=_("is validated"), default=False)
-    club = models.ForeignKey(Club, on_delete=models.CASCADE)
-    month = MonthField(verbose_name=_("invoice date"))
-
-    class Meta:
-        verbose_name = _("Invoice call")
-        verbose_name_plural = _("Invoice calls")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["club", "month"], name="counter_invoicecall_unique_club_month"
-            )
-        ]
-
-    def __str__(self):
-        return f"invoice call of {self.month} made by {self.club}"

counter/tasks.py

@@ -1,19 +0,0 @@
-# Create your tasks here
-
-from celery import shared_task
-
-from counter.models import Counter, Product
-
-
-@shared_task
-def archive_product(*, product_id: int, **kwargs):
-    product = Product.objects.get(id=product_id)
-    product.archived = True
-    product.save()
-
-
-@shared_task
-def change_counters(*, product_id: int, counters: list[int], **kwargs):
-    product = Product.objects.get(id=product_id)
-    counters = Counter.objects.filter(id__in=counters)
-    product.counters.set(counters)

counter/templates/counter/invoices_call.jinja

@@ -4,49 +4,35 @@
   {% trans %}Invoices call{% endtrans %}
 {% endblock %}
 
-{% block notifications %}{# Notifications are moved below #}{% endblock %}
-
 {% block content %}
   <h3>{% trans date=start_date|date("F Y") %}Invoices call for {{ date }}{% endtrans %}</h3>
+  <p>{% trans %}Choose another month: {% endtrans %}</p>
   <form method="get" action="">
-    <label for="id_form_other_month">{% trans %}Choose another month: {% endtrans %}</label>
-    <select name="month" id="id_form_other_month">
+    <select name="month">
       {% for m in months %}
         <option value="{{ m|date("Y-m") }}">{{ m|date("Y-m") }}</option>
       {% endfor %}
     </select>
     <input type="submit" value="{% trans %}Go{% endtrans %}" />
   </form>
-
   <br>
   <p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }} €</p>
   <br>
-
-  {% include "core/base/notifications.jinja" %}
-
-  <form method="post" action="">
-    {% csrf_token %}
-    <table>
-      <thead>
+  <table>
+    <thead>
+      <td>{% trans %}Club{% endtrans %}</td>
+      <td>{% trans %}Sum{% endtrans %}</td>
+    </thead>
+    <tbody>
+      {% for i in sums %}
         <tr>
-          <td>{% trans %}Club{% endtrans %}</td>
-          <td>{% trans %}Sum{% endtrans %}</td>
-          <td>{% trans %}Validated{% endtrans %}</td>
+          <td>{{ i['club__name'] }}</td>
+          <td>{{ i['selling_sum'] }} €</td>
         </tr>
-      </thead>
-      <tbody>
-        {% for invoice in invoices %}
-          <tr>
-            <td>{{ invoice.club__name }}</td>
-            <td>{{ "%.2f"|format(invoice.selling_sum) }} €</td>
-            <td>
-              {{ form[invoice.club_id|string] }}
-            </td>
-          </tr>
-        {% endfor %}
-      </tbody>
-    </table>
-    <input type="hidden" name="month" value="{{ start_date|date('Y-m') }}">
-    <button type="submit">{% trans %}Save{% endtrans %}</button>
-  </form>
-{% endblock %}
+      {% endfor %}
+    </tbody>
+  </table>
+{% endblock %}
+
+
+

counter/templates/counter/product_form.jinja

@@ -1,56 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% block content %}
-  {% if object %}
-    <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
-  {% else %}
-    <h2>{% trans %}Product creation{% endtrans %}</h2>
-  {% endif %}
-  <form method="post" enctype="multipart/form-data">
-    {% csrf_token %}
-    {{ form.as_p() }}
-
-    <br />
-
-    <h3>{% trans %}Automatic actions{% endtrans %}</h3>
-
-    <p class="margin-bottom">
-      <em>
-        {%- trans trimmed -%}
-          Automatic actions allows to schedule product changes
-          ahead of time.
-        {%- endtrans -%}
-      </em>
-    </p>
-
-    {{ form.action_formset.management_form }}
-    {%- for action_form in form.action_formset.forms -%}
-      <fieldset x-data="{action: '{{ action_form.task.initial }}'}">
-        {{ action_form.non_field_errors() }}
-        <div class="row gap-2x margin-bottom">
-          <div>
-            {{ action_form.task.errors }}
-            {{ action_form.task.label_tag() }}
-            {{ action_form.task|add_attr("x-model=action") }}
-          </div>
-          <div>{{ action_form.trigger_at.as_field_group() }}</div>
-        </div>
-        <div x-show="action==='counter.tasks.change_counters'" class="margin-bottom">
-          {{ action_form.counters.as_field_group() }}
-        </div>
-        {%- if action_form.DELETE -%}
-          <div class="row gap">
-            {{ action_form.DELETE.as_field_group() }}
-          </div>
-        {%- endif -%}
-        {%- for field in action_form.hidden_fields() -%}
-          {{ field }}
-        {%- endfor -%}
-      </fieldset>
-      {%- if not loop.last -%}
-        <hr class="margin-bottom">
-      {%- endif -%}
-    {%- endfor -%}
-    <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-  </form>
-{% endblock %}

counter/tests/test_auto_actions.py

@@ -1,116 +0,0 @@
-import json
-from datetime import timedelta
-
-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
-from model_bakery import baker
-
-from core.models import Group, User
-from counter.baker_recipes import counter_recipe, product_recipe
-from counter.forms import ScheduledProductActionForm, ScheduledProductActionFormSet
-from counter.models import ScheduledProductAction
-
-
-@pytest.mark.django_db
-def test_edit_product(client: Client):
-    client.force_login(
-        baker.make(
-            User, groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)]
-        )
-    )
-    product = product_recipe.make()
-    url = reverse("counter:product_edit", kwargs={"product_id": product.id})
-    res = client.get(url)
-    assert res.status_code == 200
-
-    res = client.post(url, data={})
-    # This is actually a failure, but we just want to check that
-    # we don't have a 403 or a 500.
-    # The actual behaviour will be tested directly on the form.
-    assert res.status_code == 200
-
-
-@pytest.mark.django_db
-class TestProductActionForm:
-    def test_single_form_archive(self):
-        product = product_recipe.make()
-        trigger_at = now() + timedelta(minutes=10)
-        form = ScheduledProductActionForm(
-            product=product,
-            data={
-                "scheduled-task": "counter.tasks.archive_product",
-                "scheduled-trigger_at": trigger_at,
-            },
-        )
-        assert form.is_valid()
-        instance = form.save()
-        assert instance.clocked.clocked_time == trigger_at
-        assert instance.enabled is True
-        assert instance.one_off is True
-        assert instance.task == "counter.tasks.archive_product"
-        assert instance.kwargs == json.dumps({"product_id": product.id})
-
-    def test_single_form_change_counters(self):
-        product = product_recipe.make()
-        counter = counter_recipe.make()
-        trigger_at = now() + timedelta(minutes=10)
-        form = ScheduledProductActionForm(
-            product=product,
-            data={
-                "scheduled-task": "counter.tasks.change_counters",
-                "scheduled-trigger_at": trigger_at,
-                "scheduled-counters": [counter.id],
-            },
-        )
-        assert form.is_valid()
-        instance = form.save()
-        instance.refresh_from_db()
-        assert instance.clocked.clocked_time == trigger_at
-        assert instance.enabled is True
-        assert instance.one_off is True
-        assert instance.task == "counter.tasks.change_counters"
-        assert instance.kwargs == json.dumps(
-            {"product_id": product.id, "counters": [counter.id]}
-        )
-
-    def test_delete(self):
-        product = product_recipe.make()
-        clocked = baker.make(ClockedSchedule, clocked_time=now() + timedelta(minutes=2))
-        task = baker.make(
-            ScheduledProductAction,
-            product=product,
-            one_off=True,
-            clocked=clocked,
-            task="counter.tasks.archive_product",
-        )
-        formset = ScheduledProductActionFormSet(product=product)
-        formset.delete_existing(task)
-        assert not ScheduledProductAction.objects.filter(id=task.id).exists()
-        assert not ClockedSchedule.objects.filter(id=clocked.id).exists()
-
-
-@pytest.mark.django_db
-class TestProductActionFormSet:
-    def test_ok(self):
-        product = product_recipe.make()
-        counter = counter_recipe.make()
-        trigger_at = now() + timedelta(minutes=10)
-        formset = ScheduledProductActionFormSet(
-            product=product,
-            data={
-                "form-TOTAL_FORMS": "2",
-                "form-INITIAL_FORMS": "0",
-                "form-0-task": "counter.tasks.archive_product",
-                "form-0-trigger_at": trigger_at,
-                "form-1-task": "counter.tasks.change_counters",
-                "form-1-trigger_at": trigger_at,
-                "form-1-counters": [counter.id],
-            },
-        )
-        assert formset.is_valid()
-        formset.save()
-        assert ScheduledProductAction.objects.filter(product=product).count() == 2

counter/tests/test_counter.py

@@ -355,7 +355,7 @@ class TestCounterClick(TestFullClickBase):
             self.submit_basket(self.barmen, [BasketItem(self.beer.id, 1)])
         ).status_code == 302
 
-        assert self.updated_amount(self.barmen) == Decimal(9)
+        assert self.updated_amount(self.barmen) == Decimal("9")
 
     def test_click_tray_price(self):
         force_refill_user(self.customer, 20)
@@ -364,12 +364,12 @@ class TestCounterClick(TestFullClickBase):
         # Not applying tray price
         res = self.submit_basket(self.customer, [BasketItem(self.beer_tap.id, 2)])
         assert res.status_code == 302
-        assert self.updated_amount(self.customer) == Decimal(17)
+        assert self.updated_amount(self.customer) == Decimal("17")
 
         # Applying tray price
         res = self.submit_basket(self.customer, [BasketItem(self.beer_tap.id, 7)])
         assert res.status_code == 302
-        assert self.updated_amount(self.customer) == Decimal(8)
+        assert self.updated_amount(self.customer) == Decimal("8")
 
     def test_click_alcool_unauthorized(self):
         self.login_in_bar()
@@ -381,13 +381,13 @@ class TestCounterClick(TestFullClickBase):
             res = self.submit_basket(user, [BasketItem(self.snack.id, 2)])
             assert res.status_code == 302
 
-            assert self.updated_amount(user) == Decimal(7)
+            assert self.updated_amount(user) == Decimal("7")
 
             # Buy product without age limit
             res = self.submit_basket(user, [BasketItem(self.beer.id, 2)])
             assert res.status_code == 200
 
-            assert self.updated_amount(user) == Decimal(7)
+            assert self.updated_amount(user) == Decimal("7")
 
     def test_click_unauthorized_customer(self):
         self.login_in_bar()
@@ -401,7 +401,7 @@ class TestCounterClick(TestFullClickBase):
             assert resp.status_code == 302
             assert resp.url == resolve_url(self.counter)
 
-            assert self.updated_amount(user) == Decimal(10)
+            assert self.updated_amount(user) == Decimal("10")
 
     def test_click_user_without_customer(self):
         self.login_in_bar()
@@ -418,7 +418,7 @@ class TestCounterClick(TestFullClickBase):
         )
         assert res.status_code == 302
 
-        assert self.updated_amount(self.customer_old_can_buy) == Decimal(7)
+        assert self.updated_amount(self.customer_old_can_buy) == Decimal("7")
 
     def test_click_wrong_counter(self):
         self.login_in_bar()
@@ -443,7 +443,7 @@ class TestCounterClick(TestFullClickBase):
         )
         assertRedirects(res, self.counter.get_absolute_url())
 
-        assert self.updated_amount(self.customer) == Decimal(10)
+        assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_click_not_connected(self):
         force_refill_user(self.customer, 10)
@@ -455,7 +455,7 @@ class TestCounterClick(TestFullClickBase):
         )
         assert res.status_code == 403
 
-        assert self.updated_amount(self.customer) == Decimal(10)
+        assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_click_product_not_in_counter(self):
         force_refill_user(self.customer, 10)
@@ -463,7 +463,7 @@ class TestCounterClick(TestFullClickBase):
 
         res = self.submit_basket(self.customer, [BasketItem(self.stamps.id, 2)])
         assert res.status_code == 200
-        assert self.updated_amount(self.customer) == Decimal(10)
+        assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_basket_empty(self):
         force_refill_user(self.customer, 10)
@@ -477,7 +477,7 @@ class TestCounterClick(TestFullClickBase):
                 self.submit_basket(self.customer, basket),
                 self.counter.get_absolute_url(),
             )
-            assert self.updated_amount(self.customer) == Decimal(10)
+            assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_click_product_invalid(self):
         force_refill_user(self.customer, 10)
@@ -490,7 +490,7 @@ class TestCounterClick(TestFullClickBase):
             BasketItem(self.beer.id, None),
         ]:
             assert self.submit_basket(self.customer, [item]).status_code == 200
-            assert self.updated_amount(self.customer) == Decimal(10)
+            assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_click_not_enough_money(self):
         force_refill_user(self.customer, 10)
@@ -501,7 +501,7 @@ class TestCounterClick(TestFullClickBase):
         )
         assert res.status_code == 200
 
-        assert self.updated_amount(self.customer) == Decimal(10)
+        assert self.updated_amount(self.customer) == Decimal("10")
 
     def test_annotate_has_barman_queryset(self):
         """Test if the custom queryset method `annotate_has_barman` works as intended."""

counter/tests/test_invoices.py

@@ -1,76 +0,0 @@
-from datetime import date, datetime
-
-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 localdate
-from model_bakery import baker
-from pytest_django.asserts import assertRedirects
-
-from club.models import Club
-from core.models import User
-from counter.baker_recipes import sale_recipe
-from counter.forms import InvoiceCallForm
-from counter.models import Customer, InvoiceCall, Selling
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize(
-    "month", [date(2025, 10, 20), "2025-10", datetime(2025, 10, 15, 12, 30)]
-)
-def test_invoice_date_with_date(month: date | datetime | str):
-    club = baker.make(Club)
-    invoice = InvoiceCall.objects.create(club=club, month=month)
-    invoice.refresh_from_db()
-    assert not invoice.is_validated
-    assert invoice.month == date(2025, 10, 1)
-
-
-@pytest.mark.django_db
-def test_invoice_call_invalid_month_string():
-    club = baker.make(Club)
-
-    with pytest.raises(ValidationError):
-        InvoiceCall.objects.create(club=club, month="2025-13")
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize("query", [None, {"month": "2025-08"}])
-def test_invoice_call_view(client: Client, query: dict | None):
-    user = baker.make(
-        User,
-        user_permissions=[
-            *Permission.objects.filter(
-                codename__in=["view_invoicecall", "change_invoicecall"]
-            )
-        ],
-    )
-    client.force_login(user)
-    url = reverse("counter:invoices_call", query=query)
-    assert client.get(url).status_code == 200
-    assertRedirects(client.post(url), url)
-
-
-@pytest.mark.django_db
-def test_invoice_call_form():
-    Selling.objects.all().delete()
-    month = localdate() - relativedelta(months=1)
-    clubs = baker.make(Club, _quantity=2)
-    recipe = sale_recipe.extend(date=month, customer=baker.make(Customer, amount=10000))
-    recipe.make(club=clubs[0], quantity=2, unit_price=200)
-    recipe.make(club=clubs[0], quantity=3, unit_price=5)
-    recipe.make(club=clubs[1], quantity=20, unit_price=10)
-    form = InvoiceCallForm(
-        month=month, data={str(clubs[0].id): True, str(clubs[1].id): False}
-    )
-    assert form.is_valid()
-    form.save()
-    assert InvoiceCall.objects.filter(
-        club=clubs[0], month=month, is_validated=True
-    ).exists()
-    assert InvoiceCall.objects.filter(
-        club=clubs[1], month=month, is_validated=False
-    ).exists()

counter/tests/test_product.py

@@ -6,16 +6,14 @@ import pytest
 from django.conf import settings
 from django.core.cache import cache
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.test import Client, TestCase
+from django.test import Client
 from django.urls import reverse
 from model_bakery import baker
 from PIL import Image
-from pytest_django.asserts import assertNumQueries, assertRedirects
+from pytest_django.asserts import assertNumQueries
 
-from club.models import Club
 from core.baker_recipes import board_user, subscriber_user
 from core.models import Group, User
-from counter.forms import ProductForm
 from counter.models import Product, ProductType
 
 
@@ -86,49 +84,3 @@ def test_fetch_product_nb_queries(client: Client):
         # - 1 for the actual request
         # - 1 to prefetch the related buying_groups
         client.get(reverse("api:search_products_detailed"))
-
-
-class TestCreateProduct(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.product_type = baker.make(ProductType)
-        cls.club = baker.make(Club)
-        cls.data = {
-            "name": "foo",
-            "description": "bar",
-            "product_type": cls.product_type.id,
-            "club": cls.club.id,
-            "code": "FOO",
-            "purchase_price": 1.0,
-            "selling_price": 1.0,
-            "special_selling_price": 1.0,
-            "limit_age": 0,
-            "form-TOTAL_FORMS": 0,
-            "form-INITIAL_FORMS": 0,
-        }
-
-    def test_form(self):
-        form = ProductForm(data=self.data)
-        assert form.is_valid()
-        instance = form.save()
-        assert instance.club == self.club
-        assert instance.product_type == self.product_type
-        assert instance.name == "foo"
-        assert instance.selling_price == 1.0
-
-    def test_view(self):
-        self.client.force_login(
-            baker.make(
-                User,
-                groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
-            )
-        )
-        url = reverse("counter:new_product")
-        response = self.client.get(url)
-        assert response.status_code == 200
-        response = self.client.post(url, data=self.data)
-        assertRedirects(response, reverse("counter:product_list"))
-        product = Product.objects.last()
-        assert product.name == "foo"
-        assert product.club == self.club
-        assert product.product_type == self.product_type

counter/views/admin.py

@@ -32,7 +32,7 @@ from core.utils import get_semester_code, get_start_of_semester
 from counter.forms import (
     CloseCustomerAccountForm,
     CounterEditForm,
-    ProductForm,
+    ProductEditForm,
     ReturnableProductForm,
 )
 from counter.models import (
@@ -146,8 +146,8 @@ class ProductCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """A create view for the admins."""
 
     model = Product
-    form_class = ProductForm
-    template_name = "counter/product_form.jinja"
+    form_class = ProductEditForm
+    template_name = "core/create.jinja"
     current_tab = "products"
 
 
@@ -155,9 +155,9 @@ class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """An edit view for the admins."""
 
     model = Product
-    form_class = ProductForm
+    form_class = ProductEditForm
     pk_url_kwarg = "product_id"
-    template_name = "counter/product_form.jinja"
+    template_name = "core/edit.jinja"
     current_tab = "products"
 
 

counter/views/invoice.py

@@ -12,81 +12,77 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from datetime import datetime
-from urllib.parse import urlencode
+from datetime import datetime, timedelta
+from datetime import timezone as tz
 
-from dateutil.relativedelta import relativedelta
-from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.contrib.messages.views import SuccessMessageMixin
-from django.db.models import F, Sum
-from django.utils.timezone import localdate, make_aware
-from django.utils.translation import gettext_lazy as _
-from django.views.generic import FormView
+from django.db.models import F
+from django.utils import timezone
+from django.views.generic import TemplateView
 
-from counter.forms import InvoiceCallForm
+from counter.fields import CurrencyField
 from counter.models import Refilling, Selling
-from counter.views.mixins import CounterAdminTabsMixin
+from counter.views.mixins import CounterAdminMixin, CounterAdminTabsMixin
 
 
-class InvoiceCallView(
-    CounterAdminTabsMixin, PermissionRequiredMixin, SuccessMessageMixin, FormView
-):
+class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
     template_name = "counter/invoices_call.jinja"
     current_tab = "invoices_call"
-    permission_required = ["counter.view_invoicecall", "counter.change_invoicecall"]
-    form_class = InvoiceCallForm
-    success_message = _("Invoice calls status has been updated.")
-
-    def get_month(self):
-        kwargs = self.request.GET or self.request.POST
-        if "month" in kwargs:
-            return make_aware(datetime.strptime(kwargs["month"], "%Y-%m"))
-        return localdate().replace(day=1) - relativedelta(months=1)
-
-    def get_form_kwargs(self):
-        return super().get_form_kwargs() | {"month": self.get_month()}
-
-    def form_valid(self, form):
-        form.save()
-        return super().form_valid(form)
-
-    def get_success_url(self):
-        # redirect to the month from which the request is originated
-        url = self.request.path
-        kwargs = self.request.GET or self.request.POST
-        if "month" in kwargs:
-            query = urlencode({"month": kwargs["month"]})
-            url += f"?{query}"
-        return url
 
     def get_context_data(self, **kwargs):
         """Add sums to the context."""
         kwargs = super().get_context_data(**kwargs)
         kwargs["months"] = Selling.objects.datetimes("date", "month", order="DESC")
-        start_date = self.get_month()
-        end_date = start_date + relativedelta(months=1)
-
-        kwargs["sum_cb"] = Refilling.objects.filter(
-            payment_method="CARD",
-            is_validated=True,
-            date__gte=start_date,
-            date__lte=end_date,
-        ).aggregate(res=Sum("amount", default=0))["res"]
-        kwargs["sum_cb"] += (
-            Selling.objects.filter(
-                payment_method="CARD",
-                is_validated=True,
-                date__gte=start_date,
-                date__lte=end_date,
+        if "month" in self.request.GET:
+            start_date = datetime.strptime(self.request.GET["month"], "%Y-%m")
+        else:
+            start_date = datetime(
+                year=timezone.now().year,
+                month=(timezone.now().month + 10) % 12 + 1,
+                day=1,
             )
-            .annotate(amount=F("unit_price") * F("quantity"))
-            .aggregate(res=Sum("amount", default=0))["res"]
+        start_date = start_date.replace(tzinfo=tz.utc)
+        end_date = (start_date + timedelta(days=32)).replace(
+            day=1, hour=0, minute=0, microsecond=0
+        )
+        from django.db.models import Case, Sum, When
+
+        kwargs["sum_cb"] = sum(
+            [
+                r.amount
+                for r in Refilling.objects.filter(
+                    payment_method="CARD",
+                    is_validated=True,
+                    date__gte=start_date,
+                    date__lte=end_date,
+                )
+            ]
+        )
+        kwargs["sum_cb"] += sum(
+            [
+                s.quantity * s.unit_price
+                for s in Selling.objects.filter(
+                    payment_method="CARD",
+                    is_validated=True,
+                    date__gte=start_date,
+                    date__lte=end_date,
+                )
+            ]
         )
         kwargs["start_date"] = start_date
-        kwargs["invoices"] = (
-            Selling.objects.filter(date__gte=start_date, date__lt=end_date)
-            .values("club_id", "club__name")
-            .annotate(selling_sum=Sum(F("unit_price") * F("quantity")))
+        kwargs["sums"] = (
+            Selling.objects.values("club__name")
+            .annotate(
+                selling_sum=Sum(
+                    Case(
+                        When(
+                            date__gte=start_date,
+                            date__lt=end_date,
+                            then=F("unit_price") * F("quantity"),
+                        ),
+                        output_field=CurrencyField(),
+                    )
+                )
+            )
             .exclude(selling_sum=None)
             .order_by("-selling_sum")
         )

docs/reference/api/schemas.md

@@ -1 +0,0 @@
-::: api.schemas

docs/reference/api/views.md

@@ -1 +0,0 @@
-::: api.views

docs/tutorial/api/account-link.md

@@ -1,353 +0,0 @@
-Le site AE offre des mécanismes permettant aux applications tierces
-de récupérer les informations sur un utilisateur du site AE.
-De cette manière, il devient possible de synchroniser les informations
-qu possède l'application tierce sur l'utilisateur, directement depuis
-le site AE.
-
-## Fonctionnement général
-
-Pour authentifier vos utilisateurs, vous aurez besoin d'un serveur web
-et d'un client d'API (celui auquel est liée votre
-[clef d'API](./connect.md#obtenir-une-clef-dapi)).
-Deux informations vous sont nécessaires, en plus de votre clef d'API :
-
-- l'id du client : vous pouvez l'obtenir soit en le demandant à l'équipe info,
-  soit en appelant la route `GET /client/me` avec votre clef d'API
-  renseignée dans le header [X-APIKey](./connect.md#x-apikey)
-- la clef HMAC du client : vous devez la demander à l'équipe info.
-
-Grâce à ces informations, vous allez pouvoir fournir le contexte nécessaire
-au site AE pour qu'il authentifie vos utilisateurs.
-
-En effet, la démarche d'authentification s'effectue presque entièrement
-sur le site : le travail de l'application tierce consiste uniquement
-à fournir à l'utilisateur une url avec les bons paramètres, puis
-à recevoir la réponse du serveur si tout s'est bien passé.
-
-Comme un dessin vaut parfois mieux que mille mots,
-voici les diagrammes décrivant le processus.
-L'un montre l'entièreté de la démarche ;
-l'autre dans un souci de simplicité, ne montre que ce qui est visible
-directement par l'application tierce.
-
-=== "Intégralité du processus"
-
-    ```mermaid
-    sequenceDiagram
-        actor User
-        participant App
-        User->>+App: Authentifie-moi, stp
-        App-->>-User: url de connexion<br/>avec signature
-        User->>+Sith: GET url
-        opt Utilisateur non-connecté
-            Sith->>+User: Formulaire de connexion
-            User-->>-Sith: Connexion
-        end
-        Sith->>Sith: vérification de la signature
-        Sith->>+User: Formulaire<br/>des conditions<br/>d'utilisation
-        User-->>-Sith: Validation
-        Sith->>+App: URL de retour<br/>avec données utilisateur
-        App->>App: Traitement des <br/>données utilisateur
-        App-->>-Sith: 204 OK, No content
-        Sith-->>-User: Message de succès
-        App--)User: Message de succès
-    ```
-
-=== "Point de vue de l'application tierce"
-
-    ```mermaid
-    sequenceDiagram
-        actor User
-        participant App
-        User->>+App: Authentifie-moi, stp
-        App-->>-User: url de connexion<br/>avec signature
-        opt
-            Sith->>+App: URL de retour<br/>avec données utilisateur
-            App->>App: Traitement des <br/>données utilisateur
-            App-->>-Sith: 204 OK, No content
-            App--)User: Message de succès
-        end
-    ```
-
-## Données attendues
-
-### URL de connexion
-
-L'URL de connexion que vous allez fournir à l'utilisateur doit
-être `https://ae.utbm.fr/api-link/auth/`
-et doit contenir les données décrites dans
-[`ThirdPartyAuthParamsSchema`][api.schemas.ThirdPartyAuthParamsSchema] :
-
-- `client_id` (integer) : l'id de votre client, que vous pouvez obtenir
-  de la manière décrite plus haut
-- `third_party_app`(string) : le nom de la plateforme pour laquelle
-  l'authentification va être réalisée (si votre application est un bot
-  discord, mettez la valeur "discord")
-- `privacy_link`(URL) : l'URL vers la page de politique de confidentialité
-  qui s'appliquera dans le cadre de l'application
-  (s'il s'agit d'un bot discord, donnez le lien vers celles de Discord)
-- `username`(string) : le pseudonyme que l'utilisateur possède sur
-  votre application
-- `callback_url`(URL) : l'URL que le site AE appellera si l'authentification
-  réussit
-- `signature`(string) : la signature des données de la requête.
-
-Ces données doivent être url-encodées et passées dans les paramètres GET.
-
-!!!tip "URL de retour"
-
-    Notre système n'impose aucune contrainte quant à la manière
-    de construire votre URL (hormis le fait que ce doit être une URL HTTPS valide),
-    mais il est tout de même conseillé d'utiliser l'identifiant de votre
-    utilisateur comme paramètre dans l'URL 
-    (par exemple `GET /callback/{int:user_id}/`).
-
-???Example
-
-    Supposons que votre client d'API soit utilisé dans le cadre d'un bot Discord,
-    avec les données suivantes :
-    
-    - l'id du client est 15
-    - sa clef HMAC est "beb99dd53"
-      (c'est pour l'exemple, une vraie clef sera beaucoup plus longue)
-    - le pseudonyme discord de votre utilisateur est Brian
-    - son id sur discord est 123456789
-    - votre route de callback est `GET /callback/{int:user_id}/`,
-      accessible au domaine `https://bot.ae.utbm.fr`
-    
-    Alors les paramètres de votre URL seront :
-    
-    | Paramètre       | valeur                                                                |
-    |-----------------|-----------------------------------------------------------------------|
-    | client_id       | 15                                                                    |
-    | third_party_app | discord                                                               |
-    | privacy_link    | `https://discord.com/privacy`                                         |
-    | username        | Brian                                                                 |
-    | callback_url    | `https://bot.ae.utbm.fr/callback/123456789/`                          |
-    | signature       | 1a383c51060be64f07772aa42e07<br/>18ae096b8f21f2cdb4061c0834a416d12101 |
-    
-    Et l'url fournie à l'utilisateur sera :
-    
-    `https://ae.utbm.fr/api-link/auth/?client_id=15&third_party_app=discord
-    &privacy_link=https%3A%2F%2Fdiscord.com%2Fprivacy&username=Brian
-    &callback_url=https%3A%2F%2Fbot.ae.utbm.fr%2Fcallback%2F123456789%2F
-    &signature=1a383c51060be64f07772aa42e0718ae096b8f21f2cdb4061c0834a416d12101`
-
-### Données de retour
-
-Si l'authentification réussit, le site AE enverra une requête HTTP POST
-à l'URL de retour fournie dans l'URL de connexion.
-
-Le corps de la requête de callback et au format JSON 
-et contient deux paires clef-valeur :
-
-- `user` : les données utilisateur, telles que décrites
-  par [UserProfileSchema][core.schemas.UserProfileSchema]
-- `signature` : la signature des données utilisateur
-
-???Example
-
-    En reprenant les mêmes paramètres que dans l'exemple précédent,
-    le site AE pourra renvoyer à l'application la requête suivante :
-
-    ```http
-    POST https://bot.ae.utbm.fr/callback/123456789/
-    content-type: application/json
-    body: {
-        "user": {
-            "id": 144131,
-            "nick_name": "inzekitchen",
-            "first_name": "Brian",
-            ...
-        },
-        "signature": "f16955bab6b805f6e1abbb98a86dfee53fed0bf812aa6513ca46cfd461b70020"
-    }
-    ```
-
-L'application doit répondre avec un des codes HTTP suivants :
-
-| Code | Raison                                                                         |
-|------|--------------------------------------------------------------------------------|
-| 204  | Tout s'est bien passé                                                          |
-| 403  | Les données de retour ne sont <br>pas signées ou sont mal signées              |
-| 404  | L'URL de retour ne permet pas <br>d'identifier un utilisateur de l'application |
-
-!!!note "Code d'erreur par défaut"
-
-    Si l'appel de la route fait face à plusieurs problèmes en même temps 
-    (par exemple, l'URL ne permet pas de retrouver votre utilisateur, 
-    et en plus les données sont mal signées),
-    le 403 prime et doit être retourné par défaut.
-
-## Signature des données
-
-Les données de l'URL de connexion doivent être signées,
-et la signature de l'URL de retour doit être vérifiée.
-
-Dans le deux cas, la signature est le digest HMAC-SHA512
-des données url-encodées, en utilisant la clef HMAC du client d'API.
-
-???Example "Signature de l'URL de connexion"
-
-    En reprenant le même exemple que les fois précédentes,
-    l'url-encodage des données est :
-
-    `client_id=15&third_party_app=discord
-    &privacy_link=https%3A%2F%2Fdiscord.com%2Fprivacy%2F&username=Brian
-    &callback_url=https%3A%2F%2Fbot.ae.utbm.fr%2Fcallback%2F123456789%2F`
-
-    Notez que la signature n'est pas (encore) dedans.
-    Cette dernière peut-être obtenue avec le code suivant :
-
-    === ":simple-python: Python"
-    
-        Dépendances :
-    
-        - `environs` (>=14.1)
-    
-        ```python
-        import hmac
-        from urllib.parse import urlencode
-        
-        from environs import Env
-        
-        env = Env()
-        env.read_env()
-        
-        key = env.str("HMAC_KEY").encode()
-        data = {
-            "client_id": 15,
-            "third_party_app": "discord",
-            "privacy_link": "https://discord.com/privacy/",
-            "username": "Brian",
-            "callback_url": "https://bot.ae.utbm.fr/callback/123456789/",
-        }
-        urlencoded = urlencode(data)
-        data["signature"] = hmac.digest(key, urlencoded.encode(), "sha512").hex()
-        
-        # URL a fournir à l'utilisateur pour son authentification
-        user_url = f"https://ae.ubtm.fr/api-link/auth/?{urlencode(data)}"
-        ```    
-    
-    === ":simple-rust: Rust"
-    
-        Dépendances :
-        
-        - `hmac` (>=0.12.1)
-        - `url` (>=2.5.7, features `serde`)
-        - `serde` (>=1.0.228, features `derive`)
-        - `serde_urlencoded` (>="0.7.1)
-        - `sha2` (>=0.10.9)
-        - `dotenvy` (>= 0.15)
-    
-        ```rust
-        use hmac::{Mac, SimpleHmac};
-        use serde::Serialize;
-        use sha2::Sha512;
-        use url::Url;
-        
-        #[derive(Serialize, Debug)]
-        struct UrlData<'a> {
-            client_id: u32,
-            third_party_app: &'a str,
-            privacy_link: Url,
-            username: &'a str,
-            callback_url: Url,
-        }
-        
-        impl<'a> UrlData<'a> {
-            pub fn signature(&self, key: &[u8]) -> CtOutput<SimpleHmac<Sha512>> {
-                let urlencoded = serde_urlencoded::to_string(self).unwrap();
-                SimpleHmac::<Sha512>::new_from_slice(key)
-                    .unwrap()
-                    .chain_update(urlencoded.as_bytes())
-                    .finalize()
-            }
-        }
-        
-        impl Into<Url> for UrlData<'_> {
-            fn into(self) -> Url {
-                let key = std::env::var("HMAC_KEY").unwrap();
-                let mut url = Url::parse("http://ae.utbm.fr/api-link/auth/").unwrap();
-                url.set_query(Some(
-                    format!(
-                        "{}&signature={:x}",
-                        serde_urlencoded::to_string(&self).unwrap(),
-                        self.signature(key.as_bytes()).into_bytes()
-                    )
-                    .as_str(),
-                ));
-                url
-            }
-        }
-        
-        fn main() {
-            dotenvy::dotenv().expect("Couldn't load env");
-            let data = UrlData {
-                client_id: 1,
-                third_party_app: "discord",
-                privacy_link: "https://discord.com/privacy/".parse().unwrap(),
-                username: "Brian",
-                callback_url: "https://bot.ae.utbm.fr/callback/123456789/"
-                    .parse()
-                    .unwrap(),
-            };
-            let url: Url = data.into();
-            println!("{:?}", url);
-        }
-        ```
-
-???Example "Vérification de la signature de la réponse"
-
-    Les données utilisateur peuvent ressembler à :
-
-    ```json
-    {
-        "user": {
-            "display_name": "Matthieu Vincent",
-            "profile_url": "/user/380/",
-            "profile_pict": "/static/core/img/unknown.jpg",
-            "id": 380,
-            "nick_name": None,
-            "first_name": "Matthieu",
-            "last_name": "Vincent",
-        },
-        "signature": "3802a280fbb01bd9fetc."
-    }
-    ```
-
-    Vous pouvez vérifier la signature ainsi :
-
-    ```python
-        import hmac
-        from urllib.parse import urlencode
-        
-        from environs import Env
-        
-        env = Env()
-        env.read_env()
-        
-        def is_signature_valid(user_data: dict, signature: str) -> bool:
-            key = env.str("HMAC_KEY").encode()
-            urlencoded = urlencode(user_data)
-            return hmac.compare_digest(
-                hmac.digest(key, urlencoded.encode(), "sha512").hex(),
-                signature,
-            )
-        
-        
-        post_data = <récupération des données POST>
-        print(
-            "signature valide :", 
-            is_signature_valid(post_data["user"], post_data["signature"]
-        )
-    ```
-
-!!!Warning
-
-    Vous devez impérativement vérifier la signature 
-    des données de la requête de callback !
-
-    Si l'équipe informatique se rend compte que vous ne le faites pas,
-    elle se réserve le droit de suspendre votre application,
-    immédiatement et sans préavis.

docs/tutorial/api/connect.md

@@ -112,7 +112,7 @@ cf. [HTTP persistant connection (wikipedia)](https://en.wikipedia.org/wiki/HTTP_
 
 Voici quelques exemples : 
 
-=== ":simple-python: Python (requests)"
+=== "Python (requests)"
 
     Dépendances :
 
@@ -132,7 +132,7 @@ Voici quelques exemples :
         print(response.json())
     ```
 
-=== ":simple-python: Python (aiohttp)"
+=== "Python (aiohttp)"
 
     Dépendances :
 
@@ -158,7 +158,7 @@ Voici quelques exemples :
     asyncio.run(main())
     ```
 
-=== ":simple-javascript: Javascript (axios)"
+=== "Javascript (axios)"
 
     Dépendances :
 
@@ -178,7 +178,7 @@ Voici quelques exemples :
     console.log(await instance.get("club/1").json());
     ```
 
-=== ":simple-rust: Rust (reqwest)"
+=== "Rust (reqwest)"
 
     Dépendances :
     

eboutic/converters.py

@@ -0,0 +1,37 @@
+#
+# Copyright 2022
+# - Maréchal <thgirod@hotmail.com
+#
+# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# http://ae.utbm.fr.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License a published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# Place - Suite 330, Boston, MA 02111-1307, USA.
+
+
+class PaymentResultConverter:
+    """Converter used for url mapping of the `eboutic.views.payment_result` view.
+
+    It's meant to build an url that can match
+    either `/eboutic/pay/success/` or `/eboutic/pay/failure/`
+    but nothing else.
+    """
+
+    regex = "(success|failure)"
+
+    def to_python(self, value):
+        return str(value)
+
+    def to_url(self, value):
+        return str(value)

eboutic/models.py

@@ -242,7 +242,7 @@ class Invoice(models.Model):
     def validate(self):
         if self.validated:
             raise DataError(_("Invoice already validated"))
-        customer, _created = Customer.get_or_create(user=self.user)
+        customer, created = Customer.get_or_create(user=self.user)
         eboutic = Counter.objects.filter(type="EBOUTIC").first()
         for i in self.items.all():
             if i.type_id == settings.SITH_COUNTER_PRODUCTTYPE_REFILLING:

eboutic/templates/eboutic/eboutic_billing_info.jinja

@@ -1,5 +1,3 @@
-{% from 'core/macros.jinja' import update_notifications %}
-
 <div id=billing-infos-fragment>
   <div
     class="collapse"
@@ -31,6 +29,7 @@
       >
     </form>
   </div>
+
   <br>
-  {{ update_notifications(messages) }}
+  {% include "core/base/notifications.jinja" %}
 </div>

eboutic/templates/eboutic/eboutic_checkout.jinja

@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block notifications %}
-  {# Notifications are moved under the billing form #}
+  {# Notifications are moved inside the billing info fragment #}
 {% endblock %}
 
 {% block title %}
@@ -60,7 +60,6 @@
       <div @htmx:after-request="fill">
         {{ billing_infos_form }}
       </div>
-      {% include "core/base/notifications.jinja" %}
       <form
         method="post"
         action="{{ settings.SITH_EBOUTIC_ET_URL }}"

eboutic/tests/test_payment.py

@@ -108,7 +108,7 @@ class TestPaymentSith(TestPaymentBase):
         )
         assert Basket.objects.filter(id=self.basket.id).first() is None
         self.customer.customer.refresh_from_db()
-        assert self.customer.customer.amount == Decimal(1)
+        assert self.customer.customer.amount == Decimal("1")
 
         sellings = Selling.objects.filter(customer=self.customer.customer).order_by(
             "quantity"

eboutic/urls.py

@@ -24,7 +24,7 @@
 
 from django.urls import path, register_converter
 
-from core.converters import ResultConverter
+from eboutic.converters import PaymentResultConverter
 from eboutic.views import (
     BillingInfoFormFragment,
     EbouticCheckout,
@@ -34,7 +34,7 @@ from eboutic.views import (
     payment_result,
 )
 
-register_converter(ResultConverter, "res")
+register_converter(PaymentResultConverter, "res")
 
 urlpatterns = [
     # Subscription views

eboutic/views.py

@@ -48,7 +48,7 @@ from django_countries.fields import Country
 
 from core.auth.mixins import CanViewMixin
 from core.views.mixins import FragmentMixin, UseFragmentsMixin
-from counter.forms import BaseBasketForm, BasketProductForm, BillingInfoForm
+from counter.forms import BaseBasketForm, BillingInfoForm, ProductForm
 from counter.models import (
     BillingInfo,
     Customer,
@@ -78,7 +78,7 @@ class BaseEbouticBasketForm(BaseBasketForm):
 
 
 EbouticBasketForm = forms.formset_factory(
-    BasketProductForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
+    ProductForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
 )
 
 

election/forms.py

@@ -1,155 +0,0 @@
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-from core.models import User
-from core.views.forms import SelectDateTime
-from core.views.widgets.ajax_select import (
-    AutoCompleteSelect,
-    AutoCompleteSelectMultipleGroup,
-    AutoCompleteSelectUser,
-)
-from core.views.widgets.markdown import MarkdownInput
-from election.models import Candidature, Election, ElectionList, Role
-
-
-class LimitedCheckboxField(forms.ModelMultipleChoiceField):
-    """A `ModelMultipleChoiceField`, with a max limit of selectable inputs."""
-
-    def __init__(self, queryset, max_choice, **kwargs):
-        self.max_choice = max_choice
-        super().__init__(queryset, **kwargs)
-
-    def clean(self, value):
-        qs = super().clean(value)
-        self.validate(qs)
-        return qs
-
-    def validate(self, qs):
-        if qs.count() > self.max_choice:
-            raise forms.ValidationError(
-                _("You have selected too many candidates."), code="invalid"
-            )
-
-
-class CandidateForm(forms.ModelForm):
-    """Form to candidate."""
-
-    required_css_class = "required"
-
-    class Meta:
-        model = Candidature
-        fields = ["user", "role", "program", "election_list"]
-        labels = {
-            "user": _("User to candidate"),
-        }
-        widgets = {
-            "program": MarkdownInput,
-            "user": AutoCompleteSelectUser,
-            "role": AutoCompleteSelect,
-            "election_list": AutoCompleteSelect,
-        }
-
-    def __init__(self, *args, election: Election, can_edit: bool = False, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields["role"].queryset = election.roles.select_related("election")
-        self.fields["election_list"].queryset = election.election_lists.all()
-        if not can_edit:
-            self.fields["user"].widget = forms.HiddenInput()
-
-
-class VoteForm(forms.Form):
-    def __init__(self, election: Election, user: User, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not election.can_vote(user):
-            return
-        for role in election.roles.all():
-            cand = role.candidatures
-            if role.max_choice > 1:
-                self.fields[role.title] = LimitedCheckboxField(
-                    cand, role.max_choice, required=False
-                )
-            else:
-                self.fields[role.title] = forms.ModelChoiceField(
-                    cand,
-                    required=False,
-                    widget=forms.RadioSelect(),
-                    empty_label=_("Blank vote"),
-                )
-
-
-class RoleForm(forms.ModelForm):
-    """Form for creating a role."""
-
-    class Meta:
-        model = Role
-        fields = ["title", "election", "description", "max_choice"]
-        widgets = {"election": AutoCompleteSelect}
-
-    def __init__(self, *args, **kwargs):
-        election_id = kwargs.pop("election_id", None)
-        super().__init__(*args, **kwargs)
-        if election_id:
-            self.fields["election"].queryset = Election.objects.filter(
-                id=election_id
-            ).all()
-
-    def clean(self):
-        cleaned_data = super().clean()
-        title = cleaned_data.get("title")
-        election = cleaned_data.get("election")
-        if Role.objects.filter(title=title, election=election).exists():
-            raise forms.ValidationError(
-                _("This role already exists for this election"), code="invalid"
-            )
-
-
-class ElectionListForm(forms.ModelForm):
-    class Meta:
-        model = ElectionList
-        fields = ("title", "election")
-        widgets = {"election": AutoCompleteSelect}
-
-    def __init__(self, *args, **kwargs):
-        election_id = kwargs.pop("election_id", None)
-        super().__init__(*args, **kwargs)
-        if election_id:
-            self.fields["election"].queryset = Election.objects.filter(
-                id=election_id
-            ).all()
-
-
-class ElectionForm(forms.ModelForm):
-    class Meta:
-        model = Election
-        fields = [
-            "title",
-            "description",
-            "archived",
-            "start_candidature",
-            "end_candidature",
-            "start_date",
-            "end_date",
-            "edit_groups",
-            "view_groups",
-            "vote_groups",
-            "candidature_groups",
-        ]
-        widgets = {
-            "edit_groups": AutoCompleteSelectMultipleGroup,
-            "view_groups": AutoCompleteSelectMultipleGroup,
-            "vote_groups": AutoCompleteSelectMultipleGroup,
-            "candidature_groups": AutoCompleteSelectMultipleGroup,
-        }
-
-    start_date = forms.DateTimeField(
-        label=_("Start date"), widget=SelectDateTime, required=True
-    )
-    end_date = forms.DateTimeField(
-        label=_("End date"), widget=SelectDateTime, required=True
-    )
-    start_candidature = forms.DateTimeField(
-        label=_("Start candidature"), widget=SelectDateTime, required=True
-    )
-    end_candidature = forms.DateTimeField(
-        label=_("End candidature"), widget=SelectDateTime, required=True
-    )

election/migrations/0005_alter_candidature_program_alter_candidature_user.py

@@ -1,30 +0,0 @@
-# Generated by Django 4.2.20 on 2025-03-14 18:18
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("election", "0004_auto_20191006_0049"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="candidature",
-            name="program",
-            field=models.TextField(blank=True, default="", verbose_name="description"),
-        ),
-        migrations.AlterField(
-            model_name="candidature",
-            name="user",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="candidates",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="user",
-            ),
-        ),
-    ]

election/models.py

@@ -1,7 +1,5 @@
 from django.db import models
-from django.db.models import Count
 from django.utils import timezone
-from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from ordered_model.models import OrderedModel
 
@@ -24,18 +22,21 @@ class Election(models.Model):
         verbose_name=_("edit groups"),
         blank=True,
     )
+
     view_groups = models.ManyToManyField(
         Group,
         related_name="viewable_elections",
         verbose_name=_("view groups"),
         blank=True,
     )
+
     vote_groups = models.ManyToManyField(
         Group,
         related_name="votable_elections",
         verbose_name=_("vote groups"),
         blank=True,
     )
+
     candidature_groups = models.ManyToManyField(
         Group,
         related_name="candidate_elections",
@@ -44,7 +45,7 @@ class Election(models.Model):
     )
 
     voters = models.ManyToManyField(
-        User, verbose_name=_("voters"), related_name="voted_elections"
+        User, verbose_name=("voters"), related_name="voted_elections"
     )
     archived = models.BooleanField(_("archived"), default=False)
 
@@ -54,20 +55,20 @@ class Election(models.Model):
     @property
     def is_vote_active(self):
         now = timezone.now()
-        return self.start_date <= now <= self.end_date
+        return bool(now <= self.end_date and now >= self.start_date)
 
     @property
     def is_vote_finished(self):
-        return timezone.now() > self.end_date
+        return bool(timezone.now() > self.end_date)
 
     @property
     def is_candidature_active(self):
         now = timezone.now()
-        return self.start_candidature <= now <= self.end_candidature
+        return bool(now <= self.end_candidature and now >= self.start_candidature)
 
     @property
     def is_vote_editable(self):
-        return timezone.now() <= self.end_candidature
+        return bool(timezone.now() <= self.end_candidature)
 
     def can_candidate(self, user):
         for group_id in self.candidature_groups.values_list("pk", flat=True):
@@ -86,7 +87,7 @@ class Election(models.Model):
     def has_voted(self, user):
         return self.voters.filter(id=user.id).exists()
 
-    @cached_property
+    @property
     def results(self):
         results = {}
         total_vote = self.voters.count()
@@ -94,6 +95,12 @@ class Election(models.Model):
             results[role.title] = role.results(total_vote)
         return results
 
+    def delete(self, *args, **kwargs):
+        self.election_lists.all().delete()
+        super().delete(*args, **kwargs)
+
+    # Permissions
+
 
 class Role(OrderedModel):
     """This class allows to create a new role avaliable for a candidature."""
@@ -108,37 +115,36 @@ class Role(OrderedModel):
     description = models.TextField(_("description"), null=True, blank=True)
     max_choice = models.IntegerField(_("max choice"), default=1)
 
-    def __str__(self):
-        return f"{self.title} - {self.election.title}"
-
-    def results(self, total_vote: int) -> dict[str, dict[str, int | float]]:
-        if total_vote == 0:
-            candidates = self.candidatures.values_list("user__username")
-            return {
-                key: {"vote": 0, "percent": 0} for key in ["blank_votes", *candidates]
-            }
+    def results(self, total_vote):
+        results = {}
         total_vote *= self.max_choice
-        results = {"total vote": total_vote}
         non_blank = 0
-        candidatures = self.candidatures.annotate(nb_votes=Count("votes")).values(
-            "nb_votes", "user__username"
-        )
-        for candidature in candidatures:
-            non_blank += candidature["nb_votes"]
-            results[candidature["user__username"]] = {
-                "vote": candidature["nb_votes"],
-                "percent": candidature["nb_votes"] * 100 / total_vote,
+        for candidature in self.candidatures.all():
+            cand_results = {}
+            cand_results["vote"] = self.votes.filter(candidature=candidature).count()
+            if total_vote == 0:
+                cand_results["percent"] = 0
+            else:
+                cand_results["percent"] = cand_results["vote"] * 100 / total_vote
+            non_blank += cand_results["vote"]
+            results[candidature.user.username] = cand_results
+        results["total vote"] = total_vote
+        if total_vote == 0:
+            results["blank vote"] = {"vote": 0, "percent": 0}
+        else:
+            results["blank vote"] = {
+                "vote": total_vote - non_blank,
+                "percent": (total_vote - non_blank) * 100 / total_vote,
             }
-        results["blank vote"] = {
-            "vote": total_vote - non_blank,
-            "percent": (total_vote - non_blank) * 100 / total_vote,
-        }
         return results
 
     @property
     def edit_groups(self):
         return self.election.edit_groups
 
+    def __str__(self):
+        return ("%s : %s") % (self.election.title, self.title)
+
 
 class ElectionList(models.Model):
     """To allow per list vote."""
@@ -157,6 +163,11 @@ class ElectionList(models.Model):
     def can_be_edited_by(self, user):
         return user.can_edit(self.election)
 
+    def delete(self, *args, **kwargs):
+        for candidature in self.candidatures.all():
+            candidature.delete()
+        super().delete(*args, **kwargs)
+
 
 class Candidature(models.Model):
     """This class is a component of responsability."""
@@ -171,9 +182,10 @@ class Candidature(models.Model):
         User,
         verbose_name=_("user"),
         related_name="candidates",
+        blank=True,
         on_delete=models.CASCADE,
     )
-    program = models.TextField(_("description"), default="", blank=True)
+    program = models.TextField(_("description"), null=True, blank=True)
     election_list = models.ForeignKey(
         ElectionList,
         related_name="candidatures",
@@ -184,10 +196,13 @@ class Candidature(models.Model):
     def __str__(self):
         return f"{self.role.title} : {self.user.username}"
 
+    def delete(self):
+        for vote in self.votes.all():
+            vote.delete()
+        super().delete()
+
     def can_be_edited_by(self, user):
-        return (
-            (user == self.user) or user.can_edit(self.role.election)
-        ) and self.role.election.is_vote_editable
+        return (user == self.user) or user.can_edit(self.role.election)
 
 
 class Vote(models.Model):

election/templates/election/election_detail.jinja

@@ -31,7 +31,7 @@
       <time datetime="{{ election.end_date }}">{{ election.end_date|localtime|date(DATETIME_FORMAT)}}</time>
       {% trans %} at {% endtrans %}<time>{{ election.end_date|localtime|time(DATETIME_FORMAT)}}</time>
     </p>
-    {%- if user_has_voted %}
+    {%- if election.has_voted(user) %}
       <p class="election__elector-infos">
         {%- if election.is_vote_active %}
           <span>{% trans %}You already have submitted your vote.{% endtrans %}</span>
@@ -45,11 +45,12 @@
     <form action="{{ url('election:vote', election.id) }}" method="post" class="election__vote-form" name="vote-form" id="vote-form">
       {% csrf_token %}
       <table class="election_table">
+        {%- set election_lists = election.election_lists.all() -%}
         <thead class="lists">
           <tr>
-            <th class="column" style="width: {{ 100 / (election_lists|length + 1) }}%">{% trans %}Blank vote{% endtrans %}</th>
+            <th class="column" style="width: {{ 100 / (election_lists.count() + 1) }}%">{% trans %}Blank vote{% endtrans %}</th>
             {%- for election_list in election_lists %}
-              <th class="column" style="width: {{ 100 / (election_lists|length + 1) }}%">
+              <th class="column" style="width: {{ 100 / (election_lists.count() + 1) }}%">
                 <span>{{ election_list.title }}</span>
                 {% if user.can_edit(election_list) and election.is_vote_editable -%}
                   <a href="{{ url('election:delete_list', list_id=election_list.id) }}"><i class="fa-regular fa-trash-can delete-action"></i></a>
@@ -58,26 +59,18 @@
             {%- endfor %}
           </tr>
         </thead>
-        {%- for role in election_roles %}
+        {%- set role_list = election.roles.order_by('order').all() %}
+        {%- for role in role_list %}
+          {%- set count = [0] %}
           {%- set role_data = election_form.data.getlist(role.title) if role.title in election_form.data else [] %}
-
-          <tbody
-            {% if role.max_choice > 1 -%}
-              x-data x-limited-choices="{{ role.max_choice }}"
-            {%- endif %}
-            class="role {% if role.title in election_form.errors %}role_error{% endif %}"
-          >
+          <tbody data-max-choice="{{role.max_choice}}" class="role{{ ' role_error' if role.title in election_form.errors else '' }}{{ ' role__multiple-choices' if role.max_choice > 1 else ''}}">
             <tr>
               <td class="role_title">
                 <div class="role_text">
                   <h4>{{ role.title }}</h4>
                   <p class="role_description" show-more="300">{{ role.description }}</p>
-                  {%- if role.max_choice > 1 and show_vote_buttons %}
-                    <strong>
-                      {% trans trimmed nb_choices=role.max_choice %}
-                        You may choose up to {{ nb_choices }} people.
-                      {% endtrans %}
-                    </strong>
+                  {%- if role.max_choice > 1 and not election.has_voted(user) and election.can_vote(user) %}
+                    <strong>{% trans %}You may choose up to{% endtrans %} {{ role.max_choice }} {% trans %}people.{% endtrans %}</strong>
                   {%- endif %}
 
                   {%- if election_form.errors[role.title] is defined %}
@@ -88,40 +81,36 @@
                 </div>
                 {% if user.can_edit(role) and election.is_vote_editable -%}
                   <div class="role_buttons">
-                    <a href="{{ url('election:update_role', role_id=role.id) }}">️
-                      <i class="fa-regular fa-pen-to-square edit-action"></i>
-                    </a>
-                    <a href="{{ url('election:delete_role', role_id=role.id) }}">
-                      <i class="fa-regular fa-trash-can delete-action"></i>
-                    </a>
-                    {%- if loop.last -%}
+                    <a href="{{url('election:update_role', role_id=role.id)}}">️<i class="fa-regular fa-pen-to-square edit-action"></i></a>
+                    <a href="{{url('election:delete_role', role_id=role.id)}}"><i class="fa-regular fa-trash-can delete-action"></i></a>
+                    {%- if role == role_list.last() %}
                       <button disabled><i class="fa fa-arrow-down"></i></button>
                       <button disabled><i class="fa fa-caret-down"></i></button>
-                    {%- else -%}
+                    {%- else %}
                       <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=bottom');"><i class="fa fa-arrow-down"></i></button>
                       <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=down');"><i class="fa fa-caret-down"></i></button>
-                    {%- endif -%}
-                    {%- if loop.first -%}
+                    {%- endif %}
+                    {% if role == role_list.first() %}
                       <button disabled><i class="fa fa-caret-up"></i></button>
                       <button disabled><i class="fa fa-arrow-up"></i></button>
-                    {%- else -%}
+                    {% else %}
                       <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=up');"><i class="fa fa-caret-up"></i></button>
                       <button type="button" onclick="window.location.replace('?role={{ role.id }}&action=top');"><i class="fa fa-arrow-up"></i></button>
-                    {%- endif -%}
+                    {% endif %}
                   </div>
                 {%- endif -%}
               </td>
             </tr>
             <tr class="role_candidates">
-              <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists|length + 1) }}%">
-                {%- if role.max_choice == 1 and show_vote_buttons %}
+              <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists.count() + 1) }}%">
+                {%- if role.max_choice == 1 and election.can_vote(user) %}
                   <div class="radio-btn">
-                    {% set input_id = "blank_vote_" + role.id|string %}
-                    <input id="{{ input_id }}" type="radio" name="{{ role.title }}">
-                    <label for="{{ input_id }}">
+                    <input id="id_{{ role.title }}_{{ count[0] }}" type="radio" name="{{ role.title }}" value {{ '' if role_data in election_form else 'checked' }} {{ 'disabled' if election.has_voted(user) else '' }}>
+                    <label for="id_{{ role.title }}_{{ count[0] }}">
                       <span>{% trans %}Choose blank vote{% endtrans %}</span>
                     </label>
                   </div>
+                  {%- set _ = count.append(count.pop() + 1) %}
                 {%- endif %}
                 {%- if election.is_vote_finished %}
                   {%- set results = election_results[role.title]['blank vote'] %}
@@ -131,14 +120,13 @@
                 {%- endif %}
               </td>
               {%- for election_list in election_lists %}
-                <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists|length + 1) }}%">
+                <td class="list_per_role" style="width: 100%; max-width: {{ 100 / (election_lists.count() + 1) }}%">
                   <ul class="candidates">
-                    {%- for candidature in election_list.candidatures.select_related("user", "user__profile_pict").filter(role=role) %}
+                    {%- for candidature in election_list.candidatures.filter(role=role) %}
                       <li class="candidate">
-                        {%- if show_vote_buttons %}
-                          {% set input_id = "candidature_" + candidature.id|string %}
-                          <input id="{{ input_id }}" type="{{ 'checkbox' if role.max_choice > 1 else 'radio' }}" {{ 'checked' if candidature.id|string in role_data else '' }} {{ 'disabled' if user_has_voted else '' }} name="{{ role.title }}" value="{{ candidature.id }}">
-                          <label for="{{ input_id }}">
+                        {%- if election.can_vote(user) %}
+                          <input id="id_{{ role.title }}_{{ count[0] }}" type="{{ 'checkbox' if role.max_choice > 1 else 'radio' }}" {{ 'checked' if candidature.id|string in role_data else '' }} {{ 'disabled' if election.has_voted(user) else '' }} name="{{ role.title }}" value="{{ candidature.id }}">
+                          <label for="id_{{ role.title }}_{{ count[0] }}">
                         {%- endif %}
                         <figure>
                           {%- if user.is_subscriber_viewable %}
@@ -152,7 +140,7 @@
                             <h5>{{ candidature.user.first_name }} <em>{{candidature.user.nick_name or ''}} </em>{{ candidature.user.last_name }}</h5>
                             {%- if not election.is_vote_finished %}
                               <q class="candidate_program" show-more="200">
-                                {{ candidature.program|markdown }}
+                                {{ candidature.program|markdown or '' }}
                               </q>
                             {%- endif %}
                           </figcaption>
@@ -165,8 +153,9 @@
                             {%- endif -%}
                           {%- endif -%}
                         </figure>
-                        {%- if show_vote_buttons %}
+                        {%- if election.can_vote(user) %}
                           </label>
+                          {%- set _ = count.append(count.pop() + 1) %}
                         {%- endif %}
                         {%- if election.is_vote_finished %}
                           {%- set results = election_results[role.title][candidature.user.username] %}
@@ -202,9 +191,36 @@
       <a  class="button" href="{{ url('election:delete', election_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
     {%- endif %}
   </section>
-  {%- if show_vote_buttons %}
+  {%- if not election.has_voted(user) and election.can_vote(user) %}
     <section class="buttons">
       <button class="button button_send" form="vote-form">{% trans %}Submit the vote !{% endtrans %}</button>
     </section>
   {%- endif %}
 {% endblock %}
+
+{% block script %}
+  {{ super() }}
+  <script type="text/javascript">
+    document.querySelectorAll('.role__multiple-choices').forEach(setupRestrictions);
+
+    function setupRestrictions(role) {
+      var selectedChoices = [];
+      role.querySelectorAll('input').forEach(setupRestriction);
+
+      function setupRestriction(choice) {
+        if (choice.checked)
+          selectedChoices.push(choice);
+        choice.addEventListener('change', onChange);
+
+        function onChange() {
+          if (choice.checked)
+            selectedChoices.push(choice);
+          else
+            selectedChoices.splice(selectedChoices.indexOf(choice), 1);
+          while (selectedChoices.length > role.dataset.maxChoice)
+            selectedChoices.shift().checked = false;
+        }
+      }
+    }
+  </script>
+{% endblock %}

election/tests.py

@@ -1,15 +1,9 @@
-from datetime import timedelta
-
-import pytest
 from django.conf import settings
-from django.test import Client, TestCase
+from django.test import TestCase
 from django.urls import reverse
-from django.utils.timezone import now
-from model_bakery import baker
 
-from core.baker_recipes import subscriber_user
 from core.models import Group, User
-from election.models import Candidature, Election, ElectionList, Role, Vote
+from election.models import Election
 
 
 class TestElection(TestCase):
@@ -18,7 +12,8 @@ class TestElection(TestCase):
         cls.election = Election.objects.first()
         cls.public_group = Group.objects.get(id=settings.SITH_GROUP_PUBLIC_ID)
         cls.sli = User.objects.get(username="sli")
-        cls.public = baker.make(User)
+        cls.subscriber = User.objects.get(username="subscriber")
+        cls.public = User.objects.get(username="public")
 
 
 class TestElectionDetail(TestElection):
@@ -41,7 +36,7 @@ class TestElectionDetail(TestElection):
 
 class TestElectionUpdateView(TestElection):
     def test_permission_denied(self):
-        self.client.force_login(subscriber_user.make())
+        self.client.force_login(self.subscriber)
         response = self.client.get(
             reverse("election:update", args=str(self.election.id))
         )
@@ -50,68 +45,3 @@ class TestElectionUpdateView(TestElection):
             reverse("election:update", args=str(self.election.id))
         )
         assert response.status_code == 403
-
-
-@pytest.mark.django_db
-def test_election_create_list_permission(client: Client):
-    election = baker.make(Election, end_candidature=now() + timedelta(hours=1))
-    groups = [
-        Group.objects.get(pk=settings.SITH_GROUP_SUBSCRIBERS_ID),
-        baker.make(Group),
-    ]
-    election.candidature_groups.add(groups[0])
-    election.edit_groups.add(groups[1])
-    url = reverse("election:create_list", kwargs={"election_id": election.id})
-    for user in subscriber_user.make(), baker.make(User, groups=[groups[1]]):
-        client.force_login(user)
-        assert client.get(url).status_code == 200
-        # the post is a 200 instead of a 302, because we don't give form data,
-        # but we don't care as we only test permissions here
-        assert client.post(url).status_code == 200
-    client.force_login(baker.make(User))
-    assert client.get(url).status_code == 403
-    assert client.post(url).status_code == 403
-
-
-@pytest.mark.django_db
-def test_election_results():
-    election = baker.make(
-        Election, voters=baker.make(User, _quantity=50, _bulk_create=True)
-    )
-    lists = baker.make(ElectionList, election=election, _quantity=2, _bulk_create=True)
-    roles = baker.make(
-        Role, election=election, max_choice=iter([1, 2]), _quantity=2, _bulk_create=True
-    )
-    users = baker.make(User, _quantity=4, _bulk_create=True)
-    cand = [
-        baker.make(Candidature, role=roles[0], user=users[0], election_list=lists[0]),
-        baker.make(Candidature, role=roles[0], user=users[1], election_list=lists[1]),
-        baker.make(Candidature, role=roles[1], user=users[2], election_list=lists[0]),
-        baker.make(Candidature, role=roles[1], user=users[3], election_list=lists[1]),
-    ]
-    votes = [
-        baker.make(Vote, role=roles[0], _quantity=20, _bulk_create=True),
-        baker.make(Vote, role=roles[0], _quantity=25, _bulk_create=True),
-        baker.make(Vote, role=roles[1], _quantity=20, _bulk_create=True),
-        baker.make(Vote, role=roles[1], _quantity=35, _bulk_create=True),
-        baker.make(Vote, role=roles[1], _quantity=10, _bulk_create=True),
-    ]
-    cand[0].votes.set(votes[0])
-    cand[1].votes.set(votes[1])
-    cand[2].votes.set([*votes[2], *votes[4]])
-    cand[3].votes.set([*votes[3], *votes[4]])
-
-    assert election.results == {
-        roles[0].title: {
-            cand[0].user.username: {"percent": 40.0, "vote": 20},
-            cand[1].user.username: {"percent": 50.0, "vote": 25},
-            "blank vote": {"percent": 10.0, "vote": 5},
-            "total vote": 50,
-        },
-        roles[1].title: {
-            cand[2].user.username: {"percent": 30.0, "vote": 30},
-            cand[3].user.username: {"percent": 45.0, "vote": 45},
-            "blank vote": {"percent": 25.0, "vote": 25},
-            "total vote": 100,
-        },
-    }

election/views.py

@@ -1,34 +1,183 @@
 from typing import TYPE_CHECKING
 
-from cryptography.utils import cached_property
-from django.conf import settings
-from django.contrib.auth.mixins import (
-    LoginRequiredMixin,
-    PermissionRequiredMixin,
-    UserPassesTestMixin,
-)
+from django import forms
+from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
-from django.db.models import QuerySet
-from django.shortcuts import get_object_or_404
+from django.db.models.query import QuerySet
+from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse, reverse_lazy
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView
 from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateView
 
-from core.auth.mixins import CanEditMixin, CanViewMixin
-from election.forms import (
-    CandidateForm,
-    ElectionForm,
-    ElectionListForm,
-    RoleForm,
-    VoteForm,
+from core.auth.mixins import CanCreateMixin, CanEditMixin, CanViewMixin
+from core.views.forms import SelectDateTime
+from core.views.widgets.ajax_select import (
+    AutoCompleteSelect,
+    AutoCompleteSelectMultipleGroup,
+    AutoCompleteSelectUser,
 )
+from core.views.widgets.markdown import MarkdownInput
 from election.models import Candidature, Election, ElectionList, Role, Vote
 
 if TYPE_CHECKING:
     from core.models import User
 
 
+# Custom form field
+
+
+class LimitedCheckboxField(forms.ModelMultipleChoiceField):
+    """A `ModelMultipleChoiceField`, with a max limit of selectable inputs."""
+
+    def __init__(self, queryset, max_choice, **kwargs):
+        self.max_choice = max_choice
+        super().__init__(queryset, **kwargs)
+
+    def clean(self, value):
+        qs = super().clean(value)
+        self.validate(qs)
+        return qs
+
+    def validate(self, qs):
+        if qs.count() > self.max_choice:
+            raise forms.ValidationError(
+                _("You have selected too much candidates."), code="invalid"
+            )
+
+
+# Forms
+
+
+class CandidateForm(forms.ModelForm):
+    """Form to candidate."""
+
+    class Meta:
+        model = Candidature
+        fields = ["user", "role", "program", "election_list"]
+        labels = {
+            "user": _("User to candidate"),
+        }
+        widgets = {
+            "program": MarkdownInput,
+            "user": AutoCompleteSelectUser,
+            "role": AutoCompleteSelect,
+            "election_list": AutoCompleteSelect,
+        }
+
+    def __init__(self, *args, **kwargs):
+        election_id = kwargs.pop("election_id", None)
+        can_edit = kwargs.pop("can_edit", False)
+        super().__init__(*args, **kwargs)
+        if election_id:
+            self.fields["role"].queryset = Role.objects.filter(
+                election__id=election_id
+            ).all()
+            self.fields["election_list"].queryset = ElectionList.objects.filter(
+                election__id=election_id
+            ).all()
+        if not can_edit:
+            self.fields["user"].widget = forms.HiddenInput()
+
+
+class VoteForm(forms.Form):
+    def __init__(self, election, user, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not election.has_voted(user):
+            for role in election.roles.all():
+                cand = role.candidatures
+                if role.max_choice > 1:
+                    self.fields[role.title] = LimitedCheckboxField(
+                        cand, role.max_choice, required=False
+                    )
+                else:
+                    self.fields[role.title] = forms.ModelChoiceField(
+                        cand,
+                        required=False,
+                        widget=forms.RadioSelect(),
+                        empty_label=_("Blank vote"),
+                    )
+
+
+class RoleForm(forms.ModelForm):
+    """Form for creating a role."""
+
+    class Meta:
+        model = Role
+        fields = ["title", "election", "description", "max_choice"]
+        widgets = {"election": AutoCompleteSelect}
+
+    def __init__(self, *args, **kwargs):
+        election_id = kwargs.pop("election_id", None)
+        super().__init__(*args, **kwargs)
+        if election_id:
+            self.fields["election"].queryset = Election.objects.filter(
+                id=election_id
+            ).all()
+
+    def clean(self):
+        cleaned_data = super().clean()
+        title = cleaned_data.get("title")
+        election = cleaned_data.get("election")
+        if Role.objects.filter(title=title, election=election).exists():
+            raise forms.ValidationError(
+                _("This role already exists for this election"), code="invalid"
+            )
+
+
+class ElectionListForm(forms.ModelForm):
+    class Meta:
+        model = ElectionList
+        fields = ("title", "election")
+        widgets = {"election": AutoCompleteSelect}
+
+    def __init__(self, *args, **kwargs):
+        election_id = kwargs.pop("election_id", None)
+        super().__init__(*args, **kwargs)
+        if election_id:
+            self.fields["election"].queryset = Election.objects.filter(
+                id=election_id
+            ).all()
+
+
+class ElectionForm(forms.ModelForm):
+    class Meta:
+        model = Election
+        fields = [
+            "title",
+            "description",
+            "archived",
+            "start_candidature",
+            "end_candidature",
+            "start_date",
+            "end_date",
+            "edit_groups",
+            "view_groups",
+            "vote_groups",
+            "candidature_groups",
+        ]
+        widgets = {
+            "edit_groups": AutoCompleteSelectMultipleGroup,
+            "view_groups": AutoCompleteSelectMultipleGroup,
+            "vote_groups": AutoCompleteSelectMultipleGroup,
+            "candidature_groups": AutoCompleteSelectMultipleGroup,
+        }
+
+    start_date = forms.DateTimeField(
+        label=_("Start date"), widget=SelectDateTime, required=True
+    )
+    end_date = forms.DateTimeField(
+        label=_("End date"), widget=SelectDateTime, required=True
+    )
+    start_candidature = forms.DateTimeField(
+        label=_("Start candidature"), widget=SelectDateTime, required=True
+    )
+    end_candidature = forms.DateTimeField(
+        label=_("End candidature"), widget=SelectDateTime, required=True
+    )
+
+
 # Display elections
 
 
@@ -36,21 +185,25 @@ class ElectionsListView(CanViewMixin, ListView):
     """A list of all non archived elections visible."""
 
     model = Election
-    queryset = model.objects.filter(archived=False)
     ordering = ["-id"]
     paginate_by = 10
     template_name = "election/election_list.jinja"
 
+    def get_queryset(self):
+        return super().get_queryset().filter(archived=False).all()
+
 
 class ElectionListArchivedView(CanViewMixin, ListView):
     """A list of all archived elections visible."""
 
     model = Election
-    queryset = model.objects.filter(archived=True)
     ordering = ["-id"]
     paginate_by = 10
     template_name = "election/election_list.jinja"
 
+    def get_queryset(self):
+        return super().get_queryset().filter(archived=True).all()
+
 
 class ElectionDetailView(CanViewMixin, DetailView):
     """Details an election responsability by responsability."""
@@ -59,67 +212,46 @@ class ElectionDetailView(CanViewMixin, DetailView):
     template_name = "election/election_detail.jinja"
     pk_url_kwarg = "election_id"
 
-    @staticmethod
-    def _reorder_votes(action: str, role: int):
-        role = Role.objects.filter(id=role).first()
-        if not role:
-            return
-        if action == "up":
-            role.up()
-        elif action == "down":
-            role.down()
-        elif action == "bottom":
-            role.bottom()
-        elif action == "top":
-            role.top()
-
     def get(self, request, *arg, **kwargs):
+        response = super().get(request, *arg, **kwargs)
         election: Election = self.get_object()
-        if election.is_vote_editable and request.user.can_edit(election):
+        if request.user.can_edit(election) and election.is_vote_editable:
             action = request.GET.get("action", None)
             role = request.GET.get("role", None)
-            if action and role and role.isdigit():
-                self._reorder_votes(action, int(role))
-        return super().get(request, *arg, **kwargs)
+            if action and role and Role.objects.filter(id=role).exists():
+                if action == "up":
+                    Role.objects.get(id=role).up()
+                elif action == "down":
+                    Role.objects.get(id=role).down()
+                elif action == "bottom":
+                    Role.objects.get(id=role).bottom()
+                elif action == "top":
+                    Role.objects.get(id=role).top()
+                return redirect(
+                    reverse("election:detail", kwargs={"election_id": election.id})
+                )
+        return response
 
     def get_context_data(self, **kwargs):
         """Add additionnal data to the template."""
-        user: User = self.request.user
-        return super().get_context_data(**kwargs) | {
-            "election_form": VoteForm(self.object, user),
-            "show_vote_buttons": self.object.can_vote(user),
-            "user_has_voted": self.object.has_voted(user),
-            "election_results": (
-                self.object.results if self.object.is_vote_finished else None
-            ),
-            "election_lists": list(self.object.election_lists.all()),
-            "election_roles": list(self.object.roles.order_by("order")),
-        }
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["election_form"] = VoteForm(self.object, self.request.user)
+        kwargs["election_results"] = self.object.results
+        return kwargs
 
 
 # Form view
 
 
-class VoteFormView(LoginRequiredMixin, UserPassesTestMixin, FormView):
+class VoteFormView(CanCreateMixin, FormView):
     """Alows users to vote."""
 
     form_class = VoteForm
     template_name = "election/election_detail.jinja"
 
-    @cached_property
-    def election(self):
-        return get_object_or_404(Election, pk=self.kwargs["election_id"])
-
-    def test_func(self):
-        groups = set(self.election.vote_groups.values_list("id", flat=True))
-        if (
-            settings.SITH_GROUP_SUBSCRIBERS_ID in groups
-            and self.request.user.is_subscribed
-        ):
-            # the subscriber group isn't truly attached to users,
-            # so it must be dealt with separately
-            return True
-        return self.request.user.groups.filter(id__in=groups).exists()
+    def dispatch(self, request, *arg, **kwargs):
+        self.election = get_object_or_404(Election, pk=kwargs["election_id"])
+        return super().dispatch(request, *arg, **kwargs)
 
     def vote(self, election_data):
         with transaction.atomic():
@@ -139,16 +271,20 @@ class VoteFormView(LoginRequiredMixin, UserPassesTestMixin, FormView):
             self.election.voters.add(self.request.user)
 
     def get_form_kwargs(self):
-        return super().get_form_kwargs() | {
-            "election": self.election,
-            "user": self.request.user,
-        }
+        kwargs = super().get_form_kwargs()
+        kwargs["election"] = self.election
+        kwargs["user"] = self.request.user
+        return kwargs
 
     def form_valid(self, form):
         """Verify that the user is part in a vote group."""
         data = form.clean()
-        self.vote(data)
-        return super().form_valid(form)
+        res = super(FormView, self).form_valid(form)
+        for grp_id in self.election.vote_groups.values_list("pk", flat=True):
+            if self.request.user.is_in_group(pk=grp_id):
+                self.vote(data)
+                return res
+        return res
 
     def get_success_url(self, **kwargs):
         return reverse_lazy("election:detail", kwargs={"election_id": self.election.id})
@@ -174,22 +310,26 @@ class CandidatureCreateView(LoginRequiredMixin, CreateView):
 
     def dispatch(self, request, *arg, **kwargs):
         self.election = get_object_or_404(Election, pk=kwargs["election_id"])
-        self.can_edit = self.request.user.can_edit(self.election)
         return super().dispatch(request, *arg, **kwargs)
 
     def get_initial(self):
-        return {"user": self.request.user.id}
+        init = {}
+        self.can_edit = self.request.user.can_edit(self.election)
+        init["user"] = self.request.user.id
+        return init
 
     def get_form_kwargs(self):
-        return super().get_form_kwargs() | {
-            "election": self.election,
-            "can_edit": self.can_edit,
-        }
+        kwargs = super().get_form_kwargs()
+        kwargs["election_id"] = self.election.id
+        kwargs["can_edit"] = self.can_edit
+        return kwargs
 
-    def form_valid(self, form: CandidateForm):
+    def form_valid(self, form):
         """Verify that the selected user is in candidate group."""
         obj = form.instance
         obj.election = self.election
+        if not hasattr(obj, "user"):
+            obj.user = self.request.user
         if (obj.election.can_candidate(obj.user)) and (
             obj.user == self.request.user or self.can_edit
         ):
@@ -197,7 +337,9 @@ class CandidatureCreateView(LoginRequiredMixin, CreateView):
         raise PermissionDenied
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {"election": self.election}
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["election"] = self.election
+        return kwargs
 
     def get_success_url(self, **kwargs):
         return reverse_lazy("election:detail", kwargs={"election_id": self.election.id})
@@ -213,79 +355,80 @@ class ElectionCreateView(PermissionRequiredMixin, CreateView):
         return reverse("election:detail", kwargs={"election_id": self.object.id})
 
 
-class RoleCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):
+class RoleCreateView(CanCreateMixin, CreateView):
     model = Role
     form_class = RoleForm
     template_name = "core/create.jinja"
 
-    @cached_property
-    def election(self):
-        return get_object_or_404(Election, pk=self.kwargs["election_id"])
-
-    def test_func(self):
+    def dispatch(self, request, *arg, **kwargs):
+        self.election = get_object_or_404(Election, pk=kwargs["election_id"])
         if not self.election.is_vote_editable:
-            return False
-        if self.request.user.has_perm("election.add_role"):
-            return True
-        groups = set(self.election.edit_groups.values_list("id", flat=True))
-        if (
-            settings.SITH_GROUP_SUBSCRIBERS_ID in groups
-            and self.request.user.is_subscribed
-        ):
-            # the subscriber group isn't truly attached to users,
-            # so it must be dealt with separately
-            return True
-        return self.request.user.groups.filter(id__in=groups).exists()
+            raise PermissionDenied
+        return super().dispatch(request, *arg, **kwargs)
 
     def get_initial(self):
-        return {"election": self.election}
+        init = {}
+        init["election"] = self.election
+        return init
+
+    def form_valid(self, form):
+        """Verify that the user can edit properly."""
+        obj: Role = form.instance
+        user: User = self.request.user
+        if obj.election:
+            for grp_id in obj.election.edit_groups.values_list("pk", flat=True):
+                if user.is_in_group(pk=grp_id):
+                    return super(CreateView, self).form_valid(form)
+        raise PermissionDenied
 
     def get_form_kwargs(self):
-        return super().get_form_kwargs() | {"election_id": self.election.id}
+        kwargs = super().get_form_kwargs()
+        kwargs["election_id"] = self.election.id
+        return kwargs
 
     def get_success_url(self, **kwargs):
-        return reverse(
-            "election:detail", kwargs={"election_id": self.object.election_id}
+        return reverse_lazy(
+            "election:detail", kwargs={"election_id": self.object.election.id}
         )
 
 
-class ElectionListCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):
+class ElectionListCreateView(CanCreateMixin, CreateView):
     model = ElectionList
     form_class = ElectionListForm
     template_name = "core/create.jinja"
 
-    @cached_property
-    def election(self):
-        return get_object_or_404(Election, pk=self.kwargs["election_id"])
-
-    def test_func(self):
+    def dispatch(self, request, *arg, **kwargs):
+        self.election = get_object_or_404(Election, pk=kwargs["election_id"])
         if not self.election.is_vote_editable:
-            return False
-        if self.request.user.has_perm("election.add_electionlist"):
-            return True
-        groups = set(
-            self.election.candidature_groups.values("id")
-            .union(self.election.edit_groups.values("id"))
-            .values_list("id", flat=True)
-        )
-        if (
-            settings.SITH_GROUP_SUBSCRIBERS_ID in groups
-            and self.request.user.is_subscribed
-        ):
-            # the subscriber group isn't truly attached to users,
-            # so it must be dealt with separately
-            return True
-        return self.request.user.groups.filter(id__in=groups).exists()
+            raise PermissionDenied
+        return super().dispatch(request, *arg, **kwargs)
 
     def get_initial(self):
-        return {"election": self.election}
+        init = {}
+        init["election"] = self.election
+        return init
 
     def get_form_kwargs(self):
-        return super().get_form_kwargs() | {"election_id": self.election.id}
+        kwargs = super().get_form_kwargs()
+        kwargs["election_id"] = self.election.id
+        return kwargs
+
+    def form_valid(self, form):
+        """Verify that the user can vote on this election."""
+        obj: ElectionList = form.instance
+        user: User = self.request.user
+        if obj.election:
+            for grp_id in obj.election.candidature_groups.values_list("pk", flat=True):
+                if user.is_in_group(pk=grp_id):
+                    return super(CreateView, self).form_valid(form)
+            for grp_id in obj.election.edit_groups.values_list("pk", flat=True):
+                if user.is_in_group(pk=grp_id):
+                    return super(CreateView, self).form_valid(form)
+        raise PermissionDenied
 
     def get_success_url(self, **kwargs):
-        return reverse(
-            "election:detail", kwargs={"election_id": self.object.election_id}
+        return reverse_lazy(
+            "election:detail", kwargs={"election_id": self.object.election.id}
         )
 
 
@@ -314,23 +457,45 @@ class ElectionUpdateView(CanEditMixin, UpdateView):
         return reverse_lazy("election:detail", kwargs={"election_id": self.object.id})
 
 
-class CandidatureUpdateView(LoginRequiredMixin, CanEditMixin, UpdateView):
+class CandidatureUpdateView(CanEditMixin, UpdateView):
     model = Candidature
     form_class = CandidateForm
     template_name = "core/edit.jinja"
     pk_url_kwarg = "candidature_id"
 
-    def get_form(self, *args, **kwargs):
-        form = super().get_form(*args, **kwargs)
-        form.fields.pop("role", None)
-        return form
+    def dispatch(self, request, *arg, **kwargs):
+        self.object = self.get_object()
+        if not self.object.role.election.is_vote_editable:
+            raise PermissionDenied
+        return super().dispatch(request, *arg, **kwargs)
+
+    def remove_fields(self):
+        self.form.fields.pop("role", None)
+
+    def get(self, request, *args, **kwargs):
+        self.form = self.get_form()
+        self.remove_fields()
+        return self.render_to_response(self.get_context_data(form=self.form))
+
+    def post(self, request, *args, **kwargs):
+        self.form = self.get_form()
+        self.remove_fields()
+        if (
+            request.user.is_authenticated
+            and request.user.can_edit(self.object)
+            and self.form.is_valid()
+        ):
+            return super().form_valid(self.form)
+        return self.form_invalid(self.form)
 
     def get_form_kwargs(self):
-        return super().get_form_kwargs() | {"election": self.object.role.election}
+        kwargs = super().get_form_kwargs()
+        kwargs["election_id"] = self.object.role.election.id
+        return kwargs
 
     def get_success_url(self, **kwargs):
-        return reverse(
-            "election:detail", kwargs={"election_id": self.object.role.election_id}
+        return reverse_lazy(
+            "election:detail", kwargs={"election_id": self.object.role.election.id}
         )
 
 
@@ -381,12 +546,18 @@ class RoleUpdateView(CanEditMixin, UpdateView):
 # Delete Views
 
 
-class ElectionDeleteView(PermissionRequiredMixin, DeleteView):
+class ElectionDeleteView(DeleteView):
     model = Election
     template_name = "core/delete_confirm.jinja"
     pk_url_kwarg = "election_id"
-    permission_required = "election.delete_election"
-    success_url = reverse_lazy("election:list")
+
+    def dispatch(self, request, *args, **kwargs):
+        if request.user.is_root:
+            return super().dispatch(request, *args, **kwargs)
+        raise PermissionDenied
+
+    def get_success_url(self, **kwargs):
+        return reverse_lazy("election:list")
 
 
 class CandidatureDeleteView(CanEditMixin, DeleteView):
@@ -402,7 +573,7 @@ class CandidatureDeleteView(CanEditMixin, DeleteView):
         return super().dispatch(request, *arg, **kwargs)
 
     def get_success_url(self, **kwargs):
-        return reverse("election:detail", kwargs={"election_id": self.election.id})
+        return reverse_lazy("election:detail", kwargs={"election_id": self.election.id})
 
 
 class RoleDeleteView(CanEditMixin, DeleteView):
@@ -418,7 +589,7 @@ class RoleDeleteView(CanEditMixin, DeleteView):
         return super().dispatch(request, *arg, **kwargs)
 
     def get_success_url(self, **kwargs):
-        return reverse("election:detail", kwargs={"election_id": self.election.id})
+        return reverse_lazy("election:detail", kwargs={"election_id": self.election.id})
 
 
 class ElectionListDeleteView(CanEditMixin, DeleteView):
@@ -434,4 +605,4 @@ class ElectionListDeleteView(CanEditMixin, DeleteView):
         return super().dispatch(request, *args, **kwargs)
 
     def get_success_url(self, **kwargs):
-        return reverse("election:detail", kwargs={"election_id": self.election.id})
+        return reverse_lazy("election:detail", kwargs={"election_id": self.election.id})

galaxy/management/commands/rule_galaxy.py

@@ -45,9 +45,8 @@ class Command(BaseCommand):
                 "verbosity level should be between 0 and 2 included", stacklevel=2
             )
 
-        if options["verbosity"] >= 2:
+        if options["verbosity"] == 2:
             logger.setLevel(logging.DEBUG)
-            logging.getLogger("django.db.backends").setLevel(logging.DEBUG)
         elif options["verbosity"] == 1:
             logger.setLevel(logging.INFO)
         else:
@@ -60,3 +59,6 @@ class Command(BaseCommand):
         Galaxy.objects.filter(state__isnull=True).delete()
 
         logger.info("Ruled the galaxy in {} queries.".format(len(connection.queries)))
+        if options["verbosity"] > 2:
+            for q in connection.queries:
+                logger.debug(q)

galaxy/models.py

@@ -31,14 +31,13 @@ from collections import defaultdict
 from typing import NamedTuple, TypedDict
 
 from django.db import models
-from django.db.models import Count, Exists, F, OuterRef, Q, QuerySet
-from django.utils.timezone import localdate, now
+from django.db.models import Count, F, Q, QuerySet
+from django.utils.timezone import localdate
 from django.utils.translation import gettext_lazy as _
 
 from club.models import Membership
 from core.models import User
 from sas.models import PeoplePictureRelation, Picture
-from subscription.models import Subscription
 
 
 class GalaxyStar(models.Model):
@@ -199,16 +198,8 @@ class Galaxy(models.Model):
         cls, picture_count_threshold: int = DEFAULT_PICTURE_COUNT_THRESHOLD
     ) -> QuerySet[User]:
         return (
-            User.objects.filter(is_subscriber_viewable=True)
-            .exclude(subscriptions=None)
-            .annotate(
-                pictures_count=Count("pictures"),
-                is_active_in_galaxy=Exists(
-                    Subscription.objects.filter(
-                        member=OuterRef("id"), subscription_end__gt=now()
-                    )
-                ),
-            )
+            User.objects.exclude(subscriptions=None)
+            .annotate(pictures_count=Count("pictures"))
             .filter(pictures_count__gt=picture_count_threshold)
             .distinct()
         )
@@ -299,9 +290,9 @@ class Galaxy(models.Model):
         31/12/2022 (also two years, but with an offset of one year), then their
         club score is 365.
         """
-        memberships = user.memberships.values("start_date", "end_date", "club_id")
+        memberships = user.memberships.only("start_date", "end_date", "club_id")
         result = defaultdict(int)
-        today = localdate()
+        now = localdate()
         for membership in memberships:
             # This is a N+1 query, but 92% of galaxy users have less than 10 memberships.
             # Only 5 users have more than 30 memberships.
@@ -309,23 +300,23 @@ class Galaxy(models.Model):
                 Membership.objects.exclude(user=user)
                 .filter(
                     Q(  # start2 <= start1 <= end2
-                        start_date__lte=membership["start_date"],
-                        end_date__gte=membership["start_date"],
+                        start_date__lte=membership.start_date,
+                        end_date__gte=membership.start_date,
                     )
-                    | Q(  # start2 <= start1 <= today
-                        start_date__lte=membership["start_date"], end_date=None
+                    | Q(  # start2 <= start1 <= now
+                        start_date__lte=membership.start_date, end_date=None
                     )
                     | Q(  # start1 <= start2 <= end2
-                        start_date__gte=membership["start_date"],
-                        start_date__lte=membership["end_date"] or today,
+                        start_date__gte=membership.start_date,
+                        start_date__lte=membership.end_date or now,
                     ),
-                    club_id=membership["club_id"],
+                    club_id=membership.club_id,
                 )
                 .only("start_date", "end_date", "user_id")
             )
             for other in common_memberships:
-                start = max(membership["start_date"], other.start_date)
-                end = min(membership["end_date"] or today, other.end_date or today)
+                start = max(membership.start_date, other.start_date)
+                end = min(membership.end_date or now, other.end_date or now)
                 result[other.user_id] += (end - start).days * cls.CLUBS_POINTS
         return result
 
@@ -391,22 +382,18 @@ class Galaxy(models.Model):
         # this is memory expensive but prevents a lot of db hits, therefore
         # is far more time efficient
 
-        rulable_users_qs = self.get_rulable_users(picture_count_threshold)
-        active_users_count = rulable_users_qs.filter(is_active_in_galaxy=True).count()
-        rulable_users = list(rulable_users_qs)
+        rulable_users = list(self.get_rulable_users(picture_count_threshold))
+        rulable_users_count = len(rulable_users)
         user1_count = 0
         self.logger.info(
-            f" {len(rulable_users)} citizens (with {active_users_count} active ones) "
-            f"have been listed. Starting to rule."
+            f"{rulable_users_count} citizen have been listed. Starting to rule."
         )
 
         self.logger.info("Creating stars for all citizen")
         individual_scores = self.compute_individual_scores()
         GalaxyStar.objects.bulk_create(
             [
-                GalaxyStar(
-                    owner_id=user.id, galaxy=self, mass=individual_scores[user.id]
-                )
+                GalaxyStar(owner=user, galaxy=self, mass=individual_scores[user.id])
                 for user in rulable_users
             ]
         )
@@ -418,9 +405,9 @@ class Galaxy(models.Model):
         t_global_start = time.time()
         while len(rulable_users) > 0:
             user1 = rulable_users.pop()
-            if not user1.is_active_in_galaxy:
-                continue
             user1_count += 1
+            rulable_users_count2 = len(rulable_users)
+
             star1 = stars[user1.id]
 
             lanes = []
@@ -461,20 +448,17 @@ class Galaxy(models.Model):
                 self.logger.info("")
                 self.logger.info(f" Ruling of {self} ".center(60, "#"))
                 self.logger.info(
-                    f"Progression: {user1_count}/{active_users_count} "
-                    f"citizen -- {active_users_count - user1_count} remaining"
+                    f"Progression: {user1_count}/{rulable_users_count} "
+                    f"citizen -- {rulable_users_count - user1_count} remaining"
                 )
                 self.logger.info(f"Speed: {global_avg_speed:.2f} citizen per second")
-                eta = len(rulable_users) // global_avg_speed
+                eta = rulable_users_count2 // global_avg_speed
                 self.logger.info(
                     f"ETA: {int(eta // 60 % 60)} minutes {int(eta % 60)} seconds"
                 )
                 self.logger.info("#" * 60)
             t_global_start = time.time()
 
-        count, _ = self.stars.filter(Q(lanes1=None) & Q(lanes2=None)).delete()
-        self.logger.info(f"{count} orphan stars have been trimmed.")
-
         # Here, we get the IDs of the old galaxies that we'll need to delete. In normal operation, only one galaxy
         # should be returned, and we can't delete it yet, as it's the one still displayed by the Sith.
         old_galaxies_pks = list(

galaxy/tests.py

@@ -122,7 +122,7 @@ class TestGalaxyModel(TestCase):
             self.com,
         ]
 
-        with self.assertNumQueries(38):
+        with self.assertNumQueries(44):
             while len(users) > 0:
                 user1 = users.pop(0)
                 family_scores = Galaxy.compute_user_family_score(user1)
@@ -150,7 +150,7 @@ class TestGalaxyModel(TestCase):
         that the number of queries to rule the galaxy is stable.
         """
         galaxy = Galaxy.objects.create()
-        with self.assertNumQueries(36):
+        with self.assertNumQueries(39):
             galaxy.rule(0)  # We want everybody here
 
 

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-11-07 14:50+0100\n"
+"POT-Creation-Date: 2025-09-26 22:40+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"
@@ -35,10 +35,6 @@ msgstr ""
 "True si gardé à jour par le biais d'un fournisseur externe de domains "
 "toxics, False sinon"
 
-#: api/admin.py
-msgid "Reset HMAC key"
-msgstr "Réinitialiser la clef HMAC"
-
 #: api/admin.py
 #, python-format
 msgid ""
@@ -52,23 +48,6 @@ msgstr ""
 msgid "Revoke selected API keys"
 msgstr "Révoquer les clefs d'API sélectionnées"
 
-#: api/forms.py
-msgid "I have read and I accept the terms and conditions of use"
-msgstr "J'ai lu et j'accepte les conditions générales d'utilisation."
-
-#: api/forms.py
-msgid "You must approve the terms and conditions of use."
-msgstr "Vous devez approuver les conditions générales d'utilisation."
-
-#: api/forms.py
-msgid "You must confirm that this is your username."
-msgstr "Vous devez confirmer que c'est bien votre nom d'utilisateur."
-
-#: api/forms.py
-#, python-format
-msgid "I confirm that %(username)s is my username on %(app)s"
-msgstr "Je confirme que %(username)s est mon nom d'utilisateur sur %(app)s"
-
 #: api/models.py club/models.py com/models.py counter/models.py forum/models.py
 msgid "name"
 msgstr "nom"
@@ -89,10 +68,6 @@ msgstr "permissions du client"
 msgid "Specific permissions for this api client."
 msgstr "Permissions spécifiques pour ce client d'API"
 
-#: api/models.py
-msgid "HMAC Key"
-msgstr "Clef HMAC"
-
 #: api/models.py
 msgid "api client"
 msgstr "client d'api"
@@ -122,63 +97,6 @@ msgstr "clef d'api"
 msgid "api keys"
 msgstr "clefs d'api"
 
-#: api/templates/api/third_party/auth.jinja
-msgid "Confidentiality"
-msgstr "Confidentialité"
-
-#: api/templates/api/third_party/auth.jinja
-#, python-format
-msgid ""
-"By ticking this box and clicking on the send button, you acknowledge and "
-"agree to provide %(app)s with your first name, last name, nickname and any "
-"other information that was the third party app was explicitly authorized to "
-"fetch and that it must have acknowledged to you, in a complete and accurate "
-"manner."
-msgstr ""
-"En cochant cette case et en cliquant sur le bouton « Envoyer », vous "
-"reconnaissez et acceptez de fournir à %(app)s votre prénom, nom, pseudonyme "
-"et toute autre information que l'application tierce a été explicitement "
-"autorisée à récupérer et qu'elle doit vous avoir communiqué de manière "
-"complète et exacte."
-
-#: api/templates/api/third_party/auth.jinja
-#, python-format
-msgid ""
-"The privacy policies of <a href=\"%(privacy_link)s\">%(app)s</a> and of <a "
-"href=\"%(sith_cgu_link)s\">the Students' Association</a> applies as soon as "
-"the form is submitted."
-msgstr ""
-"Les politiques de confidentialité de <a href=\"%(privacy_link)s\">%(app)s</a> et de <a "
-"href=\"%(sith_cgu_link)s\">l'Association des Etudiants</a> s'appliquent dès la soumission "
-"du formulaire."
-
-#: api/templates/api/third_party/auth.jinja
-msgid "Confirmation of identity"
-msgstr "Confirmation d'identité"
-
-#: api/views.py
-#, python-format
-msgid ""
-"You are going to link your AE account and your %(app)s account. Continue "
-"only if this page was opened from %(app)s."
-msgstr ""
-"Vous allez lier votre compte AE et votre compte %(app)s. Poursuivez "
-"uniquement si cette page a été ouverte depuis %(app)s."
-
-#: api/views.py
-msgid "You have been successfully authenticated. You can now close this page."
-msgstr "Vous avez été authentifié avec succès. Vous pouvez maintenant fermer cette page."
-
-#: api/views.py
-msgid ""
-"Your authentication on the AE website was successful, but an error happened "
-"during the interaction with the third-party application. Please contact the "
-"managers of the latter."
-msgstr ""
-"Votre authentification sur le site AE a fonctionné, mais une erreur est arrivée "
-"durant l'interaction avec l'application tierce. Veuillez contacter les responsables "
-"de cette dernière."
-
 #: club/forms.py
 msgid "Users to add"
 msgstr "Utilisateurs à ajouter"
@@ -199,7 +117,7 @@ msgstr "S'abonner"
 msgid "Remove"
 msgstr "Retirer"
 
-#: club/forms.py counter/forms.py pedagogy/templates/pedagogy/moderation.jinja
+#: club/forms.py pedagogy/templates/pedagogy/moderation.jinja
 msgid "Action"
 msgstr "Action"
 
@@ -223,12 +141,12 @@ msgstr "vous devez spécifier au moins un utilisateur ou une adresse email"
 msgid "Begin date"
 msgstr "Date de début"
 
-#: club/forms.py com/forms.py counter/forms.py election/forms.py
+#: club/forms.py com/forms.py counter/forms.py election/views.py
 #: subscription/forms.py
 msgid "End date"
 msgstr "Date de fin"
 
-#: club/forms.py club/templates/club/club_sellings.jinja club/views.py
+#: club/forms.py club/templates/club/club_sellings.jinja
 #: core/templates/core/user_account_detail.jinja
 #: counter/templates/counter/cash_summary_list.jinja counter/views/mixins.py
 msgid "Counter"
@@ -321,7 +239,7 @@ msgid "role"
 msgstr "rôle"
 
 #: club/models.py core/models.py counter/models.py election/models.py
-#: forum/models.py
+#: forum/models.py reservation/models.py
 msgid "description"
 msgstr "description"
 
@@ -491,7 +409,7 @@ msgstr "Total : "
 msgid "Benefit: "
 msgstr "Bénéfice : "
 
-#: club/templates/club/club_sellings.jinja club/views.py
+#: club/templates/club/club_sellings.jinja
 #: core/templates/core/user_account_detail.jinja
 #: counter/templates/counter/cash_summary_list.jinja
 #: counter/templates/counter/last_ops.jinja
@@ -501,34 +419,34 @@ msgstr "Bénéfice : "
 msgid "Date"
 msgstr "Date"
 
-#: club/templates/club/club_sellings.jinja club/views.py
+#: club/templates/club/club_sellings.jinja
 #: core/templates/core/user_account_detail.jinja
 #: counter/templates/counter/last_ops.jinja
 msgid "Barman"
 msgstr "Barman"
 
-#: club/templates/club/club_sellings.jinja club/views.py
+#: club/templates/club/club_sellings.jinja
 #: counter/templates/counter/counter_click.jinja
 #: counter/templates/counter/last_ops.jinja
 #: counter/templates/counter/refilling_list.jinja
 msgid "Customer"
 msgstr "Client"
 
-#: club/templates/club/club_sellings.jinja club/views.py
+#: club/templates/club/club_sellings.jinja
 #: core/templates/core/user_account_detail.jinja
 #: counter/templates/counter/last_ops.jinja
 #: rootplace/templates/rootplace/logs.jinja
 msgid "Label"
 msgstr "Étiquette"
 
-#: club/templates/club/club_sellings.jinja club/views.py
+#: club/templates/club/club_sellings.jinja
 #: core/templates/core/user_account_detail.jinja
 #: core/templates/core/user_stats.jinja
 #: counter/templates/counter/last_ops.jinja
 msgid "Quantity"
 msgstr "Quantité"
 
-#: club/templates/club/club_sellings.jinja club/views.py
+#: club/templates/club/club_sellings.jinja
 #: core/templates/core/user_account.jinja
 #: core/templates/core/user_account_detail.jinja
 #: counter/templates/counter/cash_summary_list.jinja
@@ -538,7 +456,7 @@ msgstr "Quantité"
 msgid "Total"
 msgstr "Total"
 
-#: club/templates/club/club_sellings.jinja club/views.py
+#: club/templates/club/club_sellings.jinja
 #: core/templates/core/user_account_detail.jinja
 #: core/templates/core/user_detail.jinja
 #: counter/templates/counter/last_ops.jinja
@@ -596,6 +514,18 @@ msgstr "Nouveau Trombi"
 msgid "Posters"
 msgstr "Affiches"
 
+#: club/templates/club/club_tools.jinja
+msgid "Reservable rooms"
+msgstr "Salles réservables"
+
+#: club/templates/club/club_tools.jinja
+msgid "Add a room"
+msgstr "Ajouter une salle"
+
+#: club/templates/club/club_tools.jinja
+msgid "This club manages no reservable room"
+msgstr "Ce club ne gère pas de salle réservable"
+
 #: club/templates/club/club_tools.jinja
 msgid "Counters:"
 msgstr "Comptoirs : "
@@ -638,8 +568,6 @@ msgstr ""
 #: core/templates/core/user_godfathers_tree.jinja
 #: core/templates/core/user_preferences.jinja
 #: counter/templates/counter/cash_register_summary.jinja
-#: counter/templates/counter/invoices_call.jinja
-#: counter/templates/counter/product_form.jinja
 #: forum/templates/forum/reply.jinja
 #: subscription/templates/subscription/fragments/creation_form.jinja
 #: trombi/templates/trombi/comment.jinja
@@ -772,32 +700,20 @@ msgstr "Vente"
 msgid "Mailing list"
 msgstr "Listes de diffusion"
 
-#: club/views.py
-msgid "You are now a member of this club."
-msgstr "Vous êtes maintenant membre de ce club."
-
 #: club/views.py
 #, python-format
 msgid "%(user)s has been added to club."
 msgstr "%(user)s a été ajouté au club."
 
 #: club/views.py
-msgid "Benefit"
-msgstr "Bénéfice"
-
-#: club/views.py
-msgid "Selling price"
-msgstr "Prix de vente"
-
-#: club/views.py
-msgid "Purchase price"
-msgstr "Prix d'achat"
+msgid "You are now a member of this club."
+msgstr "Vous êtes maintenant membre de ce club."
 
 #: com/forms.py
 msgid "Format: 16:9 | Resolution: 1920x1080"
 msgstr "Format : 16:9 | Résolution : 1920x1080"
 
-#: com/forms.py election/forms.py subscription/forms.py
+#: com/forms.py election/views.py subscription/forms.py
 msgid "Start date"
 msgstr "Date de début"
 
@@ -873,7 +789,7 @@ msgstr "Une description plus détaillée et exhaustive de l'évènement."
 msgid "The club which organizes the event."
 msgstr "Le club qui organise l'évènement."
 
-#: com/models.py pedagogy/models.py trombi/models.py
+#: com/models.py pedagogy/models.py reservation/models.py trombi/models.py
 msgid "author"
 msgstr "auteur"
 
@@ -987,8 +903,7 @@ msgstr "Administration des mailing listes"
 msgid "Actions"
 msgstr "Actions"
 
-#: com/templates/com/mailing_admin.jinja com/templates/com/poster_list.jinja
-#: core/templates/core/file_detail.jinja
+#: com/templates/com/mailing_admin.jinja core/templates/core/file_detail.jinja
 #: core/templates/core/file_moderation.jinja sas/templates/sas/moderation.jinja
 #: sas/templates/sas/picture.jinja
 msgid "Moderate"
@@ -1125,7 +1040,7 @@ msgstr "Événements aujourd'hui et dans les prochains jours"
 
 #: com/templates/com/news_list.jinja
 msgid "Administrate news"
-msgstr "Administrer les nouvelles"
+msgstr "Administrer les news"
 
 #: com/templates/com/news_list.jinja
 msgid "Nothing to come..."
@@ -1166,6 +1081,11 @@ msgstr "Emploi du temps"
 msgid "Matmatronch"
 msgstr "Matmatronch"
 
+#: com/templates/com/news_list.jinja
+#: reservation/templates/reservation/schedule.jinja
+msgid "Room reservation"
+msgstr "Réservation de salle"
+
 #: com/templates/com/news_list.jinja core/templates/core/base/navbar.jinja
 #: core/templates/core/user_tools.jinja
 msgid "Elections"
@@ -1204,7 +1124,8 @@ msgstr "Vous n'avez pas accès à ce contenu"
 msgid "Poster"
 msgstr "Affiche"
 
-#: com/templates/com/poster_edit.jinja com/templates/com/screen_edit.jinja
+#: com/templates/com/poster_edit.jinja com/templates/com/poster_moderate.jinja
+#: com/templates/com/screen_edit.jinja
 msgid "List"
 msgstr "Liste"
 
@@ -1217,14 +1138,26 @@ msgstr "Affiche - modifier"
 msgid "Create"
 msgstr "Créer"
 
-#: com/templates/com/poster_list.jinja com/templates/com/screen_slideshow.jinja
-msgid "Click to expand"
-msgstr "Cliquez pour agrandir"
+#: com/templates/com/poster_list.jinja
+msgid "Moderation"
+msgstr "Modération"
 
 #: com/templates/com/poster_list.jinja
 msgid "No posters"
 msgstr "Aucune affiche"
 
+#: com/templates/com/poster_list.jinja com/templates/com/screen_slideshow.jinja
+msgid "Click to expand"
+msgstr "Cliquez pour agrandir"
+
+#: com/templates/com/poster_moderate.jinja
+msgid "Posters - moderation"
+msgstr "Affiches - modération"
+
+#: com/templates/com/poster_moderate.jinja
+msgid "No objects"
+msgstr "Aucun éléments"
+
 #: com/templates/com/screen_edit.jinja
 msgid "Screen"
 msgstr "Écran"
@@ -2019,6 +1952,7 @@ msgstr "Confirmation"
 #: core/templates/core/file_delete_confirm.jinja
 #: counter/templates/counter/counter_click.jinja
 #: counter/templates/counter/fragments/delete_student_card.jinja
+#: reservation/templates/reservation/fragments/create_reservation.jinja
 #: sas/templates/sas/ask_picture_removal.jinja
 msgid "Cancel"
 msgstr "Annuler"
@@ -3039,18 +2973,6 @@ msgstr "Cet UID est invalide"
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: counter/forms.py
-msgid "Date and time of action"
-msgstr "Date et heure de l'action"
-
-#: counter/forms.py
-msgid "New counters"
-msgstr "Nouveaux comptoirs"
-
-#: counter/forms.py
-msgid "The selected counters will replace the current ones"
-msgstr "Les comptoirs sélectionnés remplaceront les comptoirs actuels"
-
 #: counter/forms.py
 msgid ""
 "Describe the product. If it's an event's click, give some insights about it, "
@@ -3155,7 +3077,7 @@ msgstr "Mettre à True si le mail a reçu une erreur"
 msgid "The operation that emptied the account."
 msgstr "L'opération qui a vidé le compte."
 
-#: counter/models.py pedagogy/models.py
+#: counter/models.py pedagogy/models.py reservation/models.py
 msgid "comment"
 msgstr "commentaire"
 
@@ -3385,52 +3307,6 @@ msgid "The returnable product cannot be the same as the returned one"
 msgstr ""
 "Le produit consigné ne peut pas être le même que le produit de déconsigne"
 
-#: counter/models.py
-msgid "Archiving"
-msgstr "Archivage"
-
-#: counter/models.py
-msgid "Counters change"
-msgstr "Changement des comptoirs"
-
-#: counter/models.py
-msgid "Product scheduled action"
-msgstr "Actions sur produit planifiées"
-
-#: counter/models.py
-msgid "Product actions must declare a clocked schedule."
-msgstr "Les actions sur les produits doivent avoir un horaire planifié."
-
-#: counter/models.py
-msgid "Year + month field (day forced to 1)"
-msgstr "Champ Année + mois (jour forcé à 1)"
-
-#: counter/models.py
-#, python-format
-msgid ""
-"“%(value)s” value has an invalid date format. It must be in YYYY-MM format."
-msgstr ""
-"La valeur « %(value)s » a un format de date invalide. Ce doit être au format "
-"YYYY-MM."
-
-#: counter/models.py
-#, python-format
-msgid ""
-"“%(value)s” value has the correct format (YYYY-MM) but it is an invalid date."
-msgstr "La valeur « %(value)s » a le bon format, mais est une date invalide."
-
-#: counter/models.py
-msgid "invoice date"
-msgstr "date de la facture"
-
-#: counter/models.py
-msgid "Invoice call"
-msgstr "Appel à facture"
-
-#: counter/models.py
-msgid "Invoice calls"
-msgstr "Appels à facture"
-
 #: counter/templates/counter/activity.jinja
 #, python-format
 msgid "%(counter_name)s activity"
@@ -3661,10 +3537,6 @@ msgstr "Payements en Carte Bancaire"
 msgid "Sum"
 msgstr "Somme"
 
-#: counter/templates/counter/invoices_call.jinja
-msgid "Validated"
-msgstr "Validé"
-
 #: counter/templates/counter/last_ops.jinja
 #, python-format
 msgid "%(counter_name)s last operations"
@@ -3753,25 +3625,6 @@ msgstr ""
 "votre cotisation. Si vous ne renouvelez pas votre cotisation, il n'y aura "
 "aucune conséquence autre que le retrait de l'argent de votre compte."
 
-#: counter/templates/counter/product_form.jinja
-#, python-format
-msgid "Edit product %(name)s"
-msgstr "Édition du produit %(name)s"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Product creation"
-msgstr "Création de produit"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Automatic actions"
-msgstr "Actions automatiques"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Automatic actions allows to schedule product changes ahead of time."
-msgstr ""
-"Les actions automatiques vous permettent de planifier des modifications du "
-"produit à l'avance."
-
 #: counter/templates/counter/product_list.jinja
 msgid "Product list"
 msgstr "Liste des produits"
@@ -3954,10 +3807,6 @@ msgstr "L'utilisateur n'est pas barman."
 msgid "Bad location, someone is already logged in somewhere else"
 msgstr "Mauvais comptoir, quelqu'un est déjà connecté ailleurs"
 
-#: counter/views/invoice.py
-msgid "Invoice calls status has been updated."
-msgstr "Le statut des appels à facture a été mis à jour."
-
 #: counter/views/mixins.py
 msgid "Cash summary"
 msgstr "Relevé de caisse"
@@ -4125,30 +3974,6 @@ msgstr ""
 msgid "You can't buy a refilling with sith money"
 msgstr "Vous ne pouvez pas acheter un rechargement avec de l'argent du sith"
 
-#: election/forms.py
-msgid "You have selected too many candidates."
-msgstr "Vous avez sélectionné trop de candidats."
-
-#: election/forms.py
-msgid "User to candidate"
-msgstr "Utilisateur se présentant"
-
-#: election/forms.py election/templates/election/election_detail.jinja
-msgid "Blank vote"
-msgstr "Vote blanc"
-
-#: election/forms.py
-msgid "This role already exists for this election"
-msgstr "Ce rôle existe déjà pour cette élection"
-
-#: election/forms.py
-msgid "Start candidature"
-msgstr "Début des candidatures"
-
-#: election/forms.py
-msgid "End candidature"
-msgstr "Fin des candidatures"
-
 #: election/models.py
 msgid "start candidature"
 msgstr "début des candidatures"
@@ -4173,10 +3998,6 @@ msgstr "groupe de vote"
 msgid "candidature groups"
 msgstr "groupe de candidature"
 
-#: election/models.py
-msgid "voters"
-msgstr "électeurs"
-
 #: election/models.py
 msgid "election"
 msgstr "élection"
@@ -4232,10 +4053,17 @@ msgstr "Vous avez déjà soumis votre vote."
 msgid "You have voted in this election."
 msgstr "Vous avez déjà voté pour cette élection."
 
+#: election/templates/election/election_detail.jinja election/views.py
+msgid "Blank vote"
+msgstr "Vote blanc"
+
 #: election/templates/election/election_detail.jinja
-#, python-format
-msgid "You may choose up to %(nb_choices)s people."
-msgstr "Vous pouvez choisir jusqu'à %(nb_choices)s personnes."
+msgid "You may choose up to"
+msgstr "Vous pouvez choisir jusqu'à"
+
+#: election/templates/election/election_detail.jinja
+msgid "people."
+msgstr "personne(s)"
 
 #: election/templates/election/election_detail.jinja
 msgid "Choose blank vote"
@@ -4277,6 +4105,26 @@ msgstr "au"
 msgid "Polls open from"
 msgstr "Votes ouverts du"
 
+#: election/views.py
+msgid "You have selected too much candidates."
+msgstr "Vous avez sélectionné trop de candidats."
+
+#: election/views.py
+msgid "User to candidate"
+msgstr "Utilisateur se présentant"
+
+#: election/views.py
+msgid "This role already exists for this election"
+msgstr "Ce rôle existe déjà pour cette élection"
+
+#: election/views.py
+msgid "Start candidature"
+msgstr "Début des candidatures"
+
+#: election/views.py
+msgid "End candidature"
+msgstr "Fin des candidatures"
+
 #: forum/models.py
 msgid "is a category"
 msgstr "est une catégorie"
@@ -4768,6 +4616,73 @@ msgstr "Signaler ce commentaire"
 msgid "Edit UE"
 msgstr "Éditer l'UE"
 
+#: reservation/forms.py
+msgid "The start must be set before the end"
+msgstr "Le début doit être placé avant la fin"
+
+#: reservation/models.py
+msgid "room name"
+msgstr "Nom de la salle"
+
+#: reservation/models.py
+msgid "room owner"
+msgstr "propriétaire de la salle"
+
+#: reservation/models.py
+msgid "The club which manages this room"
+msgstr "Le club qui gère cette salle"
+
+#: reservation/models.py
+msgid "site"
+msgstr "site"
+
+#: reservation/models.py
+msgid "reservable room"
+msgstr "salle réservable"
+
+#: reservation/models.py
+msgid "reservable rooms"
+msgstr "salles réservables"
+
+#: reservation/models.py
+msgid "reserved room"
+msgstr "salle réservée"
+
+#: reservation/models.py
+msgid "slot start"
+msgstr "début du créneau"
+
+#: reservation/models.py
+msgid "slot end"
+msgstr "fin du créneau"
+
+#: reservation/models.py
+msgid "reservation slot"
+msgstr "créneau de réservation"
+
+#: reservation/models.py
+msgid "reservation slots"
+msgstr "créneaux de réservation"
+
+#: reservation/models.py
+msgid "There is already a reservation on this slot."
+msgstr "Il y a déjà une réservation sur ce créneau."
+
+#: reservation/templates/reservation/fragments/create_reservation.jinja
+msgid "Book a room"
+msgstr "Réserver une salle"
+
+#: reservation/templates/reservation/schedule.jinja
+msgid "You can book a room by selecting a free slot in the calendar."
+msgstr ""
+"Vous pouvez réserver une salle en sélectionnant un emplacement libre dans le "
+"calendrier."
+
+#: reservation/views.py
+#, python-format
+msgid "%(name)s was updated successfully"
+msgstr "%(name)s a été mis à jour avec succès"
+
 #: rootplace/forms.py
 msgid "User that will be kept"
 msgstr "Utilisateur qui sera conservé"
@@ -5148,47 +5063,47 @@ msgstr "Suppression de rechargement"
 
 #: sith/settings.py
 msgid "One semester"
-msgstr "Un semestre"
+msgstr "Un semestre, 20 €"
 
 #: sith/settings.py
 msgid "Two semesters"
-msgstr "Deux semestres"
+msgstr "Deux semestres, 35 €"
 
 #: sith/settings.py
 msgid "Common core cursus"
-msgstr "Cursus tronc commun"
+msgstr "Cursus tronc commun, 60 €"
 
 #: sith/settings.py
 msgid "Branch cursus"
-msgstr "Cursus branche"
+msgstr "Cursus branche, 60 €"
 
 #: sith/settings.py
 msgid "Alternating cursus"
-msgstr "Cursus alternant"
+msgstr "Cursus alternant, 30 €"
 
 #: sith/settings.py
 msgid "Honorary member"
-msgstr "Membre honoraire"
+msgstr "Membre honoraire, 0 €"
 
 #: sith/settings.py
 msgid "Assidu member"
-msgstr "Membre d'Assidu"
+msgstr "Membre d'Assidu, 0 €"
 
 #: sith/settings.py
 msgid "Amicale/DOCEO member"
-msgstr "Membre de l'Amicale/DOCEO"
+msgstr "Membre de l'Amicale/DOCEO, 0 €"
 
 #: sith/settings.py
 msgid "UT network member"
-msgstr "Cotisant du réseau UT"
+msgstr "Cotisant du réseau UT, 0 €"
 
 #: sith/settings.py
 msgid "CROUS member"
-msgstr "Membres du CROUS"
+msgstr "Membres du CROUS, 0 €"
 
 #: sith/settings.py
 msgid "Sbarro/ESTA member"
-msgstr "Membre de Sbarro ou de l'ESTA"
+msgstr "Membre de Sbarro ou de l'ESTA, 20 €"
 
 #: sith/settings.py
 msgid "One semester Welcome Week"
@@ -5215,28 +5130,28 @@ msgid "One day"
 msgstr "Un jour"
 
 #: sith/settings.py
-msgid "GA staff member (2 weeks)"
-msgstr "Membre staff GA (2 semaines)"
+msgid "GA staff member"
+msgstr "Membre staff GA (2 semaines), 1 €"
 
 #: sith/settings.py
 msgid "One semester (-20%)"
-msgstr "Un semestre (-20%)"
+msgstr "Un semestre (-20%), 12 €"
 
 #: sith/settings.py
 msgid "Two semesters (-20%)"
-msgstr "Deux semestres (-20%)"
+msgstr "Deux semestres (-20%), 22 €"
 
 #: sith/settings.py
 msgid "Common core cursus (-20%)"
-msgstr "Cursus tronc commun (-20%)"
+msgstr "Cursus tronc commun (-20%), 36 €"
 
 #: sith/settings.py
 msgid "Branch cursus (-20%)"
-msgstr "Cursus branche (-20%)"
+msgstr "Cursus branche (-20%), 36 €"
 
 #: sith/settings.py
 msgid "Alternating cursus (-20%)"
-msgstr "Cursus alternant (-20%)"
+msgstr "Cursus alternant (-20%), 24 €"
 
 #: sith/settings.py
 msgid "One year for free(CA offer)"

locale/fr/LC_MESSAGES/djangojs.po

@@ -251,6 +251,14 @@ msgstr "Types de produits réordonnés !"
 msgid "Product type reorganisation failed with status code : %d"
 msgstr "La réorganisation des types de produit a échoué avec le code : %d"
 
+#: reservation/static/bundled/reservation/components/room-scheduler-index.ts
+msgid "Rooms"
+msgstr "Salles"
+
+#: reservation/static/bundled/reservation/slot-reservation-index.ts
+msgid "This slot has been successfully moved"
+msgstr "Ce créneau a été bougé avec succès"
+
 #: sas/static/bundled/sas/pictures-download-index.ts
 msgid "pictures.%(extension)s"
 msgstr "photos.%(extension)s"

mkdocs.yml

@@ -69,7 +69,6 @@ nav:
     - API:
       - Développement: tutorial/api/dev.md
       - Connexion à l'API: tutorial/api/connect.md
-      - Liaison avec le compte AE: tutorial/api/account-link.md
     - Etransactions: tutorial/etransaction.md
   - How-to:
     - L'ORM de Django: howto/querysets.md
@@ -92,8 +91,6 @@ nav:
       - reference/api/hashers.md
       - reference/api/models.md
       - reference/api/perms.md
-      - reference/api/schemas.md
-      - reference/api/views.md
     - club:
       - reference/club/models.md
       - reference/club/views.md

package.json

@@ -21,51 +21,57 @@
     "#core:*": "./core/static/bundled/*",
     "#pedagogy:*": "./pedagogy/static/bundled/*",
     "#counter:*": "./counter/static/bundled/*",
-    "#com:*": "./com/static/bundled/*"
+    "#com:*": "./com/static/bundled/*",
+    "#reservation:*": "./reservation/static/bundled/*"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.5",
-    "@babel/preset-env": "^7.28.5",
-    "@biomejs/biome": "^1.9.4",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.4",
+    "@biomejs/biome": "1.9.4",
     "@hey-api/openapi-ts": "^0.73.0",
     "@rollup/plugin-inject": "^5.0.5",
-    "@types/alpinejs": "^3.13.11",
-    "@types/cytoscape-cxtmenu": "^3.4.5",
-    "@types/cytoscape-klay": "^3.1.5",
+    "@types/alpinejs": "^3.13.10",
+    "@types/cytoscape-cxtmenu": "^3.4.4",
+    "@types/cytoscape-klay": "^3.1.4",
     "@types/js-cookie": "^3.0.6",
-    "typescript": "^5.9.3",
-    "vite": "^6.4.1",
+    "typescript": "^5.8.3",
+    "vite": "^6.3.6",
     "vite-bundle-visualizer": "^1.2.1",
-    "vite-plugin-static-copy": "^3.1.4"
+    "vite-plugin-static-copy": "^3.1.2"
   },
   "dependencies": {
-    "@alpinejs/sort": "^3.15.1",
+    "@alpinejs/morph": "^3.14.9",
+    "@alpinejs/sort": "^3.14.7",
     "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
-    "@floating-ui/dom": "^1.7.4",
-    "@fortawesome/fontawesome-free": "^6.7.2",
+    "@floating-ui/dom": "^1.6.13",
+    "@fortawesome/fontawesome-free": "^6.6.0",
     "@fullcalendar/core": "^6.1.19",
     "@fullcalendar/daygrid": "^6.1.19",
     "@fullcalendar/icalendar": "^6.1.19",
+    "@fullcalendar/interaction": "^6.1.19",
     "@fullcalendar/list": "^6.1.19",
-    "@sentry/browser": "^9.46.0",
-    "@zip.js/zip.js": "^2.8.9",
-    "3d-force-graph": "^1.79.0",
-    "alpinejs": "^3.15.1",
-    "chart.js": "^4.5.1",
+    "@fullcalendar/resource": "^6.1.19",
+    "@fullcalendar/resource-timeline": "^6.1.19",
+    "@sentry/browser": "^9.29.0",
+    "@zip.js/zip.js": "^2.7.52",
+    "3d-force-graph": "^1.73.4",
+    "alpinejs": "^3.14.7",
+    "chart.js": "^4.4.4",
     "country-flag-emoji-polyfill": "^0.1.8",
-    "cytoscape": "^3.33.1",
+    "cytoscape": "^3.30.2",
     "cytoscape-cxtmenu": "^3.5.0",
     "cytoscape-klay": "^3.1.4",
-    "d3-force-3d": "^3.0.6",
-    "easymde": "^2.20.0",
-    "glob": "^11.0.3",
+    "d3-force-3d": "^3.0.5",
+    "easymde": "^2.19.0",
+    "glob": "^11.0.0",
     "html2canvas": "^1.4.1",
-    "htmx.org": "^2.0.8",
+    "htmx-ext-alpine-morph": "^2.0.1",
+    "htmx.org": "^2.0.3",
     "js-cookie": "^3.0.5",
-    "lit-html": "^3.3.1",
+    "lit-html": "^3.3.0",
     "native-file-system-adapter": "^3.0.1",
     "three": "^0.177.0",
-    "three-spritetext": "^1.10.0",
-    "tom-select": "^2.4.3"
+    "three-spritetext": "^1.9.0",
+    "tom-select": "^2.3.1"
   }
 }

pyproject.toml

@@ -19,36 +19,36 @@ authors = [
 license = { text = "GPL-3.0-only" }
 requires-python = "<4.0,>=3.12"
 dependencies = [
-    "django>=5.2.8,<6.0.0",
-    "django-ninja>=1.4.5,<2.0.0",
-    "django-ninja-extra>=0.30.2,<1.0.0",
-    "Pillow>=12.0.0,<13.0.0",
-    "mistune>=3.1.4,<4.0.0",
+    "django>=5.2.1,<6.0.0",
+    "django-ninja<2.0.0,>=1.4.0",
+    "django-ninja-extra<1.0.0,>=0.22.9",
+    "Pillow<12.0.0,>=11.1.0",
+    "mistune<4.0.0,>=3.1.3",
     "django-jinja<3.0.0,>=2.11.0",
-    "cryptography>=46.0.3,<47.0.0",
-    "django-phonenumber-field>=8.3.0,<9.0.0",
-    "phonenumbers>=9.0.18,<10.0.0",
-    "reportlab>=4.4.4,<5.0.0",
+    "cryptography>=45.0.3,<46.0.0",
+    "django-phonenumber-field<9.0.0,>=8.1.0",
+    "phonenumbers>=9.0.2,<10.0.0",
+    "reportlab<5.0.0,>=4.3.1",
     "django-haystack<4.0.0,>=3.3.0",
     "xapian-haystack<4.0.0,>=3.1.0",
     "libsass<1.0.0,>=0.23.0",
     "django-ordered-model<4.0.0,>=3.7.4",
     "django-simple-captcha<1.0.0,>=0.6.2",
     "python-dateutil<3.0.0.0,>=2.9.0.post0",
-    "sentry-sdk>=2.43.0,<3.0.0",
+    "sentry-sdk<3.0.0,>=2.25.1",
     "jinja2<4.0.0,>=3.1.6",
-    "django-countries>=8.0.0,<9.0.0",
-    "dict2xml>=1.7.7,<2.0.0",
+    "django-countries<8.0.0,>=7.6.1",
+    "dict2xml<2.0.0,>=1.7.6",
     "Sphinx<6,>=5",
-    "tomli>=2.3.0,<3.0.0",
+    "tomli<3.0.0,>=2.2.1",
     "django-honeypot>=1.3.0,<2",
-    "pydantic-extra-types>=2.10.6,<3.0.0",
-    "ical>=11.1.0,<12",
+    "pydantic-extra-types<3.0.0,>=2.10.3",
+    "ical>=11,<12",
     "redis[hiredis]<7,>=5.3.0",
-    "environs[django]>=14.5.0,<15.0.0",
-    "requests>=2.32.5,<3.0.0",
+    "environs[django]<15.0.0,>=14.1.1",
+    "requests>=2.32.3",
     "honcho>=2.0.0",
-    "psutil>=7.1.3,<8.0.0",
+    "psutil>=7.0.0",
     "celery[redis]>=5.5.2",
     "django-celery-results>=2.5.1",
     "django-celery-beat>=2.7.0",
@@ -60,32 +60,32 @@ documentation = "https://sith-ae.readthedocs.io/"
 
 [dependency-groups]
 prod = [
-    "psycopg[c]>=3.2.12,<4.0.0",
+    "psycopg[c]>=3.2.9,<4.0.0",
 ]
 dev = [
-    "django-debug-toolbar>=6.1.0,<7",
-    "ipython>=9.7.0,<10.0.0",
-    "pre-commit>=4.3.0,<5.0.0",
-    "ruff>=0.14.4,<1.0.0",
-    "djhtml>=3.0.10,<4.0.0",
-    "faker>=37.12.0,<38.0.0",
-    "rjsmin>=1.2.5,<2.0.0",
+    "django-debug-toolbar>=6,<7",
+    "ipython<10.0.0,>=9.0.2",
+    "pre-commit<5.0.0,>=4.1.0",
+    "ruff>=0.11.13,<1.0.0",
+    "djhtml<4.0.0,>=3.0.7",
+    "faker<38.0.0,>=37.0.0",
+    "rjsmin<2.0.0,>=1.2.4",
 ]
 tests = [
-    "freezegun>=1.5.5,<2.0.0",
-    "pytest>=8.4.2,<9.0.0",
-    "pytest-cov>=7.0.0,<8.0.0",
+    "freezegun<2.0.0,>=1.5.1",
+    "pytest<9.0.0,>=8.3.5",
+    "pytest-cov<7.0.0,>=6.0.0",
     "pytest-django<5.0.0,>=4.10.0",
     "model-bakery<2.0.0,>=1.20.4",
-    "beautifulsoup4>=4.14.2,<5",
-    "lxml>=6.0.2,<7",
+    "beautifulsoup4>=4.13.3,<5",
+    "lxml>=6,<7",
 ]
 docs = [
     "mkdocs<2.0.0,>=1.6.1",
-    "mkdocs-material>=9.6.23,<10.0.0",
-    "mkdocstrings>=0.30.1,<1.0.0",
-    "mkdocstrings-python>=1.18.2,<2.0.0",
-    "mkdocs-include-markdown-plugin>=7.2.0,<8.0.0",
+    "mkdocs-material<10.0.0,>=9.6.7",
+    "mkdocstrings<1.0.0,>=0.28.3",
+    "mkdocstrings-python<2.0.0,>=1.16.3",
+    "mkdocs-include-markdown-plugin<8.0.0,>=7.1.5",
 ]
 
 [tool.uv]

reservation/admin.py

@@ -0,0 +1,19 @@
+from django.contrib import admin
+
+from reservation.models import ReservationSlot, Room
+
+
+@admin.register(Room)
+class RoomAdmin(admin.ModelAdmin):
+    list_display = ("name", "club")
+    list_filter = (("club", admin.RelatedOnlyFieldListFilter), "location")
+    autocomplete_fields = ("club",)
+    search_fields = ("name",)
+
+
+@admin.register(ReservationSlot)
+class ReservationSlotAdmin(admin.ModelAdmin):
+    list_display = ("room", "start_at", "end_at", "author")
+    autocomplete_fields = ("author",)
+    list_filter = ("room",)
+    date_hierarchy = "start_at"

reservation/api.py

@@ -0,0 +1,64 @@
+from typing import Any, Literal
+
+from django.core.exceptions import ValidationError
+from ninja import Query
+from ninja_extra import ControllerBase, api_controller, paginate, route
+from ninja_extra.pagination import PageNumberPaginationExtra
+from ninja_extra.schemas import PaginatedResponseSchema
+
+from api.permissions import HasPerm
+from reservation.models import ReservationSlot, Room
+from reservation.schemas import (
+    RoomFilterSchema,
+    RoomSchema,
+    SlotFilterSchema,
+    SlotSchema,
+    UpdateReservationSlotSchema,
+)
+
+
+@api_controller("/reservation/room")
+class ReservableRoomController(ControllerBase):
+    @route.get(
+        "",
+        response=list[RoomSchema],
+        permissions=[HasPerm("reservation.view_room")],
+        url_name="fetch_reservable_rooms",
+    )
+    def fetch_rooms(self, filters: Query[RoomFilterSchema]):
+        return filters.filter(Room.objects.select_related("club"))
+
+
+@api_controller("/reservation/slot")
+class ReservationSlotController(ControllerBase):
+    @route.get(
+        "",
+        response=PaginatedResponseSchema[SlotSchema],
+        permissions=[HasPerm("reservation.view_reservationslot")],
+        url_name="fetch_reservation_slots",
+    )
+    @paginate(PageNumberPaginationExtra)
+    def fetch_slots(self, filters: Query[SlotFilterSchema]):
+        return filters.filter(
+            ReservationSlot.objects.select_related("author").order_by("start_at")
+        )
+
+    @route.patch(
+        "/reservation/slot/{int:slot_id}",
+        permissions=[HasPerm("reservation.change_reservationslot")],
+        response={
+            200: None,
+            409: dict[Literal["detail"], dict[str, list[str]]],
+            422: dict[Literal["detail"], list[dict[str, Any]]],
+        },
+        url_name="change_reservation_slot",
+    )
+    def update_slot(self, slot_id: int, params: UpdateReservationSlotSchema):
+        slot = self.get_object_or_exception(ReservationSlot, id=slot_id)
+        slot.start_at = params.start_at
+        slot.end_at = params.end_at
+        try:
+            slot.full_clean()
+            slot.save()
+        except ValidationError as e:
+            return self.create_response({"detail": dict(e)}, status_code=409)

reservation/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class ReservationConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "reservation"

reservation/forms.py

@@ -0,0 +1,60 @@
+from django import forms
+from django.core.exceptions import NON_FIELD_ERRORS
+from django.utils.translation import gettext_lazy as _
+
+from club.widgets.ajax_select import AutoCompleteSelectClub
+from core.models import User
+from core.views.forms import FutureDateTimeField, SelectDateTime
+from reservation.models import ReservationSlot, Room
+
+
+class RoomCreateForm(forms.ModelForm):
+    required_css_class = "required"
+    error_css_class = "error"
+
+    class Meta:
+        model = Room
+        fields = ["name", "club", "location", "description"]
+        widgets = {"club": AutoCompleteSelectClub}
+
+
+class RoomUpdateForm(forms.ModelForm):
+    required_css_class = "required"
+    error_css_class = "error"
+
+    class Meta:
+        model = Room
+        fields = ["name", "club", "location", "description"]
+        widgets = {"club": AutoCompleteSelectClub}
+
+    def __init__(self, *args, request_user: User, **kwargs):
+        super().__init__(*args, **kwargs)
+        if not request_user.has_perm("reservation.change_room"):
+            # if the user doesn't have the global edition permission
+            # (i.e. it's a club board member, but not a sith admin)
+            # some fields aren't editable
+            del self.fields["club"]
+
+
+class ReservationForm(forms.ModelForm):
+    required_css_class = "required"
+    error_css_class = "error"
+
+    class Meta:
+        model = ReservationSlot
+        fields = ["room", "start_at", "end_at", "comment"]
+        field_classes = {"start_at": FutureDateTimeField, "end_at": FutureDateTimeField}
+        widgets = {"start_at": SelectDateTime(), "end_at": SelectDateTime()}
+        error_messages = {
+            NON_FIELD_ERRORS: {
+                "start_after_end": _("The start must be set before the end")
+            }
+        }
+
+    def __init__(self, *args, author: User, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.author = author
+
+    def save(self, commit: bool = True):  # noqa FBT001
+        self.instance.author = self.author
+        return super().save(commit)

reservation/migrations/0001_initial.py

@@ -0,0 +1,117 @@
+# Generated by Django 5.2.1 on 2025-06-05 10:44
+
+import django.core.validators
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = [
+        ("club", "0014_alter_club_options_rename_unix_name_club_slug_name_and_more"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Room",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100, verbose_name="room name")),
+                (
+                    "description",
+                    models.TextField(
+                        blank=True, default="", verbose_name="description"
+                    ),
+                ),
+                (
+                    "location",
+                    models.CharField(
+                        blank=True,
+                        choices=[
+                            ("BELFORT", "Belfort"),
+                            ("SEVENANS", "Sévenans"),
+                            ("MONTBELIARD", "Montbéliard"),
+                        ],
+                        verbose_name="site",
+                    ),
+                ),
+                (
+                    "club",
+                    models.ForeignKey(
+                        help_text="The club which manages this room",
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="reservable_rooms",
+                        to="club.club",
+                        verbose_name="room owner",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "reservable room",
+                "verbose_name_plural": "reservable rooms",
+            },
+        ),
+        migrations.CreateModel(
+            name="ReservationSlot",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "comment",
+                    models.TextField(blank=True, default="", verbose_name="comment"),
+                ),
+                (
+                    "start_at",
+                    models.DateTimeField(db_index=True, verbose_name="slot start"),
+                ),
+                ("end_at", models.DateTimeField(verbose_name="slot end")),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "author",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="author",
+                    ),
+                ),
+                (
+                    "room",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="slots",
+                        to="reservation.room",
+                        verbose_name="reserved room",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "reservation slot",
+                "verbose_name_plural": "reservation slots",
+                "constraints": [
+                    models.CheckConstraint(
+                        condition=models.Q(("end_at__gt", models.F("start_at"))),
+                        name="reservation_slot_end_after_start",
+                        violation_error_code="start_after_end",
+                    )
+                ],
+            },
+        ),
+    ]

reservation/models.py

@@ -0,0 +1,100 @@
+from __future__ import annotations
+
+from typing import Self
+
+from django.core.exceptions import ValidationError
+from django.db import models
+from django.db.models import F, Q
+from django.utils.translation import gettext_lazy as _
+
+from club.models import Club
+from core.models import User
+
+
+class Room(models.Model):
+    name = models.CharField(_("room name"), max_length=100)
+    description = models.TextField(_("description"), blank=True, default="")
+    club = models.ForeignKey(
+        Club,
+        on_delete=models.CASCADE,
+        related_name="reservable_rooms",
+        verbose_name=_("room owner"),
+        help_text=_("The club which manages this room"),
+    )
+    location = models.CharField(
+        _("site"),
+        blank=True,
+        choices=[
+            ("BELFORT", "Belfort"),
+            ("SEVENANS", "Sévenans"),
+            ("MONTBELIARD", "Montbéliard"),
+        ],
+    )
+
+    class Meta:
+        verbose_name = _("reservable room")
+        verbose_name_plural = _("reservable rooms")
+
+    def __str__(self):
+        return self.name
+
+    def can_be_edited_by(self, user: User) -> bool:
+        # a user may edit a room if it has the global perm
+        # or is in the owner club board
+        return user.has_perm("reservation.change_room") or self.club.board_group_id in [
+            g.id for g in user.cached_groups
+        ]
+
+
+class ReservationSlotQuerySet(models.QuerySet):
+    def overlapping_with(self, slot: ReservationSlot) -> Self:
+        return self.filter(
+            Q(start_at__lt=slot.start_at, end_at__gt=slot.start_at)
+            | Q(start_at__lt=slot.end_at, end_at__gt=slot.end_at)
+        )
+
+
+class ReservationSlot(models.Model):
+    room = models.ForeignKey(
+        Room,
+        on_delete=models.CASCADE,
+        related_name="slots",
+        verbose_name=_("reserved room"),
+    )
+    author = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_("author"))
+    comment = models.TextField(_("comment"), blank=True, default="")
+    start_at = models.DateTimeField(_("slot start"), db_index=True)
+    end_at = models.DateTimeField(_("slot end"))
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    objects = ReservationSlotQuerySet.as_manager()
+
+    class Meta:
+        verbose_name = _("reservation slot")
+        verbose_name_plural = _("reservation slots")
+        constraints = [
+            models.CheckConstraint(
+                condition=Q(end_at__gt=F("start_at")),
+                name="reservation_slot_end_after_start",
+                violation_error_code="start_after_end",
+            )
+        ]
+
+    def __str__(self):
+        return f"{self.room.name} : {self.start_at} - {self.end_at}"
+
+    def clean(self):
+        super().clean()
+        if self.end_at is None or self.start_at is None:
+            # if there is no start or no end, then there is no
+            # point to check if this perm overlap with another,
+            # so in this case, don't do the overlap check and let
+            # Django manage the non-null constraint error.
+            return
+        overlapping = ReservationSlot.objects.overlapping_with(self).filter(
+            room_id=self.room_id
+        )
+        if self.id is not None:
+            overlapping = overlapping.exclude(id=self.id)
+        if overlapping.exists():
+            raise ValidationError(_("There is already a reservation on this slot."))

reservation/schemas.py

@@ -0,0 +1,46 @@
+from datetime import datetime
+
+from ninja import FilterSchema, ModelSchema, Schema
+from pydantic import Field, FutureDatetime
+
+from club.schemas import SimpleClubSchema
+from core.schemas import SimpleUserSchema
+from reservation.models import ReservationSlot, Room
+
+
+class RoomFilterSchema(FilterSchema):
+    club: set[int] | None = Field(None, q="club_id__in")
+
+
+class RoomSchema(ModelSchema):
+    class Meta:
+        model = Room
+        fields = ["id", "name", "description", "location"]
+
+    club: SimpleClubSchema
+
+    @staticmethod
+    def resolve_location(obj: Room):
+        return obj.get_location_display()
+
+
+class SlotFilterSchema(FilterSchema):
+    after: datetime = Field(default=None, q="end_at__gt")
+    before: datetime = Field(default=None, q="start_at__lt")
+    room: set[int] | None = None
+    club: set[int] | None = None
+
+
+class SlotSchema(ModelSchema):
+    class Meta:
+        model = ReservationSlot
+        fields = ["id", "room", "comment"]
+
+    start: datetime = Field(alias="start_at")
+    end: datetime = Field(alias="end_at")
+    author: SimpleUserSchema
+
+
+class UpdateReservationSlotSchema(Schema):
+    start_at: FutureDatetime
+    end_at: FutureDatetime

reservation/static/bundled/reservation/components/room-scheduler-index.ts

@@ -0,0 +1,138 @@
+import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
+import {
+  Calendar,
+  type DateSelectArg,
+  type EventDropArg,
+  type EventSourceFuncArg,
+} from "@fullcalendar/core";
+import enLocale from "@fullcalendar/core/locales/en-gb";
+import frLocale from "@fullcalendar/core/locales/fr";
+
+import {
+  type ReservationslotFetchSlotsData,
+  type SlotSchema,
+  reservableroomFetchRooms,
+  reservationslotFetchSlots,
+  reservationslotUpdateSlot,
+} from "#openapi";
+
+import { paginated } from "#core:utils/api";
+import type { SlotSelectedEventArg } from "#reservation:reservation/types";
+import interactionPlugin, { type EventResizeDoneArg } from "@fullcalendar/interaction";
+import resourceTimelinePlugin from "@fullcalendar/resource-timeline";
+
+@registerComponent("room-scheduler")
+export class RoomScheduler extends inheritHtmlElement("div") {
+  static observedAttributes = ["locale", "can_edit_slot", "can_create_slot"];
+  private scheduler: Calendar;
+  private locale = "en";
+  private canEditSlot = false;
+  private canBookSlot = false;
+  private canDeleteSlot = false;
+
+  attributeChangedCallback(name: string, _oldValue?: string, newValue?: string) {
+    if (name === "locale") {
+      this.locale = newValue;
+    }
+    if (name === "can_edit_slot") {
+      this.canEditSlot = newValue.toLowerCase() === "true";
+    }
+    if (name === "can_create_slot") {
+      this.canBookSlot = newValue.toLowerCase() === "true";
+    }
+    if (name === "can_delete_slot") {
+      this.canDeleteSlot = newValue.toLowerCase() === "true";
+    }
+  }
+
+  /**
+   * Fetch the events displayed in the timeline.
+   * cf https://fullcalendar.io/docs/events-function
+   */
+  async fetchEvents(fetchInfo: EventSourceFuncArg) {
+    const res: SlotSchema[] = await paginated(reservationslotFetchSlots, {
+      query: { after: fetchInfo.startStr, before: fetchInfo.endStr },
+    } as ReservationslotFetchSlotsData);
+    return res.map((i) =>
+      Object.assign(i, {
+        title: `${i.author.first_name} ${i.author.last_name}`,
+        resourceId: i.room,
+        editable: new Date(i.start) > new Date(),
+      }),
+    );
+  }
+
+  /**
+   * Fetch the resources which events are associated with.
+   * cf https://fullcalendar.io/docs/resources-function
+   */
+  async fetchResources() {
+    const res = await reservableroomFetchRooms();
+    return res.data.map((i) => Object.assign(i, { title: i.name, group: i.location }));
+  }
+
+  /**
+   * Send a request to the API to change
+   * the start and the duration of a reservation slot
+   */
+  async changeReservation(args: EventDropArg | EventResizeDoneArg) {
+    const response = await reservationslotUpdateSlot({
+      // biome-ignore lint/style/useNamingConvention: api is snake_case
+      path: { slot_id: Number.parseInt(args.event.id) },
+      // biome-ignore lint/style/useNamingConvention: api is snake_case
+      body: { start_at: args.event.startStr, end_at: args.event.endStr },
+    });
+    if (response.response.ok) {
+      document.dispatchEvent(new CustomEvent("reservationSlotChanged"));
+      this.scheduler.refetchEvents();
+    }
+  }
+
+  selectFreeSlot(infos: DateSelectArg) {
+    document.dispatchEvent(
+      new CustomEvent<SlotSelectedEventArg>("timeSlotSelected", {
+        detail: {
+          ressource: Number.parseInt(infos.resource.id),
+          start: infos.startStr,
+          end: infos.endStr,
+        },
+      }),
+    );
+  }
+
+  connectedCallback() {
+    super.connectedCallback();
+    this.scheduler = new Calendar(this.node, {
+      schedulerLicenseKey: "GPL-My-Project-Is-Open-Source",
+      initialView: "resourceTimelineDay",
+      headerToolbar: {
+        left: "prev,next today",
+        center: "title",
+        right: "resourceTimelineDay,resourceTimelineWeek",
+      },
+      plugins: [resourceTimelinePlugin, interactionPlugin],
+      locales: [frLocale, enLocale],
+      height: "auto",
+      locale: this.locale,
+      resourceGroupField: "group",
+      resourceAreaHeaderContent: gettext("Rooms"),
+      editable: this.canEditSlot,
+      snapDuration: "00:15",
+      eventConstraint: { start: new Date() }, // forbid edition of past events
+      eventOverlap: false,
+      eventResourceEditable: false,
+      refetchResourcesOnNavigate: true,
+      resourceAreaWidth: "20%",
+      resources: this.fetchResources,
+      events: this.fetchEvents,
+      select: this.selectFreeSlot,
+      selectOverlap: false,
+      selectable: this.canBookSlot,
+      selectConstraint: { start: new Date() },
+      nowIndicator: true,
+      eventDrop: this.changeReservation,
+      eventResize: this.changeReservation,
+    });
+    this.scheduler.render();
+  }
+}