add feedback when moving reservation slot

club/api.py

@@ -6,15 +6,9 @@ from ninja_extra.pagination import PageNumberPaginationExtra
 from ninja_extra.schemas import PaginatedResponseSchema
 
 from api.auth import ApiKeyAuth
-from api.permissions import CanAccessLookup, CanView, HasPerm
+from api.permissions import CanAccessLookup, HasPerm
 from club.models import Club, Membership
-from club.schemas import (
-    ClubSchema,
-    ClubSearchFilterSchema,
-    SimpleClubSchema,
-    UserMembershipSchema,
-)
-from core.models import User
+from club.schemas import ClubSchema, ClubSearchFilterSchema, SimpleClubSchema
 
 
 @api_controller("/club")
@@ -44,22 +38,3 @@ class ClubController(ControllerBase):
         return self.get_object_or_exception(
             Club.objects.prefetch_related(prefetch), id=club_id
         )
-
-
-@api_controller("/user/{int:user_id}/club")
-class UserClubController(ControllerBase):
-    @route.get(
-        "",
-        response=list[UserMembershipSchema],
-        auth=[ApiKeyAuth(), SessionAuth()],
-        permissions=[CanView],
-        url_name="fetch_user_clubs",
-    )
-    def fetch_user_clubs(self, user_id: int):
-        """Get all the active memberships of the given user."""
-        user = self.get_object_or_exception(User, id=user_id)
-        return (
-            Membership.objects.ongoing()
-            .filter(user=user)
-            .select_related("club", "user")
-        )

club/schemas.py

@@ -40,8 +40,6 @@ class ClubProfileSchema(ModelSchema):
 
 
 class ClubMemberSchema(ModelSchema):
-    """A schema to represent all memberships in a club."""
-
     class Meta:
         model = Membership
         fields = ["start_date", "end_date", "role", "description"]
@@ -55,13 +53,3 @@ class ClubSchema(ModelSchema):
         fields = ["id", "name", "logo", "is_active", "short_description", "address"]
 
     members: list[ClubMemberSchema]
-
-
-class UserMembershipSchema(ModelSchema):
-    """A schema to represent the active club memberships of a user."""
-
-    class Meta:
-        model = Membership
-        fields = ["id", "start_date", "role", "description"]
-
-    club: SimpleClubSchema

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_user_club_controller.py

@@ -1,50 +0,0 @@
-from datetime import timedelta
-
-from django.test import TestCase
-from django.urls import reverse
-from django.utils.timezone import localdate
-from model_bakery import baker
-from model_bakery.recipe import Recipe
-
-from club.models import Club, Membership
-from club.schemas import UserMembershipSchema
-from core.baker_recipes import subscriber_user
-from core.models import Page
-
-
-class TestFetchClub(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.user = subscriber_user.make()
-        pages = baker.make(Page, _quantity=3, _bulk_create=True)
-        clubs = baker.make(Club, page=iter(pages), _quantity=3, _bulk_create=True)
-        recipe = Recipe(
-            Membership, user=cls.user, start_date=localdate() - timedelta(days=2)
-        )
-        cls.members = Membership.objects.bulk_create(
-            [
-                recipe.prepare(club=clubs[0]),
-                recipe.prepare(club=clubs[1], end_date=localdate() - timedelta(days=1)),
-                recipe.prepare(club=clubs[1]),
-            ]
-        )
-
-    def test_fetch_memberships(self):
-        self.client.force_login(subscriber_user.make())
-        res = self.client.get(
-            reverse("api:fetch_user_clubs", kwargs={"user_id": self.user.id})
-        )
-        assert res.status_code == 200
-        assert [UserMembershipSchema.model_validate(m) for m in res.json()] == [
-            UserMembershipSchema.from_orm(m) for m in (self.members[0], self.members[2])
-        ]
-
-    def test_fetch_club_nb_queries(self):
-        self.client.force_login(subscriber_user.make())
-        with self.assertNumQueries(6):
-            # - 5 queries for authentication
-            # - 1 query for the actual data
-            res = self.client.get(
-                reverse("api:fetch_user_clubs", kwargs={"user_id": self.user.id})
-            )
-            assert res.status_code == 200

club/views.py

@@ -260,6 +260,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

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/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") }}">{% 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>

core/api.py

@@ -123,7 +123,7 @@ class GroupController(ControllerBase):
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
     def search_group(self, search: Annotated[str, MinLen(1)]):
-        return Group.objects.filter(name__icontains=search).order_by("name").values()
+        return Group.objects.filter(name__icontains=search).values()
 
 
 DepthValue = Annotated[int, Ge(0), Le(10)]

core/auth/mixins.py

@@ -307,7 +307,6 @@ class PermissionOrClubBoardRequiredMixin(PermissionRequiredMixin):
             return False
         if super().has_permission():
             return True
-        return (
-            self.club is not None
-            and self.club.board_group_id in self.request.user.all_groups
+        return self.club is not None and any(
+            g.id == self.club.board_group_id for g in self.request.user.cached_groups
         )

core/management/commands/populate.py

@@ -41,14 +41,7 @@ from com.ics_calendar import IcsCalendar
 from com.models import News, NewsDate, Sith, Weekmail
 from core.models import BanGroup, Group, Page, PageRev, SithFile, User
 from core.utils import resize_image
-from counter.models import (
-    Counter,
-    Price,
-    Product,
-    ProductType,
-    ReturnableProduct,
-    StudentCard,
-)
+from counter.models import Counter, Product, ProductType, ReturnableProduct, StudentCard
 from election.models import Candidature, Election, ElectionList, Role
 from forum.models import Forum
 from pedagogy.models import UE
@@ -375,15 +368,125 @@ class Command(BaseCommand):
             end_date=localdate() - timedelta(days=100),
         )
 
-        self._create_products(groups, main_club, refound)
+        p = ProductType.objects.create(name="Bières bouteilles")
+        c = ProductType.objects.create(name="Cotisations")
+        r = ProductType.objects.create(name="Rechargements")
+        verre = ProductType.objects.create(name="Verre")
+        cotis = Product.objects.create(
+            name="Cotis 1 semestre",
+            code="1SCOTIZ",
+            product_type=c,
+            purchase_price="15",
+            selling_price="15",
+            special_selling_price="15",
+            club=main_club,
+        )
+        cotis2 = Product.objects.create(
+            name="Cotis 2 semestres",
+            code="2SCOTIZ",
+            product_type=c,
+            purchase_price="28",
+            selling_price="28",
+            special_selling_price="28",
+            club=main_club,
+        )
+        refill = Product.objects.create(
+            name="Rechargement 15 €",
+            code="15REFILL",
+            product_type=r,
+            purchase_price="15",
+            selling_price="15",
+            special_selling_price="15",
+            club=main_club,
+        )
+        barb = Product.objects.create(
+            name="Barbar",
+            code="BARB",
+            product_type=p,
+            purchase_price="1.50",
+            selling_price="1.7",
+            special_selling_price="1.6",
+            club=main_club,
+            limit_age=18,
+        )
+        cble = Product.objects.create(
+            name="Chimay Bleue",
+            code="CBLE",
+            product_type=p,
+            purchase_price="1.50",
+            selling_price="1.7",
+            special_selling_price="1.6",
+            club=main_club,
+            limit_age=18,
+        )
+        cons = Product.objects.create(
+            name="Consigne Eco-cup",
+            code="CONS",
+            product_type=verre,
+            purchase_price="1",
+            selling_price="1",
+            special_selling_price="1",
+            club=main_club,
+        )
+        dcons = Product.objects.create(
+            name="Déconsigne Eco-cup",
+            code="DECO",
+            product_type=verre,
+            purchase_price="-1",
+            selling_price="-1",
+            special_selling_price="-1",
+            club=main_club,
+        )
+        cors = Product.objects.create(
+            name="Corsendonk",
+            code="CORS",
+            product_type=p,
+            purchase_price="1.50",
+            selling_price="1.7",
+            special_selling_price="1.6",
+            club=main_club,
+            limit_age=18,
+        )
+        carolus = Product.objects.create(
+            name="Carolus",
+            code="CARO",
+            product_type=p,
+            purchase_price="1.50",
+            selling_price="1.7",
+            special_selling_price="1.6",
+            club=main_club,
+            limit_age=18,
+        )
+        Product.objects.create(
+            name="remboursement",
+            code="REMBOURS",
+            purchase_price="0",
+            selling_price="0",
+            special_selling_price="0",
+            club=refound,
+        )
+        groups.subscribers.products.add(
+            cotis, cotis2, refill, barb, cble, cors, carolus
+        )
+        groups.old_subscribers.products.add(cotis, cotis2)
+
+        mde = Counter.objects.get(name="MDE")
+        mde.products.add(barb, cble, cons, dcons)
+
+        eboutic = Counter.objects.get(name="Eboutic")
+        eboutic.products.add(barb, cotis, cotis2, refill)
 
         Counter.objects.create(name="Carte AE", club=refound, type="OFFICE")
 
+        ReturnableProduct.objects.create(
+            product=cons, returned_product=dcons, max_return=3
+        )
+
         # Add barman to counter
         Counter.sellers.through.objects.bulk_create(
             [
-                Counter.sellers.through(counter_id=1, user=skia),  # MDE
-                Counter.sellers.through(counter_id=2, user=krophil),  # Foyer
+                Counter.sellers.through(counter_id=2, user=krophil),
+                Counter.sellers.through(counter=mde, user=skia),
             ]
         )
 
@@ -639,131 +742,6 @@ class Command(BaseCommand):
             ]
         )
 
-    def _create_products(
-        self, groups: PopulatedGroups, main_club: Club, refound_club: Club
-    ):
-        beers_type, cotis_type, refill_type, verre_type = (
-            ProductType.objects.bulk_create(
-                [
-                    ProductType(name="Bières bouteilles"),
-                    ProductType(name="Cotisations"),
-                    ProductType(name="Rechargements"),
-                    ProductType(name="Verre"),
-                ]
-            )
-        )
-        cotis = Product.objects.create(
-            name="Cotis 1 semestre",
-            code="1SCOTIZ",
-            product_type=cotis_type,
-            purchase_price=15,
-            club=main_club,
-        )
-        cotis2 = Product.objects.create(
-            name="Cotis 2 semestres",
-            code="2SCOTIZ",
-            product_type=cotis_type,
-            purchase_price="28",
-            club=main_club,
-        )
-        refill = Product.objects.create(
-            name="Rechargement 15 €",
-            code="15REFILL",
-            product_type=refill_type,
-            purchase_price=15,
-            club=main_club,
-        )
-        barb = Product.objects.create(
-            name="Barbar",
-            code="BARB",
-            product_type=beers_type,
-            purchase_price="1.50",
-            club=main_club,
-            limit_age=18,
-        )
-        cble = Product.objects.create(
-            name="Chimay Bleue",
-            code="CBLE",
-            product_type=beers_type,
-            purchase_price="1.50",
-            club=main_club,
-            limit_age=18,
-        )
-        cons = Product.objects.create(
-            name="Consigne Eco-cup",
-            code="CONS",
-            product_type=verre_type,
-            purchase_price="1",
-            club=main_club,
-        )
-        dcons = Product.objects.create(
-            name="Déconsigne Eco-cup",
-            code="DECO",
-            product_type=verre_type,
-            purchase_price="-1",
-            club=main_club,
-        )
-        cors = Product.objects.create(
-            name="Corsendonk",
-            code="CORS",
-            product_type=beers_type,
-            purchase_price="1.50",
-            club=main_club,
-            limit_age=18,
-        )
-        carolus = Product.objects.create(
-            name="Carolus",
-            code="CARO",
-            product_type=beers_type,
-            purchase_price="1.50",
-            club=main_club,
-            limit_age=18,
-        )
-        Product.objects.create(
-            name="remboursement",
-            code="REMBOURS",
-            purchase_price=0,
-            club=refound_club,
-        )
-        ReturnableProduct.objects.create(
-            product=cons, returned_product=dcons, max_return=3
-        )
-        mde = Counter.objects.get(name="MDE")
-        mde.products.add(barb, cble, cons, dcons)
-        eboutic = Counter.objects.get(name="Eboutic")
-        eboutic.products.add(barb, cotis, cotis2, refill)
-
-        cotis, cotis2, refill, barb, cble, cors, carolus, cons, dcons = (
-            Price.objects.bulk_create(
-                [
-                    Price(product=cotis, amount=15),
-                    Price(product=cotis2, amount=28),
-                    Price(product=refill, amount=15),
-                    Price(product=barb, amount=1.7),
-                    Price(product=cble, amount=1.7),
-                    Price(product=cors, amount=1.7),
-                    Price(product=carolus, amount=1.7),
-                    Price(product=cons, amount=1),
-                    Price(product=dcons, amount=-1),
-                ]
-            )
-        )
-        Price.groups.through.objects.bulk_create(
-            [
-                Price.groups.through(price=cotis, group=groups.subscribers),
-                Price.groups.through(price=cotis2, group=groups.subscribers),
-                Price.groups.through(price=refill, group=groups.subscribers),
-                Price.groups.through(price=barb, group=groups.subscribers),
-                Price.groups.through(price=cble, group=groups.subscribers),
-                Price.groups.through(price=cors, group=groups.subscribers),
-                Price.groups.through(price=carolus, group=groups.subscribers),
-                Price.groups.through(price=cotis, group=groups.old_subscribers),
-                Price.groups.through(price=cotis2, group=groups.old_subscribers),
-                Price.groups.through(price=cons, group=groups.old_subscribers),
-                Price.groups.through(price=dcons, group=groups.old_subscribers),
-            ]
-        )
-
     def _create_profile_pict(self, user: User):
         path = self.SAS_FIXTURE_PATH / "Family" / f"{user.username}.jpg"
         file = resize_image(Image.open(path), 400, "WEBP")
@@ -812,7 +790,11 @@ class Command(BaseCommand):
 
         subscribers = Group.objects.create(name="Cotisants")
         subscribers.permissions.add(
-            *list(perms.filter(codename__in=["add_news", "add_uecomment"]))
+            *list(
+                perms.filter(
+                    codename__in=["add_news", "add_uecomment", "view_reservationslot"]
+                )
+            )
         )
         old_subscribers = Group.objects.create(name="Anciens cotisants")
         old_subscribers.permissions.add(

core/management/commands/populate_more.py

@@ -1,6 +1,7 @@
 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
@@ -17,7 +18,6 @@ from counter.models import (
     Counter,
     Customer,
     Permanency,
-    Price,
     Product,
     ProductType,
     Refilling,
@@ -25,6 +25,7 @@ from counter.models import (
 )
 from forum.models import Forum, ForumMessage, ForumTopic
 from pedagogy.models import UE
+from reservation.models import ReservationSlot, Room
 from subscription.models import Subscription
 
 
@@ -42,45 +43,20 @@ class Command(BaseCommand):
         self.stdout.write("Creating users...")
         users = self.create_users()
         self.create_bans(random.sample(users, k=len(users) // 200))  # 0.5% of 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_ues()
         self.stdout.write("Creating products...")
         self.create_products()
         self.stdout.write("Creating sales and refills...")
-        sellers = random.sample(list(User.objects.all()), 100)
+        sellers = list(User.objects.order_by("?")[:100])
         self.create_sales(sellers)
         self.stdout.write("Creating permanences...")
         self.create_permanences(sellers)
@@ -215,6 +191,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_ues(self):
         root = User.objects.get(username="root")
         categories = ["CS", "TM", "OM", "QC", "EC"]
@@ -279,7 +346,6 @@ class Command(BaseCommand):
         # 2/3 of the products are owned by AE
         clubs = [ae, ae, ae, ae, ae, ae, *other_clubs]
         products = []
-        prices = []
         buying_groups = []
         selling_places = []
         for _ in range(200):
@@ -290,28 +356,25 @@ class Command(BaseCommand):
                 product_type=random.choice(categories),
                 code="".join(self.faker.random_letters(length=random.randint(4, 8))),
                 purchase_price=price,
+                selling_price=price,
+                special_selling_price=price - min(0.5, price),
                 club=random.choice(clubs),
                 limit_age=0 if random.random() > 0.2 else 18,
-                archived=self.faker.boolean(60),
+                archived=bool(random.random() > 0.7),
             )
             products.append(product)
-            for i in range(random.randint(0, 3)):
-                product_price = Price(
-                    amount=price, product=product, is_always_shown=self.faker.boolean()
-                )
-                # prices for non-subscribers will be higher than for subscribers
-                price *= 1.2
-                prices.append(product_price)
-                buying_groups.append(
-                    Price.groups.through(price=product_price, group=groups[i])
-                )
+            # there will be products without buying groups
+            # but there are also such products in the real database
+            buying_groups.extend(
+                Product.buying_groups.through(product=product, group=group)
+                for group in random.sample(groups, k=random.randint(0, 3))
+            )
             selling_places.extend(
                 Counter.products.through(counter=counter, product=product)
                 for counter in random.sample(counters, random.randint(0, 4))
             )
         Product.objects.bulk_create(products)
-        Price.objects.bulk_create(prices)
-        Price.groups.through.objects.bulk_create(buying_groups)
+        Product.buying_groups.through.objects.bulk_create(buying_groups)
         Counter.products.through.objects.bulk_create(selling_places)
 
     def create_sales(self, sellers: list[User]):
@@ -325,7 +388,7 @@ class Command(BaseCommand):
                 )
             )
         )
-        prices = list(Price.objects.select_related("product").all())
+        products = list(Product.objects.all())
         counters = list(
             Counter.objects.filter(name__in=["Foyer", "MDE", "La Gommette"])
         )
@@ -335,14 +398,14 @@ class Command(BaseCommand):
             # the longer the customer has existed, the higher the mean of nb_products
             mu = 5 + (now().year - customer.since.year) * 2
             nb_sales = max(0, int(random.normalvariate(mu=mu, sigma=mu * 5)))
-            favoured_prices = random.sample(prices, k=(random.randint(1, 5)))
+            favoured_products = random.sample(products, k=(random.randint(1, 5)))
             favoured_counter = random.choice(counters)
             this_customer_sales = []
             for _ in range(nb_sales):
-                price = (
-                    random.choice(favoured_prices)
+                product = (
+                    random.choice(favoured_products)
                     if random.random() > 0.7
-                    else random.choice(prices)
+                    else random.choice(products)
                 )
                 counter = (
                     favoured_counter
@@ -351,11 +414,11 @@ class Command(BaseCommand):
                 )
                 this_customer_sales.append(
                     Selling(
-                        product=price.product,
+                        product=product,
                         counter=counter,
-                        club_id=price.product.club_id,
+                        club_id=product.club_id,
                         quantity=random.randint(1, 5),
-                        unit_price=price.amount,
+                        unit_price=product.selling_price,
                         seller=random.choice(sellers),
                         customer=customer,
                         date=make_aware(
@@ -415,7 +478,7 @@ class Command(BaseCommand):
         Permanency.objects.bulk_create(perms)
 
     def create_forums(self):
-        forumers = random.sample(list(User.objects.all()), 100)
+        forumers = list(User.objects.order_by("?")[:100])
         most_actives = random.sample(forumers, 10)
         categories = list(Forum.objects.filter(is_category=True))
         new_forums = [
@@ -433,7 +496,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:
@@ -441,7 +504,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(
                 [
@@ -453,7 +516,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

@@ -356,27 +356,23 @@ class User(AbstractUser):
         )
         if group_id is None:
             return False
-        return group_id in self.all_groups
+        if group_id == settings.SITH_GROUP_SUBSCRIBERS_ID:
+            return self.is_subscribed
+        if group_id == settings.SITH_GROUP_ROOT_ID:
+            return self.is_root
+        return any(g.id == group_id for g in self.cached_groups)
 
     @cached_property
-    def all_groups(self) -> dict[int, Group]:
+    def cached_groups(self) -> list[Group]:
         """Get the list of groups this user is in."""
-        additional_groups = []
-        if self.is_subscribed:
-            additional_groups.append(settings.SITH_GROUP_SUBSCRIBERS_ID)
-        if self.is_superuser:
-            additional_groups.append(settings.SITH_GROUP_ROOT_ID)
-        qs = self.groups.all()
-        if additional_groups:
-            # This is somewhat counter-intuitive, but this query runs way faster with
-            # a UNION rather than a OR (in average, 0.25ms vs 14ms).
-            # For the why, cf. https://dba.stackexchange.com/questions/293836/why-is-an-or-statement-slower-than-union
-            qs = qs.union(Group.objects.filter(id__in=additional_groups))
-        return {g.id: g for g in qs}
+        return list(self.groups.all())
 
     @cached_property
     def is_root(self) -> bool:
-        return self.is_superuser or settings.SITH_GROUP_ROOT_ID in self.all_groups
+        if self.is_superuser:
+            return True
+        root_id = settings.SITH_GROUP_ROOT_ID
+        return any(g.id == root_id for g in self.cached_groups)
 
     @cached_property
     def is_board_member(self) -> bool:
@@ -1103,7 +1099,10 @@ class PageQuerySet(models.QuerySet):
             return self.filter(view_groups=settings.SITH_GROUP_PUBLIC_ID)
         if user.has_perm("core.view_page"):
             return self.all()
-        return self.filter(view_groups__in=user.all_groups)
+        groups_ids = [g.id for g in user.cached_groups]
+        if user.is_subscribed:
+            groups_ids.append(settings.SITH_GROUP_SUBSCRIBERS_ID)
+        return self.filter(view_groups__in=groups_ids)
 
 
 # This function prevents generating migration upon settings change
@@ -1377,7 +1376,7 @@ class PageRev(models.Model):
         return self.page.can_be_edited_by(user)
 
     def is_owned_by(self, user: User) -> bool:
-        return self.page.owner_group_id in user.all_groups
+        return any(g.id == self.page.owner_group_id for g in user.cached_groups)
 
     def similarity_ratio(self, text: str) -> float:
         """Similarity ratio between this revision's content and the given text.

core/static/bundled/alpine-index.js

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

core/static/bundled/core/dynamic-formset-index.ts

@@ -1,77 +0,0 @@
-interface Config {
-  /**
-   * The prefix of the formset, in case it has been changed.
-   * See https://docs.djangoproject.com/fr/stable/topics/forms/formsets/#customizing-a-formset-s-prefix
-   */
-  prefix?: string;
-}
-
-// biome-ignore lint/style/useNamingConvention: It's the DOM API naming
-type HTMLFormInputElement = HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement;
-
-document.addEventListener("alpine:init", () => {
-  /**
-   * Alpine data element to allow the dynamic addition of forms to a formset.
-   *
-   * To use this, you need :
-   * - an HTML element containing the existing forms, noted by `x-ref="formContainer"`
-   * - a template containing the empty form
-   *   (that you can obtain jinja-side with `{{ formset.empty_form }}`),
-   *   noted by `x-ref="formTemplate"`
-   * - a button with `@click="addForm"`
-   * - you may also have one or more buttons with `@click="removeForm(element)"`,
-   *   where `element` is the HTML element containing the form.
-   *
-   * For an example of how this is used, you can have a look to
-   * `counter/templates/counter/product_form.jinja`
-   */
-  Alpine.data("dynamicFormSet", (config?: Config) => ({
-    init() {
-      this.formContainer = this.$refs.formContainer as HTMLElement;
-      this.nbForms = this.formContainer.children.length as number;
-      this.template = this.$refs.formTemplate as HTMLTemplateElement;
-      const prefix = config?.prefix ?? "form";
-      this.$root
-        .querySelector(`#id_${prefix}-TOTAL_FORMS`)
-        .setAttribute(":value", "nbForms");
-    },
-
-    addForm() {
-      this.formContainer.appendChild(document.importNode(this.template.content, true));
-      const newForm = this.formContainer.lastElementChild;
-      const inputs: NodeListOf<HTMLFormInputElement> = newForm.querySelectorAll(
-        "input, select, textarea",
-      );
-      for (const el of inputs) {
-        el.name = el.name.replace("__prefix__", this.nbForms.toString());
-        el.id = el.id.replace("__prefix__", this.nbForms.toString());
-      }
-      const labels: NodeListOf<HTMLLabelElement> = newForm.querySelectorAll("label");
-      for (const el of labels) {
-        el.htmlFor = el.htmlFor.replace("__prefix__", this.nbForms.toString());
-      }
-      inputs[0].focus();
-      this.nbForms += 1;
-    },
-
-    removeForm(container: HTMLDivElement) {
-      container.remove();
-      this.nbForms -= 1;
-      // adjust the id of remaining forms
-      for (let i = 0; i < this.nbForms; i++) {
-        const form: HTMLDivElement = this.formContainer.children[i];
-        const inputs: NodeListOf<HTMLFormInputElement> = form.querySelectorAll(
-          "input, select, textarea",
-        );
-        for (const el of inputs) {
-          el.name = el.name.replace(/\d+/, i.toString());
-          el.id = el.id.replace(/\d+/, i.toString());
-        }
-        const labels: NodeListOf<HTMLLabelElement> = form.querySelectorAll("label");
-        for (const el of labels) {
-          el.htmlFor = el.htmlFor.replace(/\d+/, i.toString());
-        }
-      }
-    },
-  }));
-});

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.detail.target.ariaBusy = true;

core/static/core/components/calendar.scss

@@ -16,16 +16,76 @@
   --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;
   --event-recurring-internal-color: #6f69cd;
   --event-recurring-unpublished-color: orange;
 }
 
-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;
@@ -62,82 +122,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/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.jinja

@@ -35,8 +35,8 @@
       <noscript><link rel="stylesheet" href="{{ static('bundled/fontawesome-index.css') }}"></noscript>
 
       <script src="{{ url('javascript-catalog') }}"></script>
-      <script type="module" src="{{ static("bundled/core/navbar-index.ts") }}"></script>
-      <script type="module" src="{{ static("bundled/core/components/include-index.ts") }}"></script>
+      <script type="module" src={{ static("bundled/core/navbar-index.ts") }}></script>
+      <script type="module" src={{ static("bundled/core/components/include-index.ts") }}></script>
       <script type="module" src="{{ static('bundled/alpine-index.js') }}"></script>
       <script type="module" src="{{ static('bundled/htmx-index.js') }}"></script>
       <script type="module" src="{{ static('bundled/country-flags-index.ts') }}"></script>

core/tests/test_core.py

@@ -418,16 +418,16 @@ class TestUserIsInGroup(TestCase):
         group_in = baker.make(Group)
         self.public_user.groups.add(group_in)
 
-        # clear the cached property `User.all_groups`
-        self.public_user.__dict__.pop("all_groups", None)
+        # clear the cached property `User.cached_groups`
+        self.public_user.__dict__.pop("cached_groups", None)
         # Test when the user is in the group
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(1):
             self.public_user.is_in_group(pk=group_in.id)
         with self.assertNumQueries(0):
             self.public_user.is_in_group(pk=group_in.id)
 
         group_not_in = baker.make(Group)
-        self.public_user.__dict__.pop("all_groups", None)
+        self.public_user.__dict__.pop("cached_groups", None)
         # Test when the user is not in the group
         with self.assertNumQueries(1):
             self.public_user.is_in_group(pk=group_not_in.id)

core/tests/test_user.py

@@ -213,9 +213,9 @@ def test_user_invoice_with_multiple_items():
     """Test that annotate_total() works when invoices contain multiple items."""
     user: User = subscriber_user.make()
     item_recipe = Recipe(InvoiceItem, invoice=foreign_key(Recipe(Invoice, user=user)))
-    item_recipe.make(_quantity=3, quantity=1, unit_price=5)
-    item_recipe.make(_quantity=1, quantity=1, unit_price=5)
-    item_recipe.make(_quantity=2, quantity=1, unit_price=iter([5, 8]))
+    item_recipe.make(_quantity=3, quantity=1, product_unit_price=5)
+    item_recipe.make(_quantity=1, quantity=1, product_unit_price=5)
+    item_recipe.make(_quantity=2, quantity=1, product_unit_price=iter([5, 8]))
     res = list(
         Invoice.objects.filter(user=user)
         .annotate_total()

core/views/forms.py

@@ -40,9 +40,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_lazy as _
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
 from PIL import Image
@@ -100,8 +99,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

@@ -24,7 +24,6 @@ from counter.models import (
     Eticket,
     InvoiceCall,
     Permanency,
-    Price,
     Product,
     ProductType,
     Refilling,
@@ -33,24 +32,19 @@ from counter.models import (
 )
 
 
-class PriceInline(admin.TabularInline):
-    model = Price
-    autocomplete_fields = ("groups",)
-
-
 @admin.register(Product)
 class ProductAdmin(SearchModelAdmin):
     list_display = (
         "name",
         "code",
         "product_type",
+        "selling_price",
         "archived",
         "created_at",
         "updated_at",
     )
     list_select_related = ("product_type",)
     search_fields = ("name", "code")
-    inlines = [PriceInline]
 
 
 @admin.register(ReturnableProduct)

counter/api.py

@@ -101,9 +101,13 @@ class ProductController(ControllerBase):
         """Get the detailed information about the products."""
         return filters.filter(
             Product.objects.select_related("club")
-            .prefetch_related("prices", "prices__groups")
+            .prefetch_related("buying_groups")
             .select_related("product_type")
-            .order_by(F("product_type__order").asc(nulls_last=True), "name")
+            .order_by(
+                F("product_type__order").asc(nulls_last=True),
+                "product_type",
+                "name",
+            )
         )
 
 

counter/baker_recipes.py

@@ -2,11 +2,10 @@ from model_bakery.recipe import Recipe, foreign_key
 
 from club.models import Club
 from core.models import User
-from counter.models import Counter, Price, Product, Refilling, Selling
+from counter.models import Counter, Product, Refilling, Selling
 
 counter_recipe = Recipe(Counter)
 product_recipe = Recipe(Product, club=foreign_key(Recipe(Club)))
-price_recipe = Recipe(Price, product=foreign_key(product_recipe))
 sale_recipe = Recipe(
     Selling,
     product=foreign_key(product_recipe),

counter/forms.py

@@ -1,11 +1,11 @@
 import json
 import math
 import uuid
-from collections import defaultdict
 from datetime import date, datetime, timezone
 
 from dateutil.relativedelta import relativedelta
 from django import forms
+from django.core.validators import MaxValueValidator
 from django.db.models import Exists, OuterRef, Q
 from django.forms import BaseModelFormSet
 from django.utils.timezone import now
@@ -35,7 +35,6 @@ from counter.models import (
     Customer,
     Eticket,
     InvoiceCall,
-    Price,
     Product,
     ProductFormula,
     Refilling,
@@ -292,22 +291,7 @@ ScheduledProductActionFormSet = forms.modelformset_factory(
     absolute_max=None,
     can_delete=True,
     can_delete_extra=False,
-    extra=0,
-)
-
-
-ProductPriceFormSet = forms.inlineformset_factory(
-    parent_model=Product,
-    model=Price,
-    fields=["amount", "label", "groups", "is_always_shown"],
-    widgets={
-        "groups": AutoCompleteSelectMultipleGroup,
-        "is_always_shown": forms.CheckboxInput(attrs={"class": "switch"}),
-    },
-    absolute_max=None,
-    can_delete_extra=False,
-    min_num=1,
-    extra=0,
+    extra=2,
 )
 
 
@@ -322,7 +306,10 @@ class ProductForm(forms.ModelForm):
             "description",
             "product_type",
             "code",
+            "buying_groups",
             "purchase_price",
+            "selling_price",
+            "special_selling_price",
             "icon",
             "club",
             "limit_age",
@@ -337,8 +324,8 @@ class ProductForm(forms.ModelForm):
         }
         widgets = {
             "product_type": AutoCompleteSelect,
+            "buying_groups": AutoCompleteSelectMultipleGroup,
             "club": AutoCompleteSelectClub,
-            "tray": forms.CheckboxInput(attrs={"class": "switch"}),
         }
 
     counters = forms.ModelMultipleChoiceField(
@@ -348,40 +335,50 @@ class ProductForm(forms.ModelForm):
         queryset=Counter.objects.all(),
     )
 
-    def __init__(self, *args, prefix: str | None = None, instance=None, **kwargs):
-        super().__init__(*args, prefix=prefix, instance=instance, **kwargs)
-        self.fields["name"].widget.attrs["autofocus"] = "autofocus"
+    def __init__(self, *args, instance=None, **kwargs):
+        super().__init__(*args, instance=instance, **kwargs)
         if self.instance.id:
             self.fields["counters"].initial = self.instance.counters.all()
             if hasattr(self.instance, "formula"):
                 self.formula_init(self.instance.formula)
-        self.price_formset = ProductPriceFormSet(
-            *args, instance=self.instance, prefix="price", **kwargs
-        )
         self.action_formset = ScheduledProductActionFormSet(
-            *args, product=self.instance, prefix="action", **kwargs
+            *args, product=self.instance, **kwargs
         )
 
+    def formula_init(self, formula: ProductFormula):
+        """Part of the form initialisation specific to formula products."""
+        self.fields["selling_price"].help_text = _(
+            "This product is a formula. "
+            "Its price cannot be greater than the price "
+            "of the products constituting it, which is %(price)s €"
+        ) % {"price": formula.max_selling_price}
+        self.fields["special_selling_price"].help_text = _(
+            "This product is a formula. "
+            "Its special price cannot be greater than the price "
+            "of the products constituting it, which is %(price)s €"
+        ) % {"price": formula.max_special_selling_price}
+        for key, price in (
+            ("selling_price", formula.max_selling_price),
+            ("special_selling_price", formula.max_special_selling_price),
+        ):
+            self.fields[key].widget.attrs["max"] = price
+            self.fields[key].validators.append(MaxValueValidator(price))
+
     def is_valid(self):
-        return (
-            super().is_valid()
-            and self.price_formset.is_valid()
-            and self.action_formset.is_valid()
-        )
+        return super().is_valid() and self.action_formset.is_valid()
 
     def save(self, *args, **kwargs) -> Product:
         product = super().save(*args, **kwargs)
         product.counters.set(self.cleaned_data["counters"])
-        # if it's a creation, the product given in the formset
-        # wasn't a persisted instance.
-        # So if we tried to persist the related objects in the current state,
-        # they would be linked to no product, thus be completely useless
-        # To make it work, we have to replace
-        # the initial product with a persisted one
         for form in self.action_formset:
+            # if it's a creation, the product given in the formset
+            # wasn't a persisted instance.
+            # So if we tried to persist the scheduled actions in the current state,
+            # they would be linked to no product, thus be completely useless
+            # To make it work, we have to replace
+            # the initial product with a persisted one
             form.set_product(product)
         self.action_formset.save()
-        self.price_formset.save()
         return product
 
 
@@ -404,6 +401,18 @@ class ProductFormulaForm(forms.ModelForm):
                     "the result and a part of the formula."
                 ),
             )
+        prices = [p.selling_price for p in cleaned_data["products"]]
+        special_prices = [p.special_selling_price for p in cleaned_data["products"]]
+        selling_price = cleaned_data["result"].selling_price
+        special_selling_price = cleaned_data["result"].special_selling_price
+        if selling_price > sum(prices) or special_selling_price > sum(special_prices):
+            self.add_error(
+                "result",
+                _(
+                    "The result cannot be more expensive "
+                    "than the total of the other products."
+                ),
+            )
         return cleaned_data
 
 
@@ -454,47 +463,48 @@ class CloseCustomerAccountForm(forms.Form):
     )
 
 
-class BasketItemForm(forms.Form):
+class BasketProductForm(forms.Form):
     quantity = forms.IntegerField(min_value=1, required=True)
-    price_id = forms.IntegerField(min_value=0, required=True)
+    id = forms.IntegerField(min_value=0, required=True)
 
     def __init__(
         self,
         customer: Customer,
         counter: Counter,
-        allowed_prices: dict[int, Price],
+        allowed_products: dict[int, Product],
         *args,
         **kwargs,
     ):
         self.customer = customer  # Used by formset
         self.counter = counter  # Used by formset
-        self.allowed_prices = allowed_prices
+        self.allowed_products = allowed_products
         super().__init__(*args, **kwargs)
 
-    def clean_price_id(self):
-        data = self.cleaned_data["price_id"]
+    def clean_id(self):
+        data = self.cleaned_data["id"]
 
-        # We store self.price so we can use it later on the formset validation
+        # We store self.product so we can use it later on the formset validation
         # And also in the global clean
-        self.price = self.allowed_prices.get(data, None)
-        if self.price is None:
+        self.product = self.allowed_products.get(data, None)
+        if self.product is None:
             raise forms.ValidationError(
                 _("The selected product isn't available for this user")
             )
+
         return data
 
     def clean(self):
         cleaned_data = super().clean()
         if len(self.errors) > 0:
-            return cleaned_data
+            return
 
         # Compute prices
         cleaned_data["bonus_quantity"] = 0
-        if self.price.product.tray:
+        if self.product.tray:
             cleaned_data["bonus_quantity"] = math.floor(
                 cleaned_data["quantity"] / Product.QUANTITY_FOR_TRAY_PRICE
             )
-        cleaned_data["total_price"] = self.price.amount * (
+        cleaned_data["total_price"] = self.product.price * (
             cleaned_data["quantity"] - cleaned_data["bonus_quantity"]
         )
 
@@ -518,8 +528,8 @@ class BaseBasketForm(forms.BaseFormSet):
             raise forms.ValidationError(_("Submitted basket is invalid"))
 
     def _check_product_are_unique(self):
-        price_ids = {form.cleaned_data["price_id"] for form in self.forms}
-        if len(price_ids) != len(self.forms):
+        product_ids = {form.cleaned_data["id"] for form in self.forms}
+        if len(product_ids) != len(self.forms):
             raise forms.ValidationError(_("Duplicated product entries."))
 
     def _check_enough_money(self, counter: Counter, customer: Customer):
@@ -529,9 +539,10 @@ class BaseBasketForm(forms.BaseFormSet):
 
     def _check_recorded_products(self, customer: Customer):
         """Check for, among other things, ecocups and pitchers"""
-        items = defaultdict(int)
-        for form in self.forms:
-            items[form.price.product_id] += form.cleaned_data["quantity"]
+        items = {
+            form.cleaned_data["id"]: form.cleaned_data["quantity"]
+            for form in self.forms
+        }
         ids = list(items.keys())
         returnables = list(
             ReturnableProduct.objects.filter(
@@ -557,7 +568,7 @@ class BaseBasketForm(forms.BaseFormSet):
 
 
 BasketForm = forms.formset_factory(
-    BasketItemForm, formset=BaseBasketForm, absolute_max=None, min_num=1
+    BasketProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
 )
 
 

counter/migrations/0038_price.py

@@ -1,149 +0,0 @@
-# Generated by Django 5.2.11 on 2026-02-18 13:30
-
-import django.db.models.deletion
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-
-import counter.fields
-
-
-def migrate_prices(apps: StateApps, schema_editor):
-    Product = apps.get_model("counter", "Product")
-    Price = apps.get_model("counter", "Price")
-    prices = [
-        Price(
-            amount=p.selling_price,
-            product=p,
-            created_at=p.created_at,
-            updated_at=p.updated_at,
-        )
-        for p in Product.objects.all()
-    ]
-    Price.objects.bulk_create(prices)
-    groups = [
-        Price.groups.through(price=price, group=group)
-        for price in Price.objects.select_related("product").prefetch_related(
-            "product__buying_groups"
-        )
-        for group in price.product.buying_groups.all()
-    ]
-    Price.groups.through.objects.bulk_create(groups)
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0048_alter_user_options"),
-        ("counter", "0037_productformula"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Price",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "amount",
-                    counter.fields.CurrencyField(
-                        decimal_places=2, max_digits=12, verbose_name="amount"
-                    ),
-                ),
-                (
-                    "is_always_shown",
-                    models.BooleanField(
-                        default=False,
-                        help_text=(
-                            "If this option is enabled, "
-                            "people will see this price and be able to pay it, "
-                            "even if another cheaper price exists. "
-                            "Else it will visible only if it is the cheapest available price."
-                        ),
-                        verbose_name="always show",
-                    ),
-                ),
-                (
-                    "label",
-                    models.CharField(
-                        default="",
-                        help_text=(
-                            "A short label for easier differentiation "
-                            "if a user can see multiple prices."
-                        ),
-                        max_length=32,
-                        verbose_name="label",
-                        blank=True,
-                    ),
-                ),
-                (
-                    "created_at",
-                    models.DateTimeField(auto_now_add=True, verbose_name="created at"),
-                ),
-                (
-                    "updated_at",
-                    models.DateTimeField(auto_now=True, verbose_name="updated at"),
-                ),
-                (
-                    "groups",
-                    models.ManyToManyField(
-                        related_name="prices", to="core.group", verbose_name="groups"
-                    ),
-                ),
-                (
-                    "product",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="prices",
-                        to="counter.product",
-                        verbose_name="product",
-                    ),
-                ),
-            ],
-            options={"verbose_name": "price"},
-        ),
-        migrations.AlterField(
-            model_name="product",
-            name="tray",
-            field=models.BooleanField(
-                default=False,
-                help_text="Buy five, get the sixth free",
-                verbose_name="tray price",
-            ),
-        ),
-        migrations.RunPython(migrate_prices, reverse_code=migrations.RunPython.noop),
-        migrations.RemoveField(model_name="product", name="selling_price"),
-        migrations.RemoveField(model_name="product", name="special_selling_price"),
-        migrations.AlterField(
-            model_name="product",
-            name="description",
-            field=models.TextField(blank=True, default="", verbose_name="description"),
-        ),
-        migrations.AlterField(
-            model_name="product",
-            name="product_type",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="products",
-                to="counter.producttype",
-                verbose_name="product type",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="productformula",
-            name="result",
-            field=models.OneToOneField(
-                help_text="The product got with the formula.",
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="formula",
-                to="counter.product",
-                verbose_name="result product",
-            ),
-        ),
-    ]

counter/models.py

@@ -22,7 +22,7 @@ import string
 from datetime import date, datetime, timedelta
 from datetime import timezone as tz
 from decimal import Decimal
-from typing import TYPE_CHECKING, Literal, Self
+from typing import Literal, Self
 
 from dict2xml import dict2xml
 from django.conf import settings
@@ -47,9 +47,6 @@ from core.utils import get_start_of_semester
 from counter.fields import CurrencyField
 from subscription.models import Subscription
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 
 def get_eboutic() -> Counter:
     return Counter.objects.filter(type="EBOUTIC").order_by("id").first()
@@ -160,7 +157,14 @@ class Customer(models.Model):
 
     @property
     def can_buy(self) -> bool:
-        """Check if whether this customer has the right to purchase any item."""
+        """Check if whether this customer has the right to purchase any item.
+
+        This must be not confused with the Product.can_be_sold_to(user)
+        method as the present method returns an information
+        about a customer whereas the other tells something
+        about the relation between a User (not a Customer,
+        don't mix them) and a Product.
+        """
         subscription = self.user.subscriptions.order_by("subscription_end").last()
         if subscription is None:
             return False
@@ -359,13 +363,13 @@ class Product(models.Model):
     QUANTITY_FOR_TRAY_PRICE = 6
 
     name = models.CharField(_("name"), max_length=64)
-    description = models.TextField(_("description"), blank=True, default="")
+    description = models.TextField(_("description"), default="")
     product_type = models.ForeignKey(
         ProductType,
         related_name="products",
         verbose_name=_("product type"),
         null=True,
-        blank=False,
+        blank=True,
         on_delete=models.SET_NULL,
     )
     code = models.CharField(_("code"), max_length=16, blank=True)
@@ -373,6 +377,11 @@ class Product(models.Model):
         _("purchase price"),
         help_text=_("Initial cost of purchasing the product"),
     )
+    selling_price = CurrencyField(_("selling price"))
+    special_selling_price = CurrencyField(
+        _("special selling price"),
+        help_text=_("Price for barmen during their permanence"),
+    )
     icon = ResizedImageField(
         height=70,
         force_format="WEBP",
@@ -385,9 +394,7 @@ class Product(models.Model):
         Club, related_name="products", verbose_name=_("club"), on_delete=models.CASCADE
     )
     limit_age = models.IntegerField(_("limit age"), default=0)
-    tray = models.BooleanField(
-        _("tray price"), help_text=_("Buy five, get the sixth free"), default=False
-    )
+    tray = models.BooleanField(_("tray price"), default=False)
     buying_groups = models.ManyToManyField(
         Group, related_name="products", verbose_name=_("buying groups"), blank=True
     )
@@ -412,77 +419,41 @@ class Product(models.Model):
             pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID
         ) or user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)
 
+    def can_be_sold_to(self, user: User) -> bool:
+        """Check if whether the user given in parameter has the right to buy
+        this product or not.
 
-class PriceQuerySet(models.QuerySet):
-    def for_user(self, user: User) -> Self:
-        age = user.age
-        if user.is_banned_alcohol:
-            age = min(age, 17)
-        return self.filter(
-            Q(is_always_shown=True, groups__in=user.all_groups)
-            | Q(
-                id=Subquery(
-                    Price.objects.filter(
-                        product_id=OuterRef("product_id"), groups__in=user.all_groups
-                    )
-                    .order_by("amount")
-                    .values("id")[:1]
-                )
-            ),
-            product__archived=False,
-            product__limit_age__lte=age,
-        )
+        This must be not confused with the Customer.can_buy()
+        method as the present method returns an information
+        about the relation between a User and a Product,
+        whereas the other tells something about a Customer
+        (and not a user, they are not the same model).
 
+        Returns:
+            True if the user can buy this product else False
 
-class Price(models.Model):
-    amount = CurrencyField(_("amount"))
-    product = models.ForeignKey(
-        Product,
-        verbose_name=_("product"),
-        related_name="prices",
-        on_delete=models.CASCADE,
-    )
-    groups = models.ManyToManyField(
-        Group, verbose_name=_("groups"), related_name="prices"
-    )
-    is_always_shown = models.BooleanField(
-        _("always show"),
-        help_text=_(
-            "If this option is enabled, "
-            "people will see this price and be able to pay it, "
-            "even if another cheaper price exists. "
-            "Else it will visible only if it is the cheapest available price."
-        ),
-        default=False,
-    )
-    label = models.CharField(
-        _("label"),
-        help_text=_(
-            "A short label for easier differentiation "
-            "if a user can see multiple prices."
-        ),
-        max_length=32,
-        default="",
-        blank=True,
-    )
-    created_at = models.DateTimeField(_("created at"), auto_now_add=True)
-    updated_at = models.DateTimeField(_("updated at"), auto_now=True)
+        Warning:
+            This performs a db query, thus you can quickly have
+            a N+1 queries problem if you call it in a loop.
+            Hopefully, you can avoid that if you prefetch the buying_groups :
 
-    objects = PriceQuerySet.as_manager()
-
-    class Meta:
-        verbose_name = _("price")
-
-    def __str__(self):
-        if not self.label:
-            return f"{self.product.name} ({self.amount}€)"
-        return f"{self.product.name} {self.label} ({self.amount}€)"
+            ```python
+            user = User.objects.get(username="foobar")
+            products = [
+                p
+                for p in Product.objects.prefetch_related("buying_groups")
+                if p.can_be_sold_to(user)
+            ]
+            ```
+        """
+        buying_groups = list(self.buying_groups.all())
+        if not buying_groups:
+            return True
+        return any(user.is_in_group(pk=group.id) for group in buying_groups)
 
     @property
-    def full_label(self):
-        if not self.label:
-            return self.product.name
-        return f"{self.product.name} \u2013 {self.label}"
+    def profit(self):
+        return self.selling_price - self.purchase_price
 
 
 class ProductFormula(models.Model):
@@ -503,6 +474,18 @@ class ProductFormula(models.Model):
     def __str__(self):
         return self.result.name
 
+    @cached_property
+    def max_selling_price(self) -> float:
+        # iterating over all products is less efficient than doing
+        # a simple aggregation, but this method is likely to be used in
+        # coordination with `max_special_selling_price`,
+        # and Django caches the result of the `all` queryset.
+        return sum(p.selling_price for p in self.products.all())
+
+    @cached_property
+    def max_special_selling_price(self) -> float:
+        return sum(p.special_selling_price for p in self.products.all())
+
 
 class CounterQuerySet(models.QuerySet):
     def annotate_has_barman(self, user: User) -> Self:
@@ -729,20 +712,35 @@ class Counter(models.Model):
         # but they share the same primary key
         return self.type == "BAR" and any(b.pk == customer.pk for b in self.barmen_list)
 
-    def get_prices_for(
-        self, customer: Customer, *, order_by: Sequence[str] | None = None
-    ) -> list[Price]:
-        qs = (
-            Price.objects.filter(
-                product__counters=self, product__product_type__isnull=False
-            )
-            .for_user(customer.user)
-            .select_related("product", "product__product_type")
-            .prefetch_related("groups")
+    def get_products_for(self, customer: Customer) -> list[Product]:
+        """
+        Get all allowed products for the provided customer on this counter
+        Prices will be annotated
+        """
+
+        products = (
+            self.products.filter(archived=False)
+            .select_related("product_type")
+            .prefetch_related("buying_groups")
         )
-        if order_by:
-            qs = qs.order_by(*order_by)
-        return list(qs)
+
+        # Only include age appropriate products
+        age = customer.user.age
+        if customer.user.is_banned_alcohol:
+            age = min(age, 17)
+        products = products.filter(limit_age__lte=age)
+
+        # Compute special price for customer if he is a barmen on that bar
+        if self.customer_is_barman(customer):
+            products = products.annotate(price=F("special_selling_price"))
+        else:
+            products = products.annotate(price=F("selling_price"))
+
+        return [
+            product
+            for product in products.all()
+            if product.can_be_sold_to(customer.user)
+        ]
 
 
 class RefillingQuerySet(models.QuerySet):
@@ -1003,9 +1001,7 @@ class Selling(models.Model):
         event = self.product.eticket.event_title or _("Unknown event")
         subject = _("Eticket bought for the event %(event)s") % {"event": event}
         message_html = _(
-            "You bought an eticket for the event %(event)s.\n"
-            "You can download it directly from this link %(eticket)s.\n"
-            "You can also retrieve all your e-tickets on your account page %(url)s."
+            "You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retrieve all your e-tickets on your account page %(url)s."
         ) % {
             "event": event,
             "url": (

counter/schemas.py

@@ -6,8 +6,8 @@ from ninja import FilterLookup, FilterSchema, ModelSchema, Schema
 from pydantic import model_validator
 
 from club.schemas import SimpleClubSchema
-from core.schemas import NonEmptyStr, SimpleUserSchema
-from counter.models import Counter, Price, Product, ProductType
+from core.schemas import GroupSchema, NonEmptyStr, SimpleUserSchema
+from counter.models import Counter, Product, ProductType
 
 
 class CounterSchema(ModelSchema):
@@ -66,12 +66,6 @@ class SimpleProductSchema(ModelSchema):
         fields = ["id", "name", "code"]
 
 
-class ProductPriceSchema(ModelSchema):
-    class Meta:
-        model = Price
-        fields = ["amount", "groups"]
-
-
 class ProductSchema(ModelSchema):
     class Meta:
         model = Product
@@ -81,12 +75,13 @@ class ProductSchema(ModelSchema):
             "code",
             "description",
             "purchase_price",
+            "selling_price",
             "icon",
             "limit_age",
             "archived",
         ]
 
-    prices: list[ProductPriceSchema]
+    buying_groups: list[GroupSchema]
     club: SimpleClubSchema
     product_type: SimpleProductTypeSchema | None
     url: str

counter/static/bundled/counter/basket.ts

@@ -1,11 +1,12 @@
-import type { CounterItem } from "#counter:counter/types";
+import type { Product } from "#counter:counter/types.ts";
 
 export class BasketItem {
   quantity: number;
-  product: CounterItem;
+  product: Product;
+  quantityForTrayPrice: number;
   errors: string[];
 
-  constructor(product: CounterItem, quantity: number) {
+  constructor(product: Product, quantity: number) {
     this.quantity = quantity;
     this.product = product;
     this.errors = [];
@@ -19,6 +20,6 @@ export class BasketItem {
   }
 
   sum(): number {
-    return (this.quantity - this.getBonusQuantity()) * this.product.price.amount;
+    return (this.quantity - this.getBonusQuantity()) * this.product.price;
   }
 }

counter/static/bundled/counter/counter-click-index.ts

@@ -1,12 +1,11 @@
-import { AlertMessage } from "#core:utils/alert-message";
-import { BasketItem } from "#counter:counter/basket";
+import { AlertMessage } from "#core:utils/alert-message.ts";
+import { BasketItem } from "#counter:counter/basket.ts";
 import type {
   CounterConfig,
-  CounterItem,
   ErrorMessage,
   ProductFormula,
-} from "#counter:counter/types";
-import type { CounterProductSelect } from "./components/counter-product-select-index";
+} from "#counter:counter/types.ts";
+import type { CounterProductSelect } from "./components/counter-product-select-index.ts";
 
 document.addEventListener("alpine:init", () => {
   Alpine.data("counter", (config: CounterConfig) => ({
@@ -64,10 +63,8 @@ document.addEventListener("alpine:init", () => {
     },
 
     checkFormulas() {
-      // Try to find a formula.
-      // A formula is found if all its elements are already in the basket
       const products = new Set(
-        Object.values(this.basket).map((item: BasketItem) => item.product.productId),
+        Object.keys(this.basket).map((i: string) => Number.parseInt(i)),
       );
       const formula: ProductFormula = config.formulas.find((f: ProductFormula) => {
         return f.products.every((p: number) => products.has(p));
@@ -75,29 +72,22 @@ document.addEventListener("alpine:init", () => {
       if (formula === undefined) {
         return;
       }
-      // Now that the formula is found, remove the items composing it from the basket
       for (const product of formula.products) {
-        const key = Object.entries(this.basket).find(
-          ([_, i]: [string, BasketItem]) => i.product.productId === product,
-        )[0];
+        const key = product.toString();
         this.basket[key].quantity -= 1;
         if (this.basket[key].quantity <= 0) {
           this.removeFromBasket(key);
         }
       }
-      // Then add the result product of the formula to the basket
-      const result = Object.values(config.products)
-        .filter((item: CounterItem) => item.productId === formula.result)
-        .reduce((acc, curr) => (acc.price.amount < curr.price.amount ? acc : curr));
-      this.addToBasket(result.price.id, 1);
       this.alertMessage.display(
         interpolate(
           gettext("Formula %(formula)s applied"),
-          { formula: result.name },
+          { formula: config.products[formula.result.toString()].name },
           true,
         ),
         { success: true },
       );
+      this.addToBasket(formula.result.toString(), 1);
     },
 
     getBasketSize() {

counter/static/bundled/counter/product-list-index.ts

@@ -1,9 +1,13 @@
 import { showSaveFilePicker } from "native-file-system-adapter";
 import type TomSelect from "tom-select";
-import { paginated } from "#core:utils/api";
-import { csv } from "#core:utils/csv";
-import { getCurrentUrlParams, History, updateQueryString } from "#core:utils/history";
-import type { NestedKeyOf } from "#core:utils/types";
+import { paginated } from "#core:utils/api.ts";
+import { csv } from "#core:utils/csv.ts";
+import {
+  getCurrentUrlParams,
+  History,
+  updateQueryString,
+} from "#core:utils/history.ts";
+import type { NestedKeyOf } from "#core:utils/types.ts";
 import {
   type ProductSchema,
   type ProductSearchProductsDetailedData,
@@ -16,9 +20,6 @@ type GroupedProducts = Record<ProductType, ProductSchema[]>;
 const defaultPageSize = 100;
 const defaultPage = 1;
 
-// biome-ignore lint/style/useNamingConvention: api is snake case
-type ProductWithPriceSchema = ProductSchema & { selling_price: string };
-
 /**
  * Keys of the properties to include in the CSV.
  */
@@ -33,7 +34,7 @@ const csvColumns = [
   "purchase_price",
   "selling_price",
   "archived",
-] as NestedKeyOf<ProductWithPriceSchema>[];
+] as NestedKeyOf<ProductSchema>[];
 
 /**
  * Title of the csv columns.
@@ -174,16 +175,7 @@ document.addEventListener("alpine:init", () => {
         this.nbPages > 1
           ? await paginated(productSearchProductsDetailed, this.getQueryParams())
           : Object.values<ProductSchema[]>(this.products).flat();
-      // CSV cannot represent nested data
-      // so we create a row for each price of each product.
-      const productsWithPrice: ProductWithPriceSchema[] = products.flatMap(
-        (product: ProductSchema) =>
-          product.prices.map((price) =>
-            // biome-ignore lint/style/useNamingConvention: API is snake_case
-            Object.assign(product, { selling_price: price.amount }),
-          ),
-      );
-      const content = csv.stringify(productsWithPrice, {
+      const content = csv.stringify(products, {
         columns: csvColumns,
         titleRow: csvColumnTitles,
       });

counter/static/bundled/counter/types.d.ts

@@ -2,7 +2,7 @@ export type ErrorMessage = string;
 
 export interface InitialFormData {
   /* Used to refill the form when the backend raises an error */
-  id?: keyof Record<string, CounterItem>;
+  id?: keyof Record<string, Product>;
   quantity?: number;
   errors?: string[];
 }
@@ -15,22 +15,17 @@ export interface ProductFormula {
 export interface CounterConfig {
   customerBalance: number;
   customerId: number;
-  products: Record<string, CounterItem>;
+  products: Record<string, Product>;
   formulas: ProductFormula[];
   formInitial: InitialFormData[];
   cancelUrl: string;
 }
 
-interface Price {
-  id: number;
-  amount: number;
-}
-
-export interface CounterItem {
-  productId: number;
-  price: Price;
+export interface Product {
+  id: string;
   code: string;
   name: string;
+  price: number;
   hasTrayPrice: boolean;
   quantityForTrayPrice: number;
 }

counter/templates/counter/counter_click.jinja

@@ -6,10 +6,10 @@
 {% endblock %}
 
 {% block additional_css %}
-  <link rel="stylesheet" href="{{ static('counter/css/counter-click.scss') }}">
-  <link rel="stylesheet" href="{{ static('bundled/core/components/ajax-select-index.css') }}">
-  <link rel="stylesheet" href="{{ static('core/components/ajax-select.scss') }}">
-  <link rel="stylesheet" href="{{ static('core/components/tabs.scss') }}">
+  <link rel="stylesheet" type="text/css" href="{{ static('counter/css/counter-click.scss') }}" defer></link>
+  <link rel="stylesheet" type="text/css" href="{{ static('bundled/core/components/ajax-select-index.css') }}" defer></link>
+  <link rel="stylesheet" type="text/css" href="{{ static('core/components/ajax-select.scss') }}" defer></link>
+  <link rel="stylesheet" type="text/css" href="{{ static('core/components/tabs.scss') }}" defer></link>
   <link rel="stylesheet" href="{{ static("core/components/card.scss") }}">
 {% endblock %}
 
@@ -65,10 +65,10 @@
                 <option value="FIN">{% trans %}Confirm (FIN){% endtrans %}</option>
                 <option value="ANN">{% trans %}Cancel (ANN){% endtrans %}</option>
               </optgroup>
-              {%- for category, prices in categories.items() -%}
+              {%- for category in categories.keys() -%}
                 <optgroup label="{{ category }}">
-                  {%- for price in prices -%}
-                    <option value="{{ price.id }}">{{ price.full_label }}</option>
+                  {%- for product in categories[category] -%}
+                    <option value="{{ product.id }}">{{ product }}</option>
                   {%- endfor -%}
                 </optgroup>
               {%- endfor -%}
@@ -103,25 +103,24 @@
             </div>
             <ul>
               <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
-              <template x-for="(item, index) in Object.values(basket)" :key="item.product.price.id">
+              <template x-for="(item, index) in Object.values(basket)" :key="item.product.id">
                 <li>
                   <template x-for="error in item.errors">
                     <div class="alert alert-red" x-text="error">
                     </div>
                   </template>
 
-                  <button @click.prevent="addToBasket(item.product.price.id, -1)">-</button>
+                  <button @click.prevent="addToBasket(item.product.id, -1)">-</button>
                   <span class="quantity" x-text="item.quantity"></span>
-                  <button @click.prevent="addToBasket(item.product.price.id, 1)">+</button>
+                  <button @click.prevent="addToBasket(item.product.id, 1)">+</button>
 
                   <span x-text="item.product.name"></span> :
                   <span x-text="item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })">€</span>
-                  <span x-show="item.getBonusQuantity() > 0"
-                        x-text="`${item.getBonusQuantity()} x P`"></span>
+                  <span x-show="item.getBonusQuantity() > 0" x-text="`${item.getBonusQuantity()} x P`"></span>
 
                   <button
                     class="remove-item"
-                    @click.prevent="removeFromBasket(item.product.price.id)"
+                    @click.prevent="removeFromBasket(item.product.id)"
                   ><i class="fa fa-trash-can delete-action"></i></button>
 
                   <input
@@ -134,9 +133,9 @@
                   >
                   <input
                     type="hidden"
-                    :value="item.product.price.id"
-                    :id="`id_form-${index}-price_id`"
-                    :name="`form-${index}-price_id`"
+                    :value="item.product.id"
+                    :id="`id_form-${index}-id`"
+                    :name="`form-${index}-id`"
                     required
                     readonly
                   >
@@ -202,30 +201,30 @@
       </div>
 
       <div id="products">
-        {% if not prices %}
+        {% if not products %}
           <div class="alert alert-red">
             {% trans %}No products available on this counter for this user{% endtrans %}
           </div>
         {% else %}
           <ui-tab-group>
-            {% for category, prices in categories.items() -%}
+            {% for category in categories.keys() -%}
               <ui-tab title="{{ category }}" {% if loop.index == 1 -%}active{%- endif -%}>
                 <h5 class="margin-bottom">{{ category }}</h5>
                 <div class="row gap-2x">
-                  {% for price in prices -%}
-                    <button class="card shadow" @click="addToBasket('{{ price.id }}', 1)">
+                  {% for product in categories[category] -%}
+                    <button class="card shadow" @click="addToBasket('{{ product.id }}', 1)">
                       <img
                         class="card-image"
-                        alt="image de {{ price.full_label }}"
-                        {% if price.product.icon %}
-                          src="{{ price.product.icon.url }}"
+                        alt="image de {{ product.name }}"
+                        {% if product.icon %}
+                          src="{{ product.icon.url }}"
                         {% else %}
                           src="{{ static('core/img/na.gif') }}"
                         {% endif %}
                       />
                       <span class="card-content">
-                        <strong class="card-title">{{ price.full_label }}</strong>
-                        <p>{{ price.amount }} €<br>{{ price.product.code }}</p>
+                        <strong class="card-title">{{ product.name }}</strong>
+                        <p>{{ product.price }} €<br>{{ product.code }}</p>
                       </span>
                     </button>
                   {%- endfor %}
@@ -242,14 +241,13 @@
   {{ super() }}
   <script>
     const products = {
-      {%- for price in prices -%}
-        {{ price.id }}: {
-          productId: {{ price.product_id }},
-          price: { id: "{{ price.id }}", amount: {{ price.amount }} },
-          code: "{{ price.product.code }}",
-          name: "{{ price.full_label }}",
-          hasTrayPrice: {{ price.product.tray | tojson }},
-          quantityForTrayPrice: {{ price.product.QUANTITY_FOR_TRAY_PRICE }},
+      {%- for product in products -%}
+        {{ product.id }}: {
+          id: "{{ product.id }}",
+          name: "{{ product.name }}",
+          price: {{ product.price }},
+          hasTrayPrice: {{ product.tray | tojson }},
+          quantityForTrayPrice: {{ product.QUANTITY_FOR_TRAY_PRICE }},
         },
       {%- endfor -%}
     };

counter/templates/counter/formula_list.jinja

@@ -49,10 +49,14 @@
             <strong class="card-title">{{ formula.result.name }}</strong>
             <p>
               {% for p in formula.products.all() %}
-                <i>{{ p.name }} ({{ p.code }})</i>
+                <i>{{ p.code }} ({{ p.selling_price }} €)</i>
                 {% if not loop.last %}+{% endif %}
               {% endfor %}
             </p>
+            <p>
+              {{ formula.result.selling_price }} €
+              ({% trans %}instead of{% endtrans %} {{ formula.max_selling_price}} €)
+            </p>
           </div>
           {% if user.has_perm("counter.delete_productformula") %}
             <button

counter/templates/counter/product_form.jinja

@@ -1,87 +1,5 @@
 {% extends "core/base.jinja" %}
 
-{% block additional_js %}
-  <script type="module" src="{{ static("bundled/core/dynamic-formset-index.ts") }}"></script>
-{% endblock %}
-
-
-{% macro action_form(form) %}
-  <fieldset x-data="{action: '{{ form.task.initial }}'}">
-    {{ form.non_field_errors() }}
-    <div class="row gap-2x margin-bottom">
-      <div>
-        {{ form.task.errors }}
-        {{ form.task.label_tag() }}
-        {{ form.task|add_attr("x-model=action") }}
-      </div>
-      <div>{{ form.trigger_at.as_field_group() }}</div>
-    </div>
-    <div x-show="action==='counter.tasks.change_counters'" class="margin-bottom">
-      {{ form.counters.as_field_group() }}
-    </div>
-    {%- if form.DELETE -%}
-      <div class="row gap">
-        {{ form.DELETE.as_field_group() }}
-      </div>
-    {%- else -%}
-      <button
-        class="btn btn-grey"
-        @click.prevent="removeForm($event.target.closest('fieldset'))"
-      >
-        <i class="fa fa-minus"></i>{% trans %}Remove this action{% endtrans %}
-      </button>
-    {%- endif -%}
-    {%- for field in form.hidden_fields() -%}
-      {{ field }}
-    {%- endfor -%}
-    <hr />
-  </fieldset>
-{% endmacro %}
-
-
-{% macro price_form(form) %}
-  <fieldset>
-    {{ form.non_field_errors() }}
-    <div class="form-group row gap-2x">
-      <div>{{ form.amount.as_field_group() }}</div>
-      <div>
-        {{ form.label.errors }}
-        <label for="{{ form.label.id_for_label }}">{{ form.label.label }}</label>
-        {{ form.label }}
-        <span class="helptext">{{ form.label.help_text }}</span>
-      </div>
-      <div class="grow">{{ form.groups.as_field_group() }}</div>
-    </div>
-    <div class="form-group">
-      <div>
-        {{ form.is_always_shown.errors }}
-        <div class="row gap">
-          {{ form.is_always_shown }}
-          <label for="{{ form.is_always_shown.id_for_label }}">{{ form.is_always_shown.label }}</label>
-        </div>
-        <span class="helptext">{{ form.is_always_shown.help_text }}</span>
-      </div>
-    </div>
-    {%- if form.DELETE -%}
-      <div class="form-group row gap">
-        {{ form.DELETE.as_field_group() }}
-      </div>
-    {%- else -%}
-      <br>
-      <button
-        class="btn btn-grey"
-        @click.prevent="removeForm($event.target.closest('fieldset').parentElement)"
-      >
-        <i class="fa fa-minus"></i> {% trans %}Remove price{% endtrans %}
-      </button>
-    {%- endif -%}
-    {%- for field in form.hidden_fields() -%}
-      {{ field }}
-    {%- endfor -%}
-  </fieldset>
-  <hr class="margin-bottom">
-{% endmacro %}
-
 {% block content %}
   {% if object %}
     <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
@@ -92,54 +10,7 @@
   {% endif %}
   <form method="post" enctype="multipart/form-data">
     {% csrf_token %}
-    {{ form.non_field_errors() }}
-    <fieldset class="row gap">
-      <div>{{ form.name.as_field_group() }}</div>
-      <div>{{ form.code.as_field_group() }}</div>
-    </fieldset>
-    <fieldset>
-      <div class="form-group">{{ form.description.as_field_group() }}</div>
-    </fieldset>
-    <fieldset class="row gap">
-      <div>{{ form.club.as_field_group() }}</div>
-      <div>{{ form.product_type.as_field_group() }}</div>
-    </fieldset>
-    <fieldset><div>{{ form.icon.as_field_group() }}</div></fieldset>
-    <fieldset><div>{{ form.purchase_price.as_field_group() }}</div></fieldset>
-    <fieldset>
-      <div>{{ form.limit_age.as_field_group() }}</div>
-    </fieldset>
-    <fieldset>
-      <div class="row gap">
-        {{ form.tray }}
-        <div>
-          {{ form.tray.label_tag() }}
-          <span class="helptext">{{ form.tray.help_text }}</span>
-        </div>
-      </div>
-    </fieldset>
-    <fieldset><div>{{ form.counters.as_field_group() }}</div></fieldset>
-
-    <h3 class="margin-bottom">{% trans %}Prices{% endtrans %}</h3>
-
-    <div x-data="dynamicFormSet({ prefix: '{{ form.price_formset.prefix }}' })">
-      {{ form.price_formset.management_form }}
-      <div x-ref="formContainer">
-        {%- for form in form.price_formset.forms -%}
-          <div>
-            {{ price_form(form) }}
-          </div>
-        {%- endfor -%}
-      </div>
-      <template x-ref="formTemplate">
-        <div>
-          {{ price_form(form.price_formset.empty_form) }}
-        </div>
-      </template>
-      <button class="btn btn-grey" @click.prevent="addForm()">
-        <i class="fa fa-plus"></i> {% trans %}Add a price{% endtrans %}
-      </button>
-    </div>
+    {{ form.as_p() }}
 
     <br />
 
@@ -154,21 +25,34 @@
       </em>
     </p>
 
-    <div x-data="dynamicFormSet({ prefix: '{{ form.action_formset.prefix }}' })" class="margin-bottom">
-      {{ form.action_formset.management_form }}
-      <div x-ref="formContainer">
-        {%- for f in form.action_formset.forms -%}
-          {{ action_form(f) }}
+    {{ 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 -%}
-      </div>
-      <template x-ref="formTemplate">
-        {{ action_form(form.action_formset.empty_form) }}
-      </template>
-      <button @click.prevent="addForm()" class="btn btn-grey">
-        <i class="fa fa-plus"></i>{% trans %}Add action{% endtrans %}
-      </button>
-    </div>
-    <div class="row gap margin-bottom">{{ form.archived.as_field_group() }}</div>
-    <p><input class="btn btn-blue" type="submit" value="{% trans %}Save{% endtrans %}" /></p>
+      </fieldset>
+      {%- if not loop.last -%}
+        <hr class="margin-bottom">
+      {%- endif -%}
+    {%- endfor -%}
+    <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
   </form>
-{% endblock %}
+{% endblock %}

counter/templates/counter/product_list.jinja

@@ -108,7 +108,7 @@
                 </template>
                 <span class="card-content">
                   <strong class="card-title" x-text="`${p.name} (${p.code})`"></strong>
-                  <p x-text="`${p.prices.map((p) => p.amount).join(' – ')} €`"></p>
+                  <p x-text="`${p.selling_price} €`"></p>
                 </span>
               </a>
             </template>

counter/tests/test_auto_actions.py

@@ -16,7 +16,7 @@ from counter.forms import (
     ScheduledProductActionForm,
     ScheduledProductActionFormSet,
 )
-from counter.models import Product, ProductType, ScheduledProductAction
+from counter.models import Product, ScheduledProductAction
 
 
 @pytest.mark.django_db
@@ -47,22 +47,20 @@ def test_create_actions_alongside_product():
     form = ProductForm(
         data={
             "name": "foo",
-            "product_type": ProductType.objects.first(),
+            "description": "bar",
+            "product_type": product.product_type_id,
             "club": product.club_id,
             "code": "FOO",
             "purchase_price": 1.0,
             "selling_price": 1.0,
             "special_selling_price": 1.0,
             "limit_age": 0,
-            "price-TOTAL_FORMS": "0",
-            "price-INITIAL_FORMS": "0",
-            "action-TOTAL_FORMS": "1",
-            "action-INITIAL_FORMS": "0",
-            "action-0-task": "counter.tasks.archive_product",
-            "action-0-trigger_at": trigger_at,
+            "form-TOTAL_FORMS": "2",
+            "form-INITIAL_FORMS": "0",
+            "form-0-task": "counter.tasks.archive_product",
+            "form-0-trigger_at": trigger_at,
         },
     )
-    form.is_valid()
     assert form.is_valid()
     product = form.save()
     action = ScheduledProductAction.objects.last()

counter/tests/test_counter.py

@@ -20,6 +20,7 @@ import pytest
 from dateutil.relativedelta import relativedelta
 from django.conf import settings
 from django.contrib.auth.models import Permission, make_password
+from django.core.cache import cache
 from django.http import HttpResponse
 from django.shortcuts import resolve_url
 from django.test import Client, TestCase
@@ -33,13 +34,13 @@ from pytest_django.asserts import assertRedirects
 
 from club.models import Membership
 from core.baker_recipes import board_user, subscriber_user, very_old_subscriber_user
-from core.models import BanGroup, Group, User
-from counter.baker_recipes import price_recipe, product_recipe, sale_recipe
+from core.models import BanGroup, User
+from counter.baker_recipes import product_recipe, sale_recipe
 from counter.models import (
     Counter,
     Customer,
     Permanency,
-    ProductType,
+    Product,
     Refilling,
     ReturnableProduct,
     Selling,
@@ -203,7 +204,7 @@ class TestRefilling(TestFullClickBase):
 
 @dataclass
 class BasketItem:
-    price_id: int | None = None
+    id: int | None = None
     quantity: int | None = None
 
     def to_form(self, index: int) -> dict[str, str]:
@@ -235,59 +236,38 @@ class TestCounterClick(TestFullClickBase):
         cls.banned_counter_customer.ban_groups.add(
             BanGroup.objects.get(pk=settings.SITH_GROUP_BANNED_COUNTER_ID)
         )
-        subscriber_group = Group.objects.get(id=settings.SITH_GROUP_SUBSCRIBERS_ID)
-        old_subscriber_group = Group.objects.get(
-            id=settings.SITH_GROUP_OLD_SUBSCRIBERS_ID
-        )
-        _product_recipe = product_recipe.extend(product_type=baker.make(ProductType))
 
-        cls.gift = price_recipe.make(
-            amount=-1.5, groups=[subscriber_group], product=_product_recipe.make()
+        cls.gift = product_recipe.make(
+            selling_price="-1.5",
+            special_selling_price="-1.5",
         )
-        cls.beer = price_recipe.make(
-            groups=[subscriber_group],
-            amount=1.5,
-            product=_product_recipe.make(limit_age=18),
+        cls.beer = product_recipe.make(
+            limit_age=18, selling_price=1.5, special_selling_price=1
         )
-        cls.beer_tap = price_recipe.make(
-            groups=[subscriber_group],
-            amount=1.5,
-            product=_product_recipe.make(limit_age=18, tray=True),
+        cls.beer_tap = product_recipe.make(
+            limit_age=18, tray=True, selling_price=1.5, special_selling_price=1
         )
-        cls.snack = price_recipe.make(
-            groups=[subscriber_group, old_subscriber_group],
-            amount=1.5,
-            product=_product_recipe.make(limit_age=0),
+        cls.snack = product_recipe.make(
+            limit_age=0, selling_price=1.5, special_selling_price=1
         )
-        cls.stamps = price_recipe.make(
-            groups=[subscriber_group],
-            amount=1.5,
-            product=_product_recipe.make(limit_age=0),
+        cls.stamps = product_recipe.make(
+            limit_age=0, selling_price=1.5, special_selling_price=1
         )
         ReturnableProduct.objects.all().delete()
-        cls.cons = price_recipe.make(
-            amount=1, groups=[subscriber_group], product=_product_recipe.make()
-        )
-        cls.dcons = price_recipe.make(
-            amount=-1, groups=[subscriber_group], product=_product_recipe.make()
-        )
+        cls.cons = baker.make(Product, selling_price=1)
+        cls.dcons = baker.make(Product, selling_price=-1)
         baker.make(
             ReturnableProduct,
-            product=cls.cons.product,
-            returned_product=cls.dcons.product,
+            product=cls.cons,
+            returned_product=cls.dcons,
             max_return=3,
         )
 
         cls.counter.products.add(
-            cls.gift.product,
-            cls.beer.product,
-            cls.beer_tap.product,
-            cls.snack.product,
-            cls.cons.product,
-            cls.dcons.product,
+            cls.gift, cls.beer, cls.beer_tap, cls.snack, cls.cons, cls.dcons
         )
-        cls.other_counter.products.add(cls.snack.product)
-        cls.club_counter.products.add(cls.stamps.product)
+        cls.other_counter.products.add(cls.snack)
+        cls.club_counter.products.add(cls.stamps)
 
     def login_in_bar(self, barmen: User | None = None):
         used_barman = barmen if barmen is not None else self.barmen
@@ -305,7 +285,10 @@ class TestCounterClick(TestFullClickBase):
     ) -> HttpResponse:
         used_counter = counter if counter is not None else self.counter
         used_client = client if client is not None else self.client
-        data = {"form-TOTAL_FORMS": str(len(basket)), "form-INITIAL_FORMS": "0"}
+        data = {
+            "form-TOTAL_FORMS": str(len(basket)),
+            "form-INITIAL_FORMS": "0",
+        }
         for index, item in enumerate(basket):
             data.update(item.to_form(index))
         return used_client.post(
@@ -348,22 +331,32 @@ class TestCounterClick(TestFullClickBase):
         res = self.submit_basket(
             self.customer, [BasketItem(self.beer.id, 2), BasketItem(self.snack.id, 1)]
         )
-        self.assertRedirects(res, self.counter.get_absolute_url())
+        assert res.status_code == 302
 
         assert self.updated_amount(self.customer) == Decimal("5.5")
 
+        # Test barmen special price
+
+        force_refill_user(self.barmen, 10)
+
+        assert (
+            self.submit_basket(self.barmen, [BasketItem(self.beer.id, 1)])
+        ).status_code == 302
+
+        assert self.updated_amount(self.barmen) == Decimal(9)
+
     def test_click_tray_price(self):
         force_refill_user(self.customer, 20)
         self.login_in_bar(self.barmen)
 
         # Not applying tray price
         res = self.submit_basket(self.customer, [BasketItem(self.beer_tap.id, 2)])
-        self.assertRedirects(res, self.counter.get_absolute_url())
+        assert res.status_code == 302
         assert self.updated_amount(self.customer) == Decimal(17)
 
         # Applying tray price
         res = self.submit_basket(self.customer, [BasketItem(self.beer_tap.id, 7)])
-        self.assertRedirects(res, self.counter.get_absolute_url())
+        assert res.status_code == 302
         assert self.updated_amount(self.customer) == Decimal(8)
 
     def test_click_alcool_unauthorized(self):
@@ -484,8 +477,7 @@ class TestCounterClick(TestFullClickBase):
             BasketItem(None, 1),
             BasketItem(self.beer.id, None),
         ]:
-            res = self.submit_basket(self.customer, [item])
-            assert res.status_code == 200
+            assert self.submit_basket(self.customer, [item]).status_code == 200
             assert self.updated_amount(self.customer) == Decimal(10)
 
     def test_click_not_enough_money(self):
@@ -514,30 +506,29 @@ class TestCounterClick(TestFullClickBase):
         res = self.submit_basket(
             self.customer, [BasketItem(self.beer.id, 1), BasketItem(self.gift.id, 1)]
         )
-        self.assertRedirects(res, self.counter.get_absolute_url())
+        assert res.status_code == 302
 
         assert self.updated_amount(self.customer) == 0
 
     def test_recordings(self):
-        force_refill_user(self.customer, self.cons.amount * 3)
+        force_refill_user(self.customer, self.cons.selling_price * 3)
         self.login_in_bar(self.barmen)
         res = self.submit_basket(self.customer, [BasketItem(self.cons.id, 3)])
         assert res.status_code == 302
         assert self.updated_amount(self.customer) == 0
         assert list(
             self.customer.customer.return_balances.values("returnable", "balance")
-        ) == [{"returnable": self.cons.product.cons.id, "balance": 3}]
+        ) == [{"returnable": self.cons.cons.id, "balance": 3}]
 
         res = self.submit_basket(self.customer, [BasketItem(self.dcons.id, 3)])
         assert res.status_code == 302
-        assert self.updated_amount(self.customer) == self.dcons.amount * -3
+        assert self.updated_amount(self.customer) == self.dcons.selling_price * -3
 
         res = self.submit_basket(
-            self.customer,
-            [BasketItem(self.dcons.id, self.dcons.product.dcons.max_return)],
+            self.customer, [BasketItem(self.dcons.id, self.dcons.dcons.max_return)]
         )
         # from now on, the user amount should not change
-        expected_amount = self.dcons.amount * (-3 - self.dcons.product.dcons.max_return)
+        expected_amount = self.dcons.selling_price * (-3 - self.dcons.dcons.max_return)
         assert res.status_code == 302
         assert self.updated_amount(self.customer) == expected_amount
 
@@ -554,57 +545,48 @@ class TestCounterClick(TestFullClickBase):
     def test_recordings_when_negative(self):
         sale_recipe.make(
             customer=self.customer.customer,
-            product=self.dcons.product,
-            unit_price=self.dcons.amount,
+            product=self.dcons,
+            unit_price=self.dcons.selling_price,
             quantity=10,
         )
         self.customer.customer.update_returnable_balance()
         self.login_in_bar(self.barmen)
         res = self.submit_basket(self.customer, [BasketItem(self.dcons.id, 1)])
         assert res.status_code == 200
-        assert self.updated_amount(self.customer) == self.dcons.amount * -10
+        assert self.updated_amount(self.customer) == self.dcons.selling_price * -10
 
         res = self.submit_basket(self.customer, [BasketItem(self.cons.id, 3)])
         assert res.status_code == 302
         assert (
             self.updated_amount(self.customer)
-            == self.dcons.amount * -10 - self.cons.amount * 3
+            == self.dcons.selling_price * -10 - self.cons.selling_price * 3
         )
 
         res = self.submit_basket(self.customer, [BasketItem(self.beer.id, 1)])
         assert res.status_code == 302
         assert (
             self.updated_amount(self.customer)
-            == self.dcons.amount * -10 - self.cons.amount * 3 - self.beer.amount
+            == self.dcons.selling_price * -10
+            - self.cons.selling_price * 3
+            - self.beer.selling_price
         )
 
     def test_no_fetch_archived_product(self):
         counter = baker.make(Counter)
-        group = baker.make(Group)
         customer = baker.make(Customer)
-        group.users.add(customer.user)
-        _product_recipe = product_recipe.extend(
-            counters=[counter], product_type=baker.make(ProductType)
+        product_recipe.make(archived=True, counters=[counter])
+        unarchived_products = product_recipe.make(
+            archived=False, counters=[counter], _quantity=3
         )
-        price_recipe.make(
-            _quantity=2,
-            product=iter(_product_recipe.make(archived=True, _quantity=2)),
-            groups=[group],
-        )
-        unarchived_prices = price_recipe.make(
-            _quantity=2,
-            product=iter(_product_recipe.make(archived=False, _quantity=2)),
-            groups=[group],
-        )
-        customer_prices = counter.get_prices_for(customer)
-        assert unarchived_prices == customer_prices
+        customer_products = counter.get_products_for(customer)
+        assert unarchived_products == customer_products
 
 
 class TestCounterStats(TestCase):
     @classmethod
     def setUpTestData(cls):
         cls.users = subscriber_user.make(_quantity=4)
-        product = price_recipe.make(amount=1).product
+        product = product_recipe.make(selling_price=1)
         cls.counter = baker.make(
             Counter, type=["BAR"], sellers=cls.users[:4], products=[product]
         )
@@ -803,6 +785,9 @@ class TestClubCounterClickAccess(TestCase):
 
         cls.user = subscriber_user.make()
 
+    def setUp(self):
+        cache.clear()
+
     def test_anonymous(self):
         res = self.client.get(self.click_url)
         assert res.status_code == 403

counter/tests/test_customer.py

@@ -341,7 +341,7 @@ def test_update_balance():
 def test_update_returnable_balance():
     ReturnableProduct.objects.all().delete()
     customer = baker.make(Customer)
-    products = product_recipe.make(_quantity=4, _bulk_create=True)
+    products = product_recipe.make(selling_price=0, _quantity=4, _bulk_create=True)
     returnables = [
         baker.make(
             ReturnableProduct, product=products[0], returned_product=products[1]

counter/tests/test_formula.py

@@ -7,7 +7,12 @@ from counter.forms import ProductFormulaForm
 class TestFormulaForm(TestCase):
     @classmethod
     def setUpTestData(cls):
-        cls.products = product_recipe.make(_quantity=3, _bulk_create=True)
+        cls.products = product_recipe.make(
+            selling_price=iter([1.5, 1, 1]),
+            special_selling_price=iter([1.4, 0.9, 0.9]),
+            _quantity=3,
+            _bulk_create=True,
+        )
 
     def test_ok(self):
         form = ProductFormulaForm(
@@ -21,6 +26,23 @@ class TestFormulaForm(TestCase):
         assert formula.result == self.products[0]
         assert set(formula.products.all()) == set(self.products[1:])
 
+    def test_price_invalid(self):
+        self.products[0].selling_price = 2.1
+        self.products[0].save()
+        form = ProductFormulaForm(
+            data={
+                "result": self.products[0].id,
+                "products": [self.products[1].id, self.products[2].id],
+            }
+        )
+        assert not form.is_valid()
+        assert form.errors == {
+            "result": [
+                "Le résultat ne peut pas être plus cher "
+                "que le total des autres produits."
+            ]
+        }
+
     def test_product_both_in_result_and_products(self):
         form = ProductFormulaForm(
             data={

counter/tests/test_product.py

@@ -9,7 +9,6 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import Client, TestCase
 from django.urls import reverse
 from model_bakery import baker
-from model_bakery.recipe import Recipe
 from PIL import Image
 from pytest_django.asserts import assertNumQueries, assertRedirects
 
@@ -17,8 +16,8 @@ from club.models import Club
 from core.baker_recipes import board_user, subscriber_user
 from core.models import Group, User
 from counter.baker_recipes import product_recipe
-from counter.forms import ProductForm, ProductPriceFormSet
-from counter.models import Price, Product, ProductType
+from counter.forms import ProductForm
+from counter.models import Product, ProductFormula, ProductType
 
 
 @pytest.mark.django_db
@@ -82,11 +81,11 @@ def test_fetch_product_access(
 def test_fetch_product_nb_queries(client: Client):
     client.force_login(baker.make(User, is_superuser=True))
     cache.clear()
-    with assertNumQueries(6):
+    with assertNumQueries(5):
         # - 2 for authentication
         # - 1 for pagination
         # - 1 for the actual request
-        # - 2 to prefetch the related prices and groups
+        # - 1 to prefetch the related buying_groups
         client.get(reverse("api:search_products_detailed"))
 
 
@@ -108,21 +107,48 @@ class TestCreateProduct(TestCase):
             "selling_price": 1.0,
             "special_selling_price": 1.0,
             "limit_age": 0,
-            "price-TOTAL_FORMS": 0,
-            "price-INITIAL_FORMS": 0,
-            "action-TOTAL_FORMS": 0,
-            "action-INITIAL_FORMS": 0,
+            "form-TOTAL_FORMS": 0,
+            "form-INITIAL_FORMS": 0,
         }
 
-    def test_form_simple(self):
+    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_simple(self):
+    def test_form_with_product_from_formula(self):
+        """Test when the edited product is a result of a formula."""
+        self.client.force_login(self.counter_admin)
+        products = product_recipe.make(
+            selling_price=iter([1.5, 1, 1]),
+            special_selling_price=iter([1.4, 0.9, 0.9]),
+            _quantity=3,
+            _bulk_create=True,
+        )
+        baker.make(ProductFormula, result=products[0], products=products[1:])
+
+        data = self.data | {"selling_price": 1.7, "special_selling_price": 1.5}
+        form = ProductForm(data=data, instance=products[0])
+        assert form.is_valid()
+
+        # it shouldn't be possible to give a price higher than the formula's products
+        data = self.data | {"selling_price": 2.1, "special_selling_price": 1.9}
+        form = ProductForm(data=data, instance=products[0])
+        assert not form.is_valid()
+        assert form.errors == {
+            "selling_price": [
+                "Assurez-vous que cette valeur est inférieure ou égale à 2.00."
+            ],
+            "special_selling_price": [
+                "Assurez-vous que cette valeur est inférieure ou égale à 1.80."
+            ],
+        }
+
+    def test_view(self):
         self.client.force_login(self.counter_admin)
         url = reverse("counter:new_product")
         response = self.client.get(url)
@@ -133,92 +159,3 @@ class TestCreateProduct(TestCase):
         assert product.name == "foo"
         assert product.club == self.club
         assert product.product_type == self.product_type
-
-
-class TestPriceFormSet(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.product = product_recipe.make()
-        cls.counter_admin = baker.make(
-            User, groups=[Group.objects.get(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)]
-        )
-        cls.groups = baker.make(Group, _quantity=3)
-
-    def test_add_price(self):
-        data = {
-            "prices-0-amount": 2,
-            "prices-0-label": "foo",
-            "prices-0-groups": [self.groups[0].id, self.groups[1].id],
-            "prices-0-is_always_shown": True,
-            "prices-1-amount": 1.5,
-            "prices-1-label": "",
-            "prices-1-groups": [self.groups[1].id, self.groups[2].id],
-            "prices-1-is_always_shown": False,
-            "prices-TOTAL_FORMS": 2,
-            "prices-INITIAL_FORMS": 0,
-        }
-        form = ProductPriceFormSet(instance=self.product, data=data)
-        assert form.is_valid()
-        form.save()
-        prices = list(self.product.prices.order_by("amount"))
-        assert len(prices) == 2
-        assert prices[0].amount == 1.5
-        assert prices[0].label == ""
-        assert prices[0].is_always_shown is False
-        assert set(prices[0].groups.all()) == {self.groups[1], self.groups[2]}
-        assert prices[1].amount == 2
-        assert prices[1].label == "foo"
-        assert prices[1].is_always_shown is True
-        assert set(prices[1].groups.all()) == {self.groups[0], self.groups[1]}
-
-    def test_change_prices(self):
-        price_a = baker.make(
-            Price, product=self.product, amount=1.5, groups=self.groups[:1]
-        )
-        price_b = baker.make(
-            Price, product=self.product, amount=2, groups=self.groups[1:]
-        )
-        data = {
-            "prices-0-id": price_a.id,
-            "prices-0-DELETE": True,
-            "prices-1-id": price_b.id,
-            "prices-1-DELETE": False,
-            "prices-1-amount": 3,
-            "prices-1-label": "foo",
-            "prices-1-groups": [self.groups[1].id],
-            "prices-1-is_always_shown": True,
-            "prices-TOTAL_FORMS": 2,
-            "prices-INITIAL_FORMS": 2,
-        }
-        form = ProductPriceFormSet(instance=self.product, data=data)
-        assert form.is_valid()
-        form.save()
-        prices = list(self.product.prices.order_by("amount"))
-        assert len(prices) == 1
-        assert prices[0].amount == 3
-        assert prices[0].label == "foo"
-        assert prices[0].is_always_shown is True
-        assert set(prices[0].groups.all()) == {self.groups[1]}
-        assert not Price.objects.filter(id=price_a.id).exists()
-
-
-@pytest.mark.django_db
-def test_price_for_user():
-    groups = baker.make(Group, _quantity=4)
-    users = [
-        baker.make(User, groups=groups[:2]),
-        baker.make(User, groups=groups[1:3]),
-        baker.make(User, groups=[groups[3]]),
-    ]
-    recipe = Recipe(Price, product=product_recipe.make())
-    prices = [
-        recipe.make(amount=5, groups=groups, is_always_shown=True),
-        recipe.make(amount=4, groups=[groups[0]], is_always_shown=True),
-        recipe.make(amount=3, groups=[groups[1]], is_always_shown=False),
-        recipe.make(amount=2, groups=[groups[3]], is_always_shown=False),
-        recipe.make(amount=1, groups=[groups[1]], is_always_shown=False),
-    ]
-    qs = Price.objects.order_by("-amount")
-    assert set(qs.for_user(users[0])) == {prices[0], prices[1], prices[4]}
-    assert set(qs.for_user(users[1])) == {prices[0], prices[4]}
-    assert set(qs.for_user(users[2])) == {prices[0], prices[3]}

counter/views/click.py

@@ -73,7 +73,7 @@ class CounterClick(
         kwargs["form_kwargs"] = {
             "customer": self.customer,
             "counter": self.object,
-            "allowed_prices": {price.id: price for price in self.prices},
+            "allowed_products": {product.id: product for product in self.products},
         }
         return kwargs
 
@@ -103,7 +103,7 @@ class CounterClick(
         ):
             return redirect(obj)  # Redirect to counter
 
-        self.prices = obj.get_prices_for(self.customer)
+        self.products = obj.get_products_for(self.customer)
 
         return super().dispatch(request, *args, **kwargs)
 
@@ -121,31 +121,32 @@ class CounterClick(
             # This is important because some items have a negative price
             # Negative priced items gives money to the customer and should
             # be processed first so that we don't throw a not enough money error
-            for form in sorted(formset, key=lambda form: form.price.amount):
+            for form in sorted(formset, key=lambda form: form.product.price):
                 self.request.session["last_basket"].append(
-                    f"{form.cleaned_data['quantity']} x {form.price.full_label}"
+                    f"{form.cleaned_data['quantity']} x {form.product.name}"
                 )
 
-                common_kwargs = {
-                    "product": form.price.product,
-                    "club_id": form.price.product.club_id,
-                    "counter": self.object,
-                    "seller": operator,
-                    "customer": self.customer,
-                }
                 Selling(
-                    **common_kwargs,
-                    label=form.price.full_label,
-                    unit_price=form.price.amount,
+                    label=form.product.name,
+                    product=form.product,
+                    club=form.product.club,
+                    counter=self.object,
+                    unit_price=form.product.price,
                     quantity=form.cleaned_data["quantity"]
                     - form.cleaned_data["bonus_quantity"],
+                    seller=operator,
+                    customer=self.customer,
                 ).save()
                 if form.cleaned_data["bonus_quantity"] > 0:
                     Selling(
-                        **common_kwargs,
-                        label=f"{form.price.full_label} (Plateau)",
+                        label=f"{form.product.name} (Plateau)",
+                        product=form.product,
+                        club=form.product.club,
+                        counter=self.object,
                         unit_price=0,
                         quantity=form.cleaned_data["bonus_quantity"],
+                        seller=operator,
+                        customer=self.customer,
                     ).save()
 
             self.customer.update_returnable_balance()
@@ -206,13 +207,14 @@ class CounterClick(
     def get_context_data(self, **kwargs):
         """Add customer to the context."""
         kwargs = super().get_context_data(**kwargs)
-        kwargs["prices"] = self.prices
+        kwargs["products"] = self.products
         kwargs["formulas"] = ProductFormula.objects.filter(
-            result__in=[p.product_id for p in self.prices]
+            result__in=self.products
         ).prefetch_related("products")
         kwargs["categories"] = defaultdict(list)
-        for price in self.prices:
-            kwargs["categories"][price.product.product_type].append(price)
+        for product in kwargs["products"]:
+            if product.product_type:
+                kwargs["categories"][product.product_type].append(product)
         kwargs["customer"] = self.customer
         kwargs["cancel_url"] = self.get_success_url()
 

eboutic/admin.py

@@ -22,22 +22,23 @@ from eboutic.models import Basket, BasketItem, Invoice, InvoiceItem
 class BasketAdmin(admin.ModelAdmin):
     list_display = ("user", "date", "total")
     autocomplete_fields = ("user",)
-    date_hierarchy = "date"
 
     def get_queryset(self, request):
         return (
             super()
             .get_queryset(request)
             .annotate(
-                total=Sum(F("items__quantity") * F("items__unit_price"), default=0)
+                total=Sum(
+                    F("items__quantity") * F("items__product_unit_price"), default=0
+                )
             )
         )
 
 
 @admin.register(BasketItem)
 class BasketItemAdmin(admin.ModelAdmin):
-    list_display = ("label", "unit_price", "quantity")
-    search_fields = ("label",)
+    list_display = ("basket", "product_name", "product_unit_price", "quantity")
+    search_fields = ("product_name",)
 
 
 @admin.register(Invoice)
@@ -49,6 +50,5 @@ class InvoiceAdmin(admin.ModelAdmin):
 
 @admin.register(InvoiceItem)
 class InvoiceItemAdmin(admin.ModelAdmin):
-    list_display = ("label", "unit_price", "quantity")
-    search_fields = ("label",)
-    list_select_related = ("price",)
+    list_display = ("invoice", "product_name", "product_unit_price", "quantity")
+    search_fields = ("product_name",)

eboutic/migrations/0003_rename_product_name_basketitem_label_and_more.py

@@ -1,53 +0,0 @@
-# Generated by Django 5.2.11 on 2026-02-22 18:13
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("counter", "0038_price"), ("eboutic", "0002_auto_20221005_2243")]
-
-    operations = [
-        migrations.RenameField(
-            model_name="basketitem", old_name="product_name", new_name="label"
-        ),
-        migrations.RenameField(
-            model_name="basketitem",
-            old_name="product_unit_price",
-            new_name="unit_price",
-        ),
-        migrations.RenameField(
-            model_name="basketitem", old_name="product_id", new_name="product"
-        ),
-        migrations.RenameField(
-            model_name="invoiceitem", old_name="product_name", new_name="label"
-        ),
-        migrations.RenameField(
-            model_name="invoiceitem",
-            old_name="product_unit_price",
-            new_name="unit_price",
-        ),
-        migrations.RenameField(
-            model_name="invoiceitem", old_name="product_id", new_name="product"
-        ),
-        migrations.RemoveField(model_name="basketitem", name="type_id"),
-        migrations.RemoveField(model_name="invoiceitem", name="type_id"),
-        migrations.AlterField(
-            model_name="basketitem",
-            name="product",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.PROTECT,
-                to="counter.product",
-                verbose_name="product",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="invoiceitem",
-            name="product",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.PROTECT,
-                to="counter.product",
-                verbose_name="product",
-            ),
-        ),
-    ]

eboutic/models.py

@@ -17,7 +17,7 @@ from __future__ import annotations
 import hmac
 from datetime import datetime
 from enum import Enum
-from typing import Self
+from typing import Any, Self
 
 from dict2xml import dict2xml
 from django.conf import settings
@@ -30,8 +30,8 @@ from core.models import User
 from counter.fields import CurrencyField
 from counter.models import (
     BillingInfo,
+    Counter,
     Customer,
-    Price,
     Product,
     Refilling,
     Selling,
@@ -39,6 +39,22 @@ from counter.models import (
 )
 
 
+def get_eboutic_products(user: User) -> list[Product]:
+    products = (
+        get_eboutic()
+        .products.filter(product_type__isnull=False)
+        .filter(archived=False, limit_age__lte=user.age)
+        .annotate(
+            order=F("product_type__order"),
+            category=F("product_type__name"),
+            category_comment=F("product_type__comment"),
+            price=F("selling_price"),  # <-- selected price for basket validation
+        )
+        .prefetch_related("buying_groups")  # <-- used in `Product.can_be_sold_to`
+    )
+    return [p for p in products if p.can_be_sold_to(user)]
+
+
 class BillingInfoState(Enum):
     VALID = 1
     EMPTY = 2
@@ -78,21 +94,21 @@ class Basket(models.Model):
     def __str__(self):
         return f"{self.user}'s basket ({self.items.all().count()} items)"
 
-    def can_be_viewed_by(self, user: User):
+    def can_be_viewed_by(self, user):
         return self.user == user
 
     @cached_property
     def contains_refilling_item(self) -> bool:
         return self.items.filter(
-            product__product_type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING
+            type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING
         ).exists()
 
     @cached_property
     def total(self) -> float:
         return float(
-            self.items.aggregate(total=Sum(F("quantity") * F("unit_price"), default=0))[
-                "total"
-            ]
+            self.items.aggregate(
+                total=Sum(F("quantity") * F("product_unit_price"), default=0)
+            )["total"]
         )
 
     def generate_sales(
@@ -104,8 +120,7 @@ class Basket(models.Model):
         Example:
             ```python
             counter = Counter.objects.get(name="Eboutic")
-            user = User.objects.get(username="bibou")
-            sales = basket.generate_sales(counter, user, Selling.PaymentMethod.SITH_ACCOUNT)
+            sales = basket.generate_sales(counter, "SITH_ACCOUNT")
             # here the basket is in the same state as before the method call
 
             with transaction.atomic():
@@ -116,23 +131,31 @@ class Basket(models.Model):
                 # thus only the sales remain
             ```
         """
-        customer = Customer.get_or_create(self.user)[0]
-        return [
-            Selling(
-                label=item.label,
-                counter=counter,
-                club_id=item.product.club_id,
-                product=item.product,
-                seller=seller,
-                customer=customer,
-                unit_price=item.unit_price,
-                quantity=item.quantity,
-                payment_method=payment_method,
+        # I must proceed with two distinct requests instead of
+        # only one with a join because the AbstractBaseItem model has been
+        # poorly designed. If you refactor the model, please refactor this too.
+        items = self.items.order_by("product_id")
+        ids = [item.product_id for item in items]
+        products = Product.objects.filter(id__in=ids).order_by("id")
+        # items and products are sorted in the same order
+        sales = []
+        for item, product in zip(items, products, strict=False):
+            sales.append(
+                Selling(
+                    label=product.name,
+                    counter=counter,
+                    club=product.club,
+                    product=product,
+                    seller=seller,
+                    customer=Customer.get_or_create(self.user)[0],
+                    unit_price=item.product_unit_price,
+                    quantity=item.quantity,
+                    payment_method=payment_method,
+                )
             )
-            for item in self.items.select_related("product")
-        ]
+        return sales
 
-    def get_e_transaction_data(self) -> list[tuple[str, str]]:
+    def get_e_transaction_data(self) -> list[tuple[str, Any]]:
         user = self.user
         if not hasattr(user, "customer"):
             raise Customer.DoesNotExist
@@ -178,7 +201,7 @@ class InvoiceQueryset(models.QuerySet):
     def annotate_total(self) -> Self:
         """Annotate the queryset with the total amount of each invoice.
 
-        The total amount is the sum of (unit_price * quantity)
+        The total amount is the sum of (product_unit_price * quantity)
         for all items related to the invoice.
         """
         # aggregates within subqueries require a little bit of black magic,
@@ -188,7 +211,7 @@ class InvoiceQueryset(models.QuerySet):
             total=Subquery(
                 InvoiceItem.objects.filter(invoice_id=OuterRef("pk"))
                 .values("invoice_id")
-                .annotate(total=Sum(F("unit_price") * F("quantity")))
+                .annotate(total=Sum(F("product_unit_price") * F("quantity")))
                 .values("total")
             )
         )
@@ -198,7 +221,11 @@ class Invoice(models.Model):
     """Invoices are generated once the payment has been validated."""
 
     user = models.ForeignKey(
-        User, related_name="invoices", verbose_name=_("user"), on_delete=models.CASCADE
+        User,
+        related_name="invoices",
+        verbose_name=_("user"),
+        blank=False,
+        on_delete=models.CASCADE,
     )
     date = models.DateTimeField(_("date"), auto_now=True)
     validated = models.BooleanField(_("validated"), default=False)
@@ -219,44 +246,53 @@ class Invoice(models.Model):
         if self.validated:
             raise DataError(_("Invoice already validated"))
         customer, _created = Customer.get_or_create(user=self.user)
-        kwargs = {
-            "counter": get_eboutic(),
-            "customer": customer,
-            "date": self.date,
-            "payment_method": Selling.PaymentMethod.CARD,
-        }
-        for i in self.items.select_related("product"):
-            if i.product.product_type_id == settings.SITH_COUNTER_PRODUCTTYPE_REFILLING:
-                Refilling.objects.create(
-                    **kwargs, operator=self.user, amount=i.unit_price * i.quantity
+        eboutic = Counter.objects.filter(type="EBOUTIC").first()
+        for i in self.items.all():
+            if i.type_id == settings.SITH_COUNTER_PRODUCTTYPE_REFILLING:
+                new = Refilling(
+                    counter=eboutic,
+                    customer=customer,
+                    operator=self.user,
+                    amount=i.product_unit_price * i.quantity,
+                    payment_method=Refilling.PaymentMethod.CARD,
+                    date=self.date,
                 )
+                new.save()
             else:
-                Selling.objects.create(
-                    **kwargs,
-                    label=i.label,
-                    club_id=i.product.club_id,
-                    product=i.product,
+                product = Product.objects.filter(id=i.product_id).first()
+                new = Selling(
+                    label=i.product_name,
+                    counter=eboutic,
+                    club=product.club,
+                    product=product,
                     seller=self.user,
-                    unit_price=i.unit_price,
+                    customer=customer,
+                    unit_price=i.product_unit_price,
                     quantity=i.quantity,
+                    payment_method=Selling.PaymentMethod.CARD,
+                    date=self.date,
                 )
+                new.save()
         self.validated = True
         self.save()
 
 
 class AbstractBaseItem(models.Model):
-    product = models.ForeignKey(
-        Product, verbose_name=_("product"), on_delete=models.PROTECT
-    )
-    label = models.CharField(_("product name"), max_length=255)
-    unit_price = CurrencyField(_("unit price"))
+    product_id = models.IntegerField(_("product id"))
+    product_name = models.CharField(_("product name"), max_length=255)
+    type_id = models.IntegerField(_("product type id"))
+    product_unit_price = CurrencyField(_("unit price"))
     quantity = models.PositiveIntegerField(_("quantity"))
 
     class Meta:
         abstract = True
 
     def __str__(self):
-        return "Item: %s (%s) x%d" % (self.product.name, self.unit_price, self.quantity)
+        return "Item: %s (%s) x%d" % (
+            self.product_name,
+            self.product_unit_price,
+            self.quantity,
+        )
 
 
 class BasketItem(AbstractBaseItem):
@@ -265,16 +301,21 @@ class BasketItem(AbstractBaseItem):
     )
 
     @classmethod
-    def from_price(cls, price: Price, quantity: int, basket: Basket):
+    def from_product(cls, product: Product, quantity: int, basket: Basket):
         """Create a BasketItem with the same characteristics as the
-        product price passed in parameters, with the specified quantity.
+        product passed in parameters, with the specified quantity.
+
+        Warning:
+            the basket field is not filled, so you must set
+            it yourself before saving the model.
         """
         return cls(
             basket=basket,
-            label=price.full_label,
-            product_id=price.product_id,
+            product_id=product.id,
+            product_name=product.name,
+            type_id=product.product_type_id,
             quantity=quantity,
-            unit_price=price.amount,
+            product_unit_price=product.selling_price,
         )
 
 

eboutic/static/bundled/eboutic/eboutic-index.ts

@@ -1,15 +1,13 @@
 export {};
 
 interface BasketItem {
-  priceId: number;
+  id: number;
   name: string;
   quantity: number;
-  unitPrice: number;
+  // biome-ignore lint/style/useNamingConvention: the python code is snake_case
+  unit_price: number;
 }
 
-// increment the key number if the data schema of the cached basket changes
-const BASKET_CACHE_KEY = "basket1";
-
 document.addEventListener("alpine:init", () => {
   Alpine.data("basket", (lastPurchaseTime?: number) => ({
     basket: [] as BasketItem[],
@@ -32,24 +30,24 @@ document.addEventListener("alpine:init", () => {
       // It's quite tricky to manually apply attributes to the management part
       // of a formset so we dynamically apply it here
       this.$refs.basketManagementForm
-        .getElementById("#id_form-TOTAL_FORMS")
+        .querySelector("#id_form-TOTAL_FORMS")
         .setAttribute(":value", "basket.length");
     },
 
     loadBasket(): BasketItem[] {
-      if (localStorage.getItem(BASKET_CACHE_KEY) === null) {
+      if (localStorage.basket === undefined) {
         return [];
       }
       try {
-        return JSON.parse(localStorage.getItem(BASKET_CACHE_KEY));
+        return JSON.parse(localStorage.basket);
       } catch (_err) {
         return [];
       }
     },
 
     saveBasket() {
-      localStorage.setItem(BASKET_CACHE_KEY, JSON.stringify(this.basket));
-      localStorage.setItem("basketTimestamp", Date.now().toString());
+      localStorage.basket = JSON.stringify(this.basket);
+      localStorage.basketTimestamp = Date.now();
     },
 
     /**
@@ -58,7 +56,7 @@ document.addEventListener("alpine:init", () => {
      */
     getTotal() {
       return this.basket.reduce(
-        (acc: number, item: BasketItem) => acc + item.quantity * item.unitPrice,
+        (acc: number, item: BasketItem) => acc + item.quantity * item.unit_price,
         0,
       );
     },
@@ -76,7 +74,7 @@ document.addEventListener("alpine:init", () => {
      * @param itemId the id of the item to remove
      */
     remove(itemId: number) {
-      const index = this.basket.findIndex((e: BasketItem) => e.priceId === itemId);
+      const index = this.basket.findIndex((e: BasketItem) => e.id === itemId);
 
       if (index < 0) {
         return;
@@ -85,7 +83,7 @@ document.addEventListener("alpine:init", () => {
 
       if (this.basket[index].quantity === 0) {
         this.basket = this.basket.filter(
-          (e: BasketItem) => e.priceId !== this.basket[index].id,
+          (e: BasketItem) => e.id !== this.basket[index].id,
         );
       }
     },
@@ -106,10 +104,11 @@ document.addEventListener("alpine:init", () => {
      */
     createItem(id: number, name: string, price: number): BasketItem {
       const newItem = {
-        priceId: id,
+        id,
         name,
         quantity: 0,
-        unitPrice: price,
+        // biome-ignore lint/style/useNamingConvention: the python code is snake_case
+        unit_price: price,
       } as BasketItem;
 
       this.basket.push(newItem);
@@ -126,7 +125,7 @@ document.addEventListener("alpine:init", () => {
      * @param price The unit price of the product
      */
     addFromCatalog(id: number, name: string, price: number) {
-      let item = this.basket.find((e: BasketItem) => e.priceId === id);
+      let item = this.basket.find((e: BasketItem) => e.id === id);
 
       // if the item is not in the basket, we create it
       // else we add + 1 to it

eboutic/templates/eboutic/eboutic_checkout.jinja

@@ -32,9 +32,9 @@
       <tbody>
         {% for item in basket.items.all() %}
           <tr>
-            <td>{{ item.label }}</td>
+            <td>{{ item.product_name }}</td>
             <td>{{ item.quantity }}</td>
-            <td>{{ item.unit_price }} €</td>
+            <td>{{ item.product_unit_price }} €</td>
           </tr>
         {% endfor %}
       </tbody>

eboutic/templates/eboutic/eboutic_main.jinja

@@ -41,7 +41,7 @@
           </div>
         {% endif %}
         <ul class="item-list">
-          {# Starting money #}
+                  {# Starting money #}
           <li>
             <span class="item-name">
               <strong>{% trans %}Current account amount: {% endtrans %}</strong>
@@ -51,15 +51,15 @@
             </span>
           </li>
 
-          <template x-for="(item, index) in Object.values(basket)" :key="item.priceId">
+          <template x-for="(item, index) in Object.values(basket)" :key="item.id">
             <li class="item-row" x-show="item.quantity > 0">
               <div class="item-quantity">
-                <i class="fa fa-minus fa-xs" @click="remove(item.priceId)"></i>
+                <i class="fa fa-minus fa-xs" @click="remove(item.id)"></i>
                 <span x-text="item.quantity"></span>
                 <i class="fa fa-plus" @click="add(item)"></i>
               </div>
               <span class="item-name" x-text="item.name"></span>
-              <span class="item-price" x-text="(item.unitPrice * item.quantity).toFixed(2) + ' €'"></span>
+              <span class="item-price" x-text="(item.unit_price * item.quantity).toFixed(2) + ' €'"></span>
 
               <input
                 type="hidden"
@@ -71,16 +71,16 @@
               >
               <input
                 type="hidden"
-                :value="item.priceId"
-                :id="`id_form-${index}-price_id`"
-                :name="`form-${index}-price_id`"
+                :value="item.id"
+                :id="`id_form-${index}-id`"
+                :name="`form-${index}-id`"
                 required
                 readonly
               >
 
             </li>
           </template>
-          {# Total price #}
+                  {# Total price #}
           <li style="margin-top: 20px">
             <span class="item-name"><strong>{% trans %}Basket amount: {% endtrans %}</strong></span>
             <span x-text="getTotal().toFixed(2) + ' €'" class="item-price"></span>
@@ -116,40 +116,45 @@
           </span>
         </div>
       {% endif %}
-      {% for prices in categories %}
-        {% set category = prices[0].product.product_type %}
-        <section>
-          <div class="category-header">
-            <h3>{{ category.name }}</h3>
-            {% if category.comment %}
-              <p><i>{{ category.comment }}</i></p>
-            {% endif %}
-          </div>
-          <div class="product-group">
-            {% for price in prices %}
-              <button
-                id="{{ price.id }}"
-                class="card product-button clickable shadow"
-                :class="{selected: basket.some((i) => i.priceId === {{ price.id }})}"
-                @click='addFromCatalog({{ price.id }}, {{ price.full_label|tojson }}, {{ price.amount }})'
-              >
-                {% if price.product.icon %}
-                  <img
-                    class="card-image"
-                    src="{{ price.product.icon.url }}"
-                    alt="image de {{ price.full_label }}"
-                  >
-                {% else %}
-                  <i class="fa-regular fa-image fa-2x card-image"></i>
+      {% for priority_groups in products|groupby('order') %}
+        {% for category, items in priority_groups.list|groupby('category') %}
+          {% if items|count > 0 %}
+            <section>
+                            {# I would have wholeheartedly directly used the header element instead
+                            but it has already been made messy in core/style.scss #}
+              <div class="category-header">
+                <h3>{{ category }}</h3>
+                {% if items[0].category_comment %}
+                  <p><i>{{ items[0].category_comment }}</i></p>
                 {% endif %}
-                <div class="card-content">
-                  <h4 class="card-title">{{ price.full_label }}</h4>
-                  <p>{{ price.amount }} €</p>
-                </div>
-              </button>
-            {% endfor %}
-          </div>
-        </section>
+              </div>
+              <div class="product-group">
+                {% for p in items %}
+                  <button
+                    id="{{ p.id }}"
+                    class="card product-button clickable shadow"
+                    :class="{selected: basket.some((i) => i.id === {{ p.id }})}"
+                    @click='addFromCatalog({{ p.id }}, {{ p.name|tojson }}, {{ p.selling_price }})'
+                  >
+                    {% if p.icon %}
+                      <img
+                        class="card-image"
+                        src="{{ p.icon.url }}"
+                        alt="image de {{ p.name }}"
+                      >
+                    {% else %}
+                      <i class="fa-regular fa-image fa-2x card-image"></i>
+                    {% endif %}
+                    <div class="card-content">
+                      <h4 class="card-title">{{ p.name }}</h4>
+                      <p>{{ p.selling_price }} €</p>
+                    </div>
+                  </button>
+                {% endfor %}
+              </div>
+            </section>
+          {% endif %}
+        {% endfor %}
       {% else %}
         <p>{% trans %}There are no items available for sale{% endtrans %}</p>
       {% endfor %}

eboutic/tests/test_basket.py

@@ -11,12 +11,7 @@ from pytest_django.asserts import assertRedirects
 
 from core.baker_recipes import subscriber_user
 from core.models import Group, User
-from counter.baker_recipes import (
-    price_recipe,
-    product_recipe,
-    refill_recipe,
-    sale_recipe,
-)
+from counter.baker_recipes import product_recipe, refill_recipe, sale_recipe
 from counter.models import (
     Counter,
     Customer,
@@ -152,29 +147,29 @@ class TestEboutic(TestCase):
 
         product_type = baker.make(ProductType)
 
-        cls.snack = price_recipe.make(
-            amount=1.5, product=product_recipe.make(product_type=product_type)
+        cls.snack = product_recipe.make(
+            selling_price=1.5, special_selling_price=1, product_type=product_type
         )
-        cls.beer = price_recipe.make(
-            product=product_recipe.make(limit_age=18, product_type=product_type),
-            amount=2.5,
+        cls.beer = product_recipe.make(
+            limit_age=18,
+            selling_price=2.5,
+            special_selling_price=1,
+            product_type=product_type,
         )
-        cls.not_in_counter = price_recipe.make(
-            product=product_recipe.make(product_type=product_type), amount=3.5
-        )
-        cls.cotiz = price_recipe.make(
-            amount=10, product=product_recipe.make(product_type=product_type)
+        cls.not_in_counter = product_recipe.make(
+            selling_price=3.5, product_type=product_type
         )
+        cls.cotiz = product_recipe.make(selling_price=10, product_type=product_type)
 
-        cls.group_public.prices.add(cls.snack, cls.beer, cls.not_in_counter)
-        cls.group_cotiz.prices.add(cls.cotiz)
+        cls.group_public.products.add(cls.snack, cls.beer, cls.not_in_counter)
+        cls.group_cotiz.products.add(cls.cotiz)
 
         cls.subscriber.groups.add(cls.group_cotiz, cls.group_public)
         cls.new_customer.groups.add(cls.group_public)
         cls.new_customer_adult.groups.add(cls.group_public)
 
         cls.eboutic = get_eboutic()
-        cls.eboutic.products.add(cls.cotiz.product, cls.beer.product, cls.snack.product)
+        cls.eboutic.products.add(cls.cotiz, cls.beer, cls.snack)
 
     @classmethod
     def set_age(cls, user: User, age: int):
@@ -258,7 +253,7 @@ class TestEboutic(TestCase):
             self.submit_basket([BasketItem(self.snack.id, 2)]),
             reverse("eboutic:checkout", kwargs={"basket_id": 1}),
         )
-        assert Basket.objects.get(id=1).total == self.snack.amount * 2
+        assert Basket.objects.get(id=1).total == self.snack.selling_price * 2
 
         self.client.force_login(self.new_customer_adult)
         assertRedirects(
@@ -268,7 +263,8 @@ class TestEboutic(TestCase):
             reverse("eboutic:checkout", kwargs={"basket_id": 2}),
         )
         assert (
-            Basket.objects.get(id=2).total == self.snack.amount * 2 + self.beer.amount
+            Basket.objects.get(id=2).total
+            == self.snack.selling_price * 2 + self.beer.selling_price
         )
 
         self.client.force_login(self.subscriber)
@@ -284,5 +280,7 @@ class TestEboutic(TestCase):
         )
         assert (
             Basket.objects.get(id=3).total
-            == self.snack.amount * 2 + self.beer.amount + self.cotiz.amount
+            == self.snack.selling_price * 2
+            + self.beer.selling_price
+            + self.cotiz.selling_price
         )

eboutic/tests/test_payment.py

@@ -16,7 +16,7 @@ from model_bakery import baker
 from pytest_django.asserts import assertRedirects
 
 from core.baker_recipes import old_subscriber_user, subscriber_user
-from counter.baker_recipes import price_recipe, product_recipe
+from counter.baker_recipes import product_recipe
 from counter.models import Product, ProductType, Selling
 from counter.tests.test_counter import force_refill_user
 from eboutic.models import Basket, BasketItem
@@ -32,22 +32,23 @@ class TestPaymentBase(TestCase):
         cls.basket = baker.make(Basket, user=cls.customer)
         cls.refilling = product_recipe.make(
             product_type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING,
-            prices=[price_recipe.make(amount=15)],
+            selling_price=15,
         )
 
         product_type = baker.make(ProductType)
 
         cls.snack = product_recipe.make(
-            product_type=product_type, prices=[price_recipe.make(amount=1.5)]
+            selling_price=1.5, special_selling_price=1, product_type=product_type
         )
         cls.beer = product_recipe.make(
             limit_age=18,
+            selling_price=2.5,
+            special_selling_price=1,
             product_type=product_type,
-            prices=[price_recipe.make(amount=2.5)],
         )
 
-        BasketItem.from_price(cls.snack.prices.first(), 1, cls.basket).save()
-        BasketItem.from_price(cls.beer.prices.first(), 2, cls.basket).save()
+        BasketItem.from_product(cls.snack, 1, cls.basket).save()
+        BasketItem.from_product(cls.beer, 2, cls.basket).save()
 
 
 class TestPaymentSith(TestPaymentBase):
@@ -115,13 +116,13 @@ class TestPaymentSith(TestPaymentBase):
         assert len(sellings) == 2
         assert sellings[0].payment_method == Selling.PaymentMethod.SITH_ACCOUNT
         assert sellings[0].quantity == 1
-        assert sellings[0].unit_price == self.snack.prices.first().amount
+        assert sellings[0].unit_price == self.snack.selling_price
         assert sellings[0].counter.type == "EBOUTIC"
         assert sellings[0].product == self.snack
 
         assert sellings[1].payment_method == Selling.PaymentMethod.SITH_ACCOUNT
         assert sellings[1].quantity == 2
-        assert sellings[1].unit_price == self.beer.prices.first().amount
+        assert sellings[1].unit_price == self.beer.selling_price
         assert sellings[1].counter.type == "EBOUTIC"
         assert sellings[1].product == self.beer
 
@@ -145,7 +146,7 @@ class TestPaymentSith(TestPaymentBase):
         )
 
     def test_refilling_in_basket(self):
-        BasketItem.from_price(self.refilling.prices.first(), 1, self.basket).save()
+        BasketItem.from_product(self.refilling, 1, self.basket).save()
         self.client.force_login(self.customer)
         force_refill_user(self.customer, self.basket.total + 1)
         self.customer.customer.refresh_from_db()
@@ -190,8 +191,8 @@ class TestPaymentCard(TestPaymentBase):
     def test_buy_success(self):
         response = self.client.get(self.generate_bank_valid_answer(self.basket))
         assert response.status_code == 200
-        assert response.content.decode() == "Payment successful"
-        assert not Basket.objects.filter(id=self.basket.id).exists()
+        assert response.content.decode("utf-8") == "Payment successful"
+        assert Basket.objects.filter(id=self.basket.id).first() is None
 
         sellings = Selling.objects.filter(customer=self.customer.customer).order_by(
             "quantity"
@@ -199,13 +200,13 @@ class TestPaymentCard(TestPaymentBase):
         assert len(sellings) == 2
         assert sellings[0].payment_method == Selling.PaymentMethod.CARD
         assert sellings[0].quantity == 1
-        assert sellings[0].unit_price == self.snack.prices.first().amount
+        assert sellings[0].unit_price == self.snack.selling_price
         assert sellings[0].counter.type == "EBOUTIC"
         assert sellings[0].product == self.snack
 
         assert sellings[1].payment_method == Selling.PaymentMethod.CARD
         assert sellings[1].quantity == 2
-        assert sellings[1].unit_price == self.beer.prices.first().amount
+        assert sellings[1].unit_price == self.beer.selling_price
         assert sellings[1].counter.type == "EBOUTIC"
         assert sellings[1].product == self.beer
 
@@ -215,9 +216,7 @@ class TestPaymentCard(TestPaymentBase):
         assert not customer.subscriptions.first().is_valid_now()
 
         basket = baker.make(Basket, user=customer)
-        BasketItem.from_price(
-            Product.objects.get(code="2SCOTIZ").prices.first(), 1, basket
-        ).save()
+        BasketItem.from_product(Product.objects.get(code="2SCOTIZ"), 1, basket).save()
         response = self.client.get(self.generate_bank_valid_answer(basket))
         assert response.status_code == 200
 
@@ -229,13 +228,12 @@ class TestPaymentCard(TestPaymentBase):
         assert subscription.location == "EBOUTIC"
 
     def test_buy_refilling(self):
-        price = self.refilling.prices.first()
-        BasketItem.from_price(price, 2, self.basket).save()
+        BasketItem.from_product(self.refilling, 2, self.basket).save()
         response = self.client.get(self.generate_bank_valid_answer(self.basket))
         assert response.status_code == 200
 
         self.customer.customer.refresh_from_db()
-        assert self.customer.customer.amount == price.amount * 2
+        assert self.customer.customer.amount == self.refilling.selling_price * 2
 
     def test_multiple_responses(self):
         bank_response = self.generate_bank_valid_answer(self.basket)
@@ -255,17 +253,17 @@ class TestPaymentCard(TestPaymentBase):
         self.basket.delete()
         response = self.client.get(bank_response)
         assert response.status_code == 500
-        assert response.text == (
-            "Basket processing failed with error: "
-            "SuspiciousOperation('Basket does not exists')"
+        assert (
+            response.text
+            == "Basket processing failed with error: SuspiciousOperation('Basket does not exists')"
         )
 
     def test_altered_basket(self):
         bank_response = self.generate_bank_valid_answer(self.basket)
-        BasketItem.from_price(self.snack.prices.first(), 1, self.basket).save()
+        BasketItem.from_product(self.snack, 1, self.basket).save()
         response = self.client.get(bank_response)
         assert response.status_code == 500
-        assert response.text == (
-            "Basket processing failed with error: "
+        assert (
+            response.text == "Basket processing failed with error: "
             "SuspiciousOperation('Basket total and amount do not match')"
         )

eboutic/views.py

@@ -17,7 +17,6 @@ from __future__ import annotations
 
 import base64
 import contextlib
-import itertools
 import json
 from typing import TYPE_CHECKING
 
@@ -29,7 +28,9 @@ from cryptography.hazmat.primitives.serialization import load_pem_public_key
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.mixins import (
+    LoginRequiredMixin,
+)
 from django.contrib.messages.views import SuccessMessageMixin
 from django.core.exceptions import SuspiciousOperation, ValidationError
 from django.db import DatabaseError, transaction
@@ -47,16 +48,23 @@ from django_countries.fields import Country
 
 from core.auth.mixins import CanViewMixin
 from core.views.mixins import FragmentMixin, UseFragmentsMixin
-from counter.forms import BaseBasketForm, BasketItemForm, BillingInfoForm
+from counter.forms import BaseBasketForm, BasketProductForm, BillingInfoForm
 from counter.models import (
     BillingInfo,
     Customer,
-    Price,
+    Product,
     Refilling,
     Selling,
     get_eboutic,
 )
-from eboutic.models import Basket, BasketItem, BillingInfoState, Invoice, InvoiceItem
+from eboutic.models import (
+    Basket,
+    BasketItem,
+    BillingInfoState,
+    Invoice,
+    InvoiceItem,
+    get_eboutic_products,
+)
 
 if TYPE_CHECKING:
     from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
@@ -70,7 +78,7 @@ class BaseEbouticBasketForm(BaseBasketForm):
 
 
 EbouticBasketForm = forms.formset_factory(
-    BasketItemForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
+    BasketProductForm, formset=BaseEbouticBasketForm, absolute_max=None, min_num=1
 )
 
 
@@ -80,6 +88,7 @@ class EbouticMainView(LoginRequiredMixin, FormView):
     The purchasable products are those of the eboutic which
     belong to a category of products of a product category
     (orphan products are inaccessible).
+
     """
 
     template_name = "eboutic/eboutic_main.jinja"
@@ -90,7 +99,7 @@ class EbouticMainView(LoginRequiredMixin, FormView):
         kwargs["form_kwargs"] = {
             "customer": self.customer,
             "counter": get_eboutic(),
-            "allowed_prices": {price.id: price for price in self.prices},
+            "allowed_products": {product.id: product for product in self.products},
         }
         return kwargs
 
@@ -101,25 +110,19 @@ class EbouticMainView(LoginRequiredMixin, FormView):
 
         with transaction.atomic():
             self.basket = Basket.objects.create(user=self.request.user)
-            BasketItem.objects.bulk_create(
-                [
-                    BasketItem.from_price(
-                        form.price, form.cleaned_data["quantity"], self.basket
-                    )
-                    for form in formset
-                ]
-            )
+            for form in formset:
+                BasketItem.from_product(
+                    form.product, form.cleaned_data["quantity"], self.basket
+                ).save()
+            self.basket.save()
         return super().form_valid(formset)
 
     def get_success_url(self):
         return reverse("eboutic:checkout", kwargs={"basket_id": self.basket.id})
 
     @cached_property
-    def prices(self) -> list[Price]:
-        return get_eboutic().get_prices_for(
-            self.customer,
-            order_by=["product__product_type__order", "product_id", "amount"],
-        )
+    def products(self) -> list[Product]:
+        return get_eboutic_products(self.request.user)
 
     @cached_property
     def customer(self) -> Customer:
@@ -127,12 +130,7 @@ class EbouticMainView(LoginRequiredMixin, FormView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["categories"] = [
-            list(i[1])
-            for i in itertools.groupby(
-                self.prices, key=lambda p: p.product.product_type_id
-            )
-        ]
+        context["products"] = self.products
         context["customer_amount"] = self.request.user.account_balance
 
         purchases = (
@@ -269,8 +267,11 @@ class EbouticPayWithSith(CanViewMixin, SingleObjectMixin, View):
     def post(self, request, *args, **kwargs):
         basket = self.get_object()
         refilling = settings.SITH_COUNTER_PRODUCTTYPE_REFILLING
-        if basket.items.filter(product__product_type_id=refilling).exists():
-            messages.error(self.request, _("You can't buy a refilling with sith money"))
+        if basket.items.filter(type_id=refilling).exists():
+            messages.error(
+                self.request,
+                _("You can't buy a refilling with sith money"),
+            )
             return redirect("eboutic:payment_result", "failure")
 
         eboutic = get_eboutic()
@@ -325,23 +326,22 @@ class EtransactionAutoAnswer(View):
                         raise SuspiciousOperation(
                             "Basket total and amount do not match"
                         )
-                    i = Invoice.objects.create(user=b.user)
-                    InvoiceItem.objects.bulk_create(
-                        [
-                            InvoiceItem(
-                                invoice=i,
-                                product_id=item.product_id,
-                                label=item.label,
-                                unit_price=item.unit_price,
-                                quantity=item.quantity,
-                            )
-                            for item in b.items.all()
-                        ]
-                    )
+                    i = Invoice()
+                    i.user = b.user
+                    i.payment_method = "CARD"
+                    i.save()
+                    for it in b.items.all():
+                        InvoiceItem(
+                            invoice=i,
+                            product_id=it.product_id,
+                            product_name=it.product_name,
+                            type_id=it.type_id,
+                            product_unit_price=it.product_unit_price,
+                            quantity=it.quantity,
+                        ).save()
                     i.validate()
                     b.delete()
             except Exception as e:
-                sentry_sdk.capture_exception(e)
                 return HttpResponse(
                     "Basket processing failed with error: " + repr(e), status=500
                 )

election/views.py

@@ -1,6 +1,7 @@
 from typing import TYPE_CHECKING
 
 from cryptography.utils import cached_property
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import (
     LoginRequiredMixin,
@@ -114,9 +115,16 @@ class VoteFormView(LoginRequiredMixin, UserPassesTestMixin, FormView):
     def test_func(self):
         if not self.election.can_vote(self.request.user):
             return False
-        return self.election.vote_groups.filter(
-            id__in=self.request.user.all_groups
-        ).exists()
+
+        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 vote(self, election_data):
         with transaction.atomic():
@@ -230,9 +238,15 @@ class RoleCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView):
             return False
         if self.request.user.has_perm("election.add_role"):
             return True
-        return self.election.edit_groups.filter(
-            id__in=self.request.user.all_groups
-        ).exists()
+        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()
 
     def get_initial(self):
         return {"election": self.election}
@@ -265,7 +279,14 @@ class ElectionListCreateView(LoginRequiredMixin, UserPassesTestMixin, CreateView
             .union(self.election.edit_groups.values("id"))
             .values_list("id", flat=True)
         )
-        return not groups.isdisjoint(self.request.user.all_groups.keys())
+        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 get_initial(self):
         return {"election": self.election}

locale/fr/LC_MESSAGES/django.po

@@ -56,7 +56,7 @@ msgstr "nom"
 msgid "owner"
 msgstr "propriétaire"
 
-#: api/models.py core/models.py counter/models.py
+#: api/models.py core/models.py
 msgid "groups"
 msgstr "groupes"
 
@@ -239,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"
 
@@ -514,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 : "
@@ -792,7 +804,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"
 
@@ -1089,6 +1101,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"
@@ -1949,6 +1966,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"
@@ -2965,6 +2983,24 @@ msgstr ""
 "Décrivez le produit. Si c'est un click pour un évènement, donnez quelques "
 "détails dessus, comme la date (en incluant l'année)."
 
+#: counter/forms.py
+#, python-format
+msgid ""
+"This product is a formula. Its price cannot be greater than the price of the "
+"products constituting it, which is %(price)s €"
+msgstr ""
+"Ce produit est une formule. Son prix ne peut pas être supérieur au prix des "
+"produits qui la constituent, soit %(price)s €."
+
+#: counter/forms.py
+#, python-format
+msgid ""
+"This product is a formula. Its special price cannot be greater than the "
+"price of the products constituting it, which is %(price)s €"
+msgstr ""
+"Ce produit est une formule. Son prix spécial ne peut pas être supérieur au "
+"prix des produits qui la constituent, soit %(price)s €."
+
 #: counter/forms.py
 msgid ""
 "The same product cannot be at the same time the result and a part of the "
@@ -2973,13 +3009,19 @@ msgstr ""
 "Un même produit ne peut pas être à la fois le résultat et un élément de la "
 "formule."
 
+#: counter/forms.py
+msgid ""
+"The result cannot be more expensive than the total of the other products."
+msgstr ""
+"Le résultat ne peut pas être plus cher que le total des autres produits."
+
 #: counter/forms.py
 msgid "Refound this account"
 msgstr "Rembourser ce compte"
 
 #: counter/forms.py
 msgid "The selected product isn't available for this user"
-msgstr "Le produit sélectionné n'est pas disponible pour cet utilisateur"
+msgstr "Le produit sélectionné n'est pas disponnible pour cet utilisateur"
 
 #: counter/forms.py
 msgid "Submitted basket is invalid"
@@ -3069,7 +3111,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"
 
@@ -3093,6 +3135,18 @@ msgstr "prix d'achat"
 msgid "Initial cost of purchasing the product"
 msgstr "Coût initial d'achat du produit"
 
+#: counter/models.py
+msgid "selling price"
+msgstr "prix de vente"
+
+#: counter/models.py
+msgid "special selling price"
+msgstr "prix de vente spécial"
+
+#: counter/models.py
+msgid "Price for barmen during their permanence"
+msgstr "Prix pour les barmen durant leur permanence"
+
 #: counter/models.py
 msgid "icon"
 msgstr "icône"
@@ -3105,10 +3159,6 @@ msgstr "âge limite"
 msgid "tray price"
 msgstr "prix plateau"
 
-#: counter/models.py
-msgid "Buy five, get the sixth free"
-msgstr "Pour cinq achetés, le sixième offert"
-
 #: counter/models.py
 msgid "buying groups"
 msgstr "groupe d'achat"
@@ -3121,35 +3171,10 @@ msgstr "archivé"
 msgid "updated at"
 msgstr "mis à jour le"
 
-#: counter/models.py eboutic/models.py
+#: counter/models.py
 msgid "product"
 msgstr "produit"
 
-#: counter/models.py
-msgid "always show"
-msgstr "toujours montrer"
-
-#: counter/models.py
-msgid ""
-"If this option is enabled, people will see this price and be able to pay it, "
-"even if another cheaper price exists. Else it will visible only if it is the "
-"cheapest available price."
-msgstr ""
-"Si cette option est activée, les gens verront ce prix et pourront le payer, "
-"même si un autre moins cher existe. Dans le cas contraire, le prix sera "
-"visible uniquement s'il s'agit du prix disponible le plus faible."
-
-#: counter/models.py
-msgid ""
-"A short label for easier differentiation if a user can see multiple prices."
-msgstr ""
-"Un court libellé pour faciliter la différentiation si un utilisateur peut "
-"voir plusieurs prix."
-
-#: counter/models.py
-msgid "price"
-msgstr "prix"
-
 #: counter/models.py
 msgid "products"
 msgstr "produits"
@@ -3624,6 +3649,10 @@ msgstr ""
 msgid "New formula"
 msgstr "Nouvelle formule"
 
+#: counter/templates/counter/formula_list.jinja
+msgid "instead of"
+msgstr "au lieu de"
+
 #: counter/templates/counter/fragments/create_student_card.jinja
 msgid "No student card registered."
 msgstr "Aucune carte étudiante enregistrée."
@@ -3746,14 +3775,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
-msgid "Remove price"
-msgstr "Retirer le prix"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Remove this action"
-msgstr "Retirer cette action"
-
 #: counter/templates/counter/product_form.jinja
 #, python-format
 msgid "Edit product %(name)s"
@@ -3771,14 +3792,6 @@ msgstr "Dernière mise à jour"
 msgid "Product creation"
 msgstr "Création de produit"
 
-#: counter/templates/counter/product_form.jinja
-msgid "Prices"
-msgstr "Prix"
-
-#: counter/templates/counter/product_form.jinja
-msgid "Add a price"
-msgstr "Ajouter un prix"
-
 #: counter/templates/counter/product_form.jinja
 msgid "Automatic actions"
 msgstr "Actions automatiques"
@@ -3789,10 +3802,6 @@ msgstr ""
 "Les actions automatiques vous permettent de planifier des modifications du "
 "produit à l'avance."
 
-#: counter/templates/counter/product_form.jinja
-msgid "Add action"
-msgstr "Ajouter une action"
-
 #: counter/templates/counter/product_list.jinja
 msgid "Product list"
 msgstr "Liste des produits"
@@ -4026,10 +4035,18 @@ msgstr "validé"
 msgid "Invoice already validated"
 msgstr "Facture déjà validée"
 
+#: eboutic/models.py
+msgid "product id"
+msgstr "ID du produit"
+
 #: eboutic/models.py
 msgid "product name"
 msgstr "nom du produit"
 
+#: eboutic/models.py
+msgid "product type id"
+msgstr "id du type du produit"
+
 #: eboutic/models.py
 msgid "basket"
 msgstr "panier"
@@ -4807,6 +4824,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é"

locale/fr/LC_MESSAGES/djangojs.po

@@ -255,6 +255,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"

package-lock.json

@@ -9,6 +9,7 @@
       "version": "3",
       "license": "GPL-3.0-only",
       "dependencies": {
+        "@alpinejs/morph": "^3.14.9",
         "@alpinejs/sort": "^3.15.8",
         "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
         "@floating-ui/dom": "^1.7.5",
@@ -16,7 +17,10 @@
         "@fullcalendar/core": "^6.1.20",
         "@fullcalendar/daygrid": "^6.1.20",
         "@fullcalendar/icalendar": "^6.1.20",
-        "@fullcalendar/list": "^6.1.20",
+        "@fullcalendar/interaction": "^6.1.19",
+        "@fullcalendar/list": "^6.1.19",
+        "@fullcalendar/resource": "^6.1.19",
+        "@fullcalendar/resource-timeline": "^6.1.20",
         "@sentry/browser": "^10.38.0",
         "@zip.js/zip.js": "^2.8.20",
         "3d-force-graph": "^1.79.1",
@@ -30,6 +34,7 @@
         "easymde": "^2.20.0",
         "glob": "^13.0.2",
         "html2canvas": "^1.4.1",
+        "htmx-ext-alpine-morph": "^2.0.1",
         "htmx.org": "^2.0.8",
         "js-cookie": "^3.0.5",
         "lit-html": "^3.3.2",
@@ -54,6 +59,12 @@
         "vite-plugin-static-copy": "^3.2.0"
       }
     },
+    "node_modules/@alpinejs/morph": {
+      "version": "3.15.2",
+      "resolved": "https://registry.npmjs.org/@alpinejs/morph/-/morph-3.15.2.tgz",
+      "integrity": "sha512-dt2uAgqRhGbExdVUJ/R4TIIOkzQfOFqGkl6kv6rGxURoFAmMU1iAUNYL4ajA2NCsUWA3KDmk96HrIRA3pv8WWw==",
+      "license": "MIT"
+    },
     "node_modules/@alpinejs/sort": {
       "version": "3.15.8",
       "resolved": "https://registry.npmjs.org/@alpinejs/sort/-/sort-3.15.8.tgz",
@@ -2256,6 +2267,15 @@
         "ical.js": "^1.4.0"
       }
     },
+    "node_modules/@fullcalendar/interaction": {
+      "version": "6.1.19",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.19.tgz",
+      "integrity": "sha512-GOciy79xe8JMVp+1evAU3ytdwN/7tv35t5i1vFkifiuWcQMLC/JnLg/RA2s4sYmQwoYhTw/p4GLcP0gO5B3X5w==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@fullcalendar/core": "~6.1.19"
+      }
+    },
     "node_modules/@fullcalendar/list": {
       "version": "6.1.20",
       "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-6.1.20.tgz",
@@ -2287,6 +2307,67 @@
         "typescript": ">=5.5.3"
       }
     },
+    "node_modules/@fullcalendar/premium-common": {
+      "version": "6.1.19",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/premium-common/-/premium-common-6.1.19.tgz",
+      "integrity": "sha512-bOWHm1u1dUy6M4fQ0hNK7qEI7SrVWrN1ovv/z4/FE/ybfM19ukz7SFs907Ur7KUBWLNKTQYXBtdrY/ginwWraw==",
+      "license": "SEE LICENSE IN LICENSE.md",
+      "peerDependencies": {
+        "@fullcalendar/core": "~6.1.19"
+      }
+    },
+    "node_modules/@fullcalendar/resource": {
+      "version": "6.1.19",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/resource/-/resource-6.1.19.tgz",
+      "integrity": "sha512-br1ylX/aIOfd8m7Tzl2LpJBSI+N9Q6aS1qw7K9qnQjYXWQyHBlfLG6ZcPmmkjfaqTUJc8ARRbtNWj1ts5qOZgQ==",
+      "license": "SEE LICENSE IN LICENSE.md",
+      "dependencies": {
+        "@fullcalendar/premium-common": "~6.1.19"
+      },
+      "peerDependencies": {
+        "@fullcalendar/core": "~6.1.19"
+      }
+    },
+    "node_modules/@fullcalendar/resource-timeline": {
+      "version": "6.1.19",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/resource-timeline/-/resource-timeline-6.1.19.tgz",
+      "integrity": "sha512-oC3aVR++dLqJNeBwmLHq9sDgRDFfIG0qSteV7bgBekvNlqEMqXx8wPjUxnELrq8rrhMmK4iV3wO7AB/48IVgyg==",
+      "license": "SEE LICENSE IN LICENSE.md",
+      "dependencies": {
+        "@fullcalendar/premium-common": "~6.1.19",
+        "@fullcalendar/scrollgrid": "~6.1.19",
+        "@fullcalendar/timeline": "~6.1.19"
+      },
+      "peerDependencies": {
+        "@fullcalendar/core": "~6.1.19",
+        "@fullcalendar/resource": "~6.1.19"
+      }
+    },
+    "node_modules/@fullcalendar/scrollgrid": {
+      "version": "6.1.19",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/scrollgrid/-/scrollgrid-6.1.19.tgz",
+      "integrity": "sha512-S1pbiYHvmV0ep6z5sWXJQfgW4Y/jrS5iLIAqSagDFPK0jr327nBxl7Ryi3Zb5UdMIP0/O4GXs8jwZabQPd8SOg==",
+      "license": "SEE LICENSE IN LICENSE.md",
+      "dependencies": {
+        "@fullcalendar/premium-common": "~6.1.19"
+      },
+      "peerDependencies": {
+        "@fullcalendar/core": "~6.1.19"
+      }
+    },
+    "node_modules/@fullcalendar/timeline": {
+      "version": "6.1.19",
+      "resolved": "https://registry.npmjs.org/@fullcalendar/timeline/-/timeline-6.1.19.tgz",
+      "integrity": "sha512-d2P961mnUTXtJeWNmIq1neoDmZcrPUaK7nGFoc+jQAlnmG3aNSVWQmD1ia694AMqLWtcWkwipW9MuaJgx2QvrA==",
+      "license": "SEE LICENSE IN LICENSE.md",
+      "dependencies": {
+        "@fullcalendar/premium-common": "~6.1.19",
+        "@fullcalendar/scrollgrid": "~6.1.19"
+      },
+      "peerDependencies": {
+        "@fullcalendar/core": "~6.1.19"
+      }
+    },
     "node_modules/@hey-api/json-schema-ref-parser": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@hey-api/json-schema-ref-parser/-/json-schema-ref-parser-1.3.0.tgz",
@@ -2527,9 +2608,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz",
-      "integrity": "sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.3.tgz",
+      "integrity": "sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w==",
       "cpu": [
         "arm"
       ],
@@ -2541,9 +2622,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz",
-      "integrity": "sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.3.tgz",
+      "integrity": "sha512-CbDGaMpdE9sh7sCmTrTUyllhrg65t6SwhjlMJsLr+J8YjFuPmCEjbBSx4Z/e4SmDyH3aB5hGaJUP2ltV/vcs4w==",
       "cpu": [
         "arm64"
       ],
@@ -2555,9 +2636,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz",
-      "integrity": "sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.3.tgz",
+      "integrity": "sha512-Nr7SlQeqIBpOV6BHHGZgYBuSdanCXuw09hon14MGOLGmXAFYjx1wNvquVPmpZnl0tLjg25dEdr4IQ6GgyToCUA==",
       "cpu": [
         "arm64"
       ],
@@ -2569,9 +2650,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz",
-      "integrity": "sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.3.tgz",
+      "integrity": "sha512-DZ8N4CSNfl965CmPktJ8oBnfYr3F8dTTNBQkRlffnUarJ2ohudQD17sZBa097J8xhQ26AwhHJ5mvUyQW8ddTsQ==",
       "cpu": [
         "x64"
       ],
@@ -2583,9 +2664,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz",
-      "integrity": "sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.3.tgz",
+      "integrity": "sha512-yMTrCrK92aGyi7GuDNtGn2sNW+Gdb4vErx4t3Gv/Tr+1zRb8ax4z8GWVRfr3Jw8zJWvpGHNpss3vVlbF58DZ4w==",
       "cpu": [
         "arm64"
       ],
@@ -2597,9 +2678,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz",
-      "integrity": "sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.3.tgz",
+      "integrity": "sha512-lMfF8X7QhdQzseM6XaX0vbno2m3hlyZFhwcndRMw8fbAGUGL3WFMBdK0hbUBIUYcEcMhVLr1SIamDeuLBnXS+Q==",
       "cpu": [
         "x64"
       ],
@@ -2611,9 +2692,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz",
-      "integrity": "sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.3.tgz",
+      "integrity": "sha512-k9oD15soC/Ln6d2Wv/JOFPzZXIAIFLp6B+i14KhxAfnq76ajt0EhYc5YPeX6W1xJkAdItcVT+JhKl1QZh44/qw==",
       "cpu": [
         "arm"
       ],
@@ -2625,9 +2706,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz",
-      "integrity": "sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.3.tgz",
+      "integrity": "sha512-vTNlKq+N6CK/8UktsrFuc+/7NlEYVxgaEgRXVUVK258Z5ymho29skzW1sutgYjqNnquGwVUObAaxae8rZ6YMhg==",
       "cpu": [
         "arm"
       ],
@@ -2639,9 +2720,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz",
-      "integrity": "sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.3.tgz",
+      "integrity": "sha512-RGrFLWgMhSxRs/EWJMIFM1O5Mzuz3Xy3/mnxJp/5cVhZ2XoCAxJnmNsEyeMJtpK+wu0FJFWz+QF4mjCA7AUQ3w==",
       "cpu": [
         "arm64"
       ],
@@ -2653,9 +2734,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz",
-      "integrity": "sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.3.tgz",
+      "integrity": "sha512-kASyvfBEWYPEwe0Qv4nfu6pNkITLTb32p4yTgzFCocHnJLAHs+9LjUu9ONIhvfT/5lv4YS5muBHyuV84epBo/A==",
       "cpu": [
         "arm64"
       ],
@@ -2667,9 +2748,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz",
-      "integrity": "sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.3.tgz",
+      "integrity": "sha512-JiuKcp2teLJwQ7vkJ95EwESWkNRFJD7TQgYmCnrPtlu50b4XvT5MOmurWNrCj3IFdyjBQ5p9vnrX4JM6I8OE7g==",
       "cpu": [
         "loong64"
       ],
@@ -2681,9 +2762,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz",
-      "integrity": "sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.3.tgz",
+      "integrity": "sha512-EoGSa8nd6d3T7zLuqdojxC20oBfNT8nexBbB/rkxgKj5T5vhpAQKKnD+h3UkoMuTyXkP5jTjK/ccNRmQrPNDuw==",
       "cpu": [
         "ppc64"
       ],
@@ -2695,9 +2776,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz",
-      "integrity": "sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.3.tgz",
+      "integrity": "sha512-4s+Wped2IHXHPnAEbIB0YWBv7SDohqxobiiPA1FIWZpX+w9o2i4LezzH/NkFUl8LRci/8udci6cLq+jJQlh+0g==",
       "cpu": [
         "riscv64"
       ],
@@ -2709,9 +2790,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz",
-      "integrity": "sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.3.tgz",
+      "integrity": "sha512-68k2g7+0vs2u9CxDt5ktXTngsxOQkSEV/xBbwlqYcUrAVh6P9EgMZvFsnHy4SEiUl46Xf0IObWVbMvPrr2gw8A==",
       "cpu": [
         "riscv64"
       ],
@@ -2723,9 +2804,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz",
-      "integrity": "sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.3.tgz",
+      "integrity": "sha512-VYsFMpULAz87ZW6BVYw3I6sWesGpsP9OPcyKe8ofdg9LHxSbRMd7zrVrr5xi/3kMZtpWL/wC+UIJWJYVX5uTKg==",
       "cpu": [
         "s390x"
       ],
@@ -2737,9 +2818,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz",
-      "integrity": "sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz",
+      "integrity": "sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==",
       "cpu": [
         "x64"
       ],
@@ -2751,9 +2832,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz",
-      "integrity": "sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz",
+      "integrity": "sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==",
       "cpu": [
         "x64"
       ],
@@ -2765,9 +2846,9 @@
       ]
     },
     "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz",
-      "integrity": "sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.3.tgz",
+      "integrity": "sha512-OueLAWgrNSPGAdUdIjSWXw+u/02BRTcnfw9PN41D2vq/JSEPnJnVuBgw18VkN8wcd4fjUs+jFHVM4t9+kBSNLw==",
       "cpu": [
         "arm64"
       ],
@@ -2779,9 +2860,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz",
-      "integrity": "sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.3.tgz",
+      "integrity": "sha512-GOFuKpsxR/whszbF/bzydebLiXIHSgsEUp6M0JI8dWvi+fFa1TD6YQa4aSZHtpmh2/uAlj/Dy+nmby3TJ3pkTw==",
       "cpu": [
         "arm64"
       ],
@@ -2793,9 +2874,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz",
-      "integrity": "sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.3.tgz",
+      "integrity": "sha512-iah+THLcBJdpfZ1TstDFbKNznlzoxa8fmnFYK4V67HvmuNYkVdAywJSoteUszvBQ9/HqN2+9AZghbajMsFT+oA==",
       "cpu": [
         "ia32"
       ],
@@ -2807,9 +2888,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz",
-      "integrity": "sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.3.tgz",
+      "integrity": "sha512-J9QDiOIZlZLdcot5NXEepDkstocktoVjkaKUtqzgzpt2yWjGlbYiKyp05rWwk4nypbYUNoFAztEgixoLaSETkg==",
       "cpu": [
         "x64"
       ],
@@ -2821,9 +2902,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz",
-      "integrity": "sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.3.tgz",
+      "integrity": "sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ==",
       "cpu": [
         "x64"
       ],
@@ -4075,6 +4156,14 @@
         "node": ">=8.0.0"
       }
     },
+    "node_modules/htmx-ext-alpine-morph": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/htmx-ext-alpine-morph/-/htmx-ext-alpine-morph-2.0.2.tgz",
+      "integrity": "sha512-9pZSSQd0CU0R4/4PhF2/kUbfCcQ+gcxyOMeVwy5fmzfpxOUquVuXWYMoB7EpdMeANzLJ1ceXaakEQwmDj9c9fg==",
+      "dependencies": {
+        "htmx.org": "^2.0.2"
+      }
+    },
     "node_modules/htmx.org": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.8.tgz",
@@ -4890,9 +4979,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.52.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.5.tgz",
-      "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==",
+      "version": "4.53.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz",
+      "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4906,28 +4995,28 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.52.5",
-        "@rollup/rollup-android-arm64": "4.52.5",
-        "@rollup/rollup-darwin-arm64": "4.52.5",
-        "@rollup/rollup-darwin-x64": "4.52.5",
-        "@rollup/rollup-freebsd-arm64": "4.52.5",
-        "@rollup/rollup-freebsd-x64": "4.52.5",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.52.5",
-        "@rollup/rollup-linux-arm-musleabihf": "4.52.5",
-        "@rollup/rollup-linux-arm64-gnu": "4.52.5",
-        "@rollup/rollup-linux-arm64-musl": "4.52.5",
-        "@rollup/rollup-linux-loong64-gnu": "4.52.5",
-        "@rollup/rollup-linux-ppc64-gnu": "4.52.5",
-        "@rollup/rollup-linux-riscv64-gnu": "4.52.5",
-        "@rollup/rollup-linux-riscv64-musl": "4.52.5",
-        "@rollup/rollup-linux-s390x-gnu": "4.52.5",
-        "@rollup/rollup-linux-x64-gnu": "4.52.5",
-        "@rollup/rollup-linux-x64-musl": "4.52.5",
-        "@rollup/rollup-openharmony-arm64": "4.52.5",
-        "@rollup/rollup-win32-arm64-msvc": "4.52.5",
-        "@rollup/rollup-win32-ia32-msvc": "4.52.5",
-        "@rollup/rollup-win32-x64-gnu": "4.52.5",
-        "@rollup/rollup-win32-x64-msvc": "4.52.5",
+        "@rollup/rollup-android-arm-eabi": "4.53.3",
+        "@rollup/rollup-android-arm64": "4.53.3",
+        "@rollup/rollup-darwin-arm64": "4.53.3",
+        "@rollup/rollup-darwin-x64": "4.53.3",
+        "@rollup/rollup-freebsd-arm64": "4.53.3",
+        "@rollup/rollup-freebsd-x64": "4.53.3",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.53.3",
+        "@rollup/rollup-linux-arm-musleabihf": "4.53.3",
+        "@rollup/rollup-linux-arm64-gnu": "4.53.3",
+        "@rollup/rollup-linux-arm64-musl": "4.53.3",
+        "@rollup/rollup-linux-loong64-gnu": "4.53.3",
+        "@rollup/rollup-linux-ppc64-gnu": "4.53.3",
+        "@rollup/rollup-linux-riscv64-gnu": "4.53.3",
+        "@rollup/rollup-linux-riscv64-musl": "4.53.3",
+        "@rollup/rollup-linux-s390x-gnu": "4.53.3",
+        "@rollup/rollup-linux-x64-gnu": "4.53.3",
+        "@rollup/rollup-linux-x64-musl": "4.53.3",
+        "@rollup/rollup-openharmony-arm64": "4.53.3",
+        "@rollup/rollup-win32-arm64-msvc": "4.53.3",
+        "@rollup/rollup-win32-ia32-msvc": "4.53.3",
+        "@rollup/rollup-win32-x64-gnu": "4.53.3",
+        "@rollup/rollup-win32-x64-msvc": "4.53.3",
         "fsevents": "~2.3.2"
       }
     },

package.json

@@ -23,7 +23,8 @@
     "#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.29.0",
@@ -41,6 +42,7 @@
     "vite-plugin-static-copy": "^3.2.0"
   },
   "dependencies": {
+    "@alpinejs/morph": "^3.14.9",
     "@alpinejs/sort": "^3.15.8",
     "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
     "@floating-ui/dom": "^1.7.5",
@@ -48,7 +50,10 @@
     "@fullcalendar/core": "^6.1.20",
     "@fullcalendar/daygrid": "^6.1.20",
     "@fullcalendar/icalendar": "^6.1.20",
+    "@fullcalendar/interaction": "^6.1.19",
     "@fullcalendar/list": "^6.1.20",
+    "@fullcalendar/resource": "^6.1.19",
+    "@fullcalendar/resource-timeline": "^6.1.19",
     "@sentry/browser": "^10.38.0",
     "@zip.js/zip.js": "^2.8.20",
     "3d-force-graph": "^1.79.1",
@@ -62,6 +67,7 @@
     "easymde": "^2.20.0",
     "glob": "^13.0.2",
     "html2canvas": "^1.4.1",
+    "htmx-ext-alpine-morph": "^2.0.1",
     "htmx.org": "^2.0.8",
     "js-cookie": "^3.0.5",
     "lit-html": "^3.3.2",

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,136 @@
+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 interactionPlugin, { type EventResizeDoneArg } from "@fullcalendar/interaction";
+import resourceTimelinePlugin from "@fullcalendar/resource-timeline";
+import { paginated } from "#core:utils/api";
+import { inheritHtmlElement, registerComponent } from "#core:utils/web-components";
+import {
+  type ReservationslotFetchSlotsData,
+  reservableroomFetchRooms,
+  reservationslotFetchSlots,
+  reservationslotUpdateSlot,
+  type SlotSchema,
+} from "#openapi";
+import type { SlotSelectedEventArg } from "#reservation:reservation/types";
+
+@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();
+  }
+}

reservation/static/bundled/reservation/slot-reservation-index.ts

@@ -0,0 +1,39 @@
+import { AlertMessage } from "#core:utils/alert-message";
+import type { SlotSelectedEventArg } from "#reservation:reservation/types";
+
+document.addEventListener("alpine:init", () => {
+  Alpine.data("slotReservation", () => ({
+    start: null as string,
+    end: null as string,
+    room: null as number,
+    showForm: false,
+
+    init() {
+      document.addEventListener(
+        "timeSlotSelected",
+        (event: CustomEvent<SlotSelectedEventArg>) => {
+          this.start = event.detail.start.split("+")[0];
+          this.end = event.detail.end.split("+")[0];
+          this.room = event.detail.ressource;
+          this.showForm = true;
+          this.$nextTick(() => this.$el.scrollIntoView({ behavior: "smooth" })).then();
+        },
+      );
+    },
+  }));
+
+  /**
+   * Component that will catch events sent from the scheduler
+   * to display success messages accordingly.
+   */
+  Alpine.data("scheduleMessages", () => ({
+    alertMessage: new AlertMessage({ defaultDuration: 2000 }),
+    init() {
+      document.addEventListener("reservationSlotChanged", (_event: CustomEvent) => {
+        this.alertMessage.display(gettext("This slot has been successfully moved"), {
+          success: true,
+        });
+      });
+    },
+  }));
+});

reservation/static/bundled/reservation/types.d.ts

@@ -0,0 +1,5 @@
+export interface SlotSelectedEventArg {
+  start: string;
+  end: string;
+  ressource: number;
+}

reservation/static/reservation/reservation.scss

@@ -0,0 +1,39 @@
+#slot-reservation {
+  margin-top: 3em;
+
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+
+  h3 {
+    display: block;
+    margin: auto;
+    text-align: left;
+  }
+
+  .alert, .error {
+    display: block;
+    margin: 1em auto auto;
+    max-width: 400px;
+    word-wrap: break-word;
+    text-wrap: wrap;
+  }
+
+  form {
+    display: flex;
+    flex-direction: column;
+    gap: .5em;
+    justify-content: center;
+
+    .buttons-row {
+      input[type="submit"], button {
+        margin: 0;
+      }
+    }
+    textarea {
+      max-width: unset;
+      width: 100%;
+      margin-top: unset;
+    }
+  }
+}

reservation/templates/reservation/fragments/create_reservation.jinja

@@ -0,0 +1,51 @@
+<section
+  id="slot-reservation"
+  x-data="slotReservation"
+  x-show="showForm"
+  hx-target="this"
+  hx-ext="alpine-morph"
+  hx-swap="morph"
+>
+  <h3>{% trans %}Book a room{% endtrans %}</h3>
+  {% set non_field_errors = form.non_field_errors() %}
+  {% if non_field_errors %}
+    <div class="alert alert-red">
+      {% for error in non_field_errors %}
+        <span>{{ error }}</span>
+      {% endfor %}
+    </div>
+  {% endif %}
+  <form
+    id="slot-reservation-form"
+    hx-post="{{ url("reservation:make_reservation") }}"
+    hx-disabled-elt="find input[type='submit']"
+  >
+    {% csrf_token %}
+    <div class="form-group">
+      {{ form.room.errors }}
+      {{ form.room.label_tag() }}
+      {{ form.room|add_attr("x-model=room") }}
+    </div>
+    <div class="form-group">
+      {{ form.start_at.errors }}
+      {{ form.start_at.label_tag() }}
+      {{ form.start_at|add_attr("x-model=start") }}
+    </div>
+    <div class="form-group">
+      {{ form.end_at.errors }}
+      {{ form.end_at.label_tag() }}
+      {{ form.end_at|add_attr("x-model=end") }}
+    </div>
+    <div class="form-group">
+      {{ form.comment.errors }}
+      {{ form.comment.label_tag() }}
+      {{ form.comment }}
+    </div>
+    <div class="row gap buttons-row">
+      <button class="btn btn-grey grow" @click.prevent="showForm = false">
+        {% trans %}Cancel{% endtrans %}
+      </button>
+      <input class="btn btn-blue grow" type="submit">
+    </div>
+  </form>
+</section>

reservation/templates/reservation/macros.jinja

@@ -0,0 +1,27 @@
+{% macro room_detail(room, can_edit, can_delete) %}
+  <div class="card card-row card-row-m">
+    <div class="card-content">
+      <strong class="card-title">{{ room.name }}</strong>
+      <em>{{ room.get_location_display() }}</em>
+      <p>{{ room.description|truncate(250) }}</p>
+    </div>
+    <div class="card-top-left">
+      {% if can_edit %}
+        <a
+          class="btn btn-grey btn-no-text"
+          href="{{ url("reservation:room_edit", room_id=room.id) }}"
+        >
+          <i class="fa fa-edit"></i>
+        </a>
+      {% endif %}
+      {% if can_delete %}
+        <a
+          class="btn btn-red btn-no-text"
+          href="{{ url("reservation:room_delete", room_id=room.id) }}"
+        >
+          <i class="fa fa-trash"></i>
+        </a>
+      {% endif %}
+    </div>
+  </div>
+{% endmacro %}

reservation/templates/reservation/schedule.jinja

@@ -0,0 +1,33 @@
+{% extends "core/base.jinja" %}
+
+{% block additional_js %}
+  <script type="module" src="{{ static("bundled/reservation/components/room-scheduler-index.ts") }}"></script>
+  <script type="module" src="{{ static("bundled/reservation/slot-reservation-index.ts") }}"></script>
+{% endblock %}
+
+{% block additional_css %}
+  <link rel="stylesheet" href="{{ static('core/components/calendar.scss') }}">
+  <link rel="stylesheet" href="{{ static('reservation/reservation.scss') }}">
+{% endblock %}
+
+
+{% block content %}
+  <h2 class="margin-bottom">{% trans %}Room reservation{% endtrans %}</h2>
+  <p
+    x-data="scheduleMessages"
+    class="alert snackbar"
+    :class="alertMessage.success ? 'alert-green' : 'alert-red'"
+    x-show="alertMessage.open"
+    x-transition.duration.500ms
+    x-text="alertMessage.content"
+  ></p>
+  <room-scheduler
+    locale="{{ LANGUAGE_CODE }}"
+    can_edit_slot="{{ user.has_perm("reservation.change_reservationslot") }}"
+    can_create_slot="{{ user.has_perm("reservation.add_reservationslot") }}"
+  ></room-scheduler>
+  {% if user.has_perm("reservation.add_reservationslot") %}
+    <p><em>{% trans %}You can book a room by selecting a free slot in the calendar.{% endtrans %}</em></p>
+    {{ add_slot_fragment }}
+  {% endif %}
+{% endblock %}

reservation/tests/test_room.py

@@ -0,0 +1,113 @@
+import pytest
+from django.contrib.auth.models import Permission
+from django.test import Client
+from django.urls import reverse
+from model_bakery import baker
+from pytest_django.asserts import assertNumQueries, assertRedirects
+
+from club.models import Club
+from core.models import User
+from reservation.forms import RoomUpdateForm
+from reservation.models import Room
+
+
+@pytest.mark.django_db
+class TestFetchRoom:
+    @pytest.fixture
+    def user(self):
+        return baker.make(
+            User,
+            user_permissions=[Permission.objects.get(codename="view_room")],
+        )
+
+    def test_fetch_simple(self, client: Client, user: User):
+        rooms = baker.make(Room, _quantity=3, _bulk_create=True)
+        client.force_login(user)
+        response = client.get(reverse("api:fetch_reservable_rooms"))
+        assert response.status_code == 200
+        assert response.json() == [
+            {
+                "id": room.id,
+                "name": room.name,
+                "description": room.description,
+                "location": room.location,
+                "club": {"id": room.club.id, "name": room.club.name},
+            }
+            for room in rooms
+        ]
+
+    def test_nb_queries(self, client: Client, user: User):
+        client.force_login(user)
+        with assertNumQueries(5):
+            # 4 for authentication
+            # 1 to fetch the actual data
+            client.get(reverse("api:fetch_reservable_rooms"))
+
+
+@pytest.mark.django_db
+class TestCreateRoom:
+    def test_ok(self, client: Client):
+        perm = Permission.objects.get(codename="add_room")
+        club = baker.make(Club)
+        client.force_login(
+            baker.make(User, user_permissions=[perm], groups=[club.board_group])
+        )
+        response = client.post(
+            reverse("reservation:room_create"),
+            data={"club": club.id, "name": "test", "location": "BELFORT"},
+        )
+        assertRedirects(response, reverse("club:tools", kwargs={"club_id": club.id}))
+        room = Room.objects.last()
+        assert room is not None
+        assert room.club == club
+        assert room.name == "test"
+        assert room.location == "BELFORT"
+
+    def test_permission_denied(self, client: Client):
+        club = baker.make(Club)
+        client.force_login(baker.make(User))
+        response = client.get(reverse("reservation:room_create"))
+        assert response.status_code == 403
+        response = client.post(
+            reverse("reservation:room_create"),
+            data={"club": club.id, "name": "test", "location": "BELFORT"},
+        )
+        assert response.status_code == 403
+
+
+@pytest.mark.django_db
+class TestUpdateRoom:
+    def test_ok(self, client: Client):
+        club = baker.make(Club)
+        room = baker.make(Room, club=club)
+        client.force_login(baker.make(User, groups=[club.board_group]))
+        url = reverse("reservation:room_edit", kwargs={"room_id": room.id})
+        response = client.post(url, data={"name": "test", "location": "BELFORT"})
+        assertRedirects(response, url)
+        room.refresh_from_db()
+        assert room.club == club
+        assert room.name == "test"
+        assert room.location == "BELFORT"
+
+    def test_permission_denied(self, client: Client):
+        club = baker.make(Club)
+        room = baker.make(Room, club=club)
+        client.force_login(baker.make(User))
+        url = reverse("reservation:room_edit", kwargs={"room_id": room.id})
+        response = client.get(url)
+        assert response.status_code == 403
+        response = client.post(url, data={"name": "test", "location": "BELFORT"})
+        assert response.status_code == 403
+
+
+@pytest.mark.django_db
+class TestUpdateRoomForm:
+    def test_form_club_edition_rights(self):
+        """The club field should appear only if the request user can edit it."""
+        room = baker.make(Room)
+        perm = Permission.objects.get(codename="change_room")
+        user_authorized = baker.make(User, user_permissions=[perm])
+        assert "club" in RoomUpdateForm(request_user=user_authorized).fields
+
+        user_forbidden = baker.make(User, groups=[room.club.board_group])
+        assert "club" not in RoomUpdateForm(request_user=user_forbidden).fields

reservation/tests/test_slot.py

@@ -0,0 +1,207 @@
+from datetime import timedelta
+
+import pytest
+from django.contrib.auth.models import Permission
+from django.test import Client
+from django.urls import reverse
+from django.utils.timezone import now
+from model_bakery import baker
+from pytest_django.asserts import assertNumQueries
+
+from core.models import User
+from reservation.forms import ReservationForm
+from reservation.models import ReservationSlot, Room
+
+
+@pytest.mark.django_db
+class TestFetchReservationSlotsApi:
+    @pytest.fixture
+    def user(self):
+        perm = Permission.objects.get(codename="view_reservationslot")
+        return baker.make(User, user_permissions=[perm])
+
+    def test_fetch_simple(self, client: Client, user: User):
+        slots = baker.make(ReservationSlot, _quantity=5, _bulk_create=True)
+        client.force_login(user)
+        response = client.get(reverse("api:fetch_reservation_slots"))
+        assert response.json()["results"] == [
+            {
+                "id": slot.id,
+                "room": slot.room_id,
+                "comment": slot.comment,
+                "start": slot.start_at.isoformat(timespec="milliseconds").replace(
+                    "+00:00", "Z"
+                ),
+                "end": slot.end_at.isoformat(timespec="milliseconds").replace(
+                    "+00:00", "Z"
+                ),
+                "author": {
+                    "id": slot.author.id,
+                    "first_name": slot.author.first_name,
+                    "last_name": slot.author.last_name,
+                    "nick_name": slot.author.nick_name,
+                },
+            }
+            for slot in slots
+        ]
+
+    def test_nb_queries(self, client: Client, user: User):
+        client.force_login(user)
+        with assertNumQueries(5):
+            # 4 for authentication
+            # 1 to fetch the actual data
+            client.get(reverse("api:fetch_reservation_slots"))
+
+
+@pytest.mark.django_db
+class TestUpdateReservationSlotApi:
+    @pytest.fixture
+    def user(self):
+        perm = Permission.objects.get(codename="change_reservationslot")
+        return baker.make(User, user_permissions=[perm])
+
+    @pytest.fixture
+    def slot(self):
+        return baker.make(
+            ReservationSlot,
+            start_at=now() + timedelta(hours=2),
+            end_at=now() + timedelta(hours=4),
+        )
+
+    def test_ok(self, client: Client, user: User, slot: ReservationSlot):
+        client.force_login(user)
+        new_start = (slot.start_at + timedelta(hours=1)).replace(microsecond=0)
+        response = client.patch(
+            reverse("api:change_reservation_slot", kwargs={"slot_id": slot.id}),
+            {"start_at": new_start, "end_at": new_start + timedelta(hours=2)},
+            content_type="application/json",
+        )
+        assert response.status_code == 200
+        slot.refresh_from_db()
+        assert slot.start_at.replace(microsecond=0) == new_start
+        assert slot.end_at.replace(microsecond=0) == new_start + timedelta(hours=2)
+
+    def test_change_past_event(self, client, user: User, slot: ReservationSlot):
+        """Test that moving a slot that already began is impossible."""
+        client.force_login(user)
+        new_start = now() - timedelta(hours=1)
+        response = client.patch(
+            reverse("api:change_reservation_slot", kwargs={"slot_id": slot.id}),
+            {"start_at": new_start, "end_at": new_start + timedelta(hours=2)},
+            content_type="application/json",
+        )
+
+        assert response.status_code == 422
+
+    def test_move_event_to_occupied_slot(
+        self, client: Client, user: User, slot: ReservationSlot
+    ):
+        client.force_login(user)
+        other_slot = baker.make(
+            ReservationSlot,
+            room=slot.room,
+            start_at=slot.end_at + timedelta(hours=1),
+            end_at=slot.end_at + timedelta(hours=3),
+        )
+        response = client.patch(
+            reverse("api:change_reservation_slot", kwargs={"slot_id": slot.id}),
+            {
+                "start_at": other_slot.start_at - timedelta(hours=1),
+                "end_at": other_slot.start_at + timedelta(hours=1),
+            },
+            content_type="application/json",
+        )
+        assert response.status_code == 409
+
+
+@pytest.mark.django_db
+class TestReservationForm:
+    def test_ok(self):
+        start = now() + timedelta(hours=2)
+        end = start + timedelta(hours=1)
+        form = ReservationForm(
+            author=baker.make(User),
+            data={"room": baker.make(Room), "start_at": start, "end_at": end},
+        )
+        assert form.is_valid()
+
+    @pytest.mark.parametrize(
+        ("start_date", "end_date", "errors"),
+        [
+            (
+                now() - timedelta(hours=2),
+                now() + timedelta(hours=2),
+                {"start_at": ["Assurez-vous que cet horodatage est dans le futur"]},
+            ),
+            (
+                now() + timedelta(hours=3),
+                now() + timedelta(hours=2),
+                {"__all__": ["Le début doit être placé avant la fin"]},
+            ),
+        ],
+    )
+    def test_invalid_timedates(self, start_date, end_date, errors):
+        form = ReservationForm(
+            author=baker.make(User),
+            data={"room": baker.make(Room), "start_at": start_date, "end_at": end_date},
+        )
+        assert not form.is_valid()
+        assert form.errors == errors
+
+    def test_unavailable_room(self):
+        room = baker.make(Room)
+        baker.make(
+            ReservationSlot,
+            room=room,
+            start_at=now() + timedelta(hours=2),
+            end_at=now() + timedelta(hours=4),
+        )
+        form = ReservationForm(
+            author=baker.make(User),
+            data={
+                "room": room,
+                "start_at": now() + timedelta(hours=1),
+                "end_at": now() + timedelta(hours=3),
+            },
+        )
+        assert not form.is_valid()
+        assert form.errors == {
+            "__all__": ["Il y a déjà une réservation sur ce créneau."]
+        }
+
+
+@pytest.mark.django_db
+class TestCreateReservationSlot:
+    @pytest.fixture
+    def user(self):
+        perms = Permission.objects.filter(
+            codename__in=["add_reservationslot", "view_reservationslot"]
+        )
+        return baker.make(User, user_permissions=list(perms))
+
+    def test_ok(self, client: Client, user: User):
+        client.force_login(user)
+        start = now() + timedelta(hours=2)
+        end = start + timedelta(hours=1)
+        room = baker.make(Room)
+        response = client.post(
+            reverse("reservation:make_reservation"),
+            {"room": room.id, "start_at": start, "end_at": end},
+        )
+        assert response.status_code == 200
+        assert response.headers.get("HX-Redirect", "") == reverse("reservation:main")
+        slot = ReservationSlot.objects.filter(room=room).last()
+        assert slot is not None
+        assert slot.start_at == start
+        assert slot.end_at == end
+        assert slot.author == user
+
+    def test_permissions_denied(self, client: Client):
+        client.force_login(baker.make(User))
+        start = now() + timedelta(hours=2)
+        end = start + timedelta(hours=1)
+        response = client.post(
+            reverse("reservation:make_reservation"),
+            {"room": baker.make(Room), "start_at": start, "end_at": end},
+        )
+        assert response.status_code == 403

reservation/urls.py

@@ -0,0 +1,19 @@
+from django.urls import path
+
+from reservation.views import (
+    ReservationFragment,
+    ReservationScheduleView,
+    RoomCreateView,
+    RoomDeleteView,
+    RoomUpdateView,
+)
+
+urlpatterns = [
+    path("", ReservationScheduleView.as_view(), name="main"),
+    path("room/create/", RoomCreateView.as_view(), name="room_create"),
+    path("room/<int:room_id>/edit", RoomUpdateView.as_view(), name="room_edit"),
+    path("room/<int:room_id>/delete", RoomDeleteView.as_view(), name="room_delete"),
+    path(
+        "fragment/reservation", ReservationFragment.as_view(), name="make_reservation"
+    ),
+]

reservation/views.py

@@ -0,0 +1,72 @@
+# Create your views here.
+
+from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.contrib.messages.views import SuccessMessageMixin
+from django.urls import reverse, reverse_lazy
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import CreateView, DeleteView, TemplateView, UpdateView
+
+from club.models import Club
+from core.auth.mixins import CanEditMixin
+from core.views import UseFragmentsMixin
+from core.views.mixins import FragmentMixin
+from reservation.forms import ReservationForm, RoomCreateForm, RoomUpdateForm
+from reservation.models import ReservationSlot, Room
+
+
+class ReservationFragment(PermissionRequiredMixin, FragmentMixin, CreateView):
+    model = ReservationSlot
+    form_class = ReservationForm
+    permission_required = "reservation.add_reservationslot"
+    template_name = "reservation/fragments/create_reservation.jinja"
+    success_url = reverse_lazy("reservation:main")
+    reload_on_redirect = True
+    object = None
+
+    def get_form_kwargs(self):
+        return super().get_form_kwargs() | {"author": self.request.user}
+
+
+class ReservationScheduleView(PermissionRequiredMixin, UseFragmentsMixin, TemplateView):
+    template_name = "reservation/schedule.jinja"
+    permission_required = "reservation.view_reservationslot"
+    fragments = {"add_slot_fragment": ReservationFragment}
+
+
+class RoomCreateView(PermissionRequiredMixin, CreateView):
+    form_class = RoomCreateForm
+    template_name = "core/create.jinja"
+    permission_required = "reservation.add_room"
+
+    def get_initial(self):
+        init = super().get_initial()
+        if "club" in self.request.GET:
+            club_id = self.request.GET["club"]
+            if club_id.isdigit() and int(club_id) > 0:
+                init["club"] = Club.objects.filter(id=int(club_id)).first()
+        return init
+
+    def get_success_url(self):
+        return reverse("club:tools", kwargs={"club_id": self.object.club_id})
+
+
+class RoomUpdateView(SuccessMessageMixin, CanEditMixin, UpdateView):
+    model = Room
+    pk_url_kwarg = "room_id"
+    form_class = RoomUpdateForm
+    template_name = "core/edit.jinja"
+    success_message = _("%(name)s was updated successfully")
+
+    def get_form_kwargs(self):
+        return super().get_form_kwargs() | {"request_user": self.request.user}
+
+    def get_success_url(self):
+        return self.request.path
+
+
+class RoomDeleteView(PermissionRequiredMixin, DeleteView):
+    model = Room
+    pk_url_kwarg = "room_id"
+    template_name = "core/delete_confirm.jinja"
+    success_url = reverse_lazy("reservation:room_list")
+    permission_required = "reservation.delete_room"

rootplace/tests/test_merge_users.py

@@ -33,6 +33,8 @@ class TestMergeUser(TestCase):
         cls.club = baker.make(Club)
         cls.eboutic = Counter.objects.get(name="Eboutic")
         cls.barbar = Product.objects.get(code="BARB")
+        cls.barbar.selling_price = 2
+        cls.barbar.save()
         cls.root = User.objects.get(username="root")
         cls.to_keep = User.objects.create(
             username="to_keep", password="plop", email="u.1@utbm.fr"

sas/static/bundled/sas/viewer-index.ts

@@ -109,225 +109,232 @@ interface ViewerConfig {
   /** id of the first picture to load on the page */
   firstPictureId: number;
   /** if the user is sas admin */
-  userCanModerate: boolean;
+  userIsSasAdmin: boolean;
 }
 
 /**
  * Load user picture page with a nice download bar
  **/
-document.addEventListener("alpine:init", () => {
-  Alpine.data("picture_viewer", (config: ViewerConfig) => ({
-    /**
-     * All the pictures that can be displayed on this picture viewer
-     **/
-    pictures: [] as PictureWithIdentifications[],
-    /**
-     * The currently displayed picture
-     * Default dummy data are pre-loaded to avoid javascript error
-     * when loading the page at the beginning
-     * @type PictureWithIdentifications
-     **/
-    currentPicture: {
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      is_moderated: true,
-      id: null as number,
-      name: "",
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      display_name: "",
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      compressed_url: "",
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      profile_url: "",
-      // biome-ignore lint/style/useNamingConvention: api is in snake_case
-      full_size_url: "",
-      owner: "",
-      date: new Date(),
-      identifications: [] as IdentifiedUserSchema[],
-    },
-    /**
-     * The picture which will be displayed next if the user press the "next" button
-     **/
-    nextPicture: null as PictureWithIdentifications,
-    /**
-     * The picture which will be displayed next if the user press the "previous" button
-     **/
-    previousPicture: null as PictureWithIdentifications,
-    /**
-     * The select2 component used to identify users
-     **/
-    selector: undefined as UserAjaxSelect,
-    /**
-     * Error message when a moderation operation fails
-     **/
-    moderationError: "",
-    /**
-     * Method of pushing new url to the browser history
-     * Used by popstate event and always reset to it's default value when used
-     **/
-    pushstate: History.Push,
+exportToHtml("loadViewer", (config: ViewerConfig) => {
+  document.addEventListener("alpine:init", () => {
+    Alpine.data("picture_viewer", () => ({
+      /**
+       * All the pictures that can be displayed on this picture viewer
+       **/
+      pictures: [] as PictureWithIdentifications[],
+      /**
+       * The currently displayed picture
+       * Default dummy data are pre-loaded to avoid javascript error
+       * when loading the page at the beginning
+       * @type PictureWithIdentifications
+       **/
+      currentPicture: {
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        is_moderated: true,
+        id: null as number,
+        name: "",
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        display_name: "",
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        compressed_url: "",
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        profile_url: "",
+        // biome-ignore lint/style/useNamingConvention: api is in snake_case
+        full_size_url: "",
+        owner: "",
+        date: new Date(),
+        identifications: [] as IdentifiedUserSchema[],
+      },
+      /**
+       * The picture which will be displayed next if the user press the "next" button
+       **/
+      nextPicture: null as PictureWithIdentifications,
+      /**
+       * The picture which will be displayed next if the user press the "previous" button
+       **/
+      previousPicture: null as PictureWithIdentifications,
+      /**
+       * The select2 component used to identify users
+       **/
+      selector: undefined as UserAjaxSelect,
+      /**
+       * Error message when a moderation operation fails
+       **/
+      moderationError: "",
+      /**
+       * Method of pushing new url to the browser history
+       * Used by popstate event and always reset to it's default value when used
+       **/
+      pushstate: History.Push,
 
-    async init() {
-      this.pictures = (
-        await paginated(picturesFetchPictures, {
-          // biome-ignore lint/style/useNamingConvention: api is in snake_case
-          query: { album_id: config.albumId },
-        } as PicturesFetchPicturesData)
-      ).map(PictureWithIdentifications.fromPicture);
-      this.selector = this.$refs.search;
-      this.selector.setFilter((users: UserProfileSchema[]) => {
-        const resp: UserProfileSchema[] = [];
-        const ids = [
-          ...(this.currentPicture.identifications || []).map(
-            (i: IdentifiedUserSchema) => i.user.id,
-          ),
-        ];
-        for (const user of users) {
-          if (!ids.includes(user.id)) {
-            resp.push(user);
+      async init() {
+        this.pictures = (
+          await paginated(picturesFetchPictures, {
+            // biome-ignore lint/style/useNamingConvention: api is in snake_case
+            query: { album_id: config.albumId },
+          } as PicturesFetchPicturesData)
+        ).map(PictureWithIdentifications.fromPicture);
+        this.selector = this.$refs.search;
+        this.selector.setFilter((users: UserProfileSchema[]) => {
+          const resp: UserProfileSchema[] = [];
+          const ids = [
+            ...(this.currentPicture.identifications || []).map(
+              (i: IdentifiedUserSchema) => i.user.id,
+            ),
+          ];
+          for (const user of users) {
+            if (!ids.includes(user.id)) {
+              resp.push(user);
+            }
           }
-        }
-        return resp;
-      });
-      this.currentPicture = this.pictures.find(
-        (i: PictureSchema) => i.id === config.firstPictureId,
-      );
-      this.$watch(
-        "currentPicture",
-        (current: PictureSchema, previous: PictureSchema) => {
-          if (current === previous) {
-            /* Avoid recursive updates */
+          return resp;
+        });
+        this.currentPicture = this.pictures.find(
+          (i: PictureSchema) => i.id === config.firstPictureId,
+        );
+        this.$watch(
+          "currentPicture",
+          (current: PictureSchema, previous: PictureSchema) => {
+            if (current === previous) {
+              /* Avoid recursive updates */
+              return;
+            }
+            this.updatePicture();
+          },
+        );
+        window.addEventListener("popstate", async (event) => {
+          if (!event.state || event.state.sasPictureId === undefined) {
             return;
           }
-          this.updatePicture();
-        },
-      );
-      window.addEventListener("popstate", async (event) => {
-        if (!event.state || event.state.sasPictureId === undefined) {
+          this.pushstate = History.Replace;
+          this.currentPicture = this.pictures.find(
+            (i: PictureSchema) =>
+              i.id === Number.parseInt(event.state.sasPictureId, 10),
+          );
+        });
+        this.pushstate = History.Replace; /* Avoid first url push */
+        await this.updatePicture();
+      },
+
+      /**
+       * Update the page.
+       * Called when the `currentPicture` property changes.
+       *
+       * The url is modified without reloading the page,
+       * and the previous picture, the next picture and
+       * the list of identified users are updated.
+       */
+      async updatePicture(): Promise<void> {
+        const updateArgs = {
+          data: { sasPictureId: this.currentPicture.id },
+          unused: "",
+          url: this.currentPicture.sas_url,
+        };
+        if (this.pushstate === History.Replace) {
+          window.history.replaceState(
+            updateArgs.data,
+            updateArgs.unused,
+            updateArgs.url,
+          );
+          this.pushstate = History.Push;
+        } else {
+          window.history.pushState(updateArgs.data, updateArgs.unused, updateArgs.url);
+        }
+
+        this.moderationError = "";
+        const index: number = this.pictures.indexOf(this.currentPicture);
+        this.previousPicture = this.pictures[index - 1] || null;
+        this.nextPicture = this.pictures[index + 1] || null;
+        this.$refs.mainPicture?.addEventListener("load", () => {
+          // once the current picture is loaded,
+          // start preloading the next and previous pictures
+          this.nextPicture?.preload();
+          this.previousPicture?.preload();
+        });
+        if (this.currentPicture.asked_for_removal && config.userIsSasAdmin) {
+          await Promise.all([
+            this.currentPicture.loadIdentifications(),
+            this.currentPicture.loadModeration(),
+          ]);
+        } else {
+          await this.currentPicture.loadIdentifications();
+        }
+      },
+
+      async moderatePicture() {
+        const res = await picturesModeratePicture({
+          // biome-ignore lint/style/useNamingConvention: api is in snake_case
+          path: { picture_id: this.currentPicture.id },
+        });
+        if (res.error) {
+          this.moderationError = `${gettext("Couldn't moderate picture")} : ${(res.error as { detail: string }).detail}`;
           return;
         }
-        this.pushstate = History.Replace;
-        this.currentPicture = this.pictures.find(
-          (i: PictureSchema) => i.id === Number.parseInt(event.state.sasPictureId, 10),
-        );
-      });
-      this.pushstate = History.Replace; /* Avoid first url push */
-      await this.updatePicture();
-    },
+        this.currentPicture.is_moderated = true;
+        this.currentPicture.asked_for_removal = false;
+      },
 
-    /**
-     * Update the page.
-     * Called when the `currentPicture` property changes.
-     *
-     * The url is modified without reloading the page,
-     * and the previous picture, the next picture and
-     * the list of identified users are updated.
-     */
-    async updatePicture(): Promise<void> {
-      const updateArgs = {
-        data: { sasPictureId: this.currentPicture.id },
-        unused: "",
-        url: this.currentPicture.sas_url,
-      };
-      if (this.pushstate === History.Replace) {
-        window.history.replaceState(updateArgs.data, updateArgs.unused, updateArgs.url);
-        this.pushstate = History.Push;
-      } else {
-        window.history.pushState(updateArgs.data, updateArgs.unused, updateArgs.url);
-      }
-
-      this.moderationError = "";
-      const index: number = this.pictures.indexOf(this.currentPicture);
-      this.previousPicture = this.pictures[index - 1] || null;
-      this.nextPicture = this.pictures[index + 1] || null;
-      this.$refs.mainPicture?.addEventListener("load", () => {
-        // once the current picture is loaded,
-        // start preloading the next and previous pictures
-        this.nextPicture?.preload();
-        this.previousPicture?.preload();
-      });
-      if (this.currentPicture.asked_for_removal && config.userCanModerate) {
-        await Promise.all([
-          this.currentPicture.loadIdentifications(),
-          this.currentPicture.loadModeration(),
-        ]);
-      } else {
-        await this.currentPicture.loadIdentifications();
-      }
-    },
-
-    async moderatePicture() {
-      const res = await picturesModeratePicture({
-        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-        path: { picture_id: this.currentPicture.id },
-      });
-      if (res.error) {
-        this.moderationError = `${gettext("Couldn't moderate picture")} : ${(res.error as { detail: string }).detail}`;
-        return;
-      }
-      this.currentPicture.is_moderated = true;
-      this.currentPicture.asked_for_removal = false;
-    },
-
-    async deletePicture() {
-      const res = await picturesDeletePicture({
-        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-        path: { picture_id: this.currentPicture.id },
-      });
-      if (res.error) {
-        this.moderationError = `${gettext("Couldn't delete picture")} : ${(res.error as { detail: string }).detail}`;
-        return;
-      }
-      this.pictures.splice(this.pictures.indexOf(this.currentPicture), 1);
-      if (this.pictures.length === 0) {
-        // The deleted picture was the only one in the list.
-        // As the album is now empty, go back to the parent page
-        document.location.href = config.albumUrl;
-      }
-      this.currentPicture = this.nextPicture || this.previousPicture;
-    },
-
-    /**
-     * Send the identification request and update the list of identified users.
-     */
-    async submitIdentification(): Promise<void> {
-      const widget: TomSelect = this.selector.widget;
-      await picturesIdentifyUsers({
-        path: {
+      async deletePicture() {
+        const res = await picturesDeletePicture({
           // biome-ignore lint/style/useNamingConvention: api is in snake_case
-          picture_id: this.currentPicture.id,
-        },
-        body: widget.items.map((i: string) => Number.parseInt(i, 10)),
-      });
-      // refresh the identified users list
-      await this.currentPicture.loadIdentifications({ forceReload: true });
+          path: { picture_id: this.currentPicture.id },
+        });
+        if (res.error) {
+          this.moderationError = `${gettext("Couldn't delete picture")} : ${(res.error as { detail: string }).detail}`;
+          return;
+        }
+        this.pictures.splice(this.pictures.indexOf(this.currentPicture), 1);
+        if (this.pictures.length === 0) {
+          // The deleted picture was the only one in the list.
+          // As the album is now empty, go back to the parent page
+          document.location.href = config.albumUrl;
+        }
+        this.currentPicture = this.nextPicture || this.previousPicture;
+      },
 
-      // Clear selection and cache of retrieved user so they can be filtered again
-      widget.clear(false);
-      widget.clearOptions();
-      widget.setTextboxValue("");
-    },
+      /**
+       * Send the identification request and update the list of identified users.
+       */
+      async submitIdentification(): Promise<void> {
+        const widget: TomSelect = this.selector.widget;
+        await picturesIdentifyUsers({
+          path: {
+            // biome-ignore lint/style/useNamingConvention: api is in snake_case
+            picture_id: this.currentPicture.id,
+          },
+          body: widget.items.map((i: string) => Number.parseInt(i, 10)),
+        });
+        // refresh the identified users list
+        await this.currentPicture.loadIdentifications({ forceReload: true });
 
-    /**
-     * Check if an identification can be removed by the currently logged user
-     */
-    canBeRemoved(identification: IdentifiedUserSchema): boolean {
-      return config.userCanModerate || identification.user.id === config.userId;
-    },
+        // Clear selection and cache of retrieved user so they can be filtered again
+        widget.clear(false);
+        widget.clearOptions();
+        widget.setTextboxValue("");
+      },
 
-    /**
-     * Untag a user from the current picture
-     */
-    async removeIdentification(identification: IdentifiedUserSchema): Promise<void> {
-      const res = await usersidentifiedDeleteRelation({
-        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-        path: { relation_id: identification.id },
-      });
-      if (!res.error && Array.isArray(this.currentPicture.identifications)) {
-        this.currentPicture.identifications =
-          this.currentPicture.identifications.filter(
-            (i: IdentifiedUserSchema) => i.id !== identification.id,
-          );
-      }
-    },
-  }));
+      /**
+       * Check if an identification can be removed by the currently logged user
+       */
+      canBeRemoved(identification: IdentifiedUserSchema): boolean {
+        return config.userIsSasAdmin || identification.user.id === config.userId;
+      },
+
+      /**
+       * Untag a user from the current picture
+       */
+      async removeIdentification(identification: IdentifiedUserSchema): Promise<void> {
+        const res = await usersidentifiedDeleteRelation({
+          // biome-ignore lint/style/useNamingConvention: api is in snake_case
+          path: { relation_id: identification.id },
+        });
+        if (!res.error && Array.isArray(this.currentPicture.identifications)) {
+          this.currentPicture.identifications =
+            this.currentPicture.identifications.filter(
+              (i: IdentifiedUserSchema) => i.id !== identification.id,
+            );
+        }
+      },
+    }));
+  });
 });

sas/templates/sas/picture.jinja

@@ -17,8 +17,10 @@
 
 {% from "sas/macros.jinja" import print_path %}
 
+{% set user_is_sas_admin = user.is_root or user.is_in_group(pk = settings.SITH_GROUP_SAS_ADMIN_ID) %}
+
 {% block content %}
-  <main x-data="picture_viewer(config)">
+  <main x-data="picture_viewer">
     <code>
       <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album) }} <span x-text="currentPicture.name"></span>
     </code>
@@ -48,13 +50,15 @@
               It will be hidden to other users until it has been moderated.
             {% endtrans %}
           </p>
-          {% if user.has_perm("sas.moderate_sasfile") %}
+          {% if user_is_sas_admin %}
             <template x-if="currentPicture.asked_for_removal">
               <div>
                 <h5>{% trans %}The following issues have been raised:{% endtrans %}</h5>
                 <template x-for="req in (currentPicture.moderationRequests ?? [])" :key="req.id">
                   <div>
-                    <h6 x-text="`${req.author.first_name} ${req.author.last_name}`"></h6>
+                    <h6
+                      x-text="`${req.author.first_name} ${req.author.last_name}`"
+                    ></h6>
                     <i x-text="Intl.DateTimeFormat(
                                '{{ LANGUAGE_CODE }}',
                                {dateStyle: 'long', timeStyle: 'short'}
@@ -66,7 +70,7 @@
             </template>
           {% endif %}
         </div>
-        {% if user.has_perm("sas.moderate_sasfile") %}
+        {% if user_is_sas_admin %}
           <div class="alert-aside">
             <button class="btn btn-blue" @click="moderatePicture()">
               {% trans %}Moderate{% endtrans %}
@@ -200,13 +204,16 @@
 {% endblock %}
 
 {% block script %}
+  {{ super() }}
   <script>
-    const config = {
-      albumId: {{ album.id }},
-      albumUrl: "{{ album.get_absolute_url() }}",
-      firstPictureId: {{ picture.id }},  {# id of the first picture to show after page load #}
-      userId: {{ user.id }},
-      userCanModerate: {{ user.has_perm("sas.moderate_sasfile")|tojson }}
-    }
+    window.addEventListener("DOMContentLoaded", () => {
+      loadViewer({
+        albumId: {{ album.id }} ,
+        albumUrl: "{{ album.get_absolute_url() }}",
+        firstPictureId: {{ picture.id }},  {# id of the first picture to show after page load #}
+        userId: {{ user.id }},
+        userIsSasAdmin: {{ user_is_sas_admin|tojson }}
+      });
+    })
   </script>
 {% endblock %}

sas/tests/test_views.py

@@ -161,22 +161,16 @@ class TestSasModeration(TestCase):
         assert len(res.context_data["pictures"]) == 1
         assert res.context_data["pictures"][0] == self.to_moderate
 
+        res = self.client.post(
+            reverse("sas:moderation"),
+            data={"album_id": self.to_moderate.id, "picture_id": self.to_moderate.id},
+        )
+
     def test_moderation_page_forbidden(self):
         self.client.force_login(self.simple_user)
         res = self.client.get(reverse("sas:moderation"))
         assert res.status_code == 403
 
-    def test_moderate_album(self):
-        self.client.force_login(self.moderator)
-        url = reverse("sas:moderation")
-        album = baker.make(
-            Album, is_moderated=False, parent_id=settings.SITH_SAS_ROOT_DIR_ID
-        )
-        res = self.client.post(url, data={"album_id": album.id, "moderate": ""})
-        assertRedirects(res, url)
-        album.refresh_from_db()
-        assert album.is_moderated
-
     def test_moderate_picture(self):
         self.client.force_login(self.moderator)
         res = self.client.get(

sas/views.py

@@ -15,10 +15,10 @@
 from typing import Any
 
 from django.conf import settings
-from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.core.exceptions import PermissionDenied
 from django.db.models import Count, OuterRef, Subquery
 from django.http import Http404, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, redirect
+from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.safestring import SafeString
 from django.views.generic import CreateView, DetailView, TemplateView
@@ -191,21 +191,26 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
 # Admin views
 
 
-class ModerationView(PermissionRequiredMixin, TemplateView):
+class ModerationView(TemplateView):
     template_name = "sas/moderation.jinja"
-    permission_required = "sas.moderate_sasfile"
+
+    def get(self, request, *args, **kwargs):
+        if request.user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
+            return super().get(request, *args, **kwargs)
+        raise PermissionDenied
 
     def post(self, request, *args, **kwargs):
         if "album_id" not in request.POST:
             raise Http404
-        album = get_object_or_404(Album, pk=request.POST["album_id"])
-        if "moderate" in request.POST:
-            album.moderator = request.user
-            album.is_moderated = True
-            album.save()
-        elif "delete" in request.POST:
-            album.delete()
-        return redirect(self.request.path)
+        if request.user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
+            album = get_object_or_404(Album, pk=request.POST["album_id"])
+            if "moderate" in request.POST:
+                album.moderator = request.user
+                album.is_moderated = True
+                album.save()
+            elif "delete" in request.POST:
+                album.delete()
+        return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)

sith/settings.py

@@ -123,6 +123,7 @@ INSTALLED_APPS = (
     "trombi",
     "matmat",
     "pedagogy",
+    "reservation",
     "galaxy",
     "antispam",
     "timetable",
@@ -274,7 +275,7 @@ LOGGING = {
 # Internationalization
 # https://docs.djangoproject.com/en/1.8/topics/i18n/
 
-LANGUAGE_CODE = "fr-FR"
+LANGUAGE_CODE = "fr"
 
 LANGUAGES = [("en", _("English")), ("fr", _("French"))]
 
@@ -551,27 +552,27 @@ SITH_SUBSCRIPTIONS = {
     # Discount subscriptions
     "un-semestre-reduction": {
         "name": _("One semester (-20%)"),
-        "price": 16,
+        "price": 12,
         "duration": 1,
     },
     "deux-semestres-reduction": {
         "name": _("Two semesters (-20%)"),
-        "price": 28,
+        "price": 22,
         "duration": 2,
     },
     "cursus-tronc-commun-reduction": {
         "name": _("Common core cursus (-20%)"),
-        "price": 48,
+        "price": 36,
         "duration": 4,
     },
     "cursus-branche-reduction": {
         "name": _("Branch cursus (-20%)"),
-        "price": 48,
+        "price": 36,
         "duration": 6,
     },
     "cursus-alternant-reduction": {
         "name": _("Alternating cursus (-20%)"),
-        "price": 28,
+        "price": 24,
         "duration": 6,
     },
     # CA special offer

sith/urls.py

@@ -49,6 +49,10 @@ urlpatterns = [
     path("trombi/", include(("trombi.urls", "trombi"), namespace="trombi")),
     path("matmatronch/", include(("matmat.urls", "matmat"), namespace="matmat")),
     path("pedagogy/", include(("pedagogy.urls", "pedagogy"), namespace="pedagogy")),
+    path(
+        "reservation/",
+        include(("reservation.urls", "reservation"), namespace="reservation"),
+    ),
     path("admin/", admin.site.urls),
     path("i18n/", include("django.conf.urls.i18n")),
     path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),

tsconfig.json

@@ -18,7 +18,8 @@
       "#core:*": ["./core/static/bundled/*"],
       "#pedagogy:*": ["./pedagogy/static/bundled/*"],
       "#counter:*": ["./counter/static/bundled/*"],
-      "#com:*": ["./com/static/bundled/*"]
+      "#com:*": ["./com/static/bundled/*"],
+      "#reservation:*": ["./reservation/static/bundled/*"]
     }
   }
 }