date validity verification

fixed template formatting

.pre-commit-config.yaml

@@ -1,10 +1,10 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.11.11
+    rev: v0.11.4
     hooks:
-      - id: ruff-check  # just check the code, and print the errors
-      - id: ruff-check  # actually fix the fixable errors, but print nothing
+      - id: ruff  # just check the code, and print the errors
+      - id: ruff  # actually fix the fixable errors, but print nothing
         args: ["--fix", "--silent"]
       # Run the formatter.
       - id: ruff-format

com/api.py

@@ -1,7 +1,6 @@
 from typing import Literal
 
 from django.http import HttpResponse
-from django.utils.cache import add_never_cache_headers
 from ninja import Query
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.pagination import PageNumberPaginationExtra
@@ -19,9 +18,7 @@ from core.views.files import send_raw_file
 class CalendarController(ControllerBase):
     @route.get("/internal.ics", url_name="calendar_internal")
     def calendar_internal(self):
-        response = send_raw_file(IcsCalendar.get_internal())
-        add_never_cache_headers(response)
-        return response
+        return send_raw_file(IcsCalendar.get_internal())
 
     @route.get(
         "/unpublished.ics",
@@ -29,12 +26,10 @@ class CalendarController(ControllerBase):
         url_name="calendar_unpublished",
     )
     def calendar_unpublished(self):
-        response = HttpResponse(
+        return HttpResponse(
             IcsCalendar.get_unpublished(self.context.request.user),
             content_type="text/calendar",
         )
-        add_never_cache_headers(response)
-        return response
 
 
 @api_controller("/news")

com/models.py

@@ -160,12 +160,9 @@ class News(models.Model):
         )
 
 
-def news_notification_callback(notif: Notification):
-    # the NewsDate linked to the News
-    # which creation triggered this callback may not exist yet,
-    # so it's important to filter by "not past date" rather than by "future date"
+def news_notification_callback(notif):
     count = News.objects.filter(
-        ~Q(dates__start_date__gt=timezone.now()), is_published=False
+        dates__start_date__gt=timezone.now(), is_published=False
     ).count()
     if count:
         notif.viewed = False

com/tests/test_notifications.py

@@ -1,23 +0,0 @@
-import pytest
-from django.conf import settings
-from model_bakery import baker
-
-from com.models import News
-from core.models import Group, Notification, User
-
-
-@pytest.mark.django_db
-def test_notification_created():
-    com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
-    com_admin_group.users.all().delete()
-    Notification.objects.all().delete()
-    com_admin = baker.make(User, groups=[com_admin_group])
-    for i in range(2):
-        # news notifications are permanent, so the notification created
-        # during the first iteration should be reused during the second one.
-        baker.make(News)
-        notifications = list(Notification.objects.all())
-        assert len(notifications) == 1
-        assert notifications[0].user == com_admin
-        assert notifications[0].type == "NEWS_MODERATION"
-        assert notifications[0].param == str(i + 1)

core/admin.py

@@ -88,9 +88,9 @@ class PageAdmin(admin.ModelAdmin):
 
 @admin.register(SithFile)
 class SithFileAdmin(admin.ModelAdmin):
-    list_display = ("name", "owner", "size", "date")
+    list_display = ("name", "owner", "size", "date", "is_in_sas")
     autocomplete_fields = ("parent", "owner", "moderator")
-    search_fields = ("name",)
+    search_fields = ("name", "parent__name")
 
 
 @admin.register(OperationLog)

core/api.py

@@ -94,7 +94,7 @@ class SithFileController(ControllerBase):
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
     def search_files(self, search: Annotated[str, annotated_types.MinLen(1)]):
-        return SithFile.objects.filter(name__icontains=search)
+        return SithFile.objects.filter(is_in_sas=False).filter(name__icontains=search)
 
 
 @api_controller("/group")

core/management/commands/populate.py

@@ -109,6 +109,7 @@ class Command(BaseCommand):
         p.save(force_lock=True)
 
         club_root = SithFile.objects.create(name="clubs", owner=root)
+        sas = SithFile.objects.create(name="SAS", owner=root)
         main_club = Club.objects.create(
             id=1, name="AE", address="6 Boulevard Anatole France, 90000 Belfort"
         )
@@ -691,21 +692,33 @@ class Command(BaseCommand):
         # SAS
         for f in self.SAS_FIXTURE_PATH.glob("*"):
             if f.is_dir():
-                album = Album.objects.create(name=f.name, is_moderated=True)
+                album = Album(
+                    parent=sas,
+                    name=f.name,
+                    owner=root,
+                    is_folder=True,
+                    is_in_sas=True,
+                    is_moderated=True,
+                )
+                album.clean()
+                album.save()
                 for p in f.iterdir():
                     file = resize_image(Image.open(p), 1000, "WEBP")
                     pict = Picture(
                         parent=album,
                         name=p.name,
-                        original=file,
+                        file=file,
                         owner=root,
+                        is_folder=False,
+                        is_in_sas=True,
                         is_moderated=True,
+                        mime_type="image/webp",
+                        size=file.size,
                     )
-                    pict.original.name = pict.name
-                    pict.generate_thumbnails()
+                    pict.file.name = p.name
                     pict.full_clean()
+                    pict.generate_thumbnails()
                     pict.save()
-                album.generate_thumbnail()
 
         img_skia = Picture.objects.get(name="skia.jpg")
         img_sli = Picture.objects.get(name="sli.jpg")

core/migrations/0046_remove_sithfiles.py

@@ -1,27 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-26 15:01
-
-from typing import TYPE_CHECKING
-
-from django.db import migrations
-from django.db.migrations.state import StateApps
-
-if TYPE_CHECKING:
-    import core.models
-
-
-def remove_sas_sithfiles(apps: StateApps, schema_editor):
-    SithFile: type[core.models.SithFile] = apps.get_model("core", "SithFile")
-    SithFile.objects.filter(is_in_sas=True).delete()
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("core", "0045_quickuploadimage"),
-        ("sas", "0006_alter_peoplepicturerelation_picture_and_more"),
-    ]
-
-    operations = [
-        migrations.RunPython(
-            remove_sas_sithfiles, reverse_code=migrations.RunPython.noop, elidable=True
-        )
-    ]

core/migrations/0047_remove_sithfile_is_in_sas.py

@@ -1,9 +0,0 @@
-# Generated by Django 4.2.17 on 2025-02-14 11:58
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [("core", "0046_remove_sithfiles")]
-
-    operations = [migrations.RemoveField(model_name="sithfile", name="is_in_sas")]

core/models.py

@@ -23,6 +23,7 @@
 #
 from __future__ import annotations
 
+import importlib
 import logging
 import os
 import string
@@ -50,7 +51,6 @@ from django.urls import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
 from django.utils.html import escape
-from django.utils.module_loading import import_string
 from django.utils.timezone import localdate, now
 from django.utils.translation import gettext_lazy as _
 from phonenumber_field.modelfields import PhoneNumberField
@@ -341,8 +341,8 @@ class User(AbstractUser):
         return reverse("core:user_profile", kwargs={"user_id": self.pk})
 
     def promo_has_logo(self) -> bool:
-        return (
-            settings.BASE_DIR / f"core/static/core/img/promo_{self.promo:02d}.png"
+        return Path(
+            settings.BASE_DIR / f"core/static/core/img/promo_{self.promo}.png"
         ).exists()
 
     @cached_property
@@ -846,6 +846,9 @@ class SithFile(models.Model):
         on_delete=models.CASCADE,
     )
     asked_for_removal = models.BooleanField(_("asked for removal"), default=False)
+    is_in_sas = models.BooleanField(
+        _("is in the SAS"), default=False, db_index=True
+    )  # Allows to query this flag, updated at each call to save()
 
     class Meta:
         verbose_name = _("file")
@@ -854,10 +857,22 @@ class SithFile(models.Model):
         return self.get_parent_path() + "/" + self.name
 
     def save(self, *args, **kwargs):
+        sas = SithFile.objects.filter(id=settings.SITH_SAS_ROOT_DIR_ID).first()
+        self.is_in_sas = sas in self.get_parent_list() or self == sas
         adding = self._state.adding
         super().save(*args, **kwargs)
         if adding:
             self.copy_rights()
+        if self.is_in_sas:
+            for user in User.objects.filter(
+                groups__id__in=[settings.SITH_GROUP_SAS_ADMIN_ID]
+            ):
+                Notification(
+                    user=user,
+                    url=reverse("sas:moderation"),
+                    type="SAS_MODERATION",
+                    param="1",
+                ).save()
 
     def is_owned_by(self, user: User) -> bool:
         if user.is_anonymous:
@@ -870,6 +885,8 @@ class SithFile(models.Model):
             return user.is_board_member
         if user.is_com_admin:
             return True
+        if self.is_in_sas and user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
+            return True
         return user.id == self.owner_id
 
     def can_be_viewed_by(self, user: User) -> bool:
@@ -896,6 +913,8 @@ class SithFile(models.Model):
         super().clean()
         if "/" in self.name:
             raise ValidationError(_("Character '/' not authorized in name"))
+        if self == self.parent:
+            raise ValidationError(_("Loop in folder tree"), code="loop")
         if self == self.parent or (
             self.parent is not None and self in self.get_parent_list()
         ):
@@ -1033,6 +1052,18 @@ class SithFile(models.Model):
     def is_file(self):
         return not self.is_folder
 
+    @cached_property
+    def as_picture(self):
+        from sas.models import Picture
+
+        return Picture.objects.filter(id=self.id).first()
+
+    @cached_property
+    def as_album(self):
+        from sas.models import Album
+
+        return Album.objects.filter(id=self.id).first()
+
     def get_parent_list(self):
         parents = []
         current = self.parent
@@ -1421,24 +1452,22 @@ class Notification(models.Model):
         return self.get_type_display()
 
     def save(self, *args, **kwargs):
-        if self._state.adding and self.type in settings.SITH_PERMANENT_NOTIFICATIONS:
+        if not self.id and self.type in settings.SITH_PERMANENT_NOTIFICATIONS:
             old_notif = self.user.notifications.filter(type=self.type).last()
             if old_notif:
                 old_notif.callback()
                 old_notif.save()
                 return
-            # if this permanent notification is the first one,
-            # go into the callback nonetheless, because the logic
-            # to set Notification.param is here
-            # (please don't be mad at me, I'm not the one who cooked this spaghetti)
-            self.callback()
         super().save(*args, **kwargs)
 
     def callback(self):
-        func_name = settings.SITH_PERMANENT_NOTIFICATIONS.get(self.type)
-        if not func_name:
-            return
-        import_string(func_name)(self)
+        # Get the callback defined in settings to update existing
+        # notifications
+        mod_name, func_name = settings.SITH_PERMANENT_NOTIFICATIONS[self.type].rsplit(
+            ".", 1
+        )
+        mod = importlib.import_module(mod_name)
+        getattr(mod, func_name)(self)
 
 
 class Gift(models.Model):

core/static/core/accordion.scss

@@ -1,89 +0,0 @@
-details.accordion>summary {
-  margin: 2px 0 0 0;
-  padding: .5em .5em .5em .7em;
-  cursor: pointer;
-  user-select: none;
-  display: block;
-
-  border-top-right-radius: 3px;
-  border-top-left-radius: 3px;
-}
-
-details[open].accordion>summary {
-  border: 1px solid #003eff;
-  background: #007fff;
-  color: #ffffff;
-}
-
-
-details:not([open]).accordion>summary {
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-
-  border: 1px solid #c5c5c5;
-  background: #f6f6f6;
-  color: #454545;
-}
-
-details.accordion>summary::before {
-  font-family: FontAwesome;
-  content: '\f0da';
-  margin-right: 5px;
-  transition: 700ms;
-  font-size: 0.8em;
-}
-
-details[open].accordion>summary::before {
-  font-family: FontAwesome;
-  content: '\f0d7';
-}
-
-details.accordion>.accordion-content {
-  background: #ffffff;
-  color: #333333;
-  padding: 1em 2.2em;
-  border: 1px solid #dddddd;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-  overflow: hidden;
-}
-
-@mixin animation($selector) {
-  details.accordion#{$selector} {
-    opacity: 0;
-
-    @supports (max-height: calc-size(max-content, size)) {
-      max-height: 0px;
-    }
-  }
-
-  details[open].accordion#{$selector} {
-    opacity: 1;
-
-    // Setting a transition on all states of the content
-    // will create a strange behavior where the transition
-    // continues without being shown, creating inconsistenties
-    transition: all 300ms ease-out;
-
-    @supports (max-height: calc-size(max-content, size)) {
-      max-height: calc-size(max-content, size);
-    }
-  }
-}
-
-// ::details-content isn't available on firefox yet
-// we use .accordion-content as a workaround
-// But we need to use ::details-content for chrome because it's
-// not working correctly otherwise
-// it only happen in chrome, not safari or firefox
-// Note: `selector` is not supported by scss so we comment it out to
-// avoid compiling it and sending it straight to the css
-// This is a trick that comes from here :
-// https://stackoverflow.com/questions/62665318/using-supports-selector-despite-sass-not-supporting-it
-@supports #{'selector(details::details-content)'} {
-  @include animation("::details-content")
-}
-
-@supports #{'not selector(details::details-content)'} {
-  @include animation(">.accordion-content")
-}

core/static/core/navbar.scss

@@ -1,7 +1,5 @@
 @import "colors";
 
-$desktop-size: 500px;
-
 nav.navbar {
   background-color: $primary-dark-color;
   margin: 1em;
@@ -9,24 +7,15 @@ nav.navbar {
   border-radius: 0.6em;
   min-height: 40px;
 
-  @media (max-width: $desktop-size) {
+  @media (max-width: 500px) {
     position: relative;
     flex-direction: column;
     align-items: flex-start;
     gap: 0;
     margin: .2em;
-
-    >.content[mobile-display="hidden"] {
-      display: none;
-    }
-
-    >.content[mobile-display="revealed"] {
-      display: block;
-    }
   }
 
-
-  >.expand-button {
+  > .expand-button {
     background-color: transparent;
     display: none;
     position: relative;
@@ -38,27 +27,27 @@ nav.navbar {
     align-items: center;
     margin: 0;
 
-    >i {
+    > i {
       font-size: 1.5em;
       color: white;
     }
 
-    @media (max-width: $desktop-size) {
+    @media (max-width: 500px) {
       display: flex;
     }
   }
 
-  >.content {
-    @media (min-width: $desktop-size) {
+  > .content {
+    @media (min-width: 500px) {display: flex;
       flex-direction: row;
       flex-wrap: wrap;
       align-items: center;
       justify-content: center;
-      display: flex;
+      display: flex !important;
     }
 
-    >.menu,
-    >.link {
+    > .menu,
+    > .link {
       box-sizing: border-box;
       width: 130px;
       height: 52px;
@@ -67,7 +56,7 @@ nav.navbar {
       justify-content: center;
       cursor: pointer;
 
-      @media (max-width: $desktop-size) {
+      @media (max-width: 500px) {
         width: 100%;
         height: auto;
         justify-content: flex-start;
@@ -75,75 +64,80 @@ nav.navbar {
         &:last-child {
           border-radius: 0 0 .6em .6em;
 
-          >.content {
+          > .content {
             box-shadow: 3px 3px 3px 0 #dfdfdf;
           }
         }
       }
     }
 
-    >.menu>.head,
-    >.link {
+    > .menu > .head,
+    > .link {
       color: white;
-    }
+      padding: 10px 20px;
+      box-sizing: border-box;
 
-    >.menu>summary,
-    >.link {
-      @media (max-width: $desktop-size) {
+      @media (max-width: 500px) {
         padding: 10px;
       }
     }
 
-    >.link {
-      padding: 10px 20px;
-      box-sizing: border-box;
-    }
-
-
     .link:hover,
     .menu:hover {
       background-color: rgba(0, 0, 0, .2);
     }
 
-    details.menu {
-      cursor: pointer;
-      user-select: none;
-      z-index: 10;
-      align-items: center;
-      display: inline-block;
+    > .menu > .head,
+    > .link {
+      color: white;
+      padding: 10px 20px;
+      box-sizing: border-box;
 
-      summary {
-        list-style: none;
-
-        display: flex;
-        align-items: center;
-        height: 100%;
-        padding-left: 20px;
-        padding-right: 20px;
-
-        @media (min-width: $desktop-size) {
-          justify-content: center;
-        }
+      @media (max-width: 500px) {
+        padding: 10px;
       }
+    }
 
-      summary::-webkit-details-marker {
+    .link:hover,
+    .menu:hover {
+      background-color: rgba(0, 0, 0, .2);
+    }
+
+    > .menu:hover > .content,
+    > .menu > .head:hover + .content,
+    > .menu > .content:hover {
+      display: flex;
+    }
+
+    > .menu {
+      display: flex;
+      position: relative;
+
+      > .content {
+        z-index: 10;
         display: none;
-      }
-
-      ul.content {
-        list-style-type: none;
-        background: white;
+        position: absolute;
+        top: 100%;
+        background-color: white;
         margin: 0;
+        list-style-type: none;
+        width: 130px;
+        box-shadow: 3px 3px 3px 0 #dfdfdf;
+        flex-direction: column;
 
-        @media (min-width: $desktop-size) {
-          box-shadow: 3px 3px 3px 0 #dfdfdf;
+        @media (max-width: 500px) {
+          position: absolute;
+          flex-direction: row;
+          flex-wrap: wrap;
+          width: 100%;
+          box-shadow: inset 3px 3px 3px 0 #dfdfdf;
         }
 
-        >li>a {
+        > li > a {
           display: flex;
           padding: 15px 20px;
 
-          @media (max-width: $desktop-size) {
+          @media (max-width: 500px) {
             padding: 10px;
           }
 

core/static/core/style.scss

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

core/templates/core/base.jinja

@@ -12,7 +12,6 @@
       <link rel="stylesheet" href="{{ static('core/header.scss') }}">
       <link rel="stylesheet" href="{{ static('core/navbar.scss') }}">
       <link rel="stylesheet" href="{{ static('core/pagination.scss') }}">
-      <link rel="stylesheet" href="{{ static('core/accordion.scss') }}">
 
       {% block jquery_css %}
         {# Thile file is quite heavy (around 250kb), so declaring it in a block allows easy removal #}
@@ -123,27 +122,10 @@
 
     {% block script %}
       <script>
-        const menuItems = document.querySelectorAll(".navbar details[name='navbar'].menu");
-        const isMobile = () => {
-          return window.innerWidth >= 500;
-        }
-        for (const item of menuItems){
-          item.addEventListener("mouseover", () => {
-            if (isMobile()){
-              item.setAttribute("open", "");
-            }
-          })
-          item.addEventListener("mouseout", () => {
-            if (isMobile()){
-              item.removeAttribute("open");
-            }
-          })
-        }
-
         function showMenu() {
           let navbar = document.getElementById("navbar-content");
-          const current = navbar.getAttribute("mobile-display");
-          navbar.setAttribute("mobile-display", current === "hidden" ? "revealed" : "hidden")
+          const current = navbar.style.getPropertyValue("display");
+          navbar.style.setProperty("display", current === "none" ? "block" : "none");
         }
 
         document.addEventListener("keydown", (e) => {

core/templates/core/base/navbar.jinja

@@ -1,47 +1,47 @@
 <nav class="navbar">
   <button class="expand-button" onclick="showMenu()"><i class="fa fa-bars"></i></button>
-  <div id="navbar-content" class="content" mobile-display="hidden">
+  <div id="navbar-content" class="content" style="display: none;">
     <a class="link" href="{{ url('core:index') }}">{% trans %}Main{% endtrans %}</a>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}Associations & Clubs{% endtrans %}</summary>
+    <div class="menu">
+      <span class="head">{% trans %}Associations & Clubs{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='ae') }}">{% trans %}AE{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='utbm-associations') }}">{% trans %}Others UTBM's Associations{% endtrans %}</a></li>
       </ul>
-    </details>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}Events{% endtrans %}</summary>
+    </div>
+    <div class="menu">
+      <span class="head">{% trans %}Events{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('election:list') }}">{% trans %}Elections{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='ga') }}">{% trans %}Big event{% endtrans %}</a></li>
       </ul>
-    </details>
+    </div>
     <a class="link" href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
     <a class="link" href="{{ url('sas:main') }}">{% trans %}Gallery{% endtrans %}</a>
     <a class="link" href="{{ url('eboutic:main') }}">{% trans %}Eboutic{% endtrans %}</a>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}Services{% endtrans %}</summary>
+    <div class="menu">
+      <span class="head">{% trans %}Services{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a></li>
         <li><a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a></li>
         <li><a href="{{ url('pedagogy:guide') }}">{% trans %}Pedagogy{% endtrans %}</a></li>
       </ul>
-    </details>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}My Benefits{% endtrans %}</summary>
+    </div>
+    <div class="menu">
+      <span class="head">{% trans %}My Benefits{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='partenaires')}}">{% trans %}Sponsors{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='avantages') }}">{% trans %}Subscriber benefits{% endtrans %}</a></li>
       </ul>
-    </details>
-    <details name="navbar" class="menu">
-      <summary class="head">{% trans %}Help{% endtrans %}</summary>
+    </div>
+    <div class="menu">
+      <span class="head">{% trans %}Help{% endtrans %}</span>
       <ul class="content">
         <li><a href="{{ url('core:page', page_name='FAQ') }}">{% trans %}FAQ{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a></li>
         <li><a href="{{ url('core:page', page_name='Index') }}">{% trans %}Wiki{% endtrans %}</a></li>
       </ul>
-    </details>
+    </div>
   </div>
 </nav>

core/templates/core/user_account.jinja

@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% macro monthly(objects) %}
-  <div class="accordion-content">
+  <div>
     <table>
       <thead>
         <tr>
@@ -37,28 +37,22 @@
   {% if customer %}
     <h3>{% trans %}User account{% endtrans %}</h3>
     <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
-    {% if buyings_month %}
-      <details class="accordion" name="account" open>
-        <summary>{% trans %}Account purchases{% endtrans %}</summary>
+    <div id="drop">
+      {% if buyings_month %}
+        <h5>{% trans %}Account purchases{% endtrans %}</h5>
         {{ monthly(buyings_month) }}
-      </details>
-    {% endif %}
-    {% if refilling_month %}
-      <details class="accordion" name="account">
-        <summary>{% trans %}Reloads{% endtrans %}</summary>
+      {% endif %}
+      {% if refilling_month %}
+        <h5>{% trans %}Reloads{% endtrans %}</h5>
         {{ monthly(refilling_month) }}
-      </details>
-    {% endif %}
-    {% if invoices_month %}
-      <details class="accordion" name="account">
-        <summary>{% trans %}Eboutic invoices{% endtrans %}</summary>
+      {% endif %}
+      {% if invoices_month %}
+        <h5>{% trans %}Eboutic invoices{% endtrans %}</h5>
         {{ monthly(invoices_month) }}
-      </details>
-    {% endif %}
-    {% if etickets %}
-      <details class="accordion" name="account">
-        <summary>{% trans %}Etickets{% endtrans %}</summary>
-        <div class="accordion-content">
+      {% endif %}
+      {% if etickets %}
+        <h4>{% trans %}Etickets{% endtrans %}</h4>
+        <div>
           <ul>
             {% for s in etickets %}
               <li>
@@ -69,9 +63,22 @@
             {% endfor %}
           </ul>
         </div>
-      </details>
-    {% endif %}
+      {% endif %}
+    </div>
   {% else %}
     <p>{% trans %}User has no account{% endtrans %}</p>
   {% endif %}
 {% endblock %}
+
+{% block script %}
+  {{ super() }}
+  <script>
+    $(function(){
+      $("#drop").accordion({
+        heightStyle: "content"
+      });
+    });
+  </script>
+{% endblock %}
+
+

core/templates/core/user_detail.jinja

@@ -254,5 +254,13 @@
         keys.shift();
       }
     });
+
+    $(function () {
+      $("#drop_gifts").accordion({
+        heightStyle: "content",
+        collapsible: true,
+        active: false
+      });
+    });
   </script>
 {% endblock %}

core/tests/test_files.py

@@ -5,7 +5,6 @@ from typing import Callable
 from uuid import uuid4
 
 import pytest
-from django.conf import settings
 from django.core.cache import cache
 from django.core.files.uploadedfile import SimpleUploadedFile, UploadedFile
 from django.test import Client, TestCase
@@ -18,8 +17,8 @@ from pytest_django.asserts import assertNumQueries
 from core.baker_recipes import board_user, old_subscriber_user, subscriber_user
 from core.models import Group, QuickUploadImage, SithFile, User
 from core.utils import RED_PIXEL_PNG
-from sas.baker_recipes import picture_recipe
 from sas.models import Picture
+from sith import settings
 
 
 @pytest.mark.django_db
@@ -31,19 +30,24 @@ class TestImageAccess:
             lambda: baker.make(
                 User, groups=[Group.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
             ),
+            lambda: baker.make(
+                User, groups=[Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)]
+            ),
         ],
     )
     def test_sas_image_access(self, user_factory: Callable[[], User]):
         """Test that only authorized users can access the sas image."""
         user = user_factory()
-        picture = picture_recipe.make()
-        assert user.can_edit(picture)
+        picture: SithFile = baker.make(
+            Picture, parent=SithFile.objects.get(pk=settings.SITH_SAS_ROOT_DIR_ID)
+        )
+        assert picture.is_owned_by(user)
 
     def test_sas_image_access_owner(self):
         """Test that the owner of the image can access it."""
         user = baker.make(User)
-        picture = picture_recipe.make(owner=user)
-        assert user.can_edit(picture)
+        picture: Picture = baker.make(Picture, owner=user)
+        assert picture.is_owned_by(user)
 
     @pytest.mark.parametrize(
         "user_factory",
@@ -59,41 +63,7 @@ class TestImageAccess:
         user = user_factory()
         owner = baker.make(User)
         picture: Picture = baker.make(Picture, owner=owner)
-        assert not user.can_edit(picture)
-
-
-@pytest.mark.django_db
-class TestUserPicture:
-    def test_anonymous_user_unauthorized(self, client):
-        """An anonymous user shouldn't have access to an user's photo page."""
-        response = client.get(
-            reverse(
-                "core:user_pictures",
-                kwargs={"user_id": User.objects.get(username="sli").pk},
-            )
-        )
-        assert response.status_code == 403
-
-    @pytest.mark.parametrize(
-        ("username", "status"),
-        [
-            ("guy", 403),
-            ("root", 200),
-            ("skia", 200),
-            ("sli", 200),
-        ],
-    )
-    def test_page_is_working(self, client, username, status):
-        """Only user that subscribed (or admins) should be able to see the page."""
-        # Test for simple user
-        client.force_login(User.objects.get(username=username))
-        response = client.get(
-            reverse(
-                "core:user_pictures",
-                kwargs={"user_id": User.objects.get(username="sli").pk},
-            )
-        )
-        assert response.status_code == status
+        assert not picture.is_owned_by(user)
 
 
 # TODO: many tests on the pages:

core/tests/test_user.py

@@ -22,7 +22,6 @@ from core.models import Group, User
 from core.views import UserTabsMixin
 from counter.models import Counter, Refilling, Selling
 from eboutic.models import Invoice, InvoiceItem
-from sas.models import Picture
 
 
 class TestSearchUsers(TestCase):
@@ -30,7 +29,6 @@ class TestSearchUsers(TestCase):
     def setUpTestData(cls):
         # News.author has on_delete=PROTECT, so news must be deleted beforehand
         News.objects.all().delete()
-        Picture.objects.all().delete()  # same for pictures
         User.objects.all().delete()
         user_recipe = Recipe(
             User,
@@ -337,10 +335,3 @@ class TestRedirectMe:
     def test_anonymous_user(self, client: Client):
         url = reverse("core:user_me_redirect")
         assertRedirects(client.get(url), reverse("core:login", query={"next": url}))
-
-
-@pytest.mark.parametrize("promo", [7, 22])
-@pytest.mark.django_db
-def test_promo_has_logo(promo):
-    user = baker.make(User, promo=promo)
-    assert user.promo_has_logo()

core/utils.py

@@ -12,23 +12,18 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from dataclasses import dataclass
+
 from datetime import date, timedelta
 
 # Image utils
 from io import BytesIO
-from typing import Any, Final, Unpack
+from typing import Final
 
 import PIL
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import UploadedFile
-from django.db import models
-from django.forms import BaseForm
-from django.http import Http404, HttpRequest
-from django.shortcuts import get_list_or_404
-from django.template.loader import render_to_string
-from django.utils.safestring import SafeString
+from django.http import HttpRequest
 from django.utils.timezone import localdate
 from PIL import ExifTags
 from PIL.Image import Image, Resampling
@@ -47,21 +42,6 @@ to generate a dummy image that is considered valid nonetheless
 """
 
 
-@dataclass
-class FormFragmentTemplateData[T: BaseForm]:
-    """Dataclass used to pre-render form fragments"""
-
-    form: T
-    template: str
-    context: dict[str, Any]
-
-    def render(self, request: HttpRequest) -> SafeString:
-        # Request is needed for csrf_tokens
-        return render_to_string(
-            self.template, context={"form": self.form, **self.context}, request=request
-        )
-
-
 def get_start_of_semester(today: date | None = None) -> date:
     """Return the date of the start of the semester of the given date.
     If no date is given, return the start date of the current semester.
@@ -215,56 +195,3 @@ def get_client_ip(request: HttpRequest) -> str | None:
             return ip
 
     return None
-
-
-Filterable = models.Model | models.QuerySet | models.Manager
-ListFilter = dict[str, list | tuple | set]
-
-
-def get_list_exact_or_404(klass: Filterable, **kwargs: Unpack[ListFilter]) -> list:
-    """Use filter() to return a list of objects from a list of unique keys (like ids)
-    or raises Http404 if the list has not the same length as the given one.
-
-    Work like `get_object_or_404()` but for lists of objects, with some caveats :
-
-    - The filter must be a list, a tuple or a set.
-    - There can't be more than exactly one filter.
-    - There must be no duplicate in the filter.
-    - The filter should consist in unique keys (like ids), or it could fail randomly.
-
-    klass may be a Model, Manager, or QuerySet object. All other passed
-    arguments and keyword arguments are used in the filter() query.
-
-    Raises:
-        Http404: If the list is empty or doesn't have as many elements as the keys list.
-        ValueError: If the first argument is not a Model, Manager, or QuerySet object.
-        ValueError: If more than one filter is passed.
-        TypeError: If the given filter is not a list, a tuple or a set.
-
-    Examples:
-        Get all the products with ids 1, 2, 3: ::
-
-            products = get_list_exact_or_404(Product, id__in=[1, 2, 3])
-
-        Don't work with duplicate ids: ::
-
-            products = get_list_exact_or_404(Product, id__in=[1, 2, 3, 3])
-            # Raises Http404: "The list of keys must contain no duplicates."
-    """
-    if len(kwargs) > 1:
-        raise ValueError("get_list_exact_or_404() only accepts one filter.")
-    key, list_filter = next(iter(kwargs.items()))
-    if not isinstance(list_filter, (list, tuple, set)):
-        raise TypeError(
-            f"The given filter must be a list, a tuple or a set, not {type(list_filter)}"
-        )
-    if len(list_filter) != len(set(list_filter)):
-        raise ValueError("The list of keys must contain no duplicates.")
-    kwargs = {key: list_filter}
-    obj_list = get_list_or_404(klass, **kwargs)
-    if len(obj_list) != len(list_filter):
-        raise Http404(
-            "The given list of keys doesn't match the number of objects found."
-            f"Expected {len(list_filter)} items, got {len(obj_list)}."
-        )
-    return obj_list

core/views/files.py

@@ -402,7 +402,7 @@ class FileDeleteView(AllowFragment, CanEditPropMixin, DeleteView):
 class FileModerationView(AllowFragment, ListView):
     model = SithFile
     template_name = "core/file_moderation.jinja"
-    queryset = SithFile.objects.filter(is_moderated=False)
+    queryset = SithFile.objects.filter(is_moderated=False, is_in_sas=False)
     ordering = "id"
     paginate_by = 100
 

counter/forms.py

@@ -19,6 +19,7 @@ from counter.models import (
     Counter,
     Customer,
     Eticket,
+    InvoiceCall,
     Product,
     Refilling,
     ReturnableProduct,
@@ -373,3 +374,35 @@ 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=None, clubs=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.month = month
+        self.clubs = clubs
+
+        for club in self.clubs:
+            field_name = f"club_{club.id}"
+            initial = (
+                InvoiceCall.objects.filter(club=club, month=month)
+                .values_list("is_validated", flat=True)
+                .first()
+            )
+
+            self.fields[field_name] = forms.BooleanField(
+                required=False,
+                initial=initial,
+            )
+
+    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,47 @@
+# Generated by Django 5.2 on 2025-06-14 14:35
+
+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(verbose_name="is validated")),
+                (
+                    "month",
+                    counter.models.MonthField(
+                        max_length=7, 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,58 @@ class ReturnableProductBalance(models.Model):
             f"return balance of {self.customer} "
             f"for {self.returnable.product_id} : {self.balance}"
         )
+
+
+class MonthField(models.CharField):
+    description = _("Year + month field")
+
+    def __init__(self, *args, **kwargs):
+        kwargs["max_length"] = 7
+        super().__init__(*args, **kwargs)
+
+    def db_type(self, connection):
+        return "char(7)"
+
+    def from_db_value(self, value, expression, connection):
+        if value is None:
+            return value
+        try:
+            year, month = value.split("-")
+            return date(year, month, 1)
+        except (ValueError, TypeError):
+            return value
+
+    def to_python(self, value):
+        if isinstance(value, date):
+            return value
+        if isinstance(value, str):
+            try:
+                year, month = value.split("-")
+                return date(year, month, 1)
+            except ValueError:
+                pass
+        return value
+
+    def get_prep_value(self, value):
+        if isinstance(value, date):
+            return value.strftime("%Y-%m")
+        if isinstance(value, str) and len(value) == 7 and value[4] == "-":
+            return value
+        return value
+
+    def value_to_string(self, obj):
+        value = self.value_from_object(obj)
+        return self.get_prep_value(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/static/bundled/counter/counter-click-index.ts

@@ -103,7 +103,7 @@ document.addEventListener("alpine:init", () => {
       this.customerBalance += Number.parseFloat(
         (event.detail.target.querySelector("#id_amount") as HTMLInputElement).value,
       );
-      document.getElementById("selling-accordion").setAttribute("open", "");
+      document.getElementById("selling-accordion").click();
       this.codeField.widget.focus();
     },
 
@@ -139,6 +139,12 @@ document.addEventListener("alpine:init", () => {
 });
 
 $(() => {
+  /* Accordion UI between basket and refills */
+  // biome-ignore lint/suspicious/noExplicitAny: dealing with legacy jquery
+  ($("#click-form") as any).accordion({
+    heightStyle: "content",
+    activate: () => $(".focus").focus(),
+  });
   // biome-ignore lint/suspicious/noExplicitAny: dealing with legacy jquery
   ($("#products") as any).tabs();
 });

counter/templates/counter/counter_click.jinja

@@ -51,192 +51,185 @@
     </div>
 
     <div id="click-form">
-      <details class="accordion" id="selling-accordion" name="selling" open>
-        <summary>{% trans %}Selling{% endtrans %}</summary>
-        <div class="accordion-content">
-          {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %}
+      <h5 id="selling-accordion">{% trans %}Selling{% endtrans %}</h5>
+      <div>
+        {% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %}
 
-          <form method="post" action=""
-                class="code_form" @submit.prevent="handleCode">
+        <form method="post" action=""
+              class="code_form" @submit.prevent="handleCode">
 
-            <counter-product-select name="code" x-ref="codeField" autofocus required placeholder="{% trans %}Select a product...{% endtrans %}">
-              <option value=""></option>
-              <optgroup label="{% trans %}Operations{% endtrans %}">
-                <option value="FIN">{% trans %}Confirm (FIN){% endtrans %}</option>
-                <option value="ANN">{% trans %}Cancel (ANN){% endtrans %}</option>
+          <counter-product-select name="code" x-ref="codeField" autofocus required placeholder="{% trans %}Select a product...{% endtrans %}">
+            <option value=""></option>
+            <optgroup label="{% trans %}Operations{% endtrans %}">
+              <option value="FIN">{% trans %}Confirm (FIN){% endtrans %}</option>
+              <option value="ANN">{% trans %}Cancel (ANN){% endtrans %}</option>
+            </optgroup>
+            {% for category in categories.keys() %}
+              <optgroup label="{{ category }}">
+                {% for product in categories[category] %}
+                  <option value="{{ product.id }}">{{ product }}</option>
+                {% endfor %}
               </optgroup>
-              {% for category in categories.keys() %}
-                <optgroup label="{{ category }}">
-                  {% for product in categories[category] %}
-                    <option value="{{ product.id }}">{{ product }}</option>
-                  {% endfor %}
-                </optgroup>
-              {% endfor %}
-            </counter-product-select>
+            {% endfor %}
+          </counter-product-select>
 
-            <input type="submit" value="{% trans %}Go{% endtrans %}"/>
-          </form>
+          <input type="submit" value="{% trans %}Go{% endtrans %}"/>
+        </form>
 
-          {% for error in form.non_form_errors() %}
-            <div class="alert alert-red">
-              {{ error }}
-            </div>
-          {% endfor %}
-          <p>{% trans %}Basket: {% endtrans %}</p>
-
-          <form x-cloak method="post" action="" x-ref="basketForm">
-
-            <div class="basket-error-container">
-              <div
-                x-cloak
-                class="alert alert-red basket-error"
-                x-show="alertMessage.show"
-                x-transition.duration.500ms
-                x-text="alertMessage.content"
-              ></div>
-            </div>
-
-            {% csrf_token %}
-            <div x-ref="basketManagementForm">
-              {{ form.management_form }}
-            </div>
-            <ul>
-              <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
-              <template x-for="(item, index) in Object.values(basket)">
-                <li>
-                  <template x-for="error in item.errors">
-                    <div class="alert alert-red" x-text="error">
-                    </div>
-                  </template>
-
-                  <button @click.prevent="addToBasketWithMessage(item.product.id, -1)">-</button>
-                  <span class="quantity" x-text="item.quantity"></span>
-                  <button @click.prevent="addToBasketWithMessage(item.product.id, 1)">+</button>
-
-                  <span x-text="item.product.name"></span> :
-                  <span x-text="item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })">€</span>
-                  <span x-show="item.getBonusQuantity() > 0" x-text="`${item.getBonusQuantity()} x P`"></span>
-
-                  <button
-                    class="remove-item"
-                    @click.prevent="removeFromBasket(item.product.id)"
-                  ><i class="fa fa-trash-can delete-action"></i></button>
-
-                  <input
-                    type="hidden"
-                    :value="item.quantity"
-                    :id="`id_form-${index}-quantity`"
-                    :name="`form-${index}-quantity`"
-                    required
-                    readonly
-                  >
-                  <input
-                    type="hidden"
-                    :value="item.product.id"
-                    :id="`id_form-${index}-id`"
-                    :name="`form-${index}-id`"
-                    required
-                    readonly
-                  >
-                </li>
-              </template>
-            </ul>
-
-            <p class="margin-bottom">
-              <strong>Total: </strong>
-              <strong x-text="sumBasket().toLocaleString(undefined, { minimumFractionDigits: 2 })"></strong>
-              <strong> €</strong>
-            </p>
-
-            <div class="row">
-              <input
-                class="btn btn-blue"
-                type="submit"
-                @click.prevent="finish"
-                :disabled="getBasketSize() === 0"
-                value="{% trans %}Finish{% endtrans %}"
-              />
-              <input
-                class="btn btn-grey"
-                type="submit" @click.prevent="cancel"
-                value="{% trans %}Cancel{% endtrans %}"
-              />
-            </div>
-          </form>
-        </div>
-      </details>
-      <details class="accordion" name="selling">
-        <summary>{% trans %}Refilling{% endtrans %}</summary>
-        {% if object.type == "BAR" %}
-          {% if refilling_fragment %}
-            <div
-              class="accordion-content"
-              @htmx:after-request="onRefillingSuccess"
-            >
-              {{ refilling_fragment }}
-            </div>
-          {% else %}
-            <div class="accordion-content">
-              <p class="alert alert-yellow">
-                {% trans trimmed %}
-                  As a barman, you are not able to refill any account on your own.
-                  An admin should be connected on this counter for that.
-                  The customer can refill by using the eboutic.
-                {% endtrans %}
-              </p>
-            </div>
-          {% endif %}
-          </details>
-          {% if student_card_fragment %}
-            <details class="accordion" name="selling">
-              <summary>{% trans %}Student card{% endtrans %}</summary>
-              <div class="accordion-content">
-                {{ student_card_fragment }}
-              </div>
-            </details>
-          {% endif %}
-
-        {% endif %}
-      </div>
-
-      <div id="products">
-        {% if not products %}
+        {% for error in form.non_form_errors() %}
           <div class="alert alert-red">
-            {% trans %}No products available on this counter for this user{% endtrans %}
+            {{ error }}
+          </div>
+        {% endfor %}
+        <p>{% trans %}Basket: {% endtrans %}</p>
+
+        <form x-cloak method="post" action="" x-ref="basketForm">
+
+          <div class="basket-error-container">
+            <div
+              x-cloak
+              class="alert alert-red basket-error"
+              x-show="alertMessage.show"
+              x-transition.duration.500ms
+              x-text="alertMessage.content"
+            ></div>
+          </div>
+
+          {% csrf_token %}
+          <div x-ref="basketManagementForm">
+            {{ form.management_form }}
+          </div>
+          <ul>
+            <li x-show="getBasketSize() === 0">{% trans %}This basket is empty{% endtrans %}</li>
+            <template x-for="(item, index) in Object.values(basket)">
+              <li>
+                <template x-for="error in item.errors">
+                  <div class="alert alert-red" x-text="error">
+                  </div>
+                </template>
+
+                <button @click.prevent="addToBasketWithMessage(item.product.id, -1)">-</button>
+                <span class="quantity" x-text="item.quantity"></span>
+                <button @click.prevent="addToBasketWithMessage(item.product.id, 1)">+</button>
+
+                <span x-text="item.product.name"></span> :
+                <span x-text="item.sum().toLocaleString(undefined, { minimumFractionDigits: 2 })">€</span>
+                <span x-show="item.getBonusQuantity() > 0" x-text="`${item.getBonusQuantity()} x P`"></span>
+
+                <button
+                  class="remove-item"
+                  @click.prevent="removeFromBasket(item.product.id)"
+                ><i class="fa fa-trash-can delete-action"></i></button>
+
+                <input
+                  type="hidden"
+                  :value="item.quantity"
+                  :id="`id_form-${index}-quantity`"
+                  :name="`form-${index}-quantity`"
+                  required
+                  readonly
+                >
+                <input
+                  type="hidden"
+                  :value="item.product.id"
+                  :id="`id_form-${index}-id`"
+                  :name="`form-${index}-id`"
+                  required
+                  readonly
+                >
+              </li>
+            </template>
+          </ul>
+
+          <p class="margin-bottom">
+            <strong>Total: </strong>
+            <strong x-text="sumBasket().toLocaleString(undefined, { minimumFractionDigits: 2 })"></strong>
+            <strong> €</strong>
+          </p>
+
+          <div class="row">
+            <input
+              class="btn btn-blue"
+              type="submit"
+              @click.prevent="finish"
+              :disabled="getBasketSize() === 0"
+              value="{% trans %}Finish{% endtrans %}"
+            />
+            <input
+              class="btn btn-grey"
+              type="submit" @click.prevent="cancel"
+              value="{% trans %}Cancel{% endtrans %}"
+            />
+          </div>
+        </form>
+      </div>
+      {% if object.type == "BAR" %}
+        <h5>{% trans %}Refilling{% endtrans %}</h5>
+        {% if refilling_fragment %}
+          <div
+            @htmx:after-request="onRefillingSuccess"
+          >
+            {{ refilling_fragment }}
           </div>
         {% else %}
-          <ul>
-            {% for category in categories.keys() -%}
-              <li><a href="#cat_{{ category|slugify }}">{{ category }}</a></li>
-            {%- endfor %}
-          </ul>
-          {% for category in categories.keys() -%}
-            <div id="cat_{{ category|slugify }}">
-              <h5 class="margin-bottom">{{ category }}</h5>
-              <div class="row gap-2x">
-                {% for product in categories[category] -%}
-                  <button class="card shadow" @click="addToBasketWithMessage('{{ product.id }}', 1)">
-                    <img
-                      class="card-image"
-                      alt="image de {{ product.name }}"
-                      {% if product.icon %}
-                        src="{{ product.icon.url }}"
-                      {% else %}
-                        src="{{ static('core/img/na.gif') }}"
-                      {% endif %}
-                    />
-                    <span class="card-content">
-                      <strong class="card-title">{{ product.name }}</strong>
-                      <p>{{ product.price }} €<br>{{ product.code }}</p>
-                    </span>
-                  </button>
-                {%- endfor %}
-              </div>
-            </div>
-          {%- endfor %}
+          <div>
+            <p class="alert alert-yellow">
+              {% trans trimmed %}
+                As a barman, you are not able to refill any account on your own.
+                An admin should be connected on this counter for that.
+                The customer can refill by using the eboutic.
+              {% endtrans %}
+            </p>
+          </div>
         {% endif %}
-      </div>
+        {% if student_card_fragment %}
+          <h5>{% trans %}Student card{% endtrans %}</h3>
+          <div>
+            {{ student_card_fragment }}
+          </div>
+        {% endif %}
+
+      {% endif %}
     </div>
+
+    <div id="products">
+      {% if not products %}
+        <div class="alert alert-red">
+          {% trans %}No products available on this counter for this user{% endtrans %}
+        </div>
+      {% else %}
+        <ul>
+          {% for category in categories.keys() -%}
+            <li><a href="#cat_{{ category|slugify }}">{{ category }}</a></li>
+          {%- endfor %}
+        </ul>
+        {% for category in categories.keys() -%}
+          <div id="cat_{{ category|slugify }}">
+            <h5 class="margin-bottom">{{ category }}</h5>
+            <div class="row gap-2x">
+              {% for product in categories[category] -%}
+                <button class="card shadow" @click="addToBasketWithMessage('{{ product.id }}', 1)">
+                  <img
+                    class="card-image"
+                    alt="image de {{ product.name }}"
+                    {% if product.icon %}
+                      src="{{ product.icon.url }}"
+                    {% else %}
+                      src="{{ static('core/img/na.gif') }}"
+                    {% endif %}
+                  />
+                  <span class="card-content">
+                    <strong class="card-title">{{ product.name }}</strong>
+                    <p>{{ product.price }} €<br>{{ product.code }}</p>
+                  </span>
+                </button>
+              {%- endfor %}
+            </div>
+          </div>
+        {%- endfor %}
+      {% endif %}
+    </div>
+  </div>
 {% endblock content %}
 
 {% block script %}

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>
-  <br>
-  <table>
-    <thead>
-      <td>{% trans %}Club{% endtrans %}</td>
-      <td>{% trans %}Sum{% endtrans %}</td>
-    </thead>
-    <tbody>
-      {% for i in sums %}
-        <tr>
-          <td>{{ i['club__name'] }}</td>
-          <td>{{ i['selling_sum'] }} €</td>
-        </tr>
-      {% endfor %}
-    </tbody>
-  </table>
-{% endblock %}
-
 
+  <form method="post" action="">
+    {% csrf_token %}
+    <br>
+    <p>{% trans %}CB Payments{% endtrans %} : {{ sum_cb }} €</p>
+    <br>
 
+    <table>
+      <thead>
+        <td>{% trans %}Club{% endtrans %}</td>
+        <td>{% trans %}Sum{% endtrans %}</td>
+        <td>{% trans %}Validated{% endtrans %}</td>
+      </thead>
+      <tbody>
+        {% for data in club_data %}
+          <tr>
+            <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:
-            start_date = datetime.strptime(self.request.GET["month"], "%Y-%m")
+        month_str = self.request.GET.get("month")
+
+        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(
-            [
-                r.amount
-                for r in Refilling.objects.filter(
-                    payment_method="CARD",
-                    is_validated=True,
-                    date__gte=start_date,
-                    date__lte=end_date,
-                )
-            ]
-        )
-        kwargs["sum_cb"] += sum(
-            [
-                s.quantity * s.unit_price
-                for s in Selling.objects.filter(
-                    payment_method="CARD",
-                    is_validated=True,
-                    date__gte=start_date,
-                    date__lte=end_date,
-                )
-            ]
-        )
+        kwargs["sum_cb"] = Refilling.objects.filter(
+            payment_method="CARD",
+            is_validated=True,
+            date__gte=start_date,
+            date__lte=end_date,
+        ).aggregate(amount=Sum(F("amount"), default=0))["amount"]
+
+        kwargs["sum_cb"] += Selling.objects.filter(
+            payment_method="CARD",
+            is_validated=True,
+            date__gte=start_date,
+            date__lte=end_date,
+        ).aggregate(amount=Sum(F("quantity") * F("unit_price"), default=0))["amount"]
+
         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', '')}")

docs/tutorial/groups.md

@@ -263,35 +263,3 @@ avec un unique champ permettant de sélectionner des groupes.
 Par défaut, seuls les utilisateurs avec la permission
 `auth.change_permission` auront accès à ce formulaire
 (donc, normalement, uniquement les utilisateurs Root).
-
-```mermaid
-sequenceDiagram
-    participant A as Utilisateur
-    participant B as ReverseProxy
-    participant C as MarkdownImage
-    participant D as Model
-
-    A->>B: GET /page/foo
-    B->>C: GET /page/foo
-    C-->>B: La page, avec les urls
-    B-->>A: La page, avec les urls
-    alt image publique 
-        A->>B: GET markdown/public/2025/img.webp
-        B-->>A: img.webp
-    end
-    alt image privée 
-        A->>B: GET markdown_image/{id}
-        B->>C: GET markdown_image/{id}
-        C->>D: user.can_view(image)
-        alt l'utilisateur a le droit de voir l'image
-            D-->>C: True
-            C-->>B: 200 (avec le X-Accel-Redirect)
-            B-->>A: img.webp
-        end
-        alt l'utilisateur n'a pas le droit de l'image
-            D-->>C: False
-            C-->>B: 403
-            B-->>A: 403
-        end
-    end
-```

docs/tutorial/structure.md

@@ -42,44 +42,46 @@ sith/
 │   └── ...
 ├── galaxy/ (11)
 │   └── ...
-├── locale/ (12)
+├── launderette/ (12)
 │   └── ...
-├── matmat/ (13)
+├── locale/ (13)
 │   └── ...
-├── pedagogy/ (14)
+├── matmat/ (14)
 │   └── ...
-├── rootplace/ (15)
+├── pedagogy/ (15)
 │   └── ...
-├── sas/ (16)
+├── rootplace/ (16)
 │   └── ...
-├── sith/ (17)
+├── sas/ (17)
 │   └── ...
-├── subscription/ (18)
+├── sith/ (18)
 │   └── ...
-├── trombi/ (19)
+├── subscription/ (19)
 │   └── ...
-├── antispam/ (20)
+├── trombi/ (20)
 │   └── ...
-├── staticfiles/ (21)
+├── antispam/ (21)
 │   └── ...
-├── processes/ (22)
+├── staticfiles/ (22)
+│   └── ...
+├── processes/ (23)
 │   └── ...
 │
-├── .coveragerc (23)
-├── .envrc (24)
+├── .coveragerc (24)
+├── .envrc (25)
 ├── .gitattributes
 ├── .gitignore
 ├── .mailmap
-├── .env (25)
-├── .env.example (26)
-├── manage.py (27)
-├── mkdocs.yml (28)
+├── .env (26)
+├── .env.example (27)
+├── manage.py (28)
+├── mkdocs.yml (29)
 ├── uv.lock
-├── pyproject.toml (29)
-├── .venv/ (30)
-├── .python-version (31)
-├── Procfile.static (32)
-├── Procfile.service (33)
+├── pyproject.toml (30)
+├── .venv/ (31)
+├── .python-version (32)
+├── Procfile.static (33)
+├── Procfile.service (34)
 └── README.md
 ```
 </div>
@@ -106,39 +108,40 @@ sith/
 11. Application de gestion de la galaxie ; la galaxie
     est un graphe des niveaux de proximité entre les différents
     étudiants.
-12. Dossier contenant les fichiers de traduction.
-13. Fonctionnalités de recherche d'utilisateurs.
-14. Le guide des UEs du site, sur lequel les utilisateurs
+12. Gestion des machines à laver de l'AE
+13. Dossier contenant les fichiers de traduction.
+14. Fonctionnalités de recherche d'utilisateurs.
+15. Le guide des UEs du site, sur lequel les utilisateurs
     peuvent également laisser leurs avis.
-15. Fonctionnalités utiles aux utilisateurs root.
-16. Le SAS, où l'on trouve toutes les photos de l'AE.
-17. Application principale du projet, contenant sa configuration. 
-18. Gestion des cotisations des utilisateurs du site. 
-19. Outil pour faciliter la fabrication des trombinoscopes de promo. 
-20. Fonctionnalités pour gérer le spam. 
-21. Gestion des statics du site. Override le système de statics de Django.
+16. Fonctionnalités utiles aux utilisateurs root.
+17. Le SAS, où l'on trouve toutes les photos de l'AE.
+18. Application principale du projet, contenant sa configuration. 
+19. Gestion des cotisations des utilisateurs du site. 
+20. Outil pour faciliter la fabrication des trombinoscopes de promo. 
+21. Fonctionnalités pour gérer le spam. 
+22. Gestion des statics du site. Override le système de statics de Django.
     Ajoute l'intégration du scss et du bundler js
     de manière transparente pour l'utilisateur. 
-22. Module de gestion des services externes.
+23. Module de gestion des services externes.
     Offre une API simple pour utiliser les fichiers `Procfile.*`.
-23. Fichier de configuration de coverage. 
-24. Fichier de configuration de direnv. 
-25. Contient les variables d'environnement, qui sont susceptibles
+24. Fichier de configuration de coverage. 
+25. Fichier de configuration de direnv. 
+26. Contient les variables d'environnement, qui sont susceptibles
     de varier d'une machine à l'autre.
-26. Contient des valeurs par défaut pour le `.env`
+27. Contient des valeurs par défaut pour le `.env`
     pouvant convenir à un environnment de développement local
-27. Fichier généré automatiquement par Django. C'est lui
+28. Fichier généré automatiquement par Django. C'est lui
     qui permet d'appeler des commandes de gestion du projet
     avec la syntaxe `python ./manage.py <nom de la commande>`
-28. Le fichier de configuration de la documentation,
+29. Le fichier de configuration de la documentation,
     avec ses plugins et sa table des matières. 
-29. Le fichier où sont déclarés les dépendances et la configuration
+30. Le fichier où sont déclarés les dépendances et la configuration
     de certaines d'entre elles.
-30. Dossier d'environnement virtuel généré par uv
-31. Fichier qui contrôle quelle version de python utiliser pour le projet
-32. Fichier qui contrôle les commandes à lancer pour gérer la compilation
+31. Dossier d'environnement virtuel généré par uv
+32. Fichier qui contrôle quelle version de python utiliser pour le projet
+33. Fichier qui contrôle les commandes à lancer pour gérer la compilation
     automatique des static et autres services nécessaires à la command runserver.
-33. Fichier qui contrôle les services tiers nécessaires au fonctionnement
+34. Fichier qui contrôle les services tiers nécessaires au fonctionnement
     du Sith tel que redis.
 
 ## L'application principale

galaxy/management/commands/generate_galaxy_test_data.py

@@ -25,12 +25,13 @@ import warnings
 from datetime import timedelta
 from typing import Final, Optional
 
+from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 
 from club.models import Club, Membership
-from core.models import Group, Page, User
+from core.models import Group, Page, SithFile, User
 from core.utils import RED_PIXEL_PNG
 from sas.models import Album, PeoplePictureRelation, Picture
 from subscription.models import Subscription
@@ -90,8 +91,13 @@ class Command(BaseCommand):
         self.NB_CLUBS = options["club_count"]
 
         root = User.objects.filter(username="root").first()
+        sas = SithFile.objects.get(id=settings.SITH_SAS_ROOT_DIR_ID)
         self.galaxy_album = Album.objects.create(
-            name="galaxy-register-file", owner=root, is_moderated=True
+            name="galaxy-register-file",
+            owner=root,
+            is_moderated=True,
+            is_in_sas=True,
+            parent=sas,
         )
 
         self.make_clubs()
@@ -279,10 +285,14 @@ class Command(BaseCommand):
                     owner=u,
                     name=f"galaxy-picture {u} {i // self.NB_USERS}",
                     is_moderated=True,
+                    is_folder=False,
                     parent=self.galaxy_album,
-                    original=ContentFile(RED_PIXEL_PNG),
+                    is_in_sas=True,
+                    file=ContentFile(RED_PIXEL_PNG),
                     compressed=ContentFile(RED_PIXEL_PNG),
                     thumbnail=ContentFile(RED_PIXEL_PNG),
+                    mime_type="image/png",
+                    size=len(RED_PIXEL_PNG),
                 )
             )
             self.picts[i].file.name = self.picts[i].name

launderette/__init__.py

@@ -0,0 +1,14 @@
+#
+# Copyright 2023 © AE UTBM
+# ae@utbm.fr / ae.info@utbm.fr
+#
+# This file is part of the website of the UTBM Student Association (AE UTBM),
+# https://ae.utbm.fr.
+#
+# You can find the source code of the website at https://github.com/ae-utbm/sith
+#
+# LICENSED UNDER THE GNU GENERAL PUBLIC LICENSE VERSION 3 (GPLv3)
+# SEE : https://raw.githubusercontent.com/ae-utbm/sith/master/LICENSE
+# OR WITHIN THE LOCAL FILE "LICENSE"
+#
+#

launderette/migrations/0001_initial.py

@@ -0,0 +1,181 @@
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [("subscription", "0001_initial"), ("counter", "0001_initial")]
+
+    operations = [
+        migrations.CreateModel(
+            name="Launderette",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("name", models.CharField(max_length=30, verbose_name="name")),
+                (
+                    "counter",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="launderette",
+                        verbose_name="counter",
+                        to="counter.Counter",
+                    ),
+                ),
+            ],
+            options={"verbose_name": "Launderette"},
+        ),
+        migrations.CreateModel(
+            name="Machine",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("name", models.CharField(max_length=30, verbose_name="name")),
+                (
+                    "type",
+                    models.CharField(
+                        choices=[("WASHING", "Washing"), ("DRYING", "Drying")],
+                        max_length=10,
+                        verbose_name="type",
+                    ),
+                ),
+                (
+                    "is_working",
+                    models.BooleanField(verbose_name="is working", default=True),
+                ),
+                (
+                    "launderette",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        verbose_name="launderette",
+                        to="launderette.Launderette",
+                        related_name="machines",
+                    ),
+                ),
+            ],
+            options={"verbose_name": "Machine"},
+        ),
+        migrations.CreateModel(
+            name="Slot",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("start_date", models.DateTimeField(verbose_name="start date")),
+                (
+                    "type",
+                    models.CharField(
+                        choices=[("WASHING", "Washing"), ("DRYING", "Drying")],
+                        max_length=10,
+                        verbose_name="type",
+                    ),
+                ),
+                (
+                    "machine",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        verbose_name="machine",
+                        to="launderette.Machine",
+                        related_name="slots",
+                    ),
+                ),
+            ],
+            options={"verbose_name": "Slot", "ordering": ["start_date"]},
+        ),
+        migrations.CreateModel(
+            name="Token",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                        auto_created=True,
+                    ),
+                ),
+                ("name", models.CharField(max_length=5, verbose_name="name")),
+                (
+                    "type",
+                    models.CharField(
+                        choices=[("WASHING", "Washing"), ("DRYING", "Drying")],
+                        max_length=10,
+                        verbose_name="type",
+                    ),
+                ),
+                (
+                    "borrow_date",
+                    models.DateTimeField(
+                        null=True, verbose_name="borrow date", blank=True
+                    ),
+                ),
+                (
+                    "launderette",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        verbose_name="launderette",
+                        to="launderette.Launderette",
+                        related_name="tokens",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        null=True,
+                        related_name="tokens",
+                        verbose_name="user",
+                        to="core.User",
+                        blank=True,
+                    ),
+                ),
+            ],
+            options={"verbose_name": "Token", "ordering": ["type", "name"]},
+        ),
+        migrations.AddField(
+            model_name="slot",
+            name="token",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                null=True,
+                related_name="slots",
+                verbose_name="token",
+                to="launderette.Token",
+                blank=True,
+            ),
+        ),
+        migrations.AddField(
+            model_name="slot",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                verbose_name="user",
+                to="core.User",
+                related_name="slots",
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="token", unique_together={("name", "launderette", "type")}
+        ),
+    ]

launderette/migrations/0002_remove_token_launderette_remove_machine_launderette_and_more.py

@@ -0,0 +1,14 @@
+# Generated by Django 5.2 on 2025-04-15 19:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [("launderette", "0001_initial")]
+
+    operations = [
+        migrations.DeleteModel(name="Launderette"),
+        migrations.DeleteModel(name="Machine"),
+        migrations.DeleteModel(name="Slot"),
+        migrations.DeleteModel(name="Token"),
+    ]

pedagogy/static/pedagogy/css/pedagogy.scss

@@ -17,7 +17,6 @@ $large-devices: 992px;
     margin-bottom: 0;
     margin-top: 0;
   }
-
   &.star-checked {
     color: $pedagogy-orange;
     margin-bottom: 0;
@@ -33,7 +32,6 @@ $large-devices: 992px;
       margin-left: 5px;
       margin-right: 5px;
     }
-
     &.star-checked {
       margin-left: 5px;
       margin-right: 5px;
@@ -44,7 +42,6 @@ $large-devices: 992px;
     &.grade-without-star {
       display: block;
     }
-
     &.grade-with-star {
       display: none;
     }
@@ -54,12 +51,10 @@ $large-devices: 992px;
     font-size: 1.1em;
 
     overflow-wrap: break-word;
-
     .closed td.title {
       color: lighten($black-color, 10%);
       font-style: italic;
     }
-
     td {
       text-align: center;
       border: none;
@@ -136,12 +131,10 @@ $large-devices: 992px;
     input[type="checkbox"] {
       display: none;
     }
-
     .radio-guide {
       margin-top: 10px;
       color: white;
     }
-
     .radio-guide label {
       display: inline-block;
       background-color: $pedagogy-blue;
@@ -150,15 +143,12 @@ $large-devices: 992px;
       font-size: 16px;
       border-radius: 4px;
     }
-
-    .radio-guide input[type="radio"]:checked+label {
+    .radio-guide input[type="radio"]:checked + label {
       background-color: $pedagogy-orange;
     }
-
-    .radio-guide input[type="checkbox"]:checked+label {
+    .radio-guide input[type="checkbox"]:checked + label {
       background-color: $pedagogy-orange;
     }
-
     .radio-guide label:hover {
       background-color: $pedagogy-hover-blue;
     }
@@ -229,7 +219,12 @@ $large-devices: 992px;
           "stars"
           "comment";
         }
+      }
 
+      .ui-accordion-content {
+        background-color: $white-color;
+        border-color: $pedagogy-orange;
+        border-right: none;
       }
 
       .form-stars {
@@ -240,6 +235,16 @@ $large-devices: 992px;
         grid-area: comment;
       }
 
+      .ui-accordion-header {
+        background-color: $pedagogy-orange;
+        color: $pedagogy-white-text;
+        clip-path: polygon(0 0%, 0 100%, 30% 100%, 33% 0);
+
+        @media screen and (max-width: $large-devices) {
+          clip-path: none;
+        }
+      }
+
       .ui-accordion-header-icon {
         color: $pedagogy-white-text;
         margin-right: 10px;
@@ -277,7 +282,7 @@ $large-devices: 992px;
       background-color: $pedagogy-blue;
       padding-right: 10px;
 
-      >p {
+      > p {
         text-align: right;
         font-weight: bold;
       }
@@ -351,7 +356,7 @@ $large-devices: 992px;
         .grade-type {
           grid-area: grade-type;
 
-          >p {
+          > p {
             color: $pedagogy-white-text;
             font-weight: bold;
             text-align: right;
@@ -507,20 +512,3 @@ $large-devices: 992px;
     }
   }
 }
-
-details.accordion summary {
-
-  background: $pedagogy-orange !important;
-  color: $pedagogy-white-text !important;
-  clip-path: polygon(0 0%, 0 100%, 30% 100%, 33% 0);
-
-  @media screen and (max-width: $large-devices) {
-    clip-path: none;
-  }
-}
-
-details.accordion>.accordion-content {
-  background-color: $white-color;
-  border-color: $pedagogy-orange;
-  border-right: none;
-}

pedagogy/templates/pedagogy/uv_detail.jinja

@@ -90,9 +90,9 @@
           <p>{% trans %}You already posted a comment on this UV. If you want to comment again, please modify or delete your previous comment.{% endtrans %}</p>
         </div>
       {% elif user.has_perm("pedagogy.add_uvcomment") %}
-        <details class="accordion" id="leave_comment">
-          <summary>{% trans %}Leave comment{% endtrans %}</summary>
-          <div class="accordion-content">
+        <div id="leave_comment">
+          <h2>{% trans %}Leave comment{% endtrans %}</h2>
+          <div>
             <form action="{{ url('pedagogy:uv_detail', uv_id=object.id) }}" method="post" enctype="multipart/form-data">
               {% csrf_token %}
               <div class="leave-comment-grid-container">
@@ -142,7 +142,7 @@
               <p><input type="submit" value="{% trans %}Comment{% endtrans %}" /></p>
             </form>
           </div>
-        </details>
+        </div>
       {% endif %}
       <br>
 
@@ -221,5 +221,21 @@
   <script type="text/javascript">
     $("#return_noscript").hide();
     $("#return_js").show();
+    const icons = {
+      header: "fa fa-toggle-right",
+      activeHeader: "fa fa-toggle-down"
+    };
+    $(function(){
+      $("#leave_comment").accordion({
+        icons: icons,
+        heightStyle: "content",
+        active: false,
+        collapsible: true
+      });
+    });
+	// Remove jquery-ui icons to make fontawesome work
+    $(document).ready(function(){
+      $(".ui-accordion-header-icon").first().removeClass("ui-icon");
+    });
   </script>
 {% endblock %}

pyproject.toml

@@ -19,13 +19,13 @@ authors = [
 license = { text = "GPL-3.0-only" }
 requires-python = "<4.0,>=3.12"
 dependencies = [
-    "django>=5.2.1,<6.0.0",
+    "django<6.0.0,>=5.2.0",
     "django-ninja<2.0.0,>=1.4.0",
     "django-ninja-extra<1.0.0,>=0.22.9",
     "Pillow<12.0.0,>=11.1.0",
     "mistune<4.0.0,>=3.1.3",
     "django-jinja<3.0.0,>=2.11.0",
-    "cryptography>=45.0.3,<46.0.0",
+    "cryptography<45.0.0,>=44.0.2",
     "django-phonenumber-field<9.0.0,>=8.1.0",
     "phonenumbers>=9.0.2,<10.0.0",
     "reportlab<5.0.0,>=4.3.1",
@@ -44,12 +44,12 @@ dependencies = [
     "django-honeypot",
     "pydantic-extra-types<3.0.0,>=2.10.3",
     "ical<10.0.0,>=9.1.0",
-    "redis[hiredis]<6.0.0,>=5.3.0",
+    "redis[hiredis]<6.0.0,>=5.2.1",
     "environs[django]<15.0.0,>=14.1.1",
     "requests>=2.32.3",
     "honcho>=2.0.0",
     "psutil>=7.0.0",
-    "celery[redis]>=5.5.2",
+    "celery[redis]>=5.5.1",
     "django-celery-results>=2.5.1",
     "django-celery-beat>=2.7.0",
 ]
@@ -60,13 +60,13 @@ documentation = "https://sith-ae.readthedocs.io/"
 
 [dependency-groups]
 prod = [
-    "psycopg[c]>=3.2.9,<4.0.0",
+    "psycopg[c]<4.0.0,>=3.2.6",
 ]
 dev = [
-    "django-debug-toolbar>=5.2.0,<6.0.0",
+    "django-debug-toolbar<5.0.0,>=4.4.6",
     "ipython<10.0.0,>=9.0.2",
     "pre-commit<5.0.0,>=4.1.0",
-    "ruff>=0.11.11,<1.0.0",
+    "ruff<1.0.0,>=0.11.1",
     "djhtml<4.0.0,>=3.0.7",
     "faker<38.0.0,>=37.0.0",
     "rjsmin<2.0.0,>=1.2.4",

sas/admin.py

@@ -20,9 +20,9 @@ from sas.models import Album, PeoplePictureRelation, Picture, PictureModerationR
 
 @admin.register(Picture)
 class PictureAdmin(admin.ModelAdmin):
-    list_display = ("name", "parent", "is_moderated")
+    list_display = ("name", "parent", "date", "size", "is_moderated")
     search_fields = ("name",)
-    autocomplete_fields = ("owner", "parent", "moderator")
+    autocomplete_fields = ("owner", "parent", "edit_groups", "view_groups", "moderator")
 
 
 @admin.register(PeoplePictureRelation)
@@ -33,9 +33,9 @@ class PeoplePictureRelationAdmin(admin.ModelAdmin):
 
 @admin.register(Album)
 class AlbumAdmin(admin.ModelAdmin):
-    list_display = ("name", "parent")
+    list_display = ("name", "parent", "date", "owner", "is_moderated")
     search_fields = ("name",)
-    autocomplete_fields = ("parent", "edit_groups", "view_groups")
+    autocomplete_fields = ("owner", "parent", "edit_groups", "view_groups")
 
 
 @admin.register(PictureModerationRequest)

sas/api.py

@@ -3,10 +3,8 @@ from typing import Any, Literal
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db.models import F
-from django.shortcuts import get_list_or_404
 from django.urls import reverse
-from ninja import Body, Query, UploadedFile
-from ninja.errors import HttpError
+from ninja import Body, File, Query
 from ninja_extra import ControllerBase, api_controller, paginate, route
 from ninja_extra.exceptions import NotFound, PermissionDenied
 from ninja_extra.pagination import PageNumberPaginationExtra
@@ -18,12 +16,11 @@ from core.auth.api_permissions import (
     CanAccessLookup,
     CanEdit,
     CanView,
-    HasPerm,
     IsInGroup,
     IsRoot,
 )
 from core.models import Notification, User
-from core.utils import get_list_exact_or_404
+from core.schemas import UploadedImage
 from sas.models import Album, PeoplePictureRelation, Picture
 from sas.schemas import (
     AlbumAutocompleteSchema,
@@ -31,7 +28,6 @@ from sas.schemas import (
     AlbumSchema,
     IdentifiedUserSchema,
     ModerationRequestSchema,
-    MoveAlbumSchema,
     PictureFilterSchema,
     PictureSchema,
 )
@@ -73,48 +69,6 @@ class AlbumController(ControllerBase):
             Album.objects.viewable_by(self.context.request.user).order_by("-date")
         )
 
-    @route.patch("/parent", permissions=[IsAuthenticated])
-    def change_album_parent(self, payload: list[MoveAlbumSchema]):
-        """Change parents of albums
-
-        Note:
-            For this operation to work, the user must be authorized
-            to edit both the moved albums and their new parent.
-        """
-        user: User = self.context.request.user
-        albums: list[Album] = get_list_exact_or_404(
-            Album, pk__in={a.id for a in payload}
-        )
-        if not user.has_perm("sas.change_album"):
-            unauthorized = [a.id for a in albums if not user.can_edit(a)]
-            raise PermissionDenied(
-                f"You can't move the following albums : {unauthorized}"
-            )
-        parents: list[Album] = get_list_exact_or_404(
-            Album, pk__in={a.new_parent_id for a in payload}
-        )
-        if not user.has_perm("sas.change_album"):
-            unauthorized = [a.id for a in parents if not user.can_edit(a)]
-            raise PermissionDenied(
-                f"You can't move to the following albums : {unauthorized}"
-            )
-        id_to_new_parent = {i.id: i.new_parent_id for i in payload}
-        for album in albums:
-            album.parent_id = id_to_new_parent[album.id]
-        # known caveat : moving an album won't move it's thumbnail.
-        # E.g. if the album foo/bar is moved to foo/baz,
-        # the thumbnail will still be foo/bar/thumb.webp
-        # This has no impact for the end user
-        # and doing otherwise would be hard for us to implement,
-        # because we would then have to manage rollbacks on fail.
-        Album.objects.bulk_update(albums, fields=["parent_id"])
-
-    @route.delete("", permissions=[HasPerm("sas.delete_album")])
-    def delete_album(self, album_ids: list[int]):
-        # known caveat : deleting an album doesn't delete the pictures on the disk.
-        # It's a db only operation.
-        albums: list[Album] = get_list_or_404(Album, pk__in=album_ids)
-
 
 @api_controller("/sas/picture")
 class PicturesController(ControllerBase):
@@ -147,7 +101,7 @@ class PicturesController(ControllerBase):
         return (
             filters.filter(Picture.objects.viewable_by(user))
             .distinct()
-            .order_by("-parent__event_date", "created_at")
+            .order_by("-parent__date", "date")
             .select_related("owner")
             .annotate(album=F("parent__name"))
         )
@@ -162,25 +116,27 @@ class PicturesController(ControllerBase):
         },
         url_name="upload_picture",
     )
-    def upload_picture(self, album_id: Body[int], picture: UploadedFile):
+    def upload_picture(self, album_id: Body[int], picture: File[UploadedImage]):
         album = self.get_object_or_exception(Album, pk=album_id)
         user = self.context.request.user
         self_moderate = user.has_perm("sas.moderate_sasfile")
         new = Picture(
             parent=album,
             name=picture.name,
-            original=picture,
+            file=picture,
             owner=user,
             is_moderated=self_moderate,
+            is_folder=False,
+            mime_type=picture.content_type,
         )
         if self_moderate:
             new.moderator = user
-        new.generate_thumbnails()
         try:
+            new.generate_thumbnails()
             new.full_clean()
+            new.save()
         except ValidationError as e:
-            raise HttpError(status_code=409, message=str(e)) from e
-        new.save()
+            return self.create_response({"detail": dict(e)}, status_code=409)
 
     @route.get(
         "/{picture_id}/identified",

sas/baker_recipes.py

@@ -1,35 +1,18 @@
-from django.core.files.uploadedfile import SimpleUploadedFile
 from model_bakery import seq
 from model_bakery.recipe import Recipe
 
-from core.utils import RED_PIXEL_PNG
-from sas.models import Album, Picture
-
-album_recipe = Recipe(
-    Album,
-    name=seq("Album "),
-    thumbnail=SimpleUploadedFile(
-        name="thumb.webp", content=b"", content_type="image/webp"
-    ),
-)
-
+from sas.models import Picture
 
 picture_recipe = Recipe(
     Picture,
+    is_in_sas=True,
+    is_folder=False,
     is_moderated=True,
     name=seq("Picture "),
-    original=SimpleUploadedFile(
-        # compressed and thumbnail are generated on save (except if bulk creating).
-        # For this step no to fail, original must be a valid image.
-        name="img.png",
-        content=RED_PIXEL_PNG,
-        content_type="image/png",
-    ),
-    compressed=SimpleUploadedFile(
-        name="img.webp", content=b"", content_type="image/webp"
-    ),
-    thumbnail=SimpleUploadedFile(
-        name="img.webp", content=b"", content_type="image/webp"
-    ),
 )
-"""A SAS Picture fixture."""
+"""A SAS Picture fixture.
+
+Warnings:
+    If you don't `bulk_create` this, you need
+    to explicitly set the parent album, or it won't work
+"""

sas/forms.py

@@ -48,12 +48,13 @@ class PictureEditForm(forms.ModelForm):
 class AlbumEditForm(forms.ModelForm):
     class Meta:
         model = Album
-        fields = ["name", "date", "thumbnail", "parent", "edit_groups"]
+        fields = ["name", "date", "file", "parent", "edit_groups"]
         widgets = {
             "parent": AutoCompleteSelectAlbum,
             "edit_groups": AutoCompleteSelectMultipleGroup,
         }
 
+    name = forms.CharField(max_length=Album.NAME_MAX_LENGTH, label=_("file name"))
     date = forms.DateField(label=_("Date"), widget=SelectDate, required=True)
     recursive = forms.BooleanField(label=_("Apply rights recursively"), required=False)
 

sas/migrations/0005_move_the_whole_sas.py

@@ -1,357 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-22 21:53
-import collections
-import itertools
-import logging
-from typing import TYPE_CHECKING
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-
-import sas.models
-
-if TYPE_CHECKING:
-    import core.models
-
-# NB : tous les commentaires sont écrits en français,
-#      parce qu'on est sur des opérations qui sont complexes,
-#      et qui sont surtout DANGEREUSES.
-#      Ici, la clarté des explications prime sur toute autre considération.
-
-
-def copy_albums_and_pictures(apps: StateApps, schema_editor):
-    SithFile: type[core.models.SithFile] = apps.get_model("core", "SithFile")
-    Album: type[sas.models.Album] = apps.get_model("sas", "Album")
-    Picture: type[sas.models.Picture] = apps.get_model("sas", "Picture")
-    logger = logging.getLogger("django")
-
-    # Il y a environ 1800 albums, 257k photos et 488k identifications
-    # d'utilisateurs dans la db de prod.
-    # En supposant qu'une insertion prenne 10ms (ce qui est très optimiste),
-    # migrer tous les enregistrements de la db prendrait plus de 2h.
-    # C'est trop long.
-    # Mais d'un autre côté, j'ai pas assez confiance dans les capacités de nos
-    # machines pour charger presque un million d'objets en mémoire.
-    # Pour faire un compromis, les albums sont migrés individuellement un à un,
-    # mais tous les objets liés à ces albums
-    # (photos, groupes de vue, groupe d'édition, identification d'utilisateurs)
-    # sont migrés en tas.
-    #
-    # Ordre des opérations :
-    # 1. On migre les albums 1 à 1 (il y en a 1800, donc c'est relativement court)
-    # 2. On migre les photos par paquet de 2500 (soit ~une centaine d'opérations)
-    # 3. On migre tous les groupes de vue et tous les groupes d'édition des albums
-    #
-    # Au total, la migration devrait demander aux alentours de 2000 insertions,
-    # ce qui est un compromis acceptable entre une migration
-    # pas trop longue et une RAM pas trop surchargée.
-    #
-    # Pour ce qui est de la répartition des tables, quatre nouvelles tables
-    # sont créées : sas_album, sas_picture,
-    # sas_pictureviewgroups et sas_picture_editgroups.
-    # Tous les albums et toutes les photos qui sont dans core_sithfile
-    # vont être copiés dans ces tables.
-    # Comme les albums sont migrés un à un, ils recevront une nouvelle
-    # clef primaire.
-    # Pour les photos, en revanche, c'est beaucoup plus sûr de leur donner
-    # le même id que celui qu'il y avait dans core_sithfile.
-    #
-    # Les identifications des photos ne sont pas migrées pour l'instant.
-    # Ce qu'on va faire, c'est qu'on va changer la contrainte de clef étrangère
-    # sur la colonne des photos pour pointer vers sas_picture
-    # au lieu de core_sithfile.
-    # Cependant, pour que ça marche,
-    # il faut qu'au moment où ce changement est effectué,
-    # toutes les clefs primaires référencées existent à la fois dans
-    # les deux tables, sinon les contraintes d'intégrité ne sont pas respectées.
-    # La migration de ce fichier va donc s'occuper de créer les nouvelles tables
-    # et d'y copier les données nécessaires.
-    # Puis une deuxième migration s'occupera de changer les contraintes.
-    # Et enfin une troisième migration supprimera les anciennes données.
-    #
-    # Pavé César
-
-    albums = SithFile.objects.filter(is_in_sas=True, is_folder=True).prefetch_related(
-        "view_groups", "edit_groups"
-    )
-    old_albums = collections.deque(
-        albums.filter(parent_id=settings.SITH_SAS_ROOT_DIR_ID)
-    )
-
-    # Changement de représentation en DB.
-    # Dans l'ancien système, un fichier était dans le SAS si
-    # un fichier spécial (le SAS_ROOT) était parmi ses ancêtres.
-    # Comme maintenant les fichiers du SAS sont dans des tables à part,
-    # il ne peut plus y avoir de confusion.
-    # Les photos ont donc obligatoirement un parent (qui est un album)
-    # et les albums peuvent avoir un parent null.
-    # Un album sans parent est considéré comme se trouvant à la racine
-    # de l'arborescence.
-    # En quelque sorte, None est le nouveau SITH_SAS_ROOT_DIR_ID
-    album_id_old_to_new = {settings.SITH_SAS_ROOT_DIR_ID: None}
-
-    logger.info(f"migrating {albums.count()} albums")
-    while len(old_albums) > 0:
-        # Comme les albums référencent leur parent, les albums doivent être migrés
-        # par ordre croissant de profondeur dans l'arborescence.
-        # Chaque album est donc pris par la gauche de la file
-        # et ses enfants ajoutés sur la droite.
-        old_album = old_albums.popleft()
-        old_albums.extend(list(albums.filter(parent=old_album)))
-        new_album = Album.objects.create(
-            parent_id=album_id_old_to_new[old_album.parent_id],
-            event_date=old_album.date.date(),
-            name=old_album.name,
-            thumbnail=(old_album.file or None),
-            is_moderated=old_album.is_moderated,
-        )
-        # on garde un dictionnaire qui associe les id des albums dans l'ancienne table
-        # à leur id dans la nouvelle table, pour pouvoir recréer
-        # les liens de parenté entre albums
-        album_id_old_to_new[old_album.id] = new_album.id
-
-    pictures = SithFile.objects.filter(is_in_sas=True, is_folder=False)
-    nb_pictures = pictures.count()
-    logger.info(f"migrating {nb_pictures} pictures")
-    for i, pictures_batch in enumerate(itertools.batched(pictures, 2500), start=1):
-        Picture.objects.bulk_create(
-            [
-                Picture(
-                    id=p.id,
-                    name=p.name,
-                    parent_id=album_id_old_to_new[p.parent_id],
-                    thumbnail=p.thumbnail,
-                    compressed=p.compressed,
-                    original=p.file,
-                    owner_id=p.owner_id,
-                    created_at=p.date,
-                    is_moderated=p.is_moderated,
-                    asked_for_removal=p.asked_for_removal,
-                    moderator_id=p.moderator_id,
-                )
-                for p in pictures_batch
-            ]
-        )
-        logger.info(f"Migrated {min(i * 2500, nb_pictures)} / {nb_pictures} pictures")
-
-    logger.info("Migrating album groups")
-    albums = SithFile.objects.filter(is_in_sas=True, is_folder=True).exclude(
-        id=settings.SITH_SAS_ROOT_DIR_ID
-    )
-    Album.edit_groups.through.objects.bulk_create(
-        [
-            Album.view_groups.through(
-                album=album_id_old_to_new[g.sithfile_id], group_id=g.group_id
-            )
-            for g in SithFile.view_groups.through.objects.filter(sithfile__in=albums)
-        ]
-    )
-    Album.edit_groups.through.objects.bulk_create(
-        [
-            Album.view_groups.through(
-                album=album_id_old_to_new[g.sithfile_id], group_id=g.group_id
-            )
-            for g in SithFile.view_groups.through.objects.filter(sithfile__in=albums)
-        ]
-    )
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ("core", "0044_alter_userban_options"),
-        ("sas", "0004_picturemoderationrequest_and_more"),
-    ]
-
-    operations = [
-        # les relations et les demandes de modération étaient liées à SithFile,
-        # via le model proxy Picture.
-        # Pour que la migration marche malgré la disparition du modèle Proxy,
-        # on change la relation pour qu'elle pointe directement vers SithFile
-        migrations.AlterField(
-            model_name="peoplepicturerelation",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="people",
-                to="core.sithfile",
-                verbose_name="picture",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="picturemoderationrequest",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="moderation_requests",
-                to="core.sithfile",
-                verbose_name="Picture",
-            ),
-        ),
-        migrations.DeleteModel(name="Album"),
-        migrations.DeleteModel(name="Picture"),
-        migrations.DeleteModel(name="SasFile"),
-        migrations.CreateModel(
-            name="Album",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "thumbnail",
-                    models.FileField(
-                        max_length=256,
-                        upload_to=sas.models.get_thumbnail_directory,
-                        verbose_name="thumbnail",
-                    ),
-                ),
-                ("name", models.CharField(max_length=100, verbose_name="name")),
-                (
-                    "event_date",
-                    models.DateField(
-                        default=django.utils.timezone.localdate,
-                        help_text="The date on which the photos in this album were taken",
-                        verbose_name="event date",
-                    ),
-                ),
-                (
-                    "is_moderated",
-                    models.BooleanField(default=False, verbose_name="is moderated"),
-                ),
-                (
-                    "edit_groups",
-                    models.ManyToManyField(
-                        related_name="editable_albums",
-                        to="core.group",
-                        verbose_name="edit groups",
-                    ),
-                ),
-                (
-                    "parent",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="children",
-                        to="sas.album",
-                        verbose_name="parent",
-                    ),
-                ),
-                (
-                    "view_groups",
-                    models.ManyToManyField(
-                        related_name="viewable_albums",
-                        to="core.group",
-                        verbose_name="view groups",
-                    ),
-                ),
-            ],
-            options={"verbose_name": "album"},
-        ),
-        migrations.CreateModel(
-            name="Picture",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "thumbnail",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_thumbnail_directory,
-                        verbose_name="thumbnail",
-                        max_length=256,
-                    ),
-                ),
-                ("name", models.CharField(max_length=256, verbose_name="file name")),
-                (
-                    "original",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_directory,
-                        verbose_name="original image",
-                        max_length=256,
-                    ),
-                ),
-                (
-                    "compressed",
-                    models.FileField(
-                        unique=True,
-                        upload_to=sas.models.get_compressed_directory,
-                        verbose_name="compressed image",
-                        max_length=256,
-                    ),
-                ),
-                ("created_at", models.DateTimeField(default=django.utils.timezone.now)),
-                (
-                    "is_moderated",
-                    models.BooleanField(default=False, verbose_name="is moderated"),
-                ),
-                (
-                    "asked_for_removal",
-                    models.BooleanField(
-                        default=False, verbose_name="asked for removal"
-                    ),
-                ),
-                (
-                    "moderator",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="moderated_pictures",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.PROTECT,
-                        related_name="owned_pictures",
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="owner",
-                    ),
-                ),
-                (
-                    "parent",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="pictures",
-                        to="sas.album",
-                        verbose_name="album",
-                    ),
-                ),
-            ],
-            options={"abstract": False, "verbose_name": "picture"},
-        ),
-        migrations.AddConstraint(
-            model_name="picture",
-            constraint=models.UniqueConstraint(
-                fields=("name", "parent"), name="sas_picture_unique_per_album"
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="album",
-            constraint=models.UniqueConstraint(
-                fields=("name", "parent"), name="unique_album_name_if_same_parent"
-            ),
-        ),
-        migrations.RunPython(
-            copy_albums_and_pictures,
-            reverse_code=migrations.RunPython.noop,
-            elidable=True,
-        ),
-    ]

sas/migrations/0006_alter_peoplepicturerelation_picture_and_more.py

@@ -1,31 +0,0 @@
-# Generated by Django 4.2.17 on 2025-01-25 23:50
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [("sas", "0005_move_the_whole_sas")]
-
-    operations = [
-        migrations.AlterField(
-            model_name="peoplepicturerelation",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="people",
-                to="sas.picture",
-                verbose_name="picture",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="picturemoderationrequest",
-            name="picture",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="moderation_requests",
-                to="sas.picture",
-                verbose_name="Picture",
-            ),
-        ),
-    ]

sas/models.py

@@ -18,53 +18,30 @@ from __future__ import annotations
 import contextlib
 from io import BytesIO
 from pathlib import Path
-from typing import TYPE_CHECKING, ClassVar, Self
+from typing import ClassVar, Self
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.exceptions import ValidationError
-from django.core.files.base import ContentFile
 from django.db import models
 from django.db.models import Exists, OuterRef, Q
-from django.db.models.deletion import Collector
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 from PIL import Image
 
-from core.models import Group, Notification, User
+from core.models import SithFile, User
 from core.utils import exif_auto_rotate, resize_image
 
-if TYPE_CHECKING:
-    from django.db.models.fields.files import FieldFile
 
-
-def get_directory(instance: SasFile, filename: str):
-    return f"./{instance.parent_path}/{filename}"
-
-
-def get_compressed_directory(instance: SasFile, filename: str):
-    return f"./.compressed/{instance.parent_path}/{filename}"
-
-
-def get_thumbnail_directory(instance: SasFile, filename: str):
-    if isinstance(instance, Album):
-        _, extension = filename.rsplit(".", 1)
-        filename = f"{instance.name}/thumb.{extension}"
-    return f"./.thumbnails/{instance.parent_path}/{filename}"
-
-
-class SasFile(models.Model):
-    """Abstract model for SAS files
+class SasFile(SithFile):
+    """Proxy model for any file in the SAS.
 
     May be used to have logic that should be shared by both
     [Picture][sas.models.Picture] and [Album][sas.models.Album].
     """
 
     class Meta:
-        abstract = True
-        permissions = [("moderate_sasfile", "Can moderate SAS albums and SAS pictures")]
+        proxy = True
 
     def can_be_viewed_by(self, user):
         if user.is_anonymous:
@@ -82,171 +59,8 @@ class SasFile(models.Model):
             cache.set(cache_key, viewable, timeout=10)
         return self.id in viewable
 
-    def can_be_edited_by(self, user: User):
-        return user.has_perm(f"sas.change_{self._meta.model_name}")
-
-    @cached_property
-    def parent_path(self) -> str:
-        """The parent location in the SAS album tree (e.g. `SAS/foo/bar`)."""
-        return "/".join(["SAS", *[p.name for p in self.parent_list]])
-
-    @cached_property
-    def parent_list(self) -> list[Album]:
-        """The ancestors of this SAS object.
-
-        The result is ordered from the direct parent to the farthest one.
-        """
-        parents = []
-        current = self.parent
-        while current is not None:
-            parents.append(current)
-            current = current.parent
-        return parents
-
-
-class AlbumQuerySet(models.QuerySet):
-    def viewable_by(self, user: User) -> Self:
-        """Filter the albums that this user can view.
-
-        Warning:
-            Calling this queryset method may add several additional requests.
-        """
-        if user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
-            return self.all()
-        if user.was_subscribed:
-            return self.filter(is_moderated=True)
-        # known bug : if all children of an album are also albums
-        # then this album is excluded, even if one of the sub-albums should be visible.
-        # The fs-like navigation is likely to be half-broken for non-subscribers,
-        # but that's ok, since non-subscribers are expected to see only the albums
-        # containing pictures on which they have been identified (hence, very few).
-        # Most, if not all, of their albums will be displayed on the
-        # `latest albums` section of the SAS.
-        # Moreover, they will still see all of their picture in their profile.
-        return self.filter(
-            Exists(Picture.objects.filter(parent_id=OuterRef("pk")).viewable_by(user))
-        )
-
-
-class Album(SasFile):
-    NAME_MAX_LENGTH: ClassVar[int] = 50
-
-    name = models.CharField(_("name"), max_length=100)
-    parent = models.ForeignKey(
-        "self",
-        related_name="children",
-        verbose_name=_("parent"),
-        null=True,
-        blank=True,
-        on_delete=models.CASCADE,
-    )
-    thumbnail = models.FileField(
-        upload_to=get_thumbnail_directory,
-        verbose_name=_("thumbnail"),
-        max_length=256,
-        blank=True,
-    )
-    view_groups = models.ManyToManyField(
-        Group, related_name="viewable_albums", verbose_name=_("view groups"), blank=True
-    )
-    edit_groups = models.ManyToManyField(
-        Group, related_name="editable_albums", verbose_name=_("edit groups"), blank=True
-    )
-    event_date = models.DateField(
-        _("event date"),
-        help_text=_("The date on which the photos in this album were taken"),
-        default=timezone.localdate,
-        blank=True,
-    )
-    is_moderated = models.BooleanField(_("is moderated"), default=False)
-
-    objects = AlbumQuerySet.as_manager()
-
-    class Meta:
-        verbose_name = _("album")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "parent"],
-                name="unique_album_name_if_same_parent",
-                # TODO : add `nulls_distinct=True` after upgrading to django>=5.0
-            )
-        ]
-
-    def __str__(self):
-        return f"Album {self.name}"
-
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        for user in User.objects.filter(
-            groups__id__in=[settings.SITH_GROUP_SAS_ADMIN_ID]
-        ):
-            Notification(
-                user=user,
-                url=reverse("sas:moderation"),
-                type="SAS_MODERATION",
-                param="1",
-            ).save()
-
-    def get_absolute_url(self):
-        return reverse("sas:album", kwargs={"album_id": self.id})
-
-    def clean(self):
-        super().clean()
-        if "/" in self.name:
-            raise ValidationError(_("Character '/' not authorized in name"))
-        if self.parent_id is not None and (
-            self.id == self.parent_id or self in self.parent_list
-        ):
-            raise ValidationError(_("Loop in album tree"), code="loop")
-        if self.thumbnail:
-            try:
-                Image.open(BytesIO(self.thumbnail.read()))
-            except Image.UnidentifiedImageError as e:
-                raise ValidationError(_("This is not a valid album thumbnail")) from e
-
-    def delete(self, *args, **kwargs):
-        """Delete the album, all of its children and all linked disk files"""
-        collector = Collector(using="default")
-        collector.collect([self])
-        albums: set[Album] = collector.data[Album]
-        pictures: set[Picture] = collector.data[Picture]
-        files: list[FieldFile] = [
-            *[a.thumbnail for a in albums],
-            *[p.thumbnail for p in pictures],
-            *[p.compressed for p in pictures],
-            *[p.original for p in pictures],
-        ]
-        # `bool(f)` checks that the file actually exists on the disk
-        files = [f for f in files if bool(f)]
-        folders = {Path(f.path).parent for f in files}
-        res = super().delete(*args, **kwargs)
-        # once the model instances have been deleted,
-        # delete the actual files.
-        for file in files:
-            # save=False ensures that django doesn't recreate the db record,
-            # which would make the whole deletion pointless
-            # cf. https://docs.djangoproject.com/en/stable/ref/models/fields/#django.db.models.fields.files.FieldFile.delete
-            file.delete(save=False)
-        for folder in folders:
-            # now that the files are deleted, remove the empty folders
-            if folder.is_dir() and next(folder.iterdir(), None) is None:
-                folder.rmdir()
-        return res
-
-    def get_download_url(self):
-        return reverse("sas:album_preview", kwargs={"album_id": self.id})
-
-    def generate_thumbnail(self):
-        p = (
-            self.pictures.exclude(thumbnail="").order_by("?").first()
-            or self.children.exclude(thumbnail="").order_by("?").first()
-        )
-        if p:
-            # The file is loaded into memory to duplicate it.
-            # It may not be the most efficient way, but thumbnails are
-            # usually quite small, so it's still ok
-            self.thumbnail = ContentFile(p.thumbnail.read(), name="thumb.webp")
-            self.save()
+    def can_be_edited_by(self, user):
+        return user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID)
 
 
 class PictureQuerySet(models.QuerySet):
@@ -263,65 +77,23 @@ class PictureQuerySet(models.QuerySet):
         return self.filter(people__user_id=user.id, is_moderated=True)
 
 
+class SASPictureManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_in_sas=True, is_folder=False)
+
+
 class Picture(SasFile):
-    name = models.CharField(_("file name"), max_length=256)
-    parent = models.ForeignKey(
-        Album,
-        related_name="pictures",
-        verbose_name=_("album"),
-        on_delete=models.CASCADE,
-    )
-    thumbnail = models.FileField(
-        upload_to=get_thumbnail_directory,
-        verbose_name=_("thumbnail"),
-        max_length=256,
-        unique=True,
-    )
-    original = models.FileField(
-        upload_to=get_directory,
-        verbose_name=_("original image"),
-        max_length=256,
-        unique=True,
-    )
-    compressed = models.FileField(
-        upload_to=get_compressed_directory,
-        verbose_name=_("compressed image"),
-        max_length=256,
-        unique=True,
-    )
-    created_at = models.DateTimeField(default=timezone.now)
-    owner = models.ForeignKey(
-        User,
-        related_name="owned_pictures",
-        verbose_name=_("owner"),
-        on_delete=models.PROTECT,
-    )
-
-    is_moderated = models.BooleanField(_("is moderated"), default=False)
-    asked_for_removal = models.BooleanField(_("asked for removal"), default=False)
-    moderator = models.ForeignKey(
-        User,
-        related_name="moderated_pictures",
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-    )
-
-    objects = PictureQuerySet.as_manager()
-
     class Meta:
-        verbose_name = _("picture")
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "parent"], name="sas_picture_unique_per_album"
-            )
-        ]
+        proxy = True
 
-    def __str__(self):
-        return self.name
+    objects = SASPictureManager.from_queryset(PictureQuerySet)()
 
-    def get_absolute_url(self):
-        return reverse("sas:picture", kwargs={"picture_id": self.id})
+    @property
+    def is_vertical(self):
+        with open(settings.MEDIA_ROOT / self.file.name, "rb") as f:
+            im = Image.open(BytesIO(f.read()))
+            (w, h) = im.size
+            return (w / h) < 1
 
     def get_download_url(self):
         return reverse("sas:download", kwargs={"picture_id": self.id})
@@ -332,34 +104,41 @@ class Picture(SasFile):
     def get_download_thumb_url(self):
         return reverse("sas:download_thumb", kwargs={"picture_id": self.id})
 
-    @property
-    def is_vertical(self):
-        # original, compressed and thumbnail image have all three the same ratio,
-        # so the smallest one is used to tell if the image is vertical
-        im = Image.open(BytesIO(self.thumbnail.read()))
-        (w, h) = im.size
-        return w < h
+    def get_absolute_url(self):
+        return reverse("sas:picture", kwargs={"picture_id": self.id})
 
-    def generate_thumbnails(self):
-        im = Image.open(self.original)
+    def generate_thumbnails(self, *, overwrite=False):
+        im = Image.open(BytesIO(self.file.read()))
         with contextlib.suppress(Exception):
             im = exif_auto_rotate(im)
         # convert the compressed image and the thumbnail into webp
+        # The original image keeps its original type, because it's not
+        # meant to be shown on the website, but rather to keep the real image
+        # for less frequent cases (like downloading the pictures of an user)
+        extension = self.mime_type.split("/")[-1]
         # the HD version of the image doesn't need to be optimized, because :
         # - it isn't frequently queried
-        # - optimizing large images takes a lot of time, which greatly hinders the UX
+        # - optimizing large images takes a lot time, which greatly hinders the UX
         # - photographers usually already optimize their images
+        file = resize_image(im, max(im.size), extension, optimize=False)
         thumb = resize_image(im, 200, "webp")
         compressed = resize_image(im, 1200, "webp")
-        new_extension_name = str(Path(self.original.name).with_suffix(".webp"))
+        if overwrite:
+            self.file.delete()
+            self.thumbnail.delete()
+            self.compressed.delete()
+        new_extension_name = str(Path(self.name).with_suffix(".webp"))
+        self.file = file
+        self.file.name = self.name
         self.thumbnail = thumb
         self.thumbnail.name = new_extension_name
         self.compressed = compressed
         self.compressed.name = new_extension_name
 
     def rotate(self, degree):
-        for field in self.original, self.compressed, self.thumbnail:
-            with open(field.file, "r+b") as file:
+        for attr in ["file", "compressed", "thumbnail"]:
+            name = self.__getattribute__(attr).name
+            with open(settings.MEDIA_ROOT / name, "r+b") as file:
                 if file:
                     im = Image.open(BytesIO(file.read()))
                     file.seek(0)
@@ -372,6 +151,110 @@ class Picture(SasFile):
                         progressive=True,
                     )
 
+    def get_next(self):
+        if self.is_moderated:
+            pictures_qs = self.parent.children.filter(
+                is_moderated=True,
+                asked_for_removal=False,
+                is_folder=False,
+                id__gt=self.id,
+            )
+        else:
+            pictures_qs = Picture.objects.filter(id__gt=self.id, is_moderated=False)
+        return pictures_qs.order_by("id").first()
+
+    def get_previous(self):
+        if self.is_moderated:
+            pictures_qs = self.parent.children.filter(
+                is_moderated=True,
+                asked_for_removal=False,
+                is_folder=False,
+                id__lt=self.id,
+            )
+        else:
+            pictures_qs = Picture.objects.filter(id__lt=self.id, is_moderated=False)
+        return pictures_qs.order_by("-id").first()
+
+
+class AlbumQuerySet(models.QuerySet):
+    def viewable_by(self, user: User) -> Self:
+        """Filter the albums that this user can view.
+
+        Warning:
+            Calling this queryset method may add several additional requests.
+        """
+        if user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID):
+            return self.all()
+        if user.was_subscribed:
+            return self.filter(Q(is_moderated=True) | Q(owner=user))
+        # known bug : if all children of an album are also albums
+        # then this album is excluded, even if one of the sub-albums should be visible.
+        # The fs-like navigation is likely to be half-broken for non-subscribers,
+        # but that's ok, since non-subscribers are expected to see only the albums
+        # containing pictures on which they have been identified (hence, very few).
+        # Most, if not all, of their albums will be displayed on the
+        # `latest albums` section of the SAS.
+        # Moreover, they will still see all of their picture in their profile.
+        return self.filter(
+            Exists(Picture.objects.filter(parent_id=OuterRef("pk")).viewable_by(user))
+        )
+
+
+class SASAlbumManager(models.Manager):
+    def get_queryset(self):
+        return super().get_queryset().filter(is_in_sas=True, is_folder=True)
+
+
+class Album(SasFile):
+    NAME_MAX_LENGTH: ClassVar[int] = 50
+    """Maximum length of an album's name.
+    
+    [SithFile][core.models.SithFile] have a maximum length
+    of 256 characters.
+    However, this limit is too high for albums.
+    Names longer than 50 characters are harder to read
+    and harder to display on the SAS page.
+    
+    It is to be noted, though, that this does not
+    add or modify any db behaviour.
+    It's just a constant to be used in views and forms.
+    """
+
+    class Meta:
+        proxy = True
+
+    objects = SASAlbumManager.from_queryset(AlbumQuerySet)()
+
+    @property
+    def children_pictures(self):
+        return Picture.objects.filter(parent=self)
+
+    @property
+    def children_albums(self):
+        return Album.objects.filter(parent=self)
+
+    def get_absolute_url(self):
+        if self.id == settings.SITH_SAS_ROOT_DIR_ID:
+            return reverse("sas:main")
+        return reverse("sas:album", kwargs={"album_id": self.id})
+
+    def get_download_url(self):
+        return reverse("sas:album_preview", kwargs={"album_id": self.id})
+
+    def generate_thumbnail(self):
+        p = (
+            self.children_pictures.order_by("?").first()
+            or self.children_albums.exclude(file=None)
+            .exclude(file="")
+            .order_by("?")
+            .first()
+        )
+        if p and p.file:
+            image = resize_image(Image.open(BytesIO(p.file.read())), 200, "webp")
+            self.file = image
+            self.file.name = f"{self.name}/thumb.webp"
+            self.save()
+
 
 def sas_notification_callback(notif):
     count = Picture.objects.filter(is_moderated=False).count()

sas/schemas.py

@@ -50,12 +50,7 @@ class AlbumAutocompleteSchema(ModelSchema):
 
     @staticmethod
     def resolve_path(obj: Album) -> str:
-        return str(Path(obj.parent_path) / obj.name)
-
-
-class MoveAlbumSchema(Schema):
-    id: int
-    new_parent_id: int
+        return str(Path(obj.get_parent_path()) / obj.name)
 
 
 class PictureFilterSchema(FilterSchema):
@@ -68,7 +63,7 @@ class PictureFilterSchema(FilterSchema):
 class PictureSchema(ModelSchema):
     class Meta:
         model = Picture
-        fields = ["id", "name", "created_at", "is_moderated", "asked_for_removal"]
+        fields = ["id", "name", "date", "size", "is_moderated", "asked_for_removal"]
 
     owner: UserProfileSchema
     sas_url: str

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

@@ -126,108 +126,3 @@ document.addEventListener("alpine:init", () => {
     },
   }));
 });
-
-// Todo: migrate to alpine.js if we have some time
-// $("form#upload_form").submit(function (event) {
-//   const formData = new FormData($(this)[0]);
-//
-//   if (!formData.get("album_name") && !formData.get("images").name) return false;
-//
-//   if (!formData.get("images").name) {
-//     return true;
-//   }
-//
-//   event.preventDefault();
-//
-//   let errorList = this.querySelector("#upload_form ul.errorlist.nonfield");
-//   if (errorList === null) {
-//     errorList = document.createElement("ul");
-//     errorList.classList.add("errorlist", "nonfield");
-//     this.insertBefore(errorList, this.firstElementChild);
-//   }
-//
-//   while (errorList.childElementCount > 0)
-//     errorList.removeChild(errorList.firstElementChild);
-//
-//   let progress = this.querySelector("progress");
-//   if (progress === null) {
-//     progress = document.createElement("progress");
-//     progress.value = 0;
-//     const p = document.createElement("p");
-//     p.appendChild(progress);
-//     this.insertBefore(p, this.lastElementChild);
-//   }
-//
-//   let dataHolder;
-//
-//   if (formData.get("album_name")) {
-//     dataHolder = new FormData();
-//     dataHolder.set("csrfmiddlewaretoken", "{{ csrf_token }}");
-//     dataHolder.set("album_name", formData.get("album_name"));
-//     $.ajax({
-//       method: "POST",
-//       url: "{{ url('sas:album_upload', album_id=object.id) }}",
-//       data: dataHolder,
-//       processData: false,
-//       contentType: false,
-//       success: onSuccess,
-//     });
-//   }
-//
-//   const images = formData.getAll("images");
-//   const imagesCount = images.length;
-//   let completeCount = 0;
-//
-//   const poolSize = 1;
-//   const imagePool = [];
-//
-//   while (images.length > 0 && imagePool.length < poolSize) {
-//     const image = images.shift();
-//     imagePool.push(image);
-//     sendImage(image);
-//   }
-//
-//   function sendImage(image) {
-//     dataHolder = new FormData();
-//     dataHolder.set("csrfmiddlewaretoken", "{{ csrf_token }}");
-//     dataHolder.set("images", image);
-//
-//     $.ajax({
-//       method: "POST",
-//       url: "{{ url('sas:album_upload', album_id=object.id) }}",
-//       data: dataHolder,
-//       processData: false,
-//       contentType: false,
-//     })
-//       .fail(onSuccess.bind(undefined, image))
-//       .done(onSuccess.bind(undefined, image))
-//       .always(next.bind(undefined, image));
-//   }
-//
-//   function next(image, _, __) {
-//     const index = imagePool.indexOf(image);
-//     const nextImage = images.shift();
-//
-//     if (index !== -1) {
-//       imagePool.splice(index, 1);
-//     }
-//
-//     if (nextImage) {
-//       imagePool.push(nextImage);
-//       sendImage(nextImage);
-//     }
-//   }
-//
-//   function onSuccess(image, data, _, __) {
-//     let errors = [];
-//
-//     if ($(data.responseText).find(".errorlist.nonfield")[0])
-//       errors = Array.from($(data.responseText).find(".errorlist.nonfield")[0].children);
-//
-//     while (errors.length > 0) errorList.appendChild(errors.shift());
-//
-//     progress.value = ++completeCount / imagesCount;
-//     if (progress.value === 1 && errorList.children.length === 0)
-//       document.location.reload();
-//   }
-// });

sas/static/bundled/sas/pictures-download-index.ts

@@ -30,10 +30,10 @@ document.addEventListener("alpine:init", () => {
 
       await Promise.all(
         this.pictures.map((p: PictureSchema) => {
-          const imgName = `${p.album}/IMG_${p.created_at.replace(/[:\-]/g, "_")}${p.name.slice(p.name.lastIndexOf("."))}`;
+          const imgName = `${p.album}/IMG_${p.date.replace(/[:\-]/g, "_")}${p.name.slice(p.name.lastIndexOf("."))}`;
           return zipWriter.add(imgName, new HttpReader(p.full_size_url), {
             level: 9,
-            lastModDate: new Date(p.created_at),
+            lastModDate: new Date(p.date),
             onstart: incrementProgressBar,
           });
         }),

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

@@ -141,8 +141,7 @@ exportToHtml("loadViewer", (config: ViewerConfig) => {
         // biome-ignore lint/style/useNamingConvention: api is in snake_case
         full_size_url: "",
         owner: "",
-        // biome-ignore lint/style/useNamingConvention: api is in snake_case
-        created_at: new Date(),
+        date: new Date(),
         identifications: [],
       },
       /**

sas/templates/sas/album.jinja

@@ -20,7 +20,7 @@
 
 {% block content %}
   <code>
-    <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album.parent) }} {{ album.name }}
+    <a href="{{ url('sas:main') }}">SAS</a> / {{ print_path(album.parent) }} {{ album.get_display_name() }}
   </code>
 
   {% set is_sas_admin = user.can_edit(album) %}
@@ -30,7 +30,7 @@
     <form action="" method="post" enctype="multipart/form-data">
       {% csrf_token %}
       <div class="album-navbar">
-        <h3>{{ album.name }}</h3>
+        <h3>{{ album.get_display_name() }}</h3>
 
         <div class="toolbar">
           <a href="{{ url('sas:album_edit', album_id=album.id) }}">{% trans %}Edit{% endtrans %}</a>
@@ -40,17 +40,17 @@
         </div>
       </div>
 
-{#      {% if clipboard %}#}
-{#        <div class="clipboard">#}
-{#          {% trans %}Clipboard: {% endtrans %}#}
-{#          <ul>#}
-{#            {% for f in clipboard["albums"] %}#}
-{#              <li>{{ f.get_full_path() }}</li>#}
-{#            {% endfor %}#}
-{#          </ul>#}
-{#          <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">#}
-{#        </div>#}
-{#      {% endif %}#}
+      {% if clipboard %}
+        <div class="clipboard">
+          {% trans %}Clipboard: {% endtrans %}
+          <ul>
+            {% for f in clipboard %}
+              <li>{{ f.get_full_path() }}</li>
+            {% endfor %}
+          </ul>
+          <input name="clear" type="submit" value="{% trans %}Clear clipboard{% endtrans %}">
+        </div>
+      {% endif %}
   {% endif %}
 
   {% if show_albums %}
@@ -73,8 +73,8 @@
                 <div class="text">{% trans %}To be moderated{% endtrans %}</div>
               </template>
             </div>
-            {% if edit_mode %}
-              <input type="checkbox" name="album_list" :value="album.id">
+            {% if is_sas_admin %}
+              <input type="checkbox" name="file_list" :value="album.id">
             {% endif %}
           </a>
         </template>
@@ -100,7 +100,7 @@
             </template>
           </div>
           {% if is_sas_admin %}
-            <input type="checkbox" name="picture_list" :value="picture.id">
+            <input type="checkbox" name="file_list" :value="picture.id">
           {% endif %}
         </a>
       </template>
@@ -120,9 +120,9 @@
       {% csrf_token %}
       <div class="inputs">
         <p>
-          <label for="{{ form.images.id_for_label }}">{{ form.images.label }} :</label>
-          {{ form.images|add_attr("x-ref=pictures") }}
-          <span class="helptext">{{ form.images.help_text }}</span>
+          <label for="{{ upload_form.images.id_for_label }}">{{ upload_form.images.label }} :</label>
+          {{ upload_form.images|add_attr("x-ref=pictures") }}
+          <span class="helptext">{{ upload_form.images.help_text }}</span>
         </p>
         <input type="submit" value="{% trans %}Upload{% endtrans %}" />
         <progress x-ref="progress" x-show="sending"></progress>

sas/templates/sas/macros.jinja

@@ -1,13 +1,19 @@
 {% macro display_album(a, edit_mode) %}
   <a href="{{ url('sas:album', album_id=a.id) }}">
-    {% if a.thumbnail %}
+    {% if a.file %}
       {% set img = a.get_download_url() %}
       {% set src = a.name %}
+    {% elif a.children.filter(is_folder=False, is_moderated=True).exists() %}
+      {% set picture = a.children.filter(is_folder=False).first().as_picture %}
+      {% set img = picture.get_download_thumb_url()  %}
+      {% set src = picture.name %}
     {% else %}
       {% set img = static('core/img/sas.jpg') %}
       {% set src = "sas.jpg" %}
     {% endif %}
-    <div class="album{% if not a.is_moderated %} not_moderated{% endif %}">
+    <div
+      class="album{% if not a.is_moderated %} not_moderated{% endif %}"
+    >
       <img src="{{ img }}" alt="{{ src }}" loading="lazy" />
       {% if not a.is_moderated %}
         <div class="overlay">&nbsp;</div>
@@ -25,7 +31,7 @@
 {% macro print_path(file) %}
   {% if file and file.parent %}
     {{ print_path(file.parent) }}
-    <a href="{{ url("sas:album", album_id=file.id) }}">{{ file.name }}</a> /
+    <a href="{{ url('sas:album', album_id=file.id) }}">{{ file.get_display_name() }}</a> /
   {% endif %}
 {% endmacro %}
 
@@ -33,7 +39,7 @@
   record of albums with alpine
 
   This needs to be used inside an alpine environment.
-  Downloaded pictures will be `pictures` from the
+  Downloaded pictures will be `pictures` from the 
   parent data store.
 
   Note:

sas/templates/sas/picture.jinja

@@ -1,9 +1,9 @@
 {% extends "core/base.jinja" %}
 
 {%- block additional_css -%}
-  <link rel="stylesheet" href="{{ static('bundled/core/components/ajax-select-index.css') }}">
-  <link rel="stylesheet" href="{{ static('core/components/ajax-select.scss') }}">
-  <link rel="stylesheet" href="{{ static('sas/css/picture.scss') }}">
+  <link defer rel="stylesheet" href="{{ static('bundled/core/components/ajax-select-index.css') }}">
+  <link defer rel="stylesheet" href="{{ static('core/components/ajax-select.scss') }}">
+  <link defer rel="stylesheet" href="{{ static('sas/css/picture.scss') }}">
 {%- endblock -%}
 
 {%- block additional_js -%}
@@ -104,7 +104,7 @@
                 <span
                   x-text="Intl.DateTimeFormat(
                           '{{ LANGUAGE_CODE }}', {dateStyle: 'long'}
-                          ).format(new Date(currentPicture.created_at))"
+                          ).format(new Date(currentPicture.date))"
                 >
                 </span>
               </div>

sas/tests/test_api.py

@@ -27,8 +27,8 @@ class TestSas(TestCase):
         cls.user_b, cls.user_c = subscriber_user.make(_quantity=2)
 
         picture = picture_recipe.extend(owner=owner)
-        cls.album_a = baker.make(Album)
-        cls.album_b = baker.make(Album)
+        cls.album_a = baker.make(Album, is_in_sas=True, parent=sas)
+        cls.album_b = baker.make(Album, is_in_sas=True, parent=sas)
         relation_recipe = Recipe(PeoplePictureRelation)
         relations = []
         for album in cls.album_a, cls.album_b:
@@ -61,7 +61,7 @@ class TestPictureSearch(TestSas):
         self.client.force_login(self.user_b)
         res = self.client.get(self.url + f"?album_id={self.album_a.id}")
         assert res.status_code == 200
-        expected = list(self.album_a.pictures.values_list("id", flat=True))
+        expected = list(self.album_a.children_pictures.values_list("id", flat=True))
         assert [i["id"] for i in res.json()["results"]] == expected
 
     def test_filter_by_user(self):
@@ -70,7 +70,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.order_by(
-                "-picture__parent__event_date", "picture__created_at"
+                "-picture__parent__date", "picture__date"
             ).values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -84,7 +84,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.union(self.user_b.pictures.all())
-            .order_by("-picture__parent__event_date", "picture__created_at")
+            .order_by("-picture__parent__date", "picture__date")
             .values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -97,7 +97,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_a.pictures.order_by(
-                "-picture__parent__event_date", "picture__created_at"
+                "-picture__parent__date", "picture__date"
             ).values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected
@@ -123,7 +123,7 @@ class TestPictureSearch(TestSas):
         assert res.status_code == 200
         expected = list(
             self.user_b.pictures.intersection(self.user_a.pictures.all())
-            .order_by("-picture__parent__event_date", "picture__created_at")
+            .order_by("-picture__parent__date", "picture__date")
             .values_list("picture_id", flat=True)
         )
         assert [i["id"] for i in res.json()["results"]] == expected

sas/tests/test_model.py

@@ -3,8 +3,8 @@ from model_bakery import baker
 
 from core.baker_recipes import old_subscriber_user, subscriber_user
 from core.models import User
-from sas.baker_recipes import album_recipe, picture_recipe
-from sas.models import Album, Picture
+from sas.baker_recipes import picture_recipe
+from sas.models import Picture
 
 
 class TestPictureQuerySet(TestCase):
@@ -44,22 +44,3 @@ class TestPictureQuerySet(TestCase):
         user.pictures.create(picture=self.pictures[1])  # moderated
         pictures = list(Picture.objects.viewable_by(user))
         assert pictures == [self.pictures[1]]
-
-
-class TestDeleteAlbum(TestCase):
-    def setUp(cls):
-        cls.album: Album = album_recipe.make()
-        cls.album_pictures = picture_recipe.make(parent=cls.album, _quantity=5)
-        cls.sub_album = album_recipe.make(parent=cls.album)
-        cls.sub_album_pictures = picture_recipe.make(parent=cls.sub_album, _quantity=5)
-
-    def test_delete(self):
-        album_ids = [self.album.id, self.sub_album.id]
-        picture_ids = [
-            *[p.id for p in self.album_pictures],
-            *[p.id for p in self.sub_album_pictures],
-        ]
-        self.album.delete()
-        # assert not p.exists()
-        assert not Album.objects.filter(id__in=album_ids).exists()
-        assert not Picture.objects.filter(id__in=picture_ids).exists()

sas/tests/test_views.py

@@ -136,7 +136,9 @@ class TestAlbumUpload:
 class TestSasModeration(TestCase):
     @classmethod
     def setUpTestData(cls):
-        album = baker.make(Album)
+        album = baker.make(
+            Album, parent_id=settings.SITH_SAS_ROOT_DIR_ID, is_moderated=True
+        )
         cls.pictures = picture_recipe.make(
             parent=album, _quantity=10, _bulk_create=True
         )

sas/views.py

@@ -12,7 +12,6 @@
 # OR WITHIN THE LOCAL FILE "LICENSE"
 #
 #
-from pathlib import Path
 from typing import Any
 
 from django.conf import settings
@@ -22,12 +21,12 @@ from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django.utils.safestring import SafeString
 from django.views.generic import CreateView, DetailView, TemplateView
-from django.views.generic.edit import FormMixin, FormView, UpdateView
+from django.views.generic.edit import FormView, UpdateView
 
 from core.auth.mixins import CanEditMixin, CanViewMixin
 from core.models import SithFile, User
-from core.views import FileView, UseFragmentsMixin
-from core.views.files import send_raw_file
+from core.views import UseFragmentsMixin
+from core.views.files import FileView, send_file
 from core.views.mixins import FragmentMixin, FragmentRenderer
 from core.views.user import UserTabsMixin
 from sas.forms import (
@@ -63,7 +62,6 @@ class AlbumCreateFragment(FragmentMixin, CreateView):
 
 
 class SASMainView(UseFragmentsMixin, TemplateView):
-    form_class = AlbumCreateForm
     template_name = "sas/main.jinja"
 
     def get_fragments(self) -> dict[str, FragmentRenderer]:
@@ -80,26 +78,12 @@ class SASMainView(UseFragmentsMixin, TemplateView):
         root_user = User.objects.get(pk=settings.SITH_ROOT_USER_ID)
         return {"album_create_fragment": {"owner": root_user}}
 
-    def dispatch(self, request, *args, **kwargs):
-        if request.method == "POST" and not self.request.user.has_perm("sas.add_album"):
-            raise PermissionDenied
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_form(self, form_class=None):
-        if not self.request.user.has_perm("sas.add_album"):
-            return None
-        return super().get_form(form_class)
-
-    def get_form_kwargs(self):
-        return super().get_form_kwargs() | {
-            "owner": User.objects.get(pk=settings.SITH_ROOT_USER_ID),
-            "parent": None,
-        }
-
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
         albums_qs = Album.objects.viewable_by(self.request.user)
-        kwargs["categories"] = list(albums_qs.filter(parent=None).order_by("id"))
+        kwargs["categories"] = list(
+            albums_qs.filter(parent_id=settings.SITH_SAS_ROOT_DIR_ID).order_by("id")
+        )
         kwargs["latest"] = list(albums_qs.order_by("-id")[:5])
         return kwargs
 
@@ -109,9 +93,6 @@ class PictureView(CanViewMixin, DetailView):
     pk_url_kwarg = "picture_id"
     template_name = "sas/picture.jinja"
 
-    def get_queryset(self):
-        return super().get_queryset().select_related("parent")
-
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
         if "rotate_right" in request.GET:
@@ -121,42 +102,31 @@ class PictureView(CanViewMixin, DetailView):
         return super().get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        return super().get_context_data(**kwargs) | {"album": self.object.parent}
+        return super().get_context_data(**kwargs) | {
+            "album": Album.objects.get(children=self.object)
+        }
 
 
 def send_album(request, album_id):
-    album = get_object_or_404(Album, id=album_id)
-    if not album.can_be_viewed_by(request.user):
-        raise PermissionDenied
-    return send_raw_file(Path(album.thumbnail.path))
+    return send_file(request, album_id, Album)
 
 
 def send_pict(request, picture_id):
-    picture = get_object_or_404(Picture, id=picture_id)
-    if not picture.can_be_viewed_by(request.user):
-        raise PermissionDenied
-    return send_raw_file(Path(picture.original.path))
+    return send_file(request, picture_id, Picture)
 
 
 def send_compressed(request, picture_id):
-    picture = get_object_or_404(Picture, id=picture_id)
-    if not picture.can_be_viewed_by(request.user):
-        raise PermissionDenied
-    return send_raw_file(Path(picture.compressed.path))
+    return send_file(request, picture_id, Picture, "compressed")
 
 
 def send_thumb(request, picture_id):
-    picture = get_object_or_404(Picture, id=picture_id)
-    if not picture.can_be_viewed_by(request.user):
-        raise PermissionDenied
-    return send_raw_file(Path(picture.thumbnail.path))
+    return send_file(request, picture_id, Picture, "thumbnail")
 
 
-class AlbumView(CanViewMixin, UseFragmentsMixin, FormMixin, DetailView):
+class AlbumView(CanViewMixin, UseFragmentsMixin, DetailView):
     model = Album
     pk_url_kwarg = "album_id"
     template_name = "sas/album.jinja"
-    form_class = PictureUploadForm
 
     def get_fragments(self) -> dict[str, FragmentRenderer]:
         return {
@@ -171,32 +141,27 @@ class AlbumView(CanViewMixin, UseFragmentsMixin, FormMixin, DetailView):
         except ValueError as e:
             raise Http404 from e
         if "clipboard" not in request.session:
-            request.session["clipboard"] = {"albums": [], "pictures": []}
+            request.session["clipboard"] = []
         return super().dispatch(request, *args, **kwargs)
 
-    def get_form(self, *args, **kwargs):
-        if not self.request.user.can_edit(self.object):
-            return None
-        return super().get_form(*args, **kwargs)
-
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
-        form = self.get_form()
-        if not form:
-            # the form is reserved for users that can edit this album.
-            # If there is no form, it means the user has no right to do a POST
-            raise PermissionDenied
-        FileView.handle_clipboard(self.request, self.object)
-        if not form.is_valid():
-            return self.form_invalid(form)
-        return self.form_valid(form)
+        if not self.object.file:
+            self.object.generate_thumbnail()
+        if request.user.can_edit(self.object):  # Handle the copy-paste functions
+            FileView.handle_clipboard(request, self.object)
+        return HttpResponseRedirect(self.request.path)
 
     def get_fragment_data(self) -> dict[str, dict[str, Any]]:
         return {"album_create_fragment": {"owner": self.request.user}}
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
-        kwargs["clipboard"] = {}
+        if ids := self.request.session.get("clipboard", None):
+            kwargs["clipboard"] = SithFile.objects.filter(id__in=ids)
+        kwargs["upload_form"] = PictureUploadForm()
+        # if True, the albums will be fetched with a request to the API
+        # if False, the section won't be displayed at all
         kwargs["show_albums"] = (
             Album.objects.viewable_by(self.request.user)
             .filter(parent_id=self.object.id)
@@ -242,7 +207,7 @@ class ModerationView(TemplateView):
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)
         kwargs["albums_to_moderate"] = Album.objects.filter(
-            is_moderated=False
+            is_moderated=False, is_in_sas=True, is_folder=True
         ).order_by("id")
         pictures = Picture.objects.filter(is_moderated=False).select_related("parent")
         kwargs["pictures"] = pictures

sith/settings.py

@@ -114,6 +114,7 @@ INSTALLED_APPS = (
     "subscription",
     "counter",
     "eboutic",
+    "launderette",
     "rootplace",
     "sas",
     "com",
@@ -722,6 +723,7 @@ if DEBUG:
         "debug_toolbar.panels.headers.HeadersPanel",
         "debug_toolbar.panels.request.RequestPanel",
         "debug_toolbar.panels.sql.SQLPanel",
+        "debug_toolbar.panels.staticfiles.StaticFilesPanel",
         "sith.toolbar_debug.TemplatesPanel",
         "debug_toolbar.panels.cache.CachePanel",
         "debug_toolbar.panels.signals.SignalsPanel",

staticfiles/processors.py

@@ -182,12 +182,13 @@ class OpenApi:
                 path[action]["operationId"] = "_".join(
                     desc["operationId"].split("_")[:-1]
                 )
-
         schema = str(schema)
 
         if old_hash == sha1(schema.encode("utf-8")).hexdigest():
             logging.getLogger("django").info("✨ Api did not change, nothing to do ✨")
             return
 
-        out.write_text(schema)
+        with open(out, "w") as f:
+            _ = f.write(schema)
+
         return subprocess.Popen(["npm", "run", "openapi"])