Bump vite from 8.3.2 to 8.3.3

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 8.3.2 to 8.3.3.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v8.3.3/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 8.3.3
  dependency-type: direct:development
...

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

core/migrations/0052_preferences_show_my_timetable.py

@@ -1,22 +0,0 @@
-# Generated by Django 5.2.17 on 2026-09-24 14:49
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("core", "0051_user_cgu_approved_at")]
-
-    operations = [
-        migrations.AddField(
-            model_name="preferences",
-            name="show_my_timetable",
-            field=models.BooleanField(
-                default=True,
-                help_text=(
-                    "Allow subscribers to see your timetable and "
-                    "to compare it to theirs (if you have filled it)"
-                ),
-                verbose_name="show your timetable to others",
-            ),
-        ),
-    ]

core/models.py

@@ -799,14 +799,6 @@ class Preferences(models.Model):
         ),
         default=False,
     )
-    show_my_timetable = models.BooleanField(
-        _("show your timetable to others"),
-        help_text=_(
-            "Allow subscribers to see your timetable and "
-            "to compare it to theirs (if you have filled it)"
-        ),
-        default=True,
-    )
     notify_on_click = models.BooleanField(
         _("get a notification for every click"), default=False
     )

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

@@ -60,7 +60,6 @@ const loadEasyMde = (textarea: HTMLTextAreaElement) => {
       });
       easymde.codemirror.replaceSelection("\n");
     },
-    previewClass: ["editor-preview", "markdown"], // default class + our own markdown class
     previewRender: (plainText) => markdown(plainText),
     forceSync: true, // Avoid validation error on generic create view
     imageTexts: {

core/static/core/markdown.scss

@@ -33,15 +33,6 @@
     padding: 1px 2px;
   }
 
-  /**
-   * Some restyling rules for the cases where our own md css
-   * conflicts with the easymde editor preview css
-   */
-  &.editor-preview {
-    pre {
-      background: unset;
-    }
-  }
   pre code {
     // code that is not inlined
     margin: 15px;

core/templates/core/fragment/user_visibility.jinja

@@ -29,13 +29,5 @@
     </span>
     {{ form.show_my_stats.errors }}
   </fieldset>
-  <fieldset class="form-group">
-    {{ form.show_my_timetable }}
-    {{ form.show_my_timetable.label_tag() }}
-    <span class="helptext">
-      {{ form.show_my_timetable.help_text }}
-    </span>
-    {{ form.show_my_timetable.errors }}
-  </fieldset>
   <input type="submit" class="btn btn-blue" value="{% trans %}Save{% endtrans %}">
 </form>

core/urls.py

@@ -84,7 +84,6 @@ from core.views import (
     notification,
     send_file,
 )
-from timetable.views import UserTimetableView
 
 register_converter(FourDigitYearConverter, "yyyy")
 register_converter(TwoDigitMonthConverter, "mm")
@@ -185,11 +184,6 @@ urlpatterns = [
         name="user_account_detail",
     ),
     path("user/<int:user_id>/stats/", UserStatsView.as_view(), name="user_stats"),
-    path(
-        "user/<int:user_id>/edt/",
-        UserTimetableView.as_view(),
-        name="user_timetable",
-    ),
     path(
         "user/<int:user_id>/gift/create/",
         GiftCreateView.as_view(),

core/views/forms.py

@@ -336,14 +336,10 @@ class UserVisibilityForm(forms.ModelForm):
 
     __preferences_fields = forms.fields_for_model(
         Preferences,
-        ["show_my_stats", "show_my_timetable"],
-        widgets={
-            "show_my_stats": forms.CheckboxInput(attrs={"class": "switch"}),
-            "show_my_timetable": forms.CheckboxInput(attrs={"class": "switch"}),
-        },
+        ["show_my_stats"],
+        widgets={"show_my_stats": forms.CheckboxInput(attrs={"class": "switch"})},
     )
     show_my_stats = __preferences_fields["show_my_stats"]
-    show_my_timetable = __preferences_fields["show_my_timetable"]
 
     def __init__(
         self, *args, initial: dict | None = None, instance: User | None = None, **kwargs
@@ -351,16 +347,12 @@ class UserVisibilityForm(forms.ModelForm):
         if instance:
             initial = initial or {}
             initial["show_my_stats"] = instance.preferences.show_my_stats
-            initial["show_my_timetable"] = instance.preferences.show_my_timetable
         super().__init__(*args, initial=initial, instance=instance, **kwargs)
 
     def save(self, commit=True) -> User:  # noqa: FBT002
         instance = super().save(commit=commit)
         if commit:
             instance.preferences.show_my_stats = self.cleaned_data["show_my_stats"]
-            instance.preferences.show_my_timetable = self.cleaned_data[
-                "show_my_timetable"
-            ]
             instance.preferences.save()
         return instance
 

core/views/mixins.py

@@ -1,14 +1,6 @@
 import copy
 import inspect
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    ClassVar,
-    LiteralString,
-    Protocol,
-    TypedDict,
-    Unpack,
-)
+from typing import TYPE_CHECKING, Any, ClassVar, LiteralString, Protocol, Unpack
 
 from django.core.exceptions import ImproperlyConfigured
 from django.template.loader import render_to_string
@@ -20,17 +12,11 @@ if TYPE_CHECKING:
     from django.utils.safestring import SafeString
 
 
-class TabItem(TypedDict):
-    url: str
-    slug: str
-    name: str
-
-
 class TabedViewMixin(View):
     """Basic functions for displaying tabs in the template."""
 
     current_tab: ClassVar[str | None] = None
-    list_of_tabs: ClassVar[list[TabItem] | None] = None
+    list_of_tabs: ClassVar[list | None] = None
     tabs_title: ClassVar[str | None] = None
 
     def get_tabs_title(self):

counter/templates/counter/product_form.jinja

@@ -83,17 +83,8 @@
 {% endmacro %}
 
 {% block content %}
-  <div class="alert alert-yellow">
-    <div class="alert-main">
-      {%- trans trimmed -%}
-        You can see product details.
-        However, you cannot edit it, thus you won't be able
-        to submit this form.
-      {%- endtrans -%}
-    </div>
-  </div>
   {% if object %}
-    <h2>{{ object }}</h2>
+    <h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
     <p><i>{% trans %}Creation date{% endtrans %} : {{ object.created_at|date }}</i></p>
     <p><i>{% trans %}Last update{% endtrans %} : {{ object.updated_at|date }}</i></p>
   {% else %}
@@ -136,17 +127,19 @@
       {{ form.price_formset.management_form }}
       <div x-ref="formContainer">
         {%- for form in form.price_formset.forms -%}
-          <div>{{ price_form(form) }}</div>
+          <div>
+            {{ price_form(form) }}
+          </div>
         {%- endfor -%}
       </div>
       <template x-ref="formTemplate">
-        <div>{{ price_form(form.price_formset.empty_form) }}</div>
+        <div>
+          {{ price_form(form.price_formset.empty_form) }}
+        </div>
       </template>
-      {% if user.has_perm("counter.change_product") %}
-        <button class="btn btn-grey" @click.prevent="addForm()">
-          <i class="fa fa-plus"></i> {% trans %}Add a price{% endtrans %}
-        </button>
-      {% endif %}
+      <button class="btn btn-grey" @click.prevent="addForm()">
+        <i class="fa fa-plus"></i> {% trans %}Add a price{% endtrans %}
+      </button>
     </div>
 
     <br />
@@ -172,16 +165,11 @@
       <template x-ref="formTemplate">
         {{ action_form(form.action_formset.empty_form) }}
       </template>
-      {% if user.has_perm("counter.change_product") %}
-        <button @click.prevent="addForm()" class="btn btn-grey">
-          <i class="fa fa-plus"></i>{% trans %}Add action{% endtrans %}
-        </button>
-      {% endif %}
+      <button @click.prevent="addForm()" class="btn btn-grey">
+        <i class="fa fa-plus"></i>{% trans %}Add action{% endtrans %}
+      </button>
     </div>
     <div class="row gap margin-bottom">{{ form.archived.as_field_group() }}</div>
-
-    {% if user.has_perm("counter.change_product") %}
-      <p><input class="btn btn-blue" type="submit" value="{% trans %}Save{% endtrans %}" /></p>
-    {% endif %}
+    <p><input class="btn btn-blue" type="submit" value="{% trans %}Save{% endtrans %}" /></p>
   </form>
 {% endblock %}

counter/templates/counter/product_list.jinja

@@ -80,11 +80,9 @@
     <h3 class="margin-bottom">{% trans %}Product list{% endtrans %}</h3>
 
     <div class="row margin-bottom">
-      {% if user.has_perm("counter.add_product") %}
-        <a href="{{ url('counter:new_product') }}" class="btn btn-blue">
-          {% trans %}New product{% endtrans %} <i class="fa fa-plus"></i>
-        </a>
-      {% endif %}
+      <a href="{{ url('counter:new_product') }}" class="btn btn-blue">
+        {% trans %}New product{% endtrans %} <i class="fa fa-plus"></i>
+      </a>
       <button
         class="btn btn-blue"
         @click="downloadCsv()"

counter/templates/counter/product_type_list.jinja

@@ -13,12 +13,12 @@
 {% endblock %}
 
 {% block content %}
-  {% if user.has_perm("counter.add_producttype") %}
-    <a href="{{ url('counter:new_product_type') }}" class="btn btn-blue margin-bottom">
+  <p>
+    <a href="{{ url('counter:new_product_type') }}" class="btn btn-blue">
       {% trans %}New product type{% endtrans %}
       <i class="fa fa-plus"></i>
     </a>
-  {% endif %}
+  </p>
   {% if product_types %}
     <aside>
       <p>

counter/views/admin.py

@@ -48,7 +48,7 @@ from counter.models import (
     Selling,
 )
 from counter.utils import is_logged_in_counter
-from counter.views.mixins import CounterAdminTabsMixin
+from counter.views.mixins import CounterAdminMixin, CounterAdminTabsMixin
 
 
 class CounterListView(CounterAdminTabsMixin, CanViewMixin, ListView):
@@ -84,18 +84,17 @@ class CounterEditView(
         return reverse_lazy("counter:admin", kwargs={"counter_id": self.object.id})
 
 
-class CounterEditPropView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
-    """Edit a counter's main infos."""
+class CounterEditPropView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
+    """Edit a counter's main informations (for the counter's admin)."""
 
     model = Counter
     form_class = modelform_factory(Counter, fields=["name", "club", "type"])
     pk_url_kwarg = "counter_id"
     template_name = "core/edit.jinja"
     current_tab = "counters"
-    permission_required = "counter.change_counter"
 
 
-class CounterCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateView):
+class CounterCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """Create a counter (for the admins)."""
 
     model = Counter
@@ -106,10 +105,9 @@ class CounterCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateVi
     )
     template_name = "core/create.jinja"
     current_tab = "counters"
-    permission_required = "counter.add_counter"
 
 
-class CounterDeleteView(CounterAdminTabsMixin, PermissionRequiredMixin, DeleteView):
+class CounterDeleteView(CounterAdminTabsMixin, CounterAdminMixin, DeleteView):
     """Delete a counter (for the admins)."""
 
     model = Counter
@@ -117,33 +115,30 @@ class CounterDeleteView(CounterAdminTabsMixin, PermissionRequiredMixin, DeleteVi
     template_name = "core/delete_confirm.jinja"
     success_url = reverse_lazy("counter:admin_list")
     current_tab = "counters"
-    permission_required = "counter.delete_counter"
 
 
 # Product management
 
 
-class ProductTypeListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView):
+class ProductTypeListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
     """A list view for the admins."""
 
     model = ProductType
     template_name = "counter/product_type_list.jinja"
     current_tab = "product_types"
     context_object_name = "product_types"
-    permission_required = "counter.view_producttype"
 
 
-class ProductTypeCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateView):
+class ProductTypeCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """A create view for the admins."""
 
     model = ProductType
     fields = ["name", "description", "comment", "icon"]
     template_name = "core/create.jinja"
     current_tab = "products"
-    permission_required = "counter.add_producttype"
 
 
-class ProductTypeEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
+class ProductTypeEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """An edit view for the admins."""
 
     model = ProductType
@@ -151,26 +146,23 @@ class ProductTypeEditView(CounterAdminTabsMixin, PermissionRequiredMixin, Update
     fields = ["name", "description", "comment", "icon"]
     pk_url_kwarg = "type_id"
     current_tab = "products"
-    permission_required = "counter.change_producttype"
 
 
-class ProductListView(CounterAdminTabsMixin, PermissionRequiredMixin, TemplateView):
+class ProductListView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
     current_tab = "products"
     template_name = "counter/product_list.jinja"
-    permission_required = "counter.view_product"
 
 
-class ProductCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateView):
+class ProductCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """A create view for the admins."""
 
     model = Product
     form_class = ProductForm
     template_name = "counter/product_form.jinja"
     current_tab = "products"
-    permission_required = "counter.add_product"
 
 
-class ProductEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
+class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """An edit view for the admins."""
 
     model = Product
@@ -178,13 +170,6 @@ class ProductEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView
     pk_url_kwarg = "product_id"
     template_name = "counter/product_form.jinja"
     current_tab = "products"
-    permission_required = "counter.change_product"
-
-    def has_permission(self):
-        return self.request.user.has_perm("counter.change_product") or (
-            self.request.method == "GET"
-            and self.request.user.has_perm("counter.view_product")
-        )
 
 
 class ProductFormulaListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView):
@@ -314,6 +299,7 @@ class RefillingDeleteView(DeleteView):
     template_name = "core/delete_confirm.jinja"
 
     def dispatch(self, request, *args, **kwargs):
+        """We have here a very particular right handling, we can't inherit from CanEditPropMixin."""
         self.object = self.get_object()
         if timezone.now() - self.object.date <= timedelta(
             minutes=settings.SITH_LAST_OPERATIONS_LIMIT
@@ -338,6 +324,7 @@ class SellingDeleteView(DeleteView):
     template_name = "core/delete_confirm.jinja"
 
     def dispatch(self, request, *args, **kwargs):
+        """We have here a very particular right handling, we can't inherit from CanEditPropMixin."""
         self.object = self.get_object()
         if timezone.now() - self.object.date <= timedelta(
             minutes=settings.SITH_LAST_OPERATIONS_LIMIT
@@ -389,31 +376,30 @@ class CounterStatView(PermissionRequiredMixin, DetailView):
         return kwargs
 
 
-class CounterRefillingListView(
-    CounterAdminTabsMixin, PermissionRequiredMixin, ListView
-):
+class CounterRefillingListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
     """List of refillings on a counter."""
 
     model = Refilling
     template_name = "counter/refilling_list.jinja"
     current_tab = "counters"
     paginate_by = 30
-    permission_required = "counter.view_refilling"
 
-    def get_queryset(self):
-        self.counter = get_object_or_404(Counter, pk=self.kwargs["counter_id"])
-        return Refilling.objects.filter(counter=self.counter).order_by("-date")
+    def dispatch(self, request, *args, **kwargs):
+        self.counter = get_object_or_404(Counter, pk=kwargs["counter_id"])
+        self.queryset = Refilling.objects.filter(counter__id=self.counter.id)
+        return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {"counter": self.counter}
+        kwargs = super().get_context_data(**kwargs)
+        kwargs["counter"] = self.counter
+        return kwargs
 
 
-class RefoundAccountView(UserPassesTestMixin, SuccessMessageMixin, FormView):
+class RefoundAccountView(UserPassesTestMixin, FormView):
     """Create a selling with the same amount as the current user money."""
 
     template_name = "counter/refound_account.jinja"
     form_class = CloseCustomerAccountForm
-    success_message = _("%(user)s's AE account has been emptied")
 
     def test_func(self):
         return self.request.user.is_root or self.request.user.is_in_group(

counter/views/eticket.py

@@ -12,7 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from django.contrib.auth.mixins import PermissionRequiredMixin
+
 from django.http import Http404, HttpResponse
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, ListView
@@ -21,30 +21,28 @@ from django.views.generic.edit import CreateView, UpdateView
 from core.auth.mixins import CanViewMixin
 from counter.forms import EticketForm
 from counter.models import Eticket, Selling
-from counter.views.mixins import CounterAdminTabsMixin
+from counter.views.mixins import CounterAdminMixin, CounterAdminTabsMixin
 
 
-class EticketListView(CounterAdminTabsMixin, PermissionRequiredMixin, ListView):
+class EticketListView(CounterAdminTabsMixin, CounterAdminMixin, ListView):
     """A list view for the admins."""
 
     model = Eticket
     template_name = "counter/eticket_list.jinja"
     ordering = ["id"]
     current_tab = "etickets"
-    permission_required = "counter.view_eticket"
 
 
-class EticketCreateView(CounterAdminTabsMixin, PermissionRequiredMixin, CreateView):
+class EticketCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
     """Create an eticket."""
 
     model = Eticket
     template_name = "core/create.jinja"
     form_class = EticketForm
     current_tab = "etickets"
-    permission_required = "counter.add_eticket"
 
 
-class EticketEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView):
+class EticketEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
     """Edit an eticket."""
 
     model = Eticket
@@ -52,7 +50,6 @@ class EticketEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView
     form_class = EticketForm
     pk_url_kwarg = "eticket_id"
     current_tab = "etickets"
-    permission_required = "counter.change_eticket"
 
 
 class EticketPDFView(CanViewMixin, DetailView):

counter/views/mixins.py

@@ -13,13 +13,38 @@
 #
 #
 
+from django.conf import settings
+from django.core.exceptions import PermissionDenied
 from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext_lazy as _
+from django.views.generic.base import View
 
 from core.views.mixins import TabedViewMixin
 from counter.utils import is_logged_in_counter
 
 
+class CounterAdminMixin(View):
+    """Protect counter admin section."""
+
+    edit_group = [settings.SITH_GROUP_COUNTER_ADMIN_ID]
+    edit_club = []
+
+    def _test_group(self, user):
+        return any(user.is_in_group(pk=grp_id) for grp_id in self.edit_group)
+
+    def _test_club(self, user):
+        return any(c.can_be_edited_by(user) for c in self.edit_club)
+
+    def dispatch(self, request, *args, **kwargs):
+        if not (
+            request.user.is_root
+            or self._test_group(request.user)
+            or self._test_club(request.user)
+        ):
+            raise PermissionDenied
+        return super().dispatch(request, *args, **kwargs)
+
+
 class CounterTabsMixin(TabedViewMixin):
     def get_tabs_title(self):
         return self.object
@@ -64,70 +89,45 @@ class CounterTabsMixin(TabedViewMixin):
 
 class CounterAdminTabsMixin(TabedViewMixin):
     tabs_title = _("Counter administration")
-
-    def get_list_of_tabs(self):
-        user = self.request.user
-        res = [
-            {
-                "url": reverse_lazy("counter:admin_list"),
-                "slug": "counters",
-                "name": _("Counters"),
-            }
-        ]
-        if user.has_perm("counter.view_product"):
-            res.append(
-                {
-                    "url": reverse_lazy("counter:product_list"),
-                    "slug": "products",
-                    "name": _("Products"),
-                }
-            )
-        if user.has_perm("counter.view_productformula"):
-            res.append(
-                {
-                    "url": reverse_lazy("counter:product_formula_list"),
-                    "slug": "formulas",
-                    "name": _("Formulas"),
-                }
-            )
-        if user.has_perm("counter.view_producttype"):
-            res.append(
-                {
-                    "url": reverse_lazy("counter:product_type_list"),
-                    "slug": "product_types",
-                    "name": _("Product types"),
-                }
-            )
-        if user.has_perm("counter.view_returnableproduct"):
-            res.append(
-                {
-                    "url": reverse_lazy("counter:returnable_list"),
-                    "slug": "returnable_products",
-                    "name": _("Returnable products"),
-                }
-            )
-        if user.has_perm("counter.view_cashregistersummary"):
-            res.append(
-                {
-                    "url": reverse_lazy("counter:cash_summary_list"),
-                    "slug": "cash_summary",
-                    "name": _("Cash register summaries"),
-                }
-            )
-        if user.has_perm("counter.view_invoicecall"):
-            res.append(
-                {
-                    "url": reverse_lazy("counter:invoices_call"),
-                    "slug": "invoices_call",
-                    "name": _("Invoices call"),
-                }
-            )
-        if user.has_perm("counter.view_eticket"):
-            res.append(
-                {
-                    "url": reverse_lazy("counter:eticket_list"),
-                    "slug": "etickets",
-                    "name": _("Etickets"),
-                }
-            )
-        return res
+    list_of_tabs = [
+        {
+            "url": reverse_lazy("counter:admin_list"),
+            "slug": "counters",
+            "name": _("Counters"),
+        },
+        {
+            "url": reverse_lazy("counter:product_list"),
+            "slug": "products",
+            "name": _("Products"),
+        },
+        {
+            "url": reverse_lazy("counter:product_formula_list"),
+            "slug": "formulas",
+            "name": _("Formulas"),
+        },
+        {
+            "url": reverse_lazy("counter:product_type_list"),
+            "slug": "product_types",
+            "name": _("Product types"),
+        },
+        {
+            "url": reverse_lazy("counter:returnable_list"),
+            "slug": "returnable_products",
+            "name": _("Returnable products"),
+        },
+        {
+            "url": reverse_lazy("counter:cash_summary_list"),
+            "slug": "cash_summary",
+            "name": _("Cash register summaries"),
+        },
+        {
+            "url": reverse_lazy("counter:invoices_call"),
+            "slug": "invoices_call",
+            "name": _("Invoices call"),
+        },
+        {
+            "url": reverse_lazy("counter:eticket_list"),
+            "slug": "etickets",
+            "name": _("Etickets"),
+        },
+    ]

docs/howto/terminal.md

@@ -48,7 +48,7 @@ des scripts complets mais qui restent lisibles,
     ```
     Ok, c'est de la triche, on installe un package externe.
     Mais bon, ça marche, et l'équivalent pur bash
-    serait un pur enfer.
+    serait carrément plus moche.
 
 === "nu"
 
@@ -59,18 +59,20 @@ des scripts complets mais qui restent lisibles,
 
     Nombre de lignes total :
     ```nu
-    ls **/*.py | par-each { open $in.name | lines | length } | math sum
+    ls **/*.py | insert linecount { get name | open | lines | length } | math sum
     ```
 
     Vous pouvez aussi exlure les lignes vides
     et les les lignes de commentaire :
     ```nu
     ls **/*.py |
-    par-each {
-        open $in.name |
+    insert linecount {
+        get name |
+        open |
         lines |
         each { str trim } |
-        where { |l| ($l | str length) > 0 and not ($l | str starts-with "#") } |
+        filter { |l| not ($l | str starts-with "#") } |  # commentaires
+        filter { |l| ($l | str length) > 0 } |  # lignes vides
         length
     } |
     math sum

docs/tutorial/install.md

@@ -18,8 +18,7 @@ il n'est pas possible de développer le site sur ce système d'exploitation.
 Heureusement, il existe une alternative qui ne requiert pas de désinstaller votre
 OS ni de mettre un dual boot sur votre ordinateur : `WSL`.
 
-- **Prérequis:** vous devez être sur Windows 10 version 2004 ou ultérieure (build 19041 & versions ultérieures) ou
-  Windows 11.
+- **Prérequis:** vous devez être sur Windows 10 version 2004 ou ultérieure (build 19041 & versions ultérieures) ou Windows 11.
 - **Plus d'info:** [docs.microsoft.com](https://docs.microsoft.com/fr-fr/windows/wsl/install)
 
 ```shell
@@ -44,7 +43,7 @@ il suffit d'utiliser la commande suivante :
 cd /mnt/<la_lettre_du_disque>/vos/fichiers/comme/dhab
 ```
 
-!!!success
+!!!note
 
     À ce stade, si vous avez réussi votre installation de `WSL` ou bien qu'il
     était déjà installé, vous pouvez effectuer la mise en place du projet en suivant
@@ -102,10 +101,10 @@ cd /mnt/<la_lettre_du_disque>/vos/fichiers/comme/dhab
         ln -s /usr/bin/valkey-server /usr/bin/redis-server
         ```
 
+
 === "macOS"
 
-    Pour installer les dépendances, il est fortement recommandé 
-    d'installer le gestionnaire de paquets `homebrew <https://brew.sh/index_fr>`_.  
+    Pour installer les dépendances, il est fortement recommandé d'installer le gestionnaire de paquets `homebrew <https://brew.sh/index_fr>`_.  
     Il est également nécessaire d'avoir installé xcode
     
     ```bash    
@@ -117,15 +116,12 @@ cd /mnt/<la_lettre_du_disque>/vos/fichiers/comme/dhab
     
     !!!note
     
-        Si vous rencontrez des erreurs lors de votre configuration, 
-        n'hésitez pas à vérifier l'état de votre installation homebrew 
-        avec :code:`brew doctor`
+        Si vous rencontrez des erreurs lors de votre configuration, n'hésitez pas à vérifier l'état de votre installation homebrew avec :code:`brew doctor`
 
 !!!note
 
     Python ne fait pas parti des dépendances puisqu'il est automatiquement
-    installé par uv. Il est cependant parfois nécessaire d'installer 
-    les headers Python nécessaire à la compilation de certains paquets.
+    installé par uv. Il est cependant parfois nécessaire d'installer les headers Python nécessaire à la compilation de certains paquets.
 
 ## Finaliser l'installation
 
@@ -149,6 +145,7 @@ uv run ./manage.py install_xapian
     de texte à l'écran.
     C'est normal, il ne faut pas avoir peur.
 
+
 La modification de la configuration passe par la modification de variables
 d'environnement.
 Ces variables sont stockées dans un fichier `.env`.
@@ -186,32 +183,11 @@ Il suffit ensuite d'utiliser cette commande :
 uv run ./manage.py runserver
 ```
 
-Le serveur est alors accessible à l'adresse
-[http://localhost:8000](http://localhost:8000) 
-ou bien [http://127.0.0.1:8000/](http://127.0.0.1:8000/).
+!!!note
 
-Pour vous connecter, vous pouvez utiliser un des comptes utilisateur
-créés durant l'installation :
-
-| username         | description                                                                |
-|------------------|----------------------------------------------------------------------------|
-| `root`           | super-utilisateur<br/>il peut tout faire et tout voir                      |
-| `subscriber`     | simple cotisant                                                            |
-| `old_subscriber` | ancien cotisant                                                            |
-| `public`         | non-cotisant                                                               |
-| `krophil`        | cotisant<br/>barman Foyer<br/>président du Troll Penché                    |
-| `sli`            | cotisant<br/>VP Troll                                                      |
-| `skia`           | cotisant<br/>barman MDE<br/>membre du bureau AE<br/>ancien membre du Troll |
-| `comunity`       | cotisant<br/>membre du bureau PdF<br/>admin communication                  |
-| `counter`        | cotisant<br/>admin comptoirs                                               |
-| `comptable`      | cotisant<br/>admin comptabilité                                            |
-| `rbatsbak`       | cotisant<br/>membre du Troll                                               |
-
-En plus de ces dernier, quelques centaines d'utilisateurs
-supplémentaires sont générés procéduralement,
-afin de rajouter un peu de volume de données.
-
-Tous les utilisateurs ont le mot de passe `plop`.
+    Le serveur est alors accessible à l'adresse
+    [http://localhost:8000](http://localhost:8000) 
+    ou bien [http://127.0.0.1:8000/](http://127.0.0.1:8000/).
 
 !!!note
 

forum/views.py

@@ -346,16 +346,13 @@ class ForumTopicDetailView(CanViewMixin, DetailView):
         return kwargs
 
 
-class ForumMessageView(SingleObjectMixin, UserPassesTestMixin, RedirectView):
+class ForumMessageView(SingleObjectMixin, RedirectView):
     model = ForumMessage
     pk_url_kwarg = "message_id"
     permanent = False
 
-    def test_func(self) -> bool:
-        self.object = self.get_object()
-        return self.request.user.can_view(self.object)
-
     def get_redirect_url(self, *args, **kwargs):
+        self.object = self.get_object()
         return self.object.get_url()
 
 

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-19 19:45+0200\n"
+"POT-Creation-Date: 2026-10-02 12:56+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"
@@ -236,7 +236,7 @@ msgstr "vous devez spécifier au moins un utilisateur ou une adresse email"
 msgid "Begin date"
 msgstr "Date de début"
 
-#: club/forms.py com/forms.py counter/forms.py
+#: club/forms.py com/forms.py counter/forms.py subscription/forms.py
 msgid "End date"
 msgstr "Date de fin"
 
@@ -1093,7 +1093,7 @@ msgstr "Prix d'achat"
 msgid "Format: 16:9 | Resolution: 1920x1080"
 msgstr "Format : 16:9 | Résolution : 1920x1080"
 
-#: com/forms.py
+#: com/forms.py subscription/forms.py
 msgid "Start date"
 msgstr "Date de début"
 
@@ -4102,6 +4102,7 @@ msgstr "Nouvelle formule"
 #: counter/templates/counter/fragments/create_student_card.jinja
 #: counter/templates/counter/invoices_call.jinja
 #: sas/templates/sas/picture.jinja
+#: subscription/templates/subscription/stats.jinja
 msgid "Go"
 msgstr "Valider"
 
@@ -4236,12 +4237,9 @@ msgid "Remove price"
 msgstr "Retirer le prix"
 
 #: counter/templates/counter/product_form.jinja
-msgid ""
-"You can see product details. However, you cannot edit it, thus you won't be "
-"able to submit this form."
-msgstr ""
-"Vous pouvez voir ce produit. Cependant, vous ne pouvez pas l'éditer ; vous "
-"ne serez donc pas en mesure de soumettre le formulaire."
+#, python-format
+msgid "Edit product %(name)s"
+msgstr "Édition du produit %(name)s"
 
 #: counter/templates/counter/product_form.jinja
 msgid "Creation date"
@@ -4413,11 +4411,6 @@ msgstr ""
 msgid "returnable product : %(returnable)s -> %(returned)s"
 msgstr "produit consigné : %(returnable)s -> %(returned)s"
 
-#: counter/views/admin.py
-#, python-format
-msgid "%(user)s's AE account has been emptied"
-msgstr "Le compte de %(user)s a été vidé"
-
 #: counter/views/cash.py
 msgid "10 cents"
 msgstr "10 centimes"
@@ -5992,8 +5985,12 @@ msgid "Create another subscription"
 msgstr "Créer une nouvelle cotisation"
 
 #: subscription/templates/subscription/stats.jinja
-msgid "All subscriptions"
-msgstr "Toutes les cotisations"
+msgid "Total subscriptions"
+msgstr "Cotisations totales"
+
+#: subscription/templates/subscription/stats.jinja
+msgid "Subscriptions by type"
+msgstr "Cotisations par type"
 
 #: subscription/templates/subscription/subscription.jinja
 msgid "Existing member"

package-lock.json

@@ -54,7 +54,7 @@
         "@typescript/native": "npm:typescript@^7.0.2",
         "rollup-plugin-visualizer": "^7.1.1",
         "typescript": "npm:@typescript/typescript6@^6.0.2",
-        "vite": "^8.3.2"
+        "vite": "^8.3.3"
       }
     },
     "node_modules/@ae_utbm/aemark": {
@@ -5168,9 +5168,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.2.tgz",
-      "integrity": "sha512-SQr1x6W5vVSbROg7vsyXIaxK9b0G7zsT68acdWWRmnBUsgDieLCRG+Rep9WdZgcposvv/GSnr4GUUBqB3vXq6w==",
+      "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.3.3.tgz",
+      "integrity": "sha512-cTAldKPImjg6c+gk48U19POPn3GCBzZwpdsN8ZMEEcbpes+6/wvfqUd0C2y3qYY4wsj8PwgFwrZ/1jBPVttMSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -37,7 +37,7 @@
     "@typescript/native": "npm:typescript@^7.0.2",
     "rollup-plugin-visualizer": "^7.1.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2",
-    "vite": "^8.3.2"
+    "vite": "^8.3.3"
   },
   "dependencies": {
     "@ae_utbm/aemark": "^0.1.3",

timetable/admin.py

@@ -1,17 +1 @@
 # Register your models here.
-from django.contrib import admin
-
-from timetable.models import Timetable, TimetableSlot
-
-
-class TimetableSlotInline(admin.TabularInline):
-    model = TimetableSlot
-
-
-@admin.register(Timetable)
-class TimetableAdmin(admin.ModelAdmin):
-    list_display = ("user", "semester")
-    search_fields = ("user__nick_name", "user__first_name", "user__last_name")
-    autocomplete_fields = ("user",)
-    inlines = (TimetableSlotInline,)
-    list_select_related = ("user",)

timetable/api.py

@@ -1,37 +0,0 @@
-from ninja.security import SessionAuth
-from ninja_extra import ControllerBase, api_controller, route
-from ninja_extra.exceptions import PermissionDenied
-
-from core.utils import get_semester_code
-from timetable.models import Timetable, TimetableSlot
-from timetable.schemas import CreateTimetableSchema, TimetableSchema
-
-
-@api_controller("/edt", urls_namespace="timetable")
-class TimetableController(ControllerBase):
-    @route.put(
-        "/{int:user_id}",
-        auth=SessionAuth(),
-        response={200: TimetableSchema},
-        url_name="save",
-    )
-    def save_timetable(self, user_id: int, data: CreateTimetableSchema):
-        user = self.context.request.user
-        if not user.has_perm("pedagogy.add_timetable") and not (
-            user.has_perm("timetable.add_self_timetable") and user.id == user_id
-        ):
-            raise PermissionDenied
-        timetable, created = Timetable.objects.get_or_create(
-            semester=get_semester_code(), user_id=user_id
-        )
-        if not created:
-            timetable.slots.all().delete()
-        if user.preferences.show_my_timetable != data.is_viewable:
-            user.preferences.show_my_timetable = data.is_viewable
-            user.preferences.save()
-        slots = TimetableSlot.objects.bulk_create(
-            [TimetableSlot(timetable=timetable, **s.model_dump()) for s in data.slots]
-        )
-        return TimetableSchema(
-            id=timetable.id, semester=timetable.semester, slots=slots
-        )

timetable/migrations/0001_initial.py

@@ -1,141 +0,0 @@
-# Generated by Django 5.2.17 on 2026-10-03 21:43
-
-import django.core.validators
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-import core.utils
-
-
-class Migration(migrations.Migration):
-    initial = True
-
-    dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]
-
-    operations = [
-        migrations.CreateModel(
-            name="Timetable",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "semester",
-                    models.CharField(
-                        blank=True,
-                        default=core.utils.get_semester_code,
-                        validators=[
-                            django.core.validators.RegexValidator("(A|P)\\d{2}")
-                        ],
-                        verbose_name="semester",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="timetables",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="user",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "timetable",
-                "verbose_name_plural": "timetables",
-                "permissions": [("add_self_timetable", "Can add its own timetable")],
-            },
-        ),
-        migrations.CreateModel(
-            name="TimetableSlot",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "weekday",
-                    models.SmallIntegerField(
-                        choices=[
-                            (1, "Monday"),
-                            (2, "Tuesday"),
-                            (3, "Wednesday"),
-                            (4, "Thursday"),
-                            (5, "Friday"),
-                            (6, "Saturday"),
-                            (7, "Sunday"),
-                        ],
-                        verbose_name="weekday",
-                    ),
-                ),
-                (
-                    "start_at",
-                    models.PositiveSmallIntegerField(
-                        validators=[django.core.validators.MaxValueValidator(95)],
-                        verbose_name="start at",
-                    ),
-                ),
-                (
-                    "end_at",
-                    models.PositiveSmallIntegerField(
-                        validators=[django.core.validators.MaxValueValidator(95)],
-                        verbose_name="end at",
-                    ),
-                ),
-                (
-                    "course_type",
-                    models.CharField(max_length=12, verbose_name="course type"),
-                ),
-                ("room", models.CharField(max_length=32, verbose_name="room")),
-                ("ue", models.CharField(max_length=32, verbose_name="ue")),
-                (
-                    "week_group",
-                    models.CharField(
-                        blank=True,
-                        choices=[("A", "A"), ("B", "B")],
-                        default="",
-                        max_length=1,
-                        verbose_name="week group",
-                    ),
-                ),
-                (
-                    "timetable",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="slots",
-                        to="timetable.timetable",
-                        verbose_name="timetable",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "timetable slot",
-                "verbose_name_plural": "timetable slots",
-            },
-        ),
-        migrations.AddConstraint(
-            model_name="timetable",
-            constraint=models.UniqueConstraint(
-                fields=("user", "semester"), name="timetable_unique_user_semester"
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="timetableslot",
-            constraint=models.CheckConstraint(
-                condition=models.Q(("end_at__gt", models.F("start_at"))),
-                name="timetable_slot_end_after_start",
-            ),
-        ),
-    ]

timetable/models.py

@@ -1,102 +1 @@
 # Create your models here.
-from datetime import timedelta
-
-from django.core.validators import MaxValueValidator, RegexValidator
-from django.db import models
-from django.db.models import F, Q
-from django.utils.translation import gettext_lazy as _
-
-from core.models import User
-from core.utils import get_semester_code
-
-
-class Timetable(models.Model):
-    user = models.ForeignKey(
-        User,
-        verbose_name=_("user"),
-        related_name="timetables",
-        on_delete=models.CASCADE,
-    )
-    semester = models.CharField(
-        _("semester"),
-        default=get_semester_code,
-        validators=[RegexValidator(r"(A|P)\d{2}")],
-        blank=True,
-    )
-
-    class Meta:
-        verbose_name = _("timetable")
-        verbose_name_plural = _("timetables")
-        constraints = [
-            models.UniqueConstraint(
-                fields=("user", "semester"), name="timetable_unique_user_semester"
-            )
-        ]
-        permissions = [("add_self_timetable", "Can add its own timetable")]
-
-    def __str__(self) -> str:
-        return f"{self.user} {self.semester}"
-
-
-class TimetableSlot(models.Model):
-    MINUTES_PER_SLOT = 15
-
-    class WeekDay(models.IntegerChoices):
-        MONDAY = 1
-        TUESDAY = 2
-        WEDNESDAY = 3
-        THURSDAY = 4
-        FRIDAY = 5
-        SATURDAY = 6
-        SUNDAY = 7
-
-    class WeekGroup(models.TextChoices):
-        A = "A"
-        B = "B"
-        BOTH = ""
-
-    timetable = models.ForeignKey(
-        Timetable,
-        verbose_name=_("timetable"),
-        related_name="slots",
-        on_delete=models.CASCADE,
-    )
-    weekday = models.SmallIntegerField(_("weekday"), choices=WeekDay)
-    # there are 4 * 24 = 96 quarters in a day, and we start counting at 0
-    start_at = models.PositiveSmallIntegerField(
-        _("start at"), validators=[MaxValueValidator(95)]
-    )
-    end_at = models.PositiveSmallIntegerField(
-        _("end at"), validators=[MaxValueValidator(95)]
-    )
-    course_type = models.CharField(_("course type"), max_length=12)
-    room = models.CharField(_("room"), max_length=32)
-    ue = models.CharField(_("ue"), max_length=32)
-    week_group = models.CharField(
-        _("week group"),
-        max_length=1,
-        choices=WeekGroup,
-        default=WeekGroup.BOTH,
-        blank=True,
-    )
-
-    class Meta:
-        verbose_name = _("timetable slot")
-        verbose_name_plural = _("timetable slots")
-        constraints = [
-            models.CheckConstraint(
-                condition=Q(end_at__gt=F("start_at")),
-                name="timetable_slot_end_after_start",
-            )
-        ]
-
-    def __str__(self) -> str:
-        return f"{self.start_hour} - {self.end_hour} - {self.get_weekday_display()}"
-
-    @property
-    def start_hour(self):
-        return timedelta(minutes=self.start_at * self.MINUTES_PER_SLOT)
-
-    @property
-    def end_hour(self):
-        return timedelta(minutes=self.end_at * self.MINUTES_PER_SLOT)

timetable/schemas.py

@@ -1,35 +0,0 @@
-from typing import Annotated
-
-from annotated_types import Ge, Le
-from ninja import ModelSchema, Schema
-from pydantic import Field
-
-from timetable.models import Timetable, TimetableSlot
-
-
-class TimetableSlotSchema(ModelSchema):
-    weekday: TimetableSlot.WeekDay = Field(
-        description=(
-            f"{TimetableSlot.WeekDay.MONDAY} is monday, "
-            f"{TimetableSlot.WeekDay.TUESDAY} is tuesday, etc."
-        )
-    )
-    start_at: Annotated[int, Ge(0), Le(96)]
-    end_at: Annotated[int, Ge(0), Le(96)]
-
-    class Meta:
-        model = TimetableSlot
-        fields = ["start_at", "end_at", "week_group", "ue", "course_type", "room"]
-
-
-class CreateTimetableSchema(Schema):
-    is_viewable: bool
-    slots: list[TimetableSlotSchema]
-
-
-class TimetableSchema(ModelSchema):
-    slots: list[TimetableSlotSchema]
-
-    class Meta:
-        model = Timetable
-        fields = ["id", "semester"]

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

@@ -1,6 +1,4 @@
 import html2canvas from "html2canvas";
-import { AlertMessage } from "#core:utils/alert-message";
-import { type WeekDay as ApiWeekDay, timetableSaveTimetable } from "#openapi";
 
 // see https://regex101.com/r/QHSaPM/3
 const TIMETABLE_ROW_RE: RegExp =
@@ -78,88 +76,17 @@ function parseSlots(s: string): TimetableSlot[] {
 }
 
 document.addEventListener("alpine:init", () => {
-  /**
-   * Alpine data that can parse a timetable, save it and export it to png.
-   */
-  Alpine.data("timetableGenerator", (userId: number) => ({
+  Alpine.data("timetableGenerator", () => ({
     content: DEFAULT_TIMETABLE,
-    error: null as { incorrectRow?: string } | null,
-    courses: [] as TimetableSlot[],
-    edtPublic: false,
-    saving: false,
-    timetableSavedMessage: new AlertMessage(),
-
-    generate() {
-      try {
-        this.courses = parseSlots(this.content);
-        this.error = null;
-      } catch (err) {
-        type ParseRowError = { cause: { row: string } };
-        this.error = { incorrectRow: (err as ParseRowError)?.cause?.row };
-        return;
-      }
-    },
-
-    async savePng() {
-      const elem = document.getElementById("timetable");
-      const img = (await html2canvas(elem as HTMLElement)).toDataURL();
-      const downloadLink = document.createElement("a");
-      downloadLink.href = img;
-      downloadLink.download = "edt.png";
-      document.body.appendChild(downloadLink);
-      downloadLink.click();
-      downloadLink.remove();
-    },
-
-    async saveSith() {
-      this.saving = true;
-      const res = await timetableSaveTimetable({
-        // biome-ignore lint/style/useNamingConvention: api is snake case
-        path: { user_id: userId },
-        body: {
-          // biome-ignore lint/style/useNamingConvention: api is snake case
-          is_viewable: this.edtPublic,
-          slots: this.courses.map((c) => ({
-            // biome-ignore lint/style/useNamingConvention: api is snake case
-            start_at: c.startSlot,
-            // biome-ignore lint/style/useNamingConvention: api is snake case
-            end_at: c.endSlot,
-            weekday: (WEEKDAYS.indexOf(c.weekday) + 1) as ApiWeekDay,
-            // biome-ignore lint/style/useNamingConvention: api is snake case
-            week_group: c.weekGroup,
-            // biome-ignore lint/style/useNamingConvention: api is snake case
-            course_type: c.courseType,
-            room: c.room,
-            ue: c.ueCode,
-          })),
-        },
-      });
-      if (res.response?.ok) {
-        this.timetableSavedMessage.display(
-          gettext("This timetable has been saved in your profile"),
-          { success: true },
-        );
-      } else {
-        this.timetableSavedMessage.display(
-          interpolate(gettext("Error %d: timetable save failed"), res.response?.status),
-          { success: false },
-        );
-      }
-      this.saving = false;
-    },
-  }));
-
-  /**
-   * Alpine data dedicated to timetable display only.
-   * It can interact with the `timetableGenerator` data with x-model and x-modelable
-   * (for example of this, see timetable/generator.jinja)
-   */
-  Alpine.data("timetableDisplay", (slots: TimetableSlot[]) => ({
+    error: null as { incorrectRow?: string },
     displayedWeekdays: [] as WeekDay[],
+    courses: [] as TimetableSlot[],
     startSlot: 0,
     endSlot: 0,
-    table: { height: 0, width: 0 },
-    slots: slots,
+    table: {
+      height: 0,
+      width: 0,
+    },
 
     colors: {} as Record<string, string>,
     colorPalette: [
@@ -176,14 +103,18 @@ document.addEventListener("alpine:init", () => {
       "#1b5e20",
     ],
 
-    init() {
-      this.$watch("slots", () => this.display());
-    },
+    generate() {
+      try {
+        this.courses = parseSlots(this.content);
+        this.error = null;
+      } catch (err) {
+        this.error = { incorrectRow: err?.cause?.row };
+        return;
+      }
 
-    display() {
       // color each UE
       let colorIndex = 0;
-      for (const slot of this.slots) {
+      for (const slot of this.courses) {
         if (!this.colors[slot.ueCode]) {
           this.colors[slot.ueCode] =
             this.colorPalette[colorIndex % this.colorPalette.length];
@@ -192,13 +123,13 @@ document.addEventListener("alpine:init", () => {
       }
 
       this.displayedWeekdays = WEEKDAYS.filter((day) =>
-        this.slots.some((slot: TimetableSlot) => slot.weekday === day),
+        this.courses.some((slot: TimetableSlot) => slot.weekday === day),
       );
-      this.startSlot = this.slots.reduce(
+      this.startSlot = this.courses.reduce(
         (acc: number, curr: TimetableSlot) => Math.min(acc, curr.startSlot),
         25 * 4,
       );
-      this.endSlot = this.slots.reduce(
+      this.endSlot = this.courses.reduce(
         (acc: number, curr: TimetableSlot) => Math.max(acc, curr.endSlot),
         1,
       );
@@ -207,7 +138,7 @@ document.addEventListener("alpine:init", () => {
     },
 
     getStyle(slot: TimetableSlot) {
-      const hasWeekGroup = !!slot.weekGroup;
+      const hasWeekGroup = slot.weekGroup !== undefined;
       const width = hasWeekGroup ? SLOT_WIDTH / 2 : SLOT_WIDTH;
       const leftOffset = slot.weekGroup === "B" ? SLOT_WIDTH / 2 : 0;
       return {
@@ -219,19 +150,15 @@ document.addEventListener("alpine:init", () => {
       };
     },
 
-    /**
-     * Return the hours that should be displayed on this timetable,
-     * with their `top` placing
-     */
-    getHours(): [string, { top: `${number}px` }][] {
+    getHours(): [string, object][] {
       let hour: number = Number.parseInt(
-        this.slots
+        this.courses
           .map((c: TimetableSlot) => c.startHour)
           .reduce((res: string, hour: string) => (hour < res ? hour : res), "24:00")
           .split(":")[0],
         10,
       );
-      const res: [string, { top: `${number}px` }][] = [];
+      const res: [string, object][] = [];
       for (let i = 0; i <= this.endSlot - this.startSlot; i += 60 / MINUTES_PER_SLOT) {
         res.push([`${hour}:00`, { top: `${i * SLOT_HEIGHT}px` }]);
         hour += 1;
@@ -242,5 +169,16 @@ document.addEventListener("alpine:init", () => {
     getWidth() {
       return this.displayedWeekdays.length * SLOT_WIDTH + 20;
     },
+
+    async savePng() {
+      const elem = document.getElementById("timetable");
+      const img = (await html2canvas(elem as HTMLElement)).toDataURL();
+      const downloadLink = document.createElement("a");
+      downloadLink.href = img;
+      downloadLink.download = "edt.png";
+      document.body.appendChild(downloadLink);
+      downloadLink.click();
+      downloadLink.remove();
+    },
   }));
 });

timetable/static/timetable/css/generator.scss

@@ -1,6 +1,6 @@
 @import "core/static/core/colors";
 
-.timetable {
+#timetable {
   --hour-side-width: 60px;
 
   display: block;

timetable/templates/timetable/generator.jinja

@@ -1,13 +1,11 @@
-{% extends "core/base.jinja" %}
-
-{% from "timetable/macros.jinja" import display_timetable %}
+{% extends 'core/base.jinja' %}
 
 {%- block additional_css -%}
   <link rel="stylesheet" href="{{ static('timetable/css/generator.scss') }}">
 {%- endblock -%}
 
 {%- block additional_js -%}
-  <script type="module" src="{{ static('bundled/timetable/timetable-index.ts') }}"></script>
+  <script type="module" src="{{ static('bundled/timetable/generator-index.ts') }}"></script>
 {%- endblock -%}
 
 {% block title %}
@@ -34,7 +32,7 @@
 {% endblock %}
 
 {% block content %}
-  <div x-data="timetableGenerator({{ user.id }})">
+  <div x-data="timetableGenerator">
     <form @submit.prevent="generate()">
       <h1>{% trans %}Timetable generator{% endtrans %}</h1>
       <template x-if="error !== null" x-cloak>
@@ -62,40 +60,44 @@
       </div>
       <input type="submit" class="btn btn-blue" value="{% trans %}Generate{% endtrans %}">
     </form>
-    {{ display_timetable("courses") }}
-    <template x-if="courses.length > 0">
-      <section>
-        {% if user.has_perm("timetable.add_self_timetable") %}
-          <div id="timetable-save" class="margin-bottom">
-            <h3>{% trans %}Save on your profile{% endtrans %}</h3>
-            <form>
-              <fieldset>
-                <input type="checkbox" class="switch" id="edt-public-switch-id" x-model="edtPublic">
-                <label for="edt-public-switch-id">{% trans %}Make this timetable public{% endtrans %}</label>
-                <span class="helptext">
-                  {% trans trimmed url=url("core:user_prefs", user_id=user.id) %}
-                    You can change this at any time in <a href="{{ url }}">your preferences</a>
-                  {% endtrans %}
-                </span>
-              </fieldset>
-              <button class="btn btn-blue" :disabled="saving" @click.prevent="saveSith">
-                {% trans %}Save timetable{% endtrans %}
-              </button>
-              <p
-                class="alert"
-                :class="timetableSavedMessage.success ? 'alert-green' : 'alert-red'"
-                x-show="timetableSavedMessage.open"
-                x-transition.duration.500ms
-                x-text="timetableSavedMessage.content"
-              ></p>
-            </form>
-          </div>
-        {% endif %}
-        <h3 class="margin-bottom">{% trans %}Export{% endtrans %}</h3>
-        <button class="margin-bottom btn btn-blue" @click="savePng">
-          {% trans %}Export to PNG{% endtrans %}
-        </button>
-      </section>
-    </template>
+    <div
+      id="timetable"
+      x-show="table.height > 0 && table.width > 0"
+      :style="{width: `${table.width+80}px`, height: `${table.height+40}px`}"
+    >
+      <div class="header">
+        <template x-for="weekday in displayedWeekdays">
+          <span x-text="weekday"></span>
+        </template>
+      </div>
+      <div class="content">
+        <div class="hours" :height="(endSlot - endSlot%4) - (startSlot - startSlot%4)">
+          <template x-for="[hour, style] in getHours()">
+            <div class="hour" :style="style">
+              <div x-text="hour"></div>
+              <div class="hour-bar" :style="{width: `${getWidth()}px`}"></div>
+            </div>
+          </template>
+        </div>
+        <div class="courses">
+          <template x-for="course in courses">
+            <div class="slot" :style="getStyle(course)">
+              <span class="course-type" x-text="course.courseType"></span>
+              <span x-text="course.ueCode"></span>
+              <span x-text="`${course.startHour} - ${course.endHour}`"></span>
+              <span x-text="(course.weekGroup ? `\nGroupe ${course.weekGroup}` : '')"></span>
+              <span x-text="course.room"></span>
+            </div>
+          </template>
+        </div>
+      </div>
+    </div>
+    <button
+      class="margin-bottom btn btn-blue"
+      @click="savePng"
+      x-show="table.height > 0 && table.width > 0"
+    >
+      {% trans %}Save to PNG{% endtrans %}
+    </button>
   </div>
 {% endblock content %}

timetable/templates/timetable/macros.jinja

@@ -1,46 +0,0 @@
-{# HTML+AlpineJS to display a timetable
-
-Args:
-    ues: either a JS variable name or an array of object
-         satisfying the TimetableSlot interface
-    reactive: if True and `ues` is a variable used in an Alpine context,
-         then this timetable will react to modifications and
-         change its own display
-#}
-{% macro display_timetable(ues) %}
-  <div
-    x-data="timetableDisplay({{ ues }})"
-    x-model="{{ ues }}"
-    x-modelable="slots"
-    class="timetable"
-    x-show="slots.length > 0"
-    :style="{width: `${table.width+80}px`, height: `${table.height+40}px`}"
-  >
-    <div class="header">
-      <template x-for="weekday in displayedWeekdays">
-        <span x-text="weekday"></span>
-      </template>
-    </div>
-    <div class="content">
-      <div class="hours" :height="(endSlot - endSlot%4) - (startSlot - startSlot%4)">
-        <template x-for="[hour, style] in getHours()">
-          <div class="hour" :style="style">
-            <div x-text="hour"></div>
-            <div class="hour-bar" :style="{width: `${getWidth()}px`}"></div>
-          </div>
-        </template>
-      </div>
-      <div class="courses">
-        <template x-for="course in slots">
-          <div class="slot" :style="getStyle(course)">
-            <span class="course-type" x-text="course.courseType"></span>
-            <span x-text="course.ueCode"></span>
-            <span x-text="`${course.startHour} - ${course.endHour}`"></span>
-            <span x-text="(course.weekGroup ? `\nGroupe ${course.weekGroup}` : '')"></span>
-            <span x-text="course.room"></span>
-          </div>
-        </template>
-      </div>
-    </div>
-  </div>
-{% endmacro %}

timetable/templates/timetable/user_timetable.jinja

@@ -1,52 +0,0 @@
-{% extends "core/base.jinja" %}
-
-{% from "timetable/macros.jinja" import display_timetable %}
-
-
-{%- block additional_css -%}
-  <link rel="stylesheet" href="{{ static('timetable/css/generator.scss') }}">
-{%- endblock -%}
-
-{%- block additional_js -%}
-  <script type="module" src="{{ static('bundled/timetable/timetable-index.ts') }}"></script>
-{%- endblock -%}
-
-{% block content %}
-  {% for timetable in timetables %}
-    <details
-      class="accordion"
-      name="{{ timetable.semester }}"
-      {% if loop.first %}open{% endif %}
-    >
-      <summary>{{ timetable.semester }}</summary>
-      <div class="accordion-content">
-        {{ display_timetable(timetable.semester) }}
-      </div>
-    </details>
-  {% endfor %}
-{% endblock %}
-
-{%- block script -%}
-  {% set weekdays = ["lundi","mardi","mercredi","jeudi","vendredi","samedi","dimanche"] %}
-  <script>
-    {%- for timetable in timetables  -%}
-      const {{ timetable.semester }} = [
-        {%- for slot in timetable.slots.all() -%}
-          {
-            courseType: "{{ slot.course_type }}",
-            room: "{{ slot.room }}",
-            startHour: "{{ "%02d:%02d" % (slot.start_hour.seconds // 3600, (slot.start_hour.seconds % 3600 ) // 60) }}",
-            endHour: "{{ "%02d:%02d" % (slot.end_hour.seconds // 3600, (slot.end_hour.seconds % 3600 ) // 60) }}",
-            startSlot: {{ slot.start_at }},
-            endSlot: {{ slot.end_at }},
-            ueCode: "{{ slot.ue }}",
-            {%- if slot.week_group -%}
-              weekGroup: "{{ slot.week_group }}",
-            {%- endif -%}
-            weekday: "{{ weekdays[slot.weekday] }}"
-          },
-        {%- endfor -%}
-      ];
-    {%- endfor -%}
-  </script>
-{%- endblock -%}

timetable/tests.py

@@ -0,0 +1 @@
+# Create your tests here.

timetable/tests/test_api.py

@@ -1,20 +0,0 @@
-from django.test import TestCase
-from django.urls import reverse
-
-from core.baker_recipes import subscriber_user
-from timetable.models import TimetableSlot
-
-
-class TestSaveTimetable(TestCase):
-    @classmethod
-    def setUpTestData(cls) -> None:
-        cls.user = subscriber_user.make()
-        cls.payload = {
-            "is_viewable": True,
-            "slots": [
-                {"weekday": TimetableSlot.WeekDay.MONDAY, "start_at": 32, "end_at": 40},
-                {"weekday": TimetableSlot.WeekDay.MONDAY, "start_at": 41, "end_at": 49},
-                {"weekday": TimetableSlot.WeekDay.FRIDAY, "start_at": 52, "end_at": 64},
-            ],
-        }
-        cls.url = reverse("api:timetable:save", kwargs={"user_id": cls.user.id})

timetable/tests/test_view.py

@@ -1,31 +0,0 @@
-from typing import TYPE_CHECKING
-
-import pytest
-from bs4 import BeautifulSoup
-from django.contrib.auth.models import Permission
-from django.urls import reverse
-from model_bakery import baker
-
-from core.models import User
-
-if TYPE_CHECKING:
-    from django.test import Client
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize("can_save", [True, False])
-def test_generator_ok(client: Client, can_save):
-    user = baker.make(User)
-    if can_save:
-        user.user_permissions.add(Permission.objects.get(codename="add_self_timetable"))
-    client.force_login(user)
-
-    res = client.get(reverse("timetable:generator"))
-    assert res.status_code == 200
-    soup = BeautifulSoup(res.text, "lxml")
-    elem = soup.find(id="timetable-save")
-
-    if can_save:
-        assert elem is not None
-    else:
-        assert elem is None

timetable/urls.py

@@ -1,8 +1,5 @@
 from django.urls import path
 
-from timetable.views import GeneratorView, UserTimetableView
+from timetable.views import GeneratorView
 
-urlpatterns = [
-    path("", GeneratorView.as_view(), name="generator"),
-    path("user/<int:user_id>", UserTimetableView.as_view(), name="user_timetable"),
-]
+urlpatterns = [path("", GeneratorView.as_view(), name="generator")]

timetable/views.py

@@ -1,54 +1,6 @@
-from django.contrib.auth.mixins import UserPassesTestMixin
-from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+# Create your views here.
 from django.views.generic import TemplateView
-from django.views.generic.detail import DetailView
-
-from core.models import User
-from core.views import TabedViewMixin
 
 
-class TimetableTabsMixin(TabedViewMixin):
-    tabs_title = _("Timetables")
-
-    def get_list_of_tabs(self):
-        res = [
-            {
-                "url": reverse("timetable:generator"),
-                "slug": "generator",
-                "name": _("Generator"),
-            }
-        ]
-        if self.request.user.timetables.exists():
-            res.append(
-                {
-                    "url": reverse(
-                        "core:user_timetable", kwargs={"user_id": self.request.user.id}
-                    ),
-                    "slug": "saved",
-                    "name": _("My timetables"),
-                }
-            )
-        return res
-
-
-class GeneratorView(TimetableTabsMixin, TemplateView):
+class GeneratorView(TemplateView):
     template_name = "timetable/generator.jinja"
-    current_tab = "generator"
-
-
-class UserTimetableView(UserPassesTestMixin, TimetableTabsMixin, DetailView):
-    model = User
-    pk_url_kwarg = "user_id"
-    template_name = "timetable/user_timetable.jinja"
-    current_tab = "saved"
-
-    def test_func(self) -> bool | None:
-        return self.request.user.id == self.kwargs[
-            "user_id"
-        ] or self.request.user.has_perm("timetable.view_timetable")
-
-    def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {
-            "timetables": list(self.object.timetables.prefetch_related("slots"))
-        }