[UPDATE] Update faker requirement

Updates the requirements on [faker](https://github.com/joke2k/faker) to permit the latest version.
- [Release notes](https://github.com/joke2k/faker/releases)
- [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/joke2k/faker/compare/v40.18.0...v40.20.0)

---
updated-dependencies:
- dependency-name: faker
  dependency-version: 40.20.0
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

club/forms.py

@@ -392,6 +392,30 @@ class ClubRoleForm(forms.ModelForm):
             self.instance.order = cleaned_data["ORDER"] - 1
         return cleaned_data
 
+    def save(self, commit=True):  # noqa: FBT002
+        instance: ClubRole = super().save(commit=commit)
+        if commit and "is_board" in self.changed_data:
+            # if the role was moved from board to simple member,
+            # remove all users with that role from the club board group.
+            # If the role became a board role, add users with
+            # that role to the club board group.
+            group_id = instance.club.board_group_id
+            if self.cleaned_data["is_board"]:
+                User.groups.through.objects.bulk_create(
+                    [
+                        User.groups.through(user_id=u, group_id=group_id)
+                        for u in Membership.objects.ongoing()
+                        .filter(role=instance)
+                        .values_list("user_id", flat=True)
+                    ],
+                    ignore_conflicts=True,
+                )
+            else:
+                User.groups.through.objects.filter(
+                    user__memberships__role=instance, group_id=group_id
+                ).delete()
+        return instance
+
 
 class ClubRoleCreateForm(forms.ModelForm):
     """Form to create a club role.

club/templates/club/club_tools.jinja

@@ -1,12 +1,7 @@
 {% 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 %} ({{ club.name }})</h3>
+  <h3>{% trans %}Club tools{% endtrans %}</h3>
   <div>
     <h4>{% trans %}Communication:{% endtrans %}</h4>
     <ul>
@@ -24,43 +19,18 @@
         <li><a href="{{ url("club:club_roles", club_id=object.id) }}"></a></li>
       {% endif %}
       {% if object.trombi %}
-        <li>
+        <li> <a href="{{ url('trombi:detail', trombi_id=object.trombi.id) }}">{% trans %}Edit Trombi{% endtrans %}</a></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('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('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 counter in counters %}
+      {% for c in object.counters.filter(type="OFFICE") %}
-        <li>{{ counter }}:
+        <li>{{ c }}:
-          <a href="{{ url('counter:details', counter_id=counter.id) }}">View</a>
+          <a href="{{ url('counter:details', counter_id=c.id) }}">View</a>
-          <a href="{{ url('counter:admin', counter_id=counter.id) }}">Edit</a>
+          <a href="{{ url('counter:admin', counter_id=c.id) }}">Edit</a>
         </li>
       {% endfor %}
     </ul>

club/tests/test_clubrole.py

@@ -4,6 +4,7 @@ import pytest
 from django.contrib.auth.models import Permission
 from django.test import Client, TestCase
 from django.urls import reverse
+from django.utils.timezone import now
 from model_bakery import baker, seq
 from model_bakery.recipe import Recipe
 from pytest_django.asserts import assertRedirects
@@ -239,7 +240,7 @@ class TestClubRoleUpdate(TestCase):
 
     def test_president_moves_itself_out_of_the_presidency(self):
         """Test that if the user moves its own role out of the presidency,
-        then it's redirected to another page and loses access to the update page."""
+        then it loses access to the update page."""
         self.payload["roles-0-is_presidency"] = False
         self.client.force_login(self.user)
         res = self.client.post(self.url, data=self.payload)
@@ -251,3 +252,29 @@ class TestClubRoleUpdate(TestCase):
 
         res = self.client.get(self.url)
         assert res.status_code == 403
+
+    def test_role_stops_being_board(self):
+        """Test that if a role stops being a board role,
+        its users lose the club board group."""
+        self.payload["roles-0-is_board"] = False
+        self.payload["roles-0-is_presidency"] = False
+        self.payload["roles-1-is_board"] = False
+        formset = ClubRoleFormSet(data=self.payload, instance=self.club)
+        assert formset.is_valid()
+        formset.save()
+        assert not self.user.groups.contains(self.club.board_group)
+
+    def test_role_becomes_board(self):
+        """Test that if a role becomes a board role,
+        its active users get the club board group"""
+        members = [
+            baker.make(Membership, club=self.club, role=self.roles[0], end_date=None),
+            baker.make(Membership, club=self.club, role=self.roles[0], end_date=now()),
+        ]
+        self.payload["roles-2-is_board"] = True
+        formset = ClubRoleFormSet(data=self.payload, instance=self.club)
+        assert formset.is_valid()
+        formset.save()
+        # the second membership is finished, so its user shouldn't get the role
+        assert members[0].user.groups.contains(self.club.board_group)
+        assert not members[1].user.groups.contains(self.club.board_group)

club/views.py

@@ -309,12 +309,6 @@ 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/components/ics-calendar.scss

@@ -16,76 +16,16 @@
   --event-details-padding: 20px;
   --event-details-border: 1px solid #EEEEEE;
   --event-details-border-radius: 4px;
-  --event-details-box-shadow: 0 6px 20px 4px rgb(0 0 0 / 16%);
+  --event-details-box-shadow: 0px 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;
@@ -122,47 +62,68 @@ ics-calendar {
       align-items: start;
       flex-direction: row;
       background-color: var(--event-details-background-color);
-      margin-top: 0;
+      margin-top: 0px;
       margin-bottom: 4px;
     }
   }
-}
 
-// Reset from style.scss
+  a.fc-col-header-cell-cushion,
-thead {
+  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
+  }
+
+  //Reset from style.scss
+  table {
+    box-shadow: none;
+    border-radius: 0px;
+    -moz-border-radius: 0px;
+    margin: 0px;
+  }
+
+  // Reset from style.scss
+  thead {
     background-color: white;
     color: black;
-}
+  }
 
-// Reset from style.scss
+  // Reset from style.scss
-tbody > tr {
+  tbody>tr {
     &:nth-child(even):not(.highlight) {
       background: white;
     }
-}
+  }
 
-.fc .fc-toolbar.fc-footer-toolbar {
+  .fc .fc-toolbar.fc-footer-toolbar {
     margin-bottom: 0.5em;
-}
+  }
 
-button.text-copy,
+  button.text-copy,
-button.text-copy:focus,
+  button.text-copy:focus,
-button.text-copy:hover {
+  button.text-copy:hover {
     background-color: #67AE6E !important;
     transition: 500ms ease-in;
-}
+  }
 
-button.text-copied,
+  button.text-copied,
-button.text-copied:focus,
+  button.text-copied:focus,
-button.text-copied:hover {
+  button.text-copied:hover {
     transition: 500ms ease-out;
-}
+  }
 
-.fc .fc-getCalendarLink-button {
+  .fc .fc-getCalendarLink-button {
     margin-right: 0.5rem;
-}
+  }
 
-.fc .fc-helpButton-button {
+  .fc .fc-helpButton-button {
     border-radius: 70%;
     padding-left: 0.5rem;
     padding-right: 0.5rem;
@@ -171,11 +132,12 @@ button.text-copied:hover {
     width: 30px;
     height: 30px;
     font-size: 11px;
-}
+  }
 
 
-.fc .fc-helpButton-button:hover {
+  .fc .fc-helpButton-button:hover {
     background-color: rgba(20, 20, 20, 0.6);
+  }
 }
 
 .tooltip.calendar-copy-tooltip {

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

@@ -84,6 +84,7 @@
     font-size: 85%;
 
     #links_content {
+      overflow: auto;
       box-shadow: $shadow-color 1px 1px 1px;
       min-height: 20em;
       padding: 1em;

com/templates/com/news_list.jinja

@@ -1,11 +1,9 @@
 {% 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('core/components/calendar.scss') }}">
+  <link rel="stylesheet" href="{{ static('com/components/ics-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") }}">
@@ -215,12 +213,6 @@
               <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/management/commands/populate.py

@@ -892,11 +892,7 @@ class Command(BaseCommand):
 
         subscribers = Group.objects.create(name="Cotisants")
         subscribers.permissions.add(
-            *list(
+            *list(perms.filter(codename__in=["add_news", "add_uecomment"]))
-                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,7 +1,6 @@
 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
@@ -26,7 +25,6 @@ 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
 
 
@@ -44,20 +42,45 @@ 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...")
-        self.create_club_memberships(subscribers)
+        users_qs = User.objects.filter(id__in=[s.id for s in subscribers])
-        self.stdout.write("Creating rooms and reservation...")
+        subscribers_now = list(
-        self.create_resources_and_reservations(random.sample(subscribers, k=40))
+            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.stdout.write("Creating uvs...")
         self.create_ues()
         self.stdout.write("Creating products...")
         self.create_products()
         self.stdout.write("Creating sales and refills...")
-        sellers = list(User.objects.order_by("?")[:100])
+        sellers = random.sample(list(User.objects.all()), 100)
         self.create_sales(sellers)
         self.stdout.write("Creating permanences...")
         self.create_permanences(sellers)
@@ -192,97 +215,6 @@ 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"]
@@ -483,7 +415,7 @@ class Command(BaseCommand):
         Permanency.objects.bulk_create(perms)
 
     def create_forums(self):
-        forumers = list(User.objects.order_by("?")[:100])
+        forumers = random.sample(list(User.objects.all()), 100)
         most_actives = random.sample(forumers, 10)
         categories = list(Forum.objects.filter(is_category=True))
         new_forums = [
@@ -501,7 +433,7 @@ class Command(BaseCommand):
             for _ in range(100)
         ]
         ForumTopic.objects.bulk_create(new_topics)
-        topics = list(ForumTopic.objects.values_list("id", flat=True))
+        topics = list(ForumTopic.objects.all())
 
         def get_author():
             if random.random() > 0.5:
@@ -509,7 +441,7 @@ class Command(BaseCommand):
             return random.choice(forumers)
 
         messages = []
-        for topic_id in topics:
+        for t in topics:
             nb_messages = max(1, int(random.normalvariate(mu=90, sigma=50)))
             dates = sorted(
                 [
@@ -521,7 +453,7 @@ class Command(BaseCommand):
             messages.extend(
                 [
                     ForumMessage(
-                        topic_id=topic_id,
+                        topic=t,
                         author=get_author(),
                         date=d,
                         message="\n\n".join(

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

@@ -6,12 +6,10 @@
  * for more efficient tree-shaking and gzip compression.
  */
 
-import { morph } from "@alpinejs/morph";
 import sort from "@alpinejs/sort";
 import Alpine from "alpinejs";
 import { polyfillCountryFlagEmojis } from "country-flag-emoji-polyfill";
 import htmx from "htmx.org";
-import "htmx-ext-alpine-morph";
 import { limitedChoices } from "#core:alpine/limited-choices";
 import { expireOldStorage } from "#core:core/localstorage";
 import { default as navbar } from "#core:core/navbar";
@@ -29,7 +27,7 @@ declare module "alpinejs" {
   }
 }
 
-Alpine.plugin([sort, limitedChoices, morph, notifications]);
+Alpine.plugin([sort, limitedChoices, notifications]);
 // biome-ignore lint/style/useNamingConvention: it's how it's named
 Object.assign(window, { Alpine });
 

core/static/core/accordion.scss

@@ -46,6 +46,10 @@ details.accordion>.accordion-content {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
   overflow: hidden;
+
+  @media screen and (max-width: 600px) {
+    padding: .75em 1.5em;
+  }
 }
 
 @mixin animation($selector) {

core/static/core/components/card.scss

@@ -16,13 +16,6 @@
   }
 }
 
-.card-group {
-  display: flex;
-  gap: 15px;
-  margin-bottom: 30px;
-  flex-wrap: wrap;
-}
-
 .card {
   background-color: $primary-neutral-light-color;
   border-radius: 5px;
@@ -99,23 +92,13 @@
   }
 
   @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,9 +10,10 @@
   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/views/forms.py

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

core/views/mixins.py

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

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

@@ -1,6 +1,6 @@
-import type { RecursivePartial, TomSettings } from "tom-select/dist/types/types";
+import type { RecursivePartial, TomSettings } from "tom-select/src/types";
-import { AutoCompleteSelectBase } from "#core:core/components/ajax-select-base.ts";
+import { AutoCompleteSelectBase } from "#core:core/components/ajax-select-base";
-import { registerComponent } from "#core:utils/web-components.ts";
+import { registerComponent } from "#core:utils/web-components";
 
 const productParsingRegex = /^(\d+x)?(.*)/i;
 const codeParsingRegex = / \((\w+)\)$/;
@@ -63,13 +63,6 @@ export class CounterProductSelect extends AutoCompleteSelectBase {
         );
       },
     );
-
-    this.widget.hook("after", "onOptionSelect", () => {
-      /* Focus the next element if it's an input */
-      if (this.nextElementSibling.nodeName === "INPUT") {
-        (this.nextElementSibling as HTMLInputElement).focus();
-      }
-    });
   }
   protected tomSelectSettings(): RecursivePartial<TomSettings> {
     /* We disable the dropdown on focus because we're going to always autofocus the widget */
@@ -80,9 +73,7 @@ export class CounterProductSelect extends AutoCompleteSelectBase {
       // We need to manually set weights or it results on an inconsistent
       // behavior between production and development environment
       searchField: [
-        // @ts-expect-error documentation says it's fine, specified type is wrong
         { field: "code", weight: 2 },
-        // @ts-expect-error documentation says it's fine, specified type is wrong
         { field: "text", weight: 0.5 },
       ],
     };

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

@@ -25,6 +25,9 @@ document.addEventListener("alpine:init", () => {
       }
 
       this.codeField = this.$refs.codeField;
+      this.codeField.widget.hook("after", "onOptionSelect", () => {
+        this.handleCode();
+      });
       this.codeField.widget.focus();
 
       // It's quite tricky to manually apply attributes to the management part
@@ -154,6 +157,7 @@ document.addEventListener("alpine:init", () => {
         this.addToBasket(code, quantity);
       }
       this.codeField.widget.clear();
+      this.codeField.widget.setTextboxValue("");
       this.codeField.widget.focus();
     },
   }));

counter/static/counter/css/counter-click.scss

@@ -42,7 +42,28 @@
   min-width: 350px;
 
   ul {
-    list-style-type: none;
+    list-style: none;
+    display: flex;
+    flex-direction: column;
+    gap: .5rem;
+    margin-left: 0;
+
+    .basket-row {
+      display: flex;
+      align-items: center;
+      gap: 1rem;
+
+      .product-name {
+        flex: 1 2 0;
+        min-width: 0;
+        text-wrap: wrap;
+      }
+    }
+  }
+
+  form {
+    margin-top: .5rem;
+    margin-bottom: .5rem;
   }
 }
 

counter/templates/counter/counter_click.jinja

@@ -56,10 +56,15 @@
         <div class="accordion-content">
           {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %}
 
-          <form method="post" action=""
+          <form method="post" action="" @submit.prevent="handleCode">
-                class="code_form" @submit.prevent="handleCode">
 
-            <counter-product-select name="code" x-ref="codeField" autofocus required placeholder="{% trans %}Select a product...{% endtrans %}">
+            <counter-product-select
+              name="code"
+              x-ref="codeField"
+              autofocus
+              required
+              placeholder="{% trans %}Select a product...{% endtrans %}"
+            >
               <option value=""></option>
               <optgroup label="{% trans %}Operations{% endtrans %}">
                 <option value="FIN">{% trans %}Confirm (FIN){% endtrans %}</option>
@@ -68,13 +73,11 @@
               {%- for category, prices in categories.items() -%}
                 <optgroup label="{{ category }}">
                   {%- for price in prices -%}
-                    <option value="{{ price.id }}">{{ price.full_label }}</option>
+                    <option value="{{ price.id }}">{{ price.full_label }} ({{ price.product.code }})</option>
                   {%- endfor -%}
                 </optgroup>
               {%- endfor -%}
             </counter-product-select>
-
-            <input type="submit" value="{% trans %}Go{% endtrans %}"/>
           </form>
 
           {% for error in form.non_form_errors() %}
@@ -102,7 +105,9 @@
               {{ form.management_form }}
             </div>
             <ul>
-              <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
+              <li x-show="getBasketSize() === 0">
+                <em>{% trans %}This basket is empty{% endtrans %}</em>
+              </li>
               <template x-for="(item, index) in Object.values(basket)" :key="item.product.price.id">
                 <li>
                   <template x-for="error in item.errors">
@@ -110,12 +115,15 @@
                     </div>
                   </template>
 
+                  <div class="basket-row">
+                    <div>
                       <button @click.prevent="addToBasket(item.product.price.id, -1)">-</button>
                       <span class="quantity" x-text="item.quantity"></span>
                       <button @click.prevent="addToBasket(item.product.price.id, 1)">+</button>
+                    </div>
 
-                  <span x-text="item.product.name"></span> :
+                    <span class="product-name" x-text="item.product.name"></span>
-                  <span x-text="item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })">€</span>
+                    <span x-text="`${item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })} €`"></span>
                     <span x-show="item.getBonusQuantity() > 0"
                           x-text="`${item.getBonusQuantity()} x P`"></span>
 
@@ -123,6 +131,7 @@
                       class="remove-item"
                       @click.prevent="removeFromBasket(item.product.price.id)"
                     ><i class="fa fa-trash-can delete-action"></i></button>
+                  </div>
 
                   <input
                     type="hidden"

eboutic/api.py

@@ -1,3 +1,6 @@
+from typing import Any
+
+from ninja import Status
 from ninja_extra import ControllerBase, api_controller, route
 from ninja_extra.exceptions import NotFound
 
@@ -8,13 +11,19 @@ from eboutic.models import Basket
 
 @api_controller("/etransaction", permissions=[CanView])
 class EtransactionInfoController(ControllerBase):
-    @route.get("/data/{basket_id}", url_name="etransaction_data")
+    @route.get(
+        "/data/{basket_id}",
+        url_name="etransaction_data",
+        response={200: dict[str, Any], 410: str},
+    )
     def fetch_etransaction_data(self, basket_id: int):
         """Generate the data to pay an eboutic command with paybox.
 
         The data is generated with the basket that is used by the current session.
         """
         basket: Basket = self.get_object_or_exception(Basket, pk=basket_id)
+        if basket.is_expired:
+            return Status(410, "This basket is expired.")
         try:
             return dict(basket.get_e_transaction_data())
         except BillingInfo.DoesNotExist as e:

eboutic/models.py

@@ -24,6 +24,7 @@ from django.conf import settings
 from django.db import DataError, models
 from django.db.models import F, OuterRef, Subquery, Sum
 from django.utils.functional import cached_property
+from django.utils.timezone import now
 from django.utils.translation import gettext_lazy as _
 
 from core.models import User
@@ -95,6 +96,10 @@ class Basket(models.Model):
             ]
         )
 
+    @property
+    def is_expired(self) -> bool:
+        return (self.date + settings.SITH_EBOUTIC_BASKET_TIMEOUT) <= now()
+
     def generate_sales(
         self, counter, seller: User, payment_method: Selling.PaymentMethod
     ):
@@ -133,9 +138,20 @@ class Basket(models.Model):
         ]
 
     def get_e_transaction_data(self) -> list[tuple[str, str]]:
+        """Get data for etransaction payment.
+
+        Raises:
+            Customer.DoesNotExist: if the user linked to this basket
+                has no customer account
+            BillingInfo.DoesNotExist: if the user linked to this basket has no
+                billing infos, or incorrect billing infos.
+            ValueError: if this is called on a basket which payment delay is expired.
+        """
         user = self.user
         if not hasattr(user, "customer"):
             raise Customer.DoesNotExist
+        if self.is_expired:
+            raise ValueError("This method cannot be called on an expired basket.")
         customer = user.customer
         if (
             not hasattr(user.customer, "billing_infos")
@@ -155,6 +171,10 @@ class Basket(models.Model):
             ("PBX_IDENTIFIANT", settings.SITH_EBOUTIC_PBX_IDENTIFIANT),
             ("PBX_TOTAL", str(int(self.total * 100))),
             ("PBX_DEVISE", "978"),  # This is Euro
+            (
+                "PBX_DISPLAY",
+                str(int(settings.SITH_EBOUTIC_ETRANSACTION_TIMEOUT.total_seconds())),
+            ),
             ("PBX_CMD", str(self.id)),
             ("PBX_PORTEUR", user.email),
             ("PBX_RETOUR", "Amount:M;BasketID:R;Auto:A;Error:E;Sig:K"),
@@ -219,16 +239,14 @@ class Invoice(models.Model):
         if self.validated:
             raise DataError(_("Invoice already validated"))
         customer, _created = Customer.get_or_create(user=self.user)
-        kwargs = {
+        kwargs = {"counter": get_eboutic(), "customer": customer, "date": self.date}
-            "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
+                    **kwargs,
+                    operator=self.user,
+                    amount=i.unit_price * i.quantity,
+                    payment_method=Refilling.PaymentMethod.CARD,
                 )
             else:
                 Selling.objects.create(
@@ -239,6 +257,7 @@ class Invoice(models.Model):
                     seller=self.user,
                     unit_price=i.unit_price,
                     quantity=i.quantity,
+                    payment_method=Selling.PaymentMethod.CARD,
                 )
         self.validated = True
         self.save()

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

@@ -1,21 +1,71 @@
+import { type Notification, NotificationLevel } from "#core:utils/notifications";
 import { etransactioninfoFetchEtransactionData } from "#openapi";
 
+interface Basket {
+  id: number;
+  timeout: Date;
+}
 document.addEventListener("alpine:init", () => {
-  Alpine.data("etransaction", (initialData, basketId: number) => ({
+  Alpine.data("etransaction", (initialData, basket: Basket) => ({
     data: initialData,
     isCbAvailable: Object.keys(initialData).length > 0,
+    isSithAvailable: true,
 
+    init() {
+      const now = new Date();
+      const timeout = basket.timeout.getTime() - now.getTime();
+      if (timeout <= 0) {
+        // basket was already outdated at initial page load
+        this.timeoutBasket();
+      } else {
+        setTimeout(() => this.timeoutBasket(), timeout);
+      }
+    },
+
+    /**
+     * Make this basket into a timeout state.
+     * All submission inputs are disabled, and an error message is displayed.
+     */
+    timeoutBasket() {
+      this.isCbAvailable = false;
+      this.isSithAvailable = false;
+      const message = gettext("Basket expired");
+
+      const existingNotif: Notification | undefined = this.$notifications
+        .getAll()
+        .find(
+          (n: Notification) =>
+            n.tag === NotificationLevel.Error && n.message === message,
+        );
+      if (existingNotif === undefined) {
+        this.$notifications.error(message);
+      }
+    },
+
+    /**
+     * Refresh the data used for etransaction.
+     *
+     * Note: if this is called while the basket is expired, it will be a no-op
+     */
     async fill() {
+      if (new Date() > basket.timeout) {
+        // refresh etransaction data only if the basket is still valid.
+        this.timeoutBasket();
+        return;
+      }
       this.isCbAvailable = false;
       const res = await etransactioninfoFetchEtransactionData({
-        path: {
         // biome-ignore lint/style/useNamingConvention: api is in snake_case
-          basket_id: basketId,
+        path: { basket_id: basket.id },
-        },
       });
       if (res.response.ok) {
         this.data = res.data;
         this.isCbAvailable = true;
+      } else if (res.response.status === 410) {
+        // The basket is expired, so no payment method should be available at all.
+        // This shouldn't happen, because we don't send the request
+        // when the timeout is passed, but we are better safe than sorry
+        this.timeoutBasket();
       }
     },
   }));

eboutic/templates/eboutic/eboutic_billing_info.jinja

@@ -21,6 +21,7 @@
       hx-swap="outerHTML"
       hx-target="#billing-infos-fragment"
       x-show="collapsed"
+      x-cloak
     >
       {% csrf_token %}
       {{ form.as_p() }}

eboutic/templates/eboutic/eboutic_checkout.jinja

@@ -15,11 +15,10 @@
 {% block content %}
   <h3>{% trans %}Eboutic{% endtrans %}</h3>
 
-  <script type="text/javascript">
+  <div x-data='etransaction(
-    let billingInfos = {{ billing_infos|safe }};
+               {{ billing_infos|tojson }},
-  </script>
+               { id: {{ basket.id }}, timeout: new Date('{{ basket.date + settings.SITH_EBOUTIC_BASKET_TIMEOUT }}') }
-
+                                                                                                                         )'>
-  <div x-data="etransaction(billingInfos, {{ basket.id }})">
     <p>{% trans %}Basket: {% endtrans %}</p>
     <table>
       <thead>
@@ -72,7 +71,11 @@
           x-cloak
           type="submit"
           id="bank-submit-button"
+          {% if basket.is_expired %}
+            disabled="disabled"
+          {% else %}
             :disabled="!isCbAvailable"
+          {% endif %}
           class="btn btn-blue"
           value="{% trans %}Pay with credit card{% endtrans %}"
         />
@@ -93,7 +96,16 @@
     {% else %}
       <form method="post" action="{{ url('eboutic:pay_with_sith', basket_id=basket.id) }}" name="sith-pay-form">
         {% csrf_token %}
-        <input class="btn btn-blue" type="submit" value="{% trans %}Pay with Sith account{% endtrans %}"/>
+        <input
+          {% if basket.is_expired %}
+            disabled="disabled"
+          {% else %}
+            :disabled="!isSithAvailable"
+          {% endif %}
+          class="btn btn-blue"
+          type="submit"
+          value="{% trans %}Pay with Sith account{% endtrans %}"
+        />
       </form>
     {% endif %}
   </div>

eboutic/tests/test_payment.py

@@ -3,6 +3,7 @@ import urllib
 from decimal import Decimal
 from typing import TYPE_CHECKING
 
+import freezegun
 from cryptography.hazmat.primitives.asymmetric.padding import PKCS1v15
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
 from cryptography.hazmat.primitives.hashes import SHA1
@@ -17,7 +18,7 @@ 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.models import Product, ProductType, Selling
+from counter.models import Product, ProductType, Refilling, Selling
 from counter.tests.test_counter import force_refill_user
 from eboutic.models import Basket, BasketItem
 
@@ -105,7 +106,7 @@ class TestPaymentSith(TestPaymentBase):
             ),
             reverse("eboutic:payment_result", kwargs={"result": "success"}),
         )
-        assert Basket.objects.filter(id=self.basket.id).first() is None
+        assert not Basket.objects.filter(id=self.basket.id).exists()
         self.customer.customer.refresh_from_db()
         assert self.customer.customer.amount == Decimal(1)
 
@@ -139,10 +140,7 @@ class TestPaymentSith(TestPaymentBase):
         assert len(messages) == 1
         assert messages[0].level == DEFAULT_LEVELS["ERROR"]
         assert messages[0].message == "Solde insuffisant"
-
+        assert not Basket.objects.filter(id=self.basket.id).exists()
-        assert Basket.objects.contains(self.basket), (
-            "After an unsuccessful request, the basket should be kept"
-        )
 
     def test_refilling_in_basket(self):
         BasketItem.from_price(self.refilling.prices.first(), 1, self.basket).save()
@@ -157,7 +155,7 @@ class TestPaymentSith(TestPaymentBase):
             response,
             reverse("eboutic:payment_result", kwargs={"result": "failure"}),
         )
-        assert Basket.objects.filter(id=self.basket.id).first() is not None
+        assert not Basket.objects.filter(id=self.basket.id).exists()
         messages = list(get_messages(response.wsgi_request))
         assert messages[0].level == DEFAULT_LEVELS["ERROR"]
         assert (
@@ -167,6 +165,24 @@ class TestPaymentSith(TestPaymentBase):
         self.customer.customer.refresh_from_db()
         assert self.customer.customer.amount == initial_account_balance
 
+    def test_basket_expired(self):
+        self.client.force_login(self.customer)
+        initial_account_balance = self.customer.customer.amount
+        with freezegun.freeze_time(settings.SITH_EBOUTIC_BASKET_TIMEOUT):
+            response = self.client.post(
+                reverse("eboutic:pay_with_sith", kwargs={"basket_id": self.basket.id})
+            )
+        assertRedirects(
+            response,
+            reverse("eboutic:payment_result", kwargs={"result": "failure"}),
+        )
+        messages = list(get_messages(response.wsgi_request))
+        assert messages[0].level == DEFAULT_LEVELS["ERROR"]
+        assert messages[0].message == "Panier expiré"
+        assert not Basket.objects.filter(id=self.basket.id).exists()
+        self.customer.customer.refresh_from_db()
+        assert self.customer.customer.amount == initial_account_balance
+
 
 class TestPaymentCard(TestPaymentBase):
     def generate_bank_valid_answer(self, basket: Basket):
@@ -236,6 +252,10 @@ class TestPaymentCard(TestPaymentBase):
 
         self.customer.customer.refresh_from_db()
         assert self.customer.customer.amount == price.amount * 2
+        refill = self.customer.customer.refillings.last()
+        assert refill is not None
+        assert refill.amount == price.amount * 2
+        assert refill.payment_method == Refilling.PaymentMethod.CARD
 
     def test_multiple_responses(self):
         bank_response = self.generate_bank_valid_answer(self.basket)

eboutic/views.py

@@ -39,6 +39,8 @@ from django.db.utils import cached_property
 from django.http import HttpResponse
 from django.shortcuts import redirect, render
 from django.urls import reverse
+from django.utils.formats import localize
+from django.utils.timezone import localtime
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.http import require_GET
 from django.views.generic import DetailView, FormView, TemplateView, UpdateView, View
@@ -187,9 +189,7 @@ class BillingInfoFormFragment(
 
     def get_initial(self):
         if self.object is None:
-            return {
+            return {"country": Country(code="FR")}
-                "country": Country(code="FR"),
-            }
         return {}
 
     def render_fragment(self, request, **kwargs) -> SafeString:
@@ -255,6 +255,15 @@ class EbouticCheckout(CanViewMixin, UseFragmentsMixin, DetailView):
             kwargs["customer_amount"] = None
         kwargs["billing_infos"] = {}
 
+        if self.object.is_expired:
+            messages.error(self.request, _("Basket expired"))
+        else:
+            timeout = self.object.date + settings.SITH_EBOUTIC_BASKET_TIMEOUT
+            messages.warning(
+                self.request,
+                _("Basket available until %(until)s")
+                % {"until": localize(localtime(timeout).time())},
+            )
             with contextlib.suppress(BillingInfo.DoesNotExist):
                 kwargs["billing_infos"] = json.dumps(
                     dict(self.object.get_e_transaction_data())
@@ -268,9 +277,14 @@ class EbouticPayWithSith(CanViewMixin, SingleObjectMixin, View):
 
     def post(self, request, *args, **kwargs):
         basket = self.get_object()
+        if basket.is_expired:
+            messages.error(self.request, _("Basket expired"))
+            basket.delete()
+            return redirect("eboutic:payment_result", "failure")
         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"))
+            basket.delete()
             return redirect("eboutic:payment_result", "failure")
 
         eboutic = get_eboutic()
@@ -288,6 +302,7 @@ class EbouticPayWithSith(CanViewMixin, SingleObjectMixin, View):
         except DatabaseError as e:
             sentry_sdk.capture_exception(e)
         except ValidationError as e:
+            basket.delete()
             messages.error(self.request, e.message)
         return redirect("eboutic:payment_result", "failure")
 

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-05-12 11:12+0200\n"
+"POT-Creation-Date: 2026-05-15 11:46+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -304,11 +304,6 @@ msgstr "date de fin"
 msgid "role"
 msgstr "rôle"
 
-#: club/models.py core/models.py counter/models.py election/models.py
-#: forum/models.py reservation/models.py
-msgid "description"
-msgstr "description"
-
 #: club/models.py
 msgid "past member"
 msgstr "ancien membre"
@@ -760,18 +755,6 @@ 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 : "
@@ -1071,7 +1054,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 reservation/models.py trombi/models.py
+#: com/models.py pedagogy/models.py trombi/models.py
 msgid "author"
 msgstr "auteur"
 
@@ -1364,11 +1347,6 @@ 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"
@@ -2232,7 +2210,6 @@ 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"
@@ -3394,7 +3371,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 reservation/models.py
+#: counter/models.py pedagogy/models.py
 msgid "comment"
 msgstr "commentaire"
 
@@ -4528,6 +4505,15 @@ msgstr ""
 "souhaitez payer par carte, vous devez rajouter un numéro de téléphone aux "
 "données que vous aviez déjà fourni."
 
+#: eboutic/views.py
+msgid "Basket expired"
+msgstr "Panier expiré"
+
+#: eboutic/views.py
+#, python-format
+msgid "Basket available until %(until)s"
+msgstr "Panier disponible jusqu'à %(until)s"
+
 #: eboutic/views.py
 msgid "You can't buy a refilling with sith money"
 msgstr "Vous ne pouvez pas acheter un rechargement avec de l'argent du sith"
@@ -5173,73 +5159,6 @@ 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

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-04-17 22:42+0200\n"
+"POT-Creation-Date: 2026-05-17 10:03+0200\n"
 "PO-Revision-Date: 2024-09-17 11:54+0200\n"
 "Last-Translator: Sli <antoine@bartuccio.fr>\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -263,13 +263,9 @@ 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
+#: eboutic/static/bundled/eboutic/checkout-index.ts
-msgid "Rooms"
+msgid "Basket expired"
-msgstr "Salles"
+msgstr "Panier expiré"
-
-#: 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"

package-lock.json

@@ -9,7 +9,6 @@
       "version": "3",
       "license": "GPL-3.0-only",
       "dependencies": {
-        "@alpinejs/morph": "^3.14.9",
         "@alpinejs/sort": "^3.15.12",
         "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
         "@floating-ui/dom": "^1.7.6",
@@ -17,10 +16,7 @@
         "@fullcalendar/core": "^6.1.20",
         "@fullcalendar/daygrid": "^6.1.20",
         "@fullcalendar/icalendar": "^6.1.20",
-        "@fullcalendar/interaction": "^6.1.20",
         "@fullcalendar/list": "^6.1.20",
-        "@fullcalendar/resource": "^6.1.20",
-        "@fullcalendar/resource-timeline": "^6.1.20",
         "@sentry/browser": "^10.53.1",
         "@zip.js/zip.js": "^2.8.26",
         "3d-force-graph": "^1.80.0",
@@ -34,7 +30,6 @@
         "easymde": "^2.21.0",
         "glob": "^13.0.6",
         "html2canvas": "^1.4.1",
-        "htmx-ext-alpine-morph": "^2.0.1",
         "htmx.org": "^2.0.10",
         "js-cookie": "^3.0.7",
         "lit-html": "^3.3.3",
@@ -58,12 +53,6 @@
         "vite": "^8.0.13"
       }
     },
-    "node_modules/@alpinejs/morph": {
-      "version": "3.15.12",
-      "resolved": "https://registry.npmjs.org/@alpinejs/morph/-/morph-3.15.12.tgz",
-      "integrity": "sha512-x/QZUsbE3uMAVVzsEjSZf2xbjgzIqUZ+HW9GUtePheyIrOgHlqZETXBq1DpXg6H8kA0099SyAI9YWnKFDS31cg==",
-      "license": "MIT"
-    },
     "node_modules/@alpinejs/sort": {
       "version": "3.15.12",
       "resolved": "https://registry.npmjs.org/@alpinejs/sort/-/sort-3.15.12.tgz",
@@ -223,9 +212,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.6",
+      "version": "0.6.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.6.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.7.tgz",
-      "integrity": "sha512-mOAsxeeKkUKayvZR3HeTYD/fICpCPLJrU5ZjelT/PA6WHtNDBOE436YiaEUvHN454bRM3CebhDsIpieCc4texA==",
+      "integrity": "sha512-6Fqi8MtQ/PweQ9xvux65emkLQ83uB+qAVtfHkC9UodyHMIZdxNI01HjLCLUtybElp2KY2XNE0nOgyP1E1vXw9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1891,15 +1880,6 @@
         "ical.js": "^1.4.0"
       }
     },
-    "node_modules/@fullcalendar/interaction": {
-      "version": "6.1.20",
-      "resolved": "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.20.tgz",
-      "integrity": "sha512-p6txmc5txL0bMiPaJxe2ip6o0T384TyoD2KGdsU6UjZ5yoBlaY+dg7kxfnYKpYMzEJLG58n+URrHr2PgNL2fyA==",
-      "license": "MIT",
-      "peerDependencies": {
-        "@fullcalendar/core": "~6.1.20"
-      }
-    },
     "node_modules/@fullcalendar/list": {
       "version": "6.1.20",
       "resolved": "https://registry.npmjs.org/@fullcalendar/list/-/list-6.1.20.tgz",
@@ -1909,67 +1889,6 @@
         "@fullcalendar/core": "~6.1.20"
       }
     },
-    "node_modules/@fullcalendar/premium-common": {
-      "version": "6.1.20",
-      "resolved": "https://registry.npmjs.org/@fullcalendar/premium-common/-/premium-common-6.1.20.tgz",
-      "integrity": "sha512-rT+AitNnRyZuFEtYvsB1OJ2g1Bq2jmTR6qdn/dEU6LwkIj/4L499goLtMOena/JyJ31VBztdHrccX//36QrY3w==",
-      "license": "SEE LICENSE IN LICENSE.md",
-      "peerDependencies": {
-        "@fullcalendar/core": "~6.1.20"
-      }
-    },
-    "node_modules/@fullcalendar/resource": {
-      "version": "6.1.20",
-      "resolved": "https://registry.npmjs.org/@fullcalendar/resource/-/resource-6.1.20.tgz",
-      "integrity": "sha512-vpQs1eYJbc1zGOzF3obVVr+XsHTMTG7STKVQBEGy3AeFgfosRkUz+3DUawmy98vSjJUYOAQHO+pWW0ek0n5g0w==",
-      "license": "SEE LICENSE IN LICENSE.md",
-      "dependencies": {
-        "@fullcalendar/premium-common": "~6.1.20"
-      },
-      "peerDependencies": {
-        "@fullcalendar/core": "~6.1.20"
-      }
-    },
-    "node_modules/@fullcalendar/resource-timeline": {
-      "version": "6.1.20",
-      "resolved": "https://registry.npmjs.org/@fullcalendar/resource-timeline/-/resource-timeline-6.1.20.tgz",
-      "integrity": "sha512-HAlM/I+9xJPzZx3Wry7l5oibc8n5Pv/iL8tp2dxUu/0zqS0UqADbHItJucuANfDDeL7PEbCbh/uFx9VvzRUIkQ==",
-      "license": "SEE LICENSE IN LICENSE.md",
-      "dependencies": {
-        "@fullcalendar/premium-common": "~6.1.20",
-        "@fullcalendar/scrollgrid": "~6.1.20",
-        "@fullcalendar/timeline": "~6.1.20"
-      },
-      "peerDependencies": {
-        "@fullcalendar/core": "~6.1.20",
-        "@fullcalendar/resource": "~6.1.20"
-      }
-    },
-    "node_modules/@fullcalendar/scrollgrid": {
-      "version": "6.1.20",
-      "resolved": "https://registry.npmjs.org/@fullcalendar/scrollgrid/-/scrollgrid-6.1.20.tgz",
-      "integrity": "sha512-M55m0hxpou4IPObto5f0nVcXvIj3rkSTba0ypclSFDwBz3JxuCPS6l8kaUznqlZCr2Ld/HFJr+jwyvY070AafQ==",
-      "license": "SEE LICENSE IN LICENSE.md",
-      "dependencies": {
-        "@fullcalendar/premium-common": "~6.1.20"
-      },
-      "peerDependencies": {
-        "@fullcalendar/core": "~6.1.20"
-      }
-    },
-    "node_modules/@fullcalendar/timeline": {
-      "version": "6.1.20",
-      "resolved": "https://registry.npmjs.org/@fullcalendar/timeline/-/timeline-6.1.20.tgz",
-      "integrity": "sha512-yhTgMNDWfB+XqEUTLWrpPjM4fcvGYLOA9DvTp1ysdeqhRGoZnRK9Iv2WW5BaKT+VXhXoAPrj2Ud/lXt6youWAQ==",
-      "license": "SEE LICENSE IN LICENSE.md",
-      "dependencies": {
-        "@fullcalendar/premium-common": "~6.1.20",
-        "@fullcalendar/scrollgrid": "~6.1.20"
-      },
-      "peerDependencies": {
-        "@fullcalendar/core": "~6.1.20"
-      }
-    },
     "node_modules/@hey-api/codegen-core": {
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/@hey-api/codegen-core/-/codegen-core-0.7.4.tgz",
@@ -2191,9 +2110,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@oxc-project/types": {
-      "version": "0.132.0",
+      "version": "0.130.0",
-      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.132.0.tgz",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.130.0.tgz",
-      "integrity": "sha512-FESMOxil5Se014ui/Eq8fT5uHJo6nIRwH0PfJrZJXs6Gek3ZVFOrpUv3YIZT20m+extU98Hg1Ym72U58rlsxUQ==",
+      "integrity": "sha512-ibD2usx9JRu7f5pu2tMKMI4cpA4NgXJQoYRP4pQ7Pxmn1l6k/53qWtQWZayhYy3X4QZkt90Ot+mJEaeXouio6Q==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -2201,9 +2120,9 @@
       }
     },
     "node_modules/@rolldown/binding-android-arm64": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.1.tgz",
-      "integrity": "sha512-ZS4D1JPGn/MYQN/SYDWftIE/nVsM8j/AFOYEzAoOE2O3NktQOZru+/vYXGbR/qtdLdIfGCP0lcoJiYVzsEz+iQ==",
+      "integrity": "sha512-fJI3I0r3C3Oj/zdBCpaCmBRZYf07xpaq4yCfDDoSFm+beWNzbIl26puW8RraUdugoJw/95zerNOn6jasAhzSmg==",
       "cpu": [
         "arm64"
       ],
@@ -2218,9 +2137,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-arm64": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.1.tgz",
-      "integrity": "sha512-vdFA9+C/rekyGce7WqHs/xoT0ioZEWaOFyZLIV1mEeNFaFDUQrPIo8Vs2GvJ6eetb3rzDUtUBgzto3ExpXJB3w==",
+      "integrity": "sha512-cKnAhWEsV7TPcA/5EAteDp6KcJZBQ2G+BqE7zayMMi7kMvwRsbv7WT9aOnn0WNl4SKEIf43vjS31iUPu80nzXg==",
       "cpu": [
         "arm64"
       ],
@@ -2235,9 +2154,9 @@
       }
     },
     "node_modules/@rolldown/binding-darwin-x64": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.1.tgz",
-      "integrity": "sha512-BewSOwTHazv77DTYiAZXSqqKZ4KP/KonFisDMVU7PImxoWfB2aepnPhd2E4SWz3zDzYgDNbs6jBmTdgNnF02GA==",
+      "integrity": "sha512-YKrVwQjIRBPo+5G/u03wGjbdy4q7pyzCe93DK9VJ7zkVmeg8LJ7GbgsiHWdR4xSoe4CAXRD7Bcjgbtr64bkXNg==",
       "cpu": [
         "x64"
       ],
@@ -2252,9 +2171,9 @@
       }
     },
     "node_modules/@rolldown/binding-freebsd-x64": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.1.tgz",
-      "integrity": "sha512-m41o7M0YWtUdqk61Tb+jnKb2rN++iRdIASlExkUoKfIAH30DOHCB8fVLzSUpbWHHU8esmEioY62PxzexE8MBuA==",
+      "integrity": "sha512-z/oBsREo46SsFqBwYtFe0kpJeBijAT48O/WXLI4suiCLBkr03RTtTJMCzSdDd2znlh8VJizL09XVkQgk8IZonw==",
       "cpu": [
         "x64"
       ],
@@ -2269,9 +2188,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.1.tgz",
-      "integrity": "sha512-jcojB9H7W/jS29pMKWAK1N+fU99vXodHDTatS3b3y/XSOCiHo0kkA74pL3jJmkoQtYpOCxDvaKs1fo2Ij/1X5w==",
+      "integrity": "sha512-ik8q7GM11zxvYxFc2PeDcT6TBvhCQMaUxfph/M5l9sKuTs/Sjg3L+Byw0F7w0ZVLBZmx30P+gG0ECzzN+MFcmQ==",
       "cpu": [
         "arm"
       ],
@@ -2286,9 +2205,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-gnu": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.1.tgz",
-      "integrity": "sha512-1jn6qDU5iiOgFgygDzKUuKP0maTi0/f1+sBLgvij/76C77Nm3ts6ufz9Bjg5q5dduxiUIxtq86JIoBvo1xQ4Ig==",
+      "integrity": "sha512-QoSx2EkyrrdZ6kcyE8stqZ62t0Yra8Fs5ia9lOxJrh6TMQJK7gQKmscdTHf7pOXKREKrVwOtJcQG3qVSfc866A==",
       "cpu": [
         "arm64"
       ],
@@ -2306,9 +2225,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-arm64-musl": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.1.tgz",
-      "integrity": "sha512-QVLO/czFMdoMFSqlX3bcswcJNm/23r+qoa/jgtmFc/qEp6/jXmIkDjF/XIo8dPfGaiwy1xfQn8o77L79GeXFgw==",
+      "integrity": "sha512-uwNwFpwKeNiZawfAWBgg0VIztPTV3ihhh1vV334h9ivnNLorxnQMU6Fz8wG1Zb4Qh9LC1/MkcyT3YlDXG3Rsgg==",
       "cpu": [
         "arm64"
       ],
@@ -2326,9 +2245,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-ppc64-gnu": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.1.tgz",
-      "integrity": "sha512-hgO5Abm0w5UL6FEa2iFnZqo2KlK7TQ5QhV5x09hujBf7t5KzHQ1VmfPuTpqRy/rNlSxua3eWH374xxiVrP+lcA==",
+      "integrity": "sha512-zY1bul7OWr7DFBiJ++wofXvnr8B45ce3QsQUhKrIhXsygAh7bTkwyeM1bi1a2g5C/yC/N8TZyGDEoMfm/l9mpg==",
       "cpu": [
         "ppc64"
       ],
@@ -2346,9 +2265,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-s390x-gnu": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.1.tgz",
-      "integrity": "sha512-fy8rXxuYEu602abC8MUNaPjYLIFzReOaEIEMKMUa0rFEUxNpVXhs15KSSQ4qlqSaM7B6rcj9rDZgADh/IGDzLQ==",
+      "integrity": "sha512-0frlsT/f4Ft6I7SMESTKnF3cZsdicQn1dCMkF/jT9wDLE+gGoiQfv1nmT9e+s7s/fekvvy6tZM2jHvI2tkbJDQ==",
       "cpu": [
         "s390x"
       ],
@@ -2366,9 +2285,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-gnu": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.1.tgz",
-      "integrity": "sha512-0+bOkiQ779+r1WpoHOWHqncvyySci0vKph+myNDYb+im6meJAzHQXay6oEgnkHuUGouM1LKTZwqKpBow6Kj7CQ==",
+      "integrity": "sha512-XABVmGp9Tg0WspTVvwduTc4fpqy6JnAUrSQe6OuyqD/03nI7r0O9OWUkMIwFrjKAIqolvqoA4ZrJppgwE0Gxmw==",
       "cpu": [
         "x64"
       ],
@@ -2386,9 +2305,9 @@
       }
     },
     "node_modules/@rolldown/binding-linux-x64-musl": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.1.tgz",
-      "integrity": "sha512-mjSkrzZK5Qsl0a9d1JgILOiuZOSDTVdKENcSXBoqbzSrspLR/4/IRVDo5wd2GgZjNss/viBFJdeq+j7qH2nypw==",
+      "integrity": "sha512-bV4fzswuzVcKD90o/VM6QqKxnxlDq0g2BISDLNVmxrnhpv1DDbyPhCIjYfvzYLV+MvkKKnQt2Q6AO86SEBULUQ==",
       "cpu": [
         "x64"
       ],
@@ -2406,9 +2325,9 @@
       }
     },
     "node_modules/@rolldown/binding-openharmony-arm64": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.1.tgz",
-      "integrity": "sha512-1v5vHasdfQAZoEHakBV72LIFAC9JjnymsiKxp+GEr/ma3+NJCPSaYK+qavInOovJkgwFrs7GccX2d6IgDA3Z5w==",
+      "integrity": "sha512-/Mh0Zhq3OP7fVs0kcQHZP6lZEthMGTaSf8UBQYSFEZDWGXXlEC+nJ6EqenaK2t4LBXMe3A+K/G2BVXXdtOr4PQ==",
       "cpu": [
         "arm64"
       ],
@@ -2423,9 +2342,9 @@
       }
     },
     "node_modules/@rolldown/binding-wasm32-wasi": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.1.tgz",
-      "integrity": "sha512-mb1VobWn6NheziTk5/WEaR6AKVbrwT5sOi6C7zk3gy/pD1qtJfU1j4PgTo2NJnOtbL9Dl3Aeei8w9jJ7qC2jZQ==",
+      "integrity": "sha512-+1xc9X45l8ufsBAm6Gjvx2qDRIY9lTVt0cgWNcJ+1gdhXvkbxePA60yRTwSTuXL09CMhyJmjpV7E3NoyxbqFQQ==",
       "cpu": [
         "wasm32"
       ],
@@ -2442,9 +2361,9 @@
       }
     },
     "node_modules/@rolldown/binding-win32-arm64-msvc": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.1.tgz",
-      "integrity": "sha512-SqKonF56vA/L2yHwHYcEp2P34URpOZ7d1fS635cTkpDnUtEGdUbhI6NzsPdqeSWvAAeGDrxjWjNmibDIdFf9/A==",
+      "integrity": "sha512-1D+UqZdfnuR+Jy1GgMJwi85bD40H21uNmOPRWQhw4oRSuolZ/B5rixZ45DK2KXOTCvmVCecauWgEhbw8bI7tOw==",
       "cpu": [
         "arm64"
       ],
@@ -2459,9 +2378,9 @@
       }
     },
     "node_modules/@rolldown/binding-win32-x64-msvc": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.1.tgz",
-      "integrity": "sha512-v7qRI7gXLRINcOGXt+7YmAZ6iFuyZVMIoXAxhd8oP+DR9dLfL9GfNIx7PLMxmhZdvq8waUJBQiWN9EKNy+TRBQ==",
+      "integrity": "sha512-INAycaWuhlOK3wk4mRHGsdgwYWmd9cChdPdE9bwWmy6rn9VqVNYNFGhOdXrofXUxwHIncSiPNb8tNm8knDVIeQ==",
       "cpu": [
         "x64"
       ],
@@ -2765,14 +2684,14 @@
       "license": "Python-2.0"
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.15",
+      "version": "0.4.16",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.15.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.16.tgz",
-      "integrity": "sha512-hR3GwrRwHUfYwGfrisXPIDP3JcYfBrW7wKE7+Au6wDYl7fm/ka1NEII6kORzxNU556JjfidZeBsO10kYvtV1aw==",
+      "integrity": "sha512-xaVwwSfebXf0ooE11BJovZYKhFjIvQo7TsyVpETuIeH2JHv0k/T6Y5j22pPTvqYqmpkxdlPAJlyJ0tfOJAoMxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.28.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.7",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -2780,13 +2699,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.14.0",
+      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.14.1.tgz",
-      "integrity": "sha512-AvDcMxJ34W4Wgy4KBIIePQTAOP1Ie2WFwkQp3dB7FQ/f0lI5+nM96zUnYEOE1P9sEg0es5VCP0HxiWu5fUHZAQ==",
+      "integrity": "sha512-ENp89vM9Pw4kv/koBb5N2f9bDZsR0hpf3BdPMOg/pkS3pwO4dzNnQZVXtBbeyAadgm865DmQG2jMMLqmZXvuCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.7",
         "core-js-compat": "^3.48.0"
       },
       "peerDependencies": {
@@ -2794,13 +2713,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.6",
+      "version": "0.6.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.6.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.7.tgz",
-      "integrity": "sha512-hYm+XLYRMvupxiQzrvXUj7YyvFFVfv5gI0R71AJzudg1g2AI2vyCPPIFEBjk162/wFzti3inBHo7isWFuEVS/A==",
+      "integrity": "sha512-OTYbUlSwXhNgr4g6efMZgsO8//jA61P7ZbRX3iTT53VON8l+WQS8IAUEVo4a4cWknrg2W8Cj4gQhRYNCJ8GkAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.6"
+        "@babel/helper-define-polyfill-provider": "^0.6.7"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -2825,13 +2744,16 @@
       }
     },
     "node_modules/baseline-browser-mapping": {
-      "version": "2.9.19",
+      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.19.tgz",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz",
-      "integrity": "sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==",
+      "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
-        "baseline-browser-mapping": "dist/cli.js"
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
       }
     },
     "node_modules/brace-expansion": {
@@ -2926,9 +2848,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001769",
+      "version": "1.0.30001777",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001769.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001777.tgz",
-      "integrity": "sha512-BCfFL1sHijQlBGWBMuJyhZUhzo7wer5sVj9hqekB/7xn0Ypy+pER/edCYQm4exbXj4WiySGp40P8UuTh6w1srg==",
+      "integrity": "sha512-tmN+fJxroPndC74efCdp12j+0rk0RHwV5Jwa1zWaFVyw2ZxAuPeG8ZgWC3Wz7uSjT3qMRQ5XHZ4COgQmsCMJAQ==",
       "dev": true,
       "funding": [
         {
@@ -3415,9 +3337,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.286",
+      "version": "1.5.307",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.286.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.307.tgz",
-      "integrity": "sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==",
+      "integrity": "sha512-5z3uFKBWjiNR44nFcYdkcXjKMbg5KXNdciu7mhTPo9tB7NbqSNP2sSnGR+fqknZSCwKkBN+oxiiajWs4dT6ORg==",
       "dev": true,
       "license": "ISC"
     },
@@ -3557,9 +3479,9 @@
       }
     },
     "node_modules/get-east-asian-width": {
-      "version": "1.6.0",
+      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.5.0.tgz",
-      "integrity": "sha512-QRbvDIbx6YklUe6RxeTeleMR0yv3cYH6PsPZHcnVn7xv7zO1BHN8r0XETu8n6Ye3Q+ahtSarc3WgtNWmehIBfA==",
+      "integrity": "sha512-CQ+bEO+Tva/qlmw24dCejulK5pMzVnUOFOijVogd3KQs07HnRIgp8TGipvCCRT06xeYEbpbgwaCxglFyiuIcmA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3643,14 +3565,6 @@
         "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.10",
       "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.10.tgz",
@@ -3986,9 +3900,6 @@
         "arm64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -4010,9 +3921,6 @@
         "arm64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -4034,9 +3942,6 @@
         "x64"
       ],
       "dev": true,
-      "libc": [
-        "glibc"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -4058,9 +3963,6 @@
         "x64"
       ],
       "dev": true,
-      "libc": [
-        "musl"
-      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -4126,9 +4028,9 @@
       }
     },
     "node_modules/lodash-es": {
-      "version": "4.17.23",
+      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.23.tgz",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz",
-      "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==",
+      "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==",
       "license": "MIT"
     },
     "node_modules/lodash.debounce": {
@@ -4161,12 +4063,12 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "10.2.5",
+      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "brace-expansion": "^5.0.5"
+        "brace-expansion": "^5.0.2"
       },
       "engines": {
         "node": "18 || 20 || >=22"
@@ -4250,9 +4152,9 @@
       }
     },
     "node_modules/ngraph.graph": {
-      "version": "20.1.1",
+      "version": "20.1.2",
-      "resolved": "https://registry.npmjs.org/ngraph.graph/-/ngraph.graph-20.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ngraph.graph/-/ngraph.graph-20.1.2.tgz",
-      "integrity": "sha512-KNtZWYzYe7SMOuG3vvROznU+fkPmL5cGYFsWjqt+Ob1uF5xZz5EjomtsNOZEIwVuD37/zokeEqNK1ghY4/fhDg==",
+      "integrity": "sha512-W/G3GBR3Y5UxMLHTUCPP9v+pbtpzwuAEIqP5oZV+9IwgxAIEZwh+Foc60iPc1idlnK7Zxu0p3puxAyNmDvBd0Q==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "ngraph.events": "^1.4.0"
@@ -4299,9 +4201,9 @@
       "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.27",
+      "version": "2.0.36",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.36.tgz",
-      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
+      "integrity": "sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4392,9 +4294,9 @@
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "11.5.0",
+      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
-      "integrity": "sha512-5YgH9UJd7wVb9hIouI2adWpgqrrICkt070Dnj8EUY1+B4B2P9eRLPAkAAo6NICA7CEhOIeBHl46u9zSNpNu7zA==",
+      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
       "license": "BlueOak-1.0.0",
       "engines": {
         "node": "20 || >=22"
@@ -4625,13 +4527,13 @@
       }
     },
     "node_modules/rolldown": {
-      "version": "1.0.2",
+      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.1.tgz",
-      "integrity": "sha512-oZx5zVDtVB44AW3eaifgDml1gWRDZGvjcfdxonE4swNPG98PrrXjaO/KrnUjzlMnztCCRVlUueA1kCXhARGk6g==",
+      "integrity": "sha512-X0KQHljNnEkWNqqiz9zJrGunh1B0HgOxLXvnFpCOcadzcy5qohZ3tqMEUg00vncoRovXuK3ZqCT9KnnKzoInFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@oxc-project/types": "=0.132.0",
+        "@oxc-project/types": "=0.130.0",
         "@rolldown/pluginutils": "^1.0.0"
       },
       "bin": {
@@ -4641,21 +4543,21 @@
         "node": "^20.19.0 || >=22.12.0"
       },
       "optionalDependencies": {
-        "@rolldown/binding-android-arm64": "1.0.2",
+        "@rolldown/binding-android-arm64": "1.0.1",
-        "@rolldown/binding-darwin-arm64": "1.0.2",
+        "@rolldown/binding-darwin-arm64": "1.0.1",
-        "@rolldown/binding-darwin-x64": "1.0.2",
+        "@rolldown/binding-darwin-x64": "1.0.1",
-        "@rolldown/binding-freebsd-x64": "1.0.2",
+        "@rolldown/binding-freebsd-x64": "1.0.1",
-        "@rolldown/binding-linux-arm-gnueabihf": "1.0.2",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.0.1",
-        "@rolldown/binding-linux-arm64-gnu": "1.0.2",
+        "@rolldown/binding-linux-arm64-gnu": "1.0.1",
-        "@rolldown/binding-linux-arm64-musl": "1.0.2",
+        "@rolldown/binding-linux-arm64-musl": "1.0.1",
-        "@rolldown/binding-linux-ppc64-gnu": "1.0.2",
+        "@rolldown/binding-linux-ppc64-gnu": "1.0.1",
-        "@rolldown/binding-linux-s390x-gnu": "1.0.2",
+        "@rolldown/binding-linux-s390x-gnu": "1.0.1",
-        "@rolldown/binding-linux-x64-gnu": "1.0.2",
+        "@rolldown/binding-linux-x64-gnu": "1.0.1",
-        "@rolldown/binding-linux-x64-musl": "1.0.2",
+        "@rolldown/binding-linux-x64-musl": "1.0.1",
-        "@rolldown/binding-openharmony-arm64": "1.0.2",
+        "@rolldown/binding-openharmony-arm64": "1.0.1",
-        "@rolldown/binding-wasm32-wasi": "1.0.2",
+        "@rolldown/binding-wasm32-wasi": "1.0.1",
-        "@rolldown/binding-win32-arm64-msvc": "1.0.2",
+        "@rolldown/binding-win32-arm64-msvc": "1.0.1",
-        "@rolldown/binding-win32-x64-msvc": "1.0.2"
+        "@rolldown/binding-win32-x64-msvc": "1.0.1"
       }
     },
     "node_modules/rollup-plugin-visualizer": {
@@ -4848,9 +4750,9 @@
       }
     },
     "node_modules/three-render-objects": {
-      "version": "1.42.0",
+      "version": "1.41.1",
-      "resolved": "https://registry.npmjs.org/three-render-objects/-/three-render-objects-1.42.0.tgz",
+      "resolved": "https://registry.npmjs.org/three-render-objects/-/three-render-objects-1.41.1.tgz",
-      "integrity": "sha512-KYfkPrYGEbIK8ChFocWqOF1aAN80FBUBWVYB8mB2oBpVuVN+52FvvngVYB5ieFANQu7Rt21rPYZ/xKaAgVWWRQ==",
+      "integrity": "sha512-0H7l7yREPVKfO3HL7RjPQ67T0phHgnyMeEc4ww/OCEfK6jbsm7psEcrR0SGFqGDyS/pDQTPi4DyPbS/xlHRJKw==",
       "license": "MIT",
       "dependencies": {
         "@tweenjs/tween.js": "18 - 25",
@@ -5041,16 +4943,16 @@
       }
     },
     "node_modules/vite": {
-      "version": "8.0.14",
+      "version": "8.0.13",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.14.tgz",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.13.tgz",
-      "integrity": "sha512-s4BJJ+5y1pYL6Otw51FHhVJQhPnuRinKig64g/1+EUNaJsd3gCKdD31IPFvswUgW9/60QT9oFHbZHbQK5imcxw==",
+      "integrity": "sha512-MFtjBYgzmSxmgA4RAfjIyXWpGe1oALnjgUTzzV7QLx/TKxCzjtMH6Fd9/eVK+5Fg1qNoz5VAwsmMs/NofrmJvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "lightningcss": "^1.32.0",
         "picomatch": "^4.0.4",
-        "postcss": "^8.5.15",
+        "postcss": "^8.5.14",
-        "rolldown": "1.0.2",
+        "rolldown": "1.0.1",
         "tinyglobby": "^0.2.16"
       },
       "bin": {

package.json

@@ -21,8 +21,7 @@
     "#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",
@@ -39,7 +38,6 @@
     "vite": "^8.0.13"
   },
   "dependencies": {
-    "@alpinejs/morph": "^3.14.9",
     "@alpinejs/sort": "^3.15.12",
     "@arendjr/text-clipper": "npm:@jsr/arendjr__text-clipper@^3.0.0",
     "@floating-ui/dom": "^1.7.6",
@@ -47,10 +45,7 @@
     "@fullcalendar/core": "^6.1.20",
     "@fullcalendar/daygrid": "^6.1.20",
     "@fullcalendar/icalendar": "^6.1.20",
-    "@fullcalendar/interaction": "^6.1.20",
     "@fullcalendar/list": "^6.1.20",
-    "@fullcalendar/resource": "^6.1.20",
-    "@fullcalendar/resource-timeline": "^6.1.20",
     "@sentry/browser": "^10.53.1",
     "@zip.js/zip.js": "^2.8.26",
     "3d-force-graph": "^1.80.0",
@@ -64,7 +59,6 @@
     "easymde": "^2.21.0",
     "glob": "^13.0.6",
     "html2canvas": "^1.4.1",
-    "htmx-ext-alpine-morph": "^2.0.1",
     "htmx.org": "^2.0.10",
     "js-cookie": "^3.0.7",
     "lit-html": "^3.3.3",

pyproject.toml

@@ -68,7 +68,7 @@ dev = [
     "pre-commit>=4.6.0,<5.0.0",
     "ruff>=0.15.13,<1.0.0",
     "djhtml>=3.0.11,<4.0.0",
-    "faker>=40.18.0,<41.0.0",
+    "faker>=40.20.0,<41.0.0",
     "rjsmin>=1.2.5,<2.0.0",
 ]
 tests = [

reservation/admin.py

@@ -1,19 +0,0 @@
-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

@@ -1,64 +0,0 @@
-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

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

reservation/forms.py

@@ -1,60 +0,0 @@
-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

@@ -1,117 +0,0 @@
-# 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

@@ -1,100 +0,0 @@
-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

@@ -1,46 +0,0 @@
-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

@@ -1,136 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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

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

reservation/static/reservation/reservation.scss

@@ -1,39 +0,0 @@
-#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

@@ -1,51 +0,0 @@
-<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

@@ -1,27 +0,0 @@
-{% 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

@@ -1,33 +0,0 @@
-{% 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

@@ -1,113 +0,0 @@
-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

@@ -1,207 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,72 +0,0 @@
-# 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"

sith/settings.py

@@ -128,7 +128,6 @@ INSTALLED_APPS = (
     "trombi",
     "matmat",
     "pedagogy",
-    "reservation",
     "galaxy",
     "antispam",
     "timetable",
@@ -280,7 +279,7 @@ LOGGING = {
 # Internationalization
 # https://docs.djangoproject.com/en/1.8/topics/i18n/
 
-LANGUAGE_CODE = "fr"
+LANGUAGE_CODE = "fr-FR"
 
 LANGUAGES = [("en", _("English")), ("fr", _("French"))]
 
@@ -572,6 +571,11 @@ SITH_BARMAN_TIMEOUT = 30
 # Minutes to delete the last operations
 SITH_LAST_OPERATIONS_LIMIT = 10
 
+# time before a basket is considered expired
+SITH_EBOUTIC_BASKET_TIMEOUT = timedelta(minutes=10)
+# time that a user can spend on the CB payment page before it to timeout
+SITH_EBOUTIC_ETRANSACTION_TIMEOUT = timedelta(minutes=10)
+
 # ET variables
 SITH_EBOUTIC_CB_ENABLED = env.bool("SITH_EBOUTIC_CB_ENABLED", default=True)
 SITH_EBOUTIC_ET_URL = env.str(

sith/urls.py

@@ -49,10 +49,6 @@ 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,8 +18,7 @@
       "#core:*": ["./core/static/bundled/*"],
       "#pedagogy:*": ["./pedagogy/static/bundled/*"],
       "#counter:*": ["./counter/static/bundled/*"],
-      "#com:*": ["./com/static/bundled/*"],
+      "#com:*": ["./com/static/bundled/*"]
-      "#reservation:*": ["./reservation/static/bundled/*"]
     }
   }
 }