change MonthField from CharField to DateField

fixed template formatting

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

@@ -83,8 +83,7 @@
     #links_content {
       overflow: auto;
       box-shadow: $shadow-color 1px 1px 1px;
-      min-height: 20em;
+      height: 20em;
-      padding-bottom: 1em;
 
       h4 {
         margin-left: 5px;

com/templates/com/news_list.jinja

@@ -205,10 +205,6 @@
               <i class="fa-solid fa-graduation-cap fa-xl"></i>
               <a href="{{ url("pedagogy:guide") }}">{% trans %}UV Guide{% endtrans %}</a>
             </li>
-            <li>
-              <i class="fa-solid fa-calendar-days fa-xl"></i>
-              <a href="{{ url("timetable:generator") }}">{% trans %}Timetable{% endtrans %}</a>
-            </li>
             <li>
               <i class="fa-solid fa-magnifying-glass fa-xl"></i>
               <a href="{{ url("matmat:search_clear") }}">{% trans %}Matmatronch{% endtrans %}</a>

core/models.py

@@ -560,7 +560,7 @@ class User(AbstractUser):
         """Determine if the object is owned by the user."""
         if hasattr(obj, "is_owned_by") and obj.is_owned_by(self):
             return True
-        if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group_id):
+        if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group.id):
             return True
         return self.is_root
 
@@ -569,15 +569,9 @@ class User(AbstractUser):
         if hasattr(obj, "can_be_edited_by") and obj.can_be_edited_by(self):
             return True
         if hasattr(obj, "edit_groups"):
-            if (
+            for pk in obj.edit_groups.values_list("pk", flat=True):
-                hasattr(obj, "_prefetched_objects_cache")
+                if self.is_in_group(pk=pk):
-                and "edit_groups" in obj._prefetched_objects_cache
+                    return True
-            ):
-                pks = [g.id for g in obj.edit_groups.all()]
-            else:
-                pks = list(obj.edit_groups.values_list("id", flat=True))
-            if any(self.is_in_group(pk=pk) for pk in pks):
-                return True
         if isinstance(obj, User) and obj == self:
             return True
         return self.is_owner(obj)
@@ -587,18 +581,9 @@ class User(AbstractUser):
         if hasattr(obj, "can_be_viewed_by") and obj.can_be_viewed_by(self):
             return True
         if hasattr(obj, "view_groups"):
-            # if "view_groups" has already been prefetched, use
+            for pk in obj.view_groups.values_list("pk", flat=True):
-            # the prefetch cache, else fetch only the ids, to make
+                if self.is_in_group(pk=pk):
-            # the query lighter.
+                    return True
-            if (
-                hasattr(obj, "_prefetched_objects_cache")
-                and "view_groups" in obj._prefetched_objects_cache
-            ):
-                pks = [g.id for g in obj.view_groups.all()]
-            else:
-                pks = list(obj.view_groups.values_list("id", flat=True))
-            if any(self.is_in_group(pk=pk) for pk in pks):
-                return True
         return self.can_edit(obj)
 
     def can_be_edited_by(self, user):
@@ -651,6 +636,9 @@ class User(AbstractUser):
 
 
 class AnonymousUser(AuthAnonymousUser):
+    def __init__(self):
+        super().__init__()
+
     @property
     def was_subscribed(self):
         return False
@@ -659,6 +647,10 @@ class AnonymousUser(AuthAnonymousUser):
     def is_subscribed(self):
         return False
 
+    @property
+    def subscribed(self):
+        return False
+
     @property
     def is_root(self):
         return False
@@ -1392,9 +1384,9 @@ class Page(models.Model):
 
     @cached_property
     def is_club_page(self):
-        return (
+        club_root_page = Page.objects.filter(name=settings.SITH_CLUB_ROOT_PAGE).first()
-            self.name == settings.SITH_CLUB_ROOT_PAGE
+        return club_root_page is not None and (
-            or settings.SITH_CLUB_ROOT_PAGE in [p.name for p in self.get_parent_list()]
+            self == club_root_page or club_root_page in self.get_parent_list()
         )
 
     @cached_property

core/static/core/style.scss

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

core/templates/core/page_list.jinja

@@ -5,12 +5,16 @@
 {% endblock %}
 
 {% block content %}
-  <h3>{% trans %}Page list{% endtrans %}</h3>
+  {% if page_list %}
-  <ul>
+    <h3>{% trans %}Page list{% endtrans %}</h3>
-    {% for p in page_list %}
+    <ul>
-      <li><a href="{{ p.get_absolute_url() }}">{{ p.display_name }}</a></li>
+      {% for p in page_list %}
-    {% endfor %}
+        <li><a href="{{ p.get_absolute_url() }}">{{ p.get_display_name() }}</a></li>
-  </ul>
+      {% endfor %}
+    </ul>
+  {% else %}
+    {% trans %}There is no page in this website.{% endtrans %}
+  {% endif %}
 {% endblock %}
 
 

core/views/page.py

@@ -12,10 +12,7 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-
 from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.db.models import F, OuterRef, Subquery
-from django.db.models.functions import Coalesce
 
 # This file contains all the views that concern the page model
 from django.forms.models import modelform_factory
@@ -46,20 +43,6 @@ class CanEditPagePropMixin(CanEditPropMixin):
 class PageListView(CanViewMixin, ListView):
     model = Page
     template_name = "core/page_list.jinja"
-    queryset = (
-        Page.objects.annotate(
-            display_name=Coalesce(
-                Subquery(
-                    PageRev.objects.filter(page=OuterRef("id"))
-                    .order_by("-date")
-                    .values("title")[:1]
-                ),
-                F("name"),
-            )
-        )
-        .prefetch_related("view_groups")
-        .select_related("parent")
-    )
 
 
 class PageView(CanViewMixin, DetailView):

counter/forms.py

@@ -5,6 +5,7 @@ from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
 
+from club.models import Club
 from club.widgets.ajax_select import AutoCompleteSelectClub
 from core.models import User
 from core.views.forms import NFCTextInput, SelectDate, SelectDateTime
@@ -19,6 +20,7 @@ from counter.models import (
     Counter,
     Customer,
     Eticket,
+    InvoiceCall,
     Product,
     Refilling,
     ReturnableProduct,
@@ -373,3 +375,39 @@ class BaseBasketForm(forms.BaseFormSet):
 BasketForm = forms.formset_factory(
     ProductForm, formset=BaseBasketForm, absolute_max=None, min_num=1
 )
+
+
+class InvoiceCallForm(forms.Form):
+    def __init__(self, *args, month, clubs: list[Club] | None = None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.month = month
+        self.clubs = clubs
+
+        if self.clubs is None:
+            self.clubs = []
+
+        invoices = {
+            i["club_id"]: i["is_validated"]
+            for i in InvoiceCall.objects.filter(
+                club__in=self.clubs, month=self.month
+            ).values("club_id", "is_validated")
+        }
+
+        for club in self.clubs:
+            is_validated = invoices.get(club.id, False)
+
+            self.fields[f"club_{club.id}"] = forms.BooleanField(
+                required=False, initial=is_validated
+            )
+
+    def save(self):
+        for club in self.clubs:
+            field_name = f"club_{club.id}"
+            is_validated = self.cleaned_data.get(field_name, False)
+
+            InvoiceCall.objects.update_or_create(
+                month=self.month, club=club, defaults={"is_validated": is_validated}
+            )
+
+    def get_club_name(self, club_id):
+        return f"club_{club_id}"

counter/migrations/0032_invoicecall.py

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

counter/models.py

@@ -1362,3 +1362,45 @@ class ReturnableProductBalance(models.Model):
             f"return balance of {self.customer} "
             f"for {self.returnable.product_id} : {self.balance}"
         )
+
+
+class MonthField(models.DateField):
+    description = _("Year + month field (day forced to 1)")
+    default_error_messages = {
+        "invalid": _(
+            "“%(value)s” value has an invalid date format. It must be "
+            "in YYYY-MM format."
+        ),
+        "invalid_date": _(
+            "“%(value)s” value has the correct format (YYYY-MM) "
+            "but it is an invalid date."
+        ),
+    }
+
+    def to_python(self, value):
+        if isinstance(value, date):
+            return value.replace(day=1)
+
+        if isinstance(value, str):
+            try:
+                year, month = map(int, value.split("-"))
+                return date(year, month, 1)
+            except (ValueError, TypeError) as err:
+                raise ValueError(
+                    self.error_messages["invalid"] % {"value": value}
+                ) from err
+
+        return super().to_python(value)
+
+
+class InvoiceCall(models.Model):
+    is_validated = models.BooleanField(verbose_name=_("is validated"), default=False)
+    club = models.ForeignKey(Club, on_delete=models.CASCADE)
+    month = MonthField(verbose_name=_("invoice date"))
+
+    class Meta:
+        verbose_name = _("Invoice call")
+        verbose_name_plural = _("Invoice calls")
+
+    def __str__(self):
+        return f"invoice call of {self.month} made by {self.club}"

counter/templates/counter/invoices_call.jinja

@@ -15,24 +15,32 @@
     </select>
     <input type="submit" value="{% trans %}Go{% endtrans %}" />
   </form>
-  <br>
+
-  <p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }} €</p>
+  <form method="post" action="">
-  <br>
+    {% csrf_token %}
-  <table>
+    <br>
-    <thead>
+    <p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }} €</p>
-      <td>{% trans %}Club{% endtrans %}</td>
+    <br>
-      <td>{% trans %}Sum{% endtrans %}</td>
+
-    </thead>
+    <table>
-    <tbody>
+      <thead>
-      {% for i in sums %}
+        <td>{% trans %}Club{% endtrans %}</td>
-        <tr>
+        <td>{% trans %}Sum{% endtrans %}</td>
-          <td>{{ i['club__name'] }}</td>
+        <td>{% trans %}Validated{% endtrans %}</td>
-          <td>{{ i['selling_sum'] }} €</td>
+      </thead>
-        </tr>
+      <tbody>
-      {% endfor %}
+        {% for data in club_data %}
-    </tbody>
+          <tr>
-  </table>
+            <td>{{ data.club.name }}</td>
+            <td>{{"%.2f"|format(data.sum)}} €</td>
+            <td>
+              {{ form[form.get_club_name(data.club.id)] }}
+            </td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+    <input type="hidden" name="month" value="{{ start_date|date('Y-m') }}">
+    <button type="submit">{% trans %}Save validation{% endtrans %}</button>
+  </form>
 {% endblock %}
-
-
-

counter/views/invoice.py

@@ -12,15 +12,17 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
 from datetime import timezone as tz
 
-from django.db.models import F
+from django.db.models import Exists, F, OuterRef
+from django.shortcuts import redirect
 from django.utils import timezone
 from django.views.generic import TemplateView
 
 from counter.fields import CurrencyField
-from counter.models import Refilling, Selling
+from counter.forms import InvoiceCallForm
+from counter.models import Club, InvoiceCall, Refilling, Selling
 from counter.views.mixins import CounterAdminMixin, CounterAdminTabsMixin
 
 
@@ -28,12 +30,30 @@ class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
     template_name = "counter/invoices_call.jinja"
     current_tab = "invoices_call"
 
+    def get(self, request, *args, **kwargs):
+        month_str = request.GET.get("month")
+
+        if month_str:
+            try:
+                start_date = datetime.strptime(month_str, "%Y-%m").date()
+                today = timezone.now().date().replace(day=1)
+                if start_date > today:
+                    return redirect("counter:invoices_call")
+            except ValueError:
+                return redirect("counter:invoices_call")
+        return super().get(request, *args, **kwargs)
+
     def get_context_data(self, **kwargs):
         """Add sums to the context."""
         kwargs = super().get_context_data(**kwargs)
         kwargs["months"] = Selling.objects.datetimes("date", "month", order="DESC")
-        if "month" in self.request.GET:
+        month_str = self.request.GET.get("month")
-            start_date = datetime.strptime(self.request.GET["month"], "%Y-%m")
+
+        if month_str:
+            try:
+                start_date = datetime.strptime(self.request.GET["month"], "%Y-%m")
+            except ValueError:
+                return redirect("counter:invoices_call")
         else:
             start_date = datetime(
                 year=timezone.now().year,
@@ -46,30 +66,23 @@ class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
         )
         from django.db.models import Case, Sum, When
 
-        kwargs["sum_cb"] = sum(
+        kwargs["sum_cb"] = Refilling.objects.filter(
-            [
+            payment_method="CARD",
-                r.amount
+            is_validated=True,
-                for r in Refilling.objects.filter(
+            date__gte=start_date,
-                    payment_method="CARD",
+            date__lte=end_date,
-                    is_validated=True,
+        ).aggregate(amount=Sum(F("amount"), default=0))["amount"]
-                    date__gte=start_date,
+
-                    date__lte=end_date,
+        kwargs["sum_cb"] += Selling.objects.filter(
-                )
+            payment_method="CARD",
-            ]
+            is_validated=True,
-        )
+            date__gte=start_date,
-        kwargs["sum_cb"] += sum(
+            date__lte=end_date,
-            [
+        ).aggregate(amount=Sum(F("quantity") * F("unit_price"), default=0))["amount"]
-                s.quantity * s.unit_price
+
-                for s in Selling.objects.filter(
-                    payment_method="CARD",
-                    is_validated=True,
-                    date__gte=start_date,
-                    date__lte=end_date,
-                )
-            ]
-        )
         kwargs["start_date"] = start_date
-        kwargs["sums"] = (
+
+        kwargs["sums"] = list(
             Selling.objects.values("club__name")
             .annotate(
                 selling_sum=Sum(
@@ -86,4 +99,56 @@ class InvoiceCallView(CounterAdminTabsMixin, CounterAdminMixin, TemplateView):
             .exclude(selling_sum=None)
             .order_by("-selling_sum")
         )
+
+        club_names = [i["club__name"] for i in kwargs["sums"]]
+        clubs = Club.objects.filter(name__in=club_names)
+
+        invoice_calls = InvoiceCall.objects.filter(month=month_str, club__in=clubs)
+        invoice_statuses = {ic.club.name: ic.is_validated for ic in invoice_calls}
+
+        kwargs["form"] = InvoiceCallForm(clubs=clubs, month=month_str)
+
+        kwargs["club_data"] = []
+        for club in clubs:
+            selling_sum = next(
+                (
+                    item["selling_sum"]
+                    for item in kwargs["sums"]
+                    if item["club__name"] == club.name
+                ),
+                0,
+            )
+            kwargs["club_data"].append(
+                {
+                    "club": club,
+                    "sum": selling_sum,
+                    "validated": invoice_statuses.get(club.name, False),
+                }
+            )
+
         return kwargs
+
+    def post(self, request, *args, **kwargs):
+        month_str = request.POST.get("month")
+        if not month_str:
+            return self.get(request, *args, **kwargs)
+        try:
+            start_date = datetime.strptime(month_str, "%Y-%m")
+            start_date = date(start_date.year, start_date.month, 1)
+        except ValueError:
+            return redirect(request.path)
+
+        selling_subquery = Selling.objects.filter(
+            club=OuterRef("pk"),
+            date__year=start_date.year,
+            date__month=start_date.month,
+        )
+
+        clubs = Club.objects.filter(Exists(selling_subquery))
+
+        form = InvoiceCallForm(request.POST, clubs=clubs, month=month_str)
+
+        if form.is_valid():
+            form.save()
+
+        return redirect(f"{request.path}?month={request.POST.get('month', '')}")

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-09-13 00:17+0200\n"
+"POT-Creation-Date: 2025-09-01 18:18+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"
@@ -1043,10 +1043,6 @@ msgstr "Nos services"
 msgid "UV Guide"
 msgstr "Guide des UVs"
 
-#: com/templates/com/news_list.jinja
-msgid "Timetable"
-msgstr "Emploi du temps"
-
 #: com/templates/com/news_list.jinja core/templates/core/base/navbar.jinja
 msgid "Matmatronch"
 msgstr "Matmatronch"
@@ -1717,8 +1713,8 @@ msgid ""
 "AE UTBM is a voluntary organisation run by UTBM students. It organises "
 "student life at UTBM and manages its student facilities."
 msgstr ""
-"L'AE UTBM est une association bénévole gérée par les étudiants de l'UTBM. "
+"L'AE UTBM est une association bénévole gérée par les étudiants de "
-"Elle organise la vie étudiante de l'UTBM et gère ses lieux de vie."
+"l'UTBM. Elle organise la vie étudiante de l'UTBM et gère ses lieux de vie."
 
 #: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja
 msgid "Contacts"
@@ -2161,6 +2157,10 @@ msgstr ""
 msgid "Page history"
 msgstr "Historique de la page"
 
+#: core/templates/core/page_list.jinja
+msgid "There is no page in this website."
+msgstr "Il n'y a pas de page sur ce site web."
+
 #: core/templates/core/page_prop.jinja
 msgid "Page properties"
 msgstr "Propriétés de la page"
@@ -5201,18 +5201,6 @@ msgstr "Membre existant"
 msgid "the groups that can create subscriptions"
 msgstr "les groupes pouvant créer des cotisations"
 
-#: timetable/templates/timetable/generator.jinja
-msgid "Timetable generator"
-msgstr "Générateur d'emploi du temps"
-
-#: timetable/templates/timetable/generator.jinja
-msgid "Generate"
-msgstr "Générer"
-
-#: timetable/templates/timetable/generator.jinja
-msgid "Save to PNG"
-msgstr "Sauver en PNG"
-
 #: trombi/models.py
 msgid "subscription deadline"
 msgstr "fin des inscriptions"
@@ -5510,9 +5498,3 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée."
 #, python-format
 msgid "Maximum characters: %(max_length)s"
 msgstr "Nombre de caractères max: %(max_length)s"
-
-#~ msgid "Timeplan generator"
-#~ msgstr "Temps de génération du template : "
-
-#~ msgid "There is no page in this website."
-#~ msgstr "Il n'y a pas de page sur ce site web."

package-lock.json

@@ -29,7 +29,6 @@
         "d3-force-3d": "^3.0.5",
         "easymde": "^2.19.0",
         "glob": "^11.0.0",
-        "html2canvas": "^1.4.1",
         "htmx.org": "^2.0.3",
         "jquery": "^3.7.1",
         "js-cookie": "^3.0.5",
@@ -3125,15 +3124,6 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/base64-arraybuffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
-      "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -3522,15 +3512,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/css-line-break": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz",
-      "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
-      "license": "MIT",
-      "dependencies": {
-        "utrie": "^1.0.2"
-      }
-    },
     "node_modules/cytoscape": {
       "version": "3.33.1",
       "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz",
@@ -4203,19 +4184,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/html2canvas": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
-      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
-      "license": "MIT",
-      "dependencies": {
-        "css-line-break": "^2.1.0",
-        "text-segmentation": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
     "node_modules/htmx.org": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.6.tgz",
@@ -5511,15 +5479,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/text-segmentation": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz",
-      "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
-      "license": "MIT",
-      "dependencies": {
-        "utrie": "^1.0.2"
-      }
-    },
     "node_modules/three": {
       "version": "0.177.0",
       "resolved": "https://registry.npmjs.org/three/-/three-0.177.0.tgz",
@@ -5777,15 +5736,6 @@
         "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/utrie": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz",
-      "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
-      "license": "MIT",
-      "dependencies": {
-        "base64-arraybuffer": "^1.0.2"
-      }
-    },
     "node_modules/vite": {
       "version": "6.3.5",
       "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",

package.json

@@ -60,7 +60,6 @@
     "d3-force-3d": "^3.0.5",
     "easymde": "^2.19.0",
     "glob": "^11.0.0",
-    "html2canvas": "^1.4.1",
     "htmx.org": "^2.0.3",
     "jquery": "^3.7.1",
     "js-cookie": "^3.0.5",

sith/settings.py

@@ -125,7 +125,6 @@ INSTALLED_APPS = (
     "pedagogy",
     "galaxy",
     "antispam",
-    "timetable",
     "api",
 )
 

sith/urls.py

@@ -53,7 +53,6 @@ urlpatterns = [
     path("i18n/", include("django.conf.urls.i18n")),
     path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),
     path("captcha/", include("captcha.urls")),
-    path("edt/", include(("timetable.urls", "timetable"), namespace="timetable")),
 ]
 
 if settings.DEBUG:

timetable/admin.py

@@ -1 +0,0 @@
-# Register your models here.

timetable/apps.py

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

timetable/models.py

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

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

@@ -1,164 +0,0 @@
-import html2canvas from "html2canvas";
-
-// see https://regex101.com/r/QHSaPM/2
-const TIMETABLE_ROW_RE: RegExp =
-  /^(?<ueCode>\w.+\w)\s+(?<courseType>[A-Z]{2}\d)\s+((?<weekGroup>[AB])\s+)?(?<weekday>(lundi)|(mardi)|(mercredi)|(jeudi)|(vendredi)|(samedi)|(dimanche))\s+(?<startHour>\d{2}:\d{2})\s+(?<endHour>\d{2}:\d{2})\s+[\dA-B]\s+((?<attendance>[\wé]*)\s+)?(?<room>\w+(?:, \w+)?)$/;
-
-const DEFAULT_TIMETABLE: string = `DS52\t\tCM1\t\tlundi\t08:00\t10:00\t1\tPrésentiel\tA113
-DS53\t\tCM1\t\tlundi\t10:15\t12:15\t1\tPrésentiel\tA101
-DS53\t\tTP1\t\tlundi\t13:00\t16:00\t1\tPrésentiel\tH010
-SO03\t\tCM1\t\tlundi\t16:15\t17:45\t1\tPrésentiel\tA103
-SO03\t\tTD1\t\tlundi\t17:45\t19:45\t1\tPrésentiel\tA103
-DS50\t\tTP1\t\tmardi\t08:00\t10:00\t1\tPrésentiel\tA216
-DS51\t\tCM1\t\tmardi\t10:15\t12:15\t1\tPrésentiel\tA216
-DS51\t\tTP1\t\tmardi\t14:00\t18:00\t1\tPrésentiel\tH010
-DS52\t\tTP2\tA\tjeudi\t08:00\t10:00\tA\tPrésentiel\tA110a, A110b
-DS52\t\tTD1\t\tjeudi\t10:15\t12:15\t1\tPrésentiel\tA110a, A110b
-LC02\t\tTP1\t\tjeudi\t15:00\t16:00\t1\tPrésentiel\tA209
-LC02\t\tTD1\t\tjeudi\t16:15\t18:15\t1\tPrésentiel\tA206`;
-
-type WeekDay =
-  | "lundi"
-  | "mardi"
-  | "mercredi"
-  | "jeudi"
-  | "vendredi"
-  | "samedi"
-  | "dimanche";
-
-const WEEKDAYS = [
-  "lundi",
-  "mardi",
-  "mercredi",
-  "jeudi",
-  "vendredi",
-  "samedi",
-  "dimanche",
-] as const;
-
-const SLOT_HEIGHT = 20 as const; // Each 15min has a height of 20px in the timetable
-const SLOT_WIDTH = 250 as const; // Each weekday ha a width of 400px in the timetable
-const MINUTES_PER_SLOT = 15 as const;
-
-interface TimetableSlot {
-  courseType: string;
-  room: string;
-  startHour: string;
-  endHour: string;
-  startSlot: number;
-  endSlot: number;
-  ueCode: string;
-  weekGroup?: string;
-  weekday: WeekDay;
-}
-
-function parseSlots(s: string): TimetableSlot[] {
-  return s
-    .split("\n")
-    .filter((s: string) => s.length > 0)
-    .map((row: string) => {
-      const parsed = TIMETABLE_ROW_RE.exec(row);
-      if (!parsed) {
-        throw new Error(`Couldn't parse row ${row}`);
-      }
-      const [startHour, startMin] = parsed.groups.startHour
-        .split(":")
-        .map((i) => Number.parseInt(i));
-      const [endHour, endMin] = parsed.groups.endHour
-        .split(":")
-        .map((i) => Number.parseInt(i));
-      return {
-        ...parsed.groups,
-        startSlot: Math.floor((startHour * 60 + startMin) / MINUTES_PER_SLOT),
-        endSlot: Math.floor((endHour * 60 + endMin) / MINUTES_PER_SLOT),
-      } as unknown as TimetableSlot;
-    });
-}
-
-document.addEventListener("alpine:init", () => {
-  Alpine.data("timetableGenerator", () => ({
-    content: DEFAULT_TIMETABLE,
-    error: "",
-    displayedWeekdays: [] as WeekDay[],
-    courses: [] as TimetableSlot[],
-    startSlot: 0,
-    table: {
-      height: 0,
-      width: 0,
-    },
-
-    colors: {} as Record<string, string>,
-    colorPalette: [
-      "#27ae60",
-      "#2980b9",
-      "#c0392b",
-      "#7f8c8d",
-      "#f1c40f",
-      "#1abc9c",
-      "#95a5a6",
-      "#26C6DA",
-      "#c2185b",
-      "#e64a19",
-      "#1b5e20",
-    ],
-
-    generate() {
-      try {
-        this.courses = parseSlots(this.content);
-      } catch {
-        this.error = gettext(
-          "Wrong timetable format. Make sure you copied if from your student folder.",
-        );
-        return;
-      }
-
-      // color each UE
-      let colorIndex = 0;
-      for (const slot of this.courses) {
-        if (!this.colors[slot.ueCode]) {
-          this.colors[slot.ueCode] =
-            this.colorPalette[colorIndex % this.colorPalette.length];
-          colorIndex++;
-        }
-      }
-
-      this.displayedWeekdays = WEEKDAYS.filter((day) =>
-        this.courses.some((slot: TimetableSlot) => slot.weekday === day),
-      );
-      this.startSlot = this.courses.reduce(
-        (acc: number, curr: TimetableSlot) => Math.min(acc, curr.startSlot),
-        25 * 4,
-      );
-      this.endSlot = this.courses.reduce(
-        (acc: number, curr: TimetableSlot) => Math.max(acc, curr.endSlot),
-        1,
-      );
-      this.table.height = SLOT_HEIGHT * (this.endSlot - this.startSlot);
-      this.table.width = SLOT_WIDTH * this.displayedWeekdays.length;
-    },
-
-    getStyle(slot: TimetableSlot) {
-      const hasWeekGroup = slot.weekGroup !== undefined;
-      const width = hasWeekGroup ? SLOT_WIDTH / 2 : SLOT_WIDTH;
-      const leftOffset = slot.weekGroup === "B" ? SLOT_WIDTH / 2 : 0;
-      return {
-        height: `${(slot.endSlot - slot.startSlot) * SLOT_HEIGHT}px`,
-        width: `${width}px`,
-        top: `${(slot.startSlot - this.startSlot) * SLOT_HEIGHT}px`,
-        left: `${this.displayedWeekdays.indexOf(slot.weekday) * SLOT_WIDTH + leftOffset}px`,
-        backgroundColor: this.colors[slot.ueCode],
-      };
-    },
-
-    async savePng() {
-      const elem = document.getElementById("timetable");
-      const img = (await html2canvas(elem)).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,35 +0,0 @@
-#timetable {
-  display: block;
-  margin: 2em auto ;
-  .header {
-    background-color: white;
-    box-shadow: none;
-    width: 100%;
-    display: flex;
-    flex-direction: row;
-    gap: 0;
-    span {
-      flex: 1;
-      text-align: center;
-    }
-  }
-  .content {
-    position: relative;
-    text-align: center;
-
-    .slot {
-      background-color: cadetblue;
-      position: absolute;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-
-      .course-type {
-        position: absolute;
-        top: 0;
-        right: 0;
-        padding: 10px;
-      }
-    }
-  }
-}

timetable/templates/timetable/generator.jinja

@@ -1,58 +0,0 @@
-{% 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/generator-index.ts') }}"></script>
-{%- endblock -%}
-
-{% block title %}
-  {% trans %}Timetable generator{% endtrans %}
-{% endblock %}
-
-{% block content %}
-  <div x-data="timetableGenerator">
-    <form @submit.prevent="generate()">
-      <h1>Générateur d'emploi du temps</h1>
-      <div class="alert alert-red" x-show="!!error" x-cloak>
-        <span class="alert-main" x-text="error"></span>
-      </div>
-      <div class="form-group">
-        <label for="timetable-input">Colle ton emploi du temps (sans l'entête)</label>
-        <textarea id="timetable-input" cols="30" rows="15" x-model="content"></textarea>
-      </div>
-      <input type="submit" class="btn btn-blue" value="{% trans %}Generate{% endtrans %}">
-    </form>
-    <div
-      id="timetable"
-      x-show="table.height > 0 && table.width > 0"
-      :style="{width: `${table.width}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">
-        <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>
-    <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/tests.py

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

timetable/urls.py

@@ -1,5 +0,0 @@
-from django.urls import path
-
-from timetable.views import GeneratorView
-
-urlpatterns = [path("", GeneratorView.as_view(), name="generator")]

timetable/views.py

@@ -1,8 +0,0 @@
-# Create your views here.
-from django.views.generic import TemplateView
-
-from core.auth.mixins import FormerSubscriberMixin
-
-
-class GeneratorView(FormerSubscriberMixin, TemplateView):
-    template_name = "timetable/generator.jinja"