Merge pull request #1315 from ae-utbm/taiste

Product history, formula management, test election

.gitignore

@@ -24,9 +24,6 @@ node_modules/
 # compiled documentation
 site/
 
-# rollup-bundle-visualizer report
-.bundle-size-report.html
-
 ### Redis ###
 
 # Ignore redis binary dump (dump.rdb) files

biome.json

@@ -7,7 +7,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**/static/**", "vite.config.mts"]
+    "includes": ["**/static/**"]
   },
   "formatter": {
     "enabled": true,

club/api.py

@@ -6,10 +6,9 @@ from ninja_extra.pagination import PageNumberPaginationExtra
 from ninja_extra.schemas import PaginatedResponseSchema
 
 from api.auth import ApiKeyAuth
-from api.permissions import CanView, HasPerm
+from api.permissions import CanAccessLookup, CanView, HasPerm
 from club.models import Club, Membership
 from club.schemas import (
-    ClubProfileSchema,
     ClubSchema,
     ClubSearchFilterSchema,
     SimpleClubSchema,
@@ -23,21 +22,13 @@ class ClubController(ControllerBase):
     @route.get(
         "/search",
         response=PaginatedResponseSchema[SimpleClubSchema],
+        auth=[ApiKeyAuth(), SessionAuth()],
+        permissions=[CanAccessLookup],
         url_name="search_club",
     )
     @paginate(PageNumberPaginationExtra, page_size=50)
     def search_club(self, filters: Query[ClubSearchFilterSchema]):
-        return filters.filter(Club.objects.order_by("name")).values()
+        return filters.filter(Club.objects.all())
-
-    @route.get(
-        "/search-profile",
-        response=PaginatedResponseSchema[ClubProfileSchema],
-        url_name="search_club_profile",
-    )
-    @paginate(PageNumberPaginationExtra, page_size=50)
-    def search_club_profile(self, filters: Query[ClubSearchFilterSchema]):
-        """Same as /api/club/search, but with more returned data"""
-        return filters.filter(Club.objects.order_by("name"))
 
     @route.get(
         "/{int:club_id}",

club/schemas.py

@@ -30,7 +30,7 @@ class ClubProfileSchema(ModelSchema):
 
     class Meta:
         model = Club
-        fields = ["id", "name", "logo", "is_active", "short_description"]
+        fields = ["id", "name", "logo"]
 
     url: str
 

club/static/bundled/club/club-list-index.ts

@@ -1,63 +0,0 @@
-import { History, updateQueryString } from "#core:utils/history";
-import {
-  type ClubProfileSchema,
-  type ClubSearchClubData,
-  clubSearchClubProfile,
-  type Options,
-} from "#openapi";
-
-type ClubStatus = "active" | "inactive" | "both";
-const PAGE_SIZE = 50;
-
-document.addEventListener("alpine:init", () => {
-  Alpine.data("clubList", () => ({
-    clubName: "",
-    clubStatus: "active" as ClubStatus,
-    currentPage: 1,
-    nbPages: 1,
-    clubs: [] as ClubProfileSchema[],
-    loading: false,
-
-    async init() {
-      const urlParams = new URLSearchParams(window.location.search);
-      this.clubName = urlParams.get("clubName") || "";
-      this.clubStatus = urlParams.get("clubStatus") || "active";
-      this.currentPage = urlParams.get("currentPage") || 1;
-      for (const param of ["clubName", "clubStatus", "currentPage"]) {
-        this.$watch(param, async (value: number | string) => {
-          updateQueryString(param, value.toString(), History.Replace);
-          await this.loadClubs();
-        });
-      }
-      await this.loadClubs();
-    },
-    async loadClubs() {
-      this.loading = true;
-      const searchParams: Options<ClubSearchClubData> = {
-        query: { page: this.currentPage },
-      };
-      if (this.clubName) {
-        searchParams.query.search = this.clubName;
-      }
-      if (this.clubStatus === "active") {
-        searchParams.query.is_active = true;
-      } else if (this.clubStatus === "inactive") {
-        searchParams.query.is_active = false;
-      }
-      const res = await clubSearchClubProfile(searchParams);
-      this.nbPages = Math.ceil(res.data.count / PAGE_SIZE);
-      this.clubs = res.data.results;
-      this.loading = false;
-    },
-
-    getParagraphs(s: string) {
-      if (!s) {
-        return [];
-      }
-      return s
-        .split("\n")
-        .map((s) => s.trim())
-        .filter((s) => s !== "");
-    },
-  }));
-});

club/static/club/list.scss

@@ -1,47 +0,0 @@
-#club-list {
-  display: flex;
-  flex-direction: column;
-  gap: 2em;
-  padding: 2em;
-
-  .card {
-    display: block;
-    background-color: unset;
-
-    .club-image {
-      float: left;
-      margin-right: 2rem;
-      margin-bottom: .5rem;
-      width: 150px;
-      height: 150px;
-      border-radius: 10%;
-      background-color: rgba(173, 173, 173, 0.2);
-
-      @media screen and (max-width: 500px) {
-        width: 100px;
-        height: 100px;
-      }
-    }
-
-    i.club-image {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      color: black;
-    }
-
-    .content {
-      display: block;
-      text-align: justify;
-
-      h4 {
-        margin-top: 0;
-        margin-right: .5rem;
-      }
-
-      p {
-        font-size: 100%;
-      }
-    }
-  }
-}

club/templates/club/club_list.jinja

@@ -1,5 +1,4 @@
 {% extends "core/base.jinja" %}
-{% from "core/macros.jinja" import paginate_alpine %}
 
 {% block title -%}
   {% trans %}Club list{% endtrans %}
@@ -9,76 +8,45 @@
   {% trans %}The list of all clubs existing at UTBM.{% endtrans %}
 {%- endblock %}
 
-{% block additional_js %}
+{% macro display_club(club) -%}
-  <script type="module" src="{{ static("bundled/club/club-list-index.ts") }}"></script>
-{% endblock %}
 
-{% block additional_css %}
+  {% if club.is_active or user.is_root %}
-  <link rel="stylesheet" href="{{ static("club/list.scss") }}">
+
-{% endblock %}
+    <li><a href="{{ url('club:club_view', club_id=club.id) }}">{{ club.name }}</a>
+
+      {% if not club.is_active %}
+        ({% trans %}inactive{% endtrans %})
+      {% endif %}
+
+      {% if club.president %} - <a href="{{ url('core:user_profile', user_id=club.president.user.id) }}">{{ club.president.user }}</a>{% endif %}
+      {% if club.short_description %}<p>{{ club.short_description|markdown }}</p>{% endif %}
+
+  {% endif %}
+
+  {%- if club.children.all()|length != 0 %}
+    <ul>
+      {%- for c in club.children.order_by('name').prefetch_related("children") %}
+        {{ display_club(c) }}
+      {%- endfor %}
+    </ul>
+  {%- endif -%}
+  </li>
+{%- endmacro %}
 
 {% block content %}
-  <main x-data="clubList">
+  {% if user.is_root %}
-    <h3>{% trans %}Filters{% endtrans %}</h3>
+    <p><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></p>
-    <form id="club-list-filters">
+  {% endif %}
-      <div class="row gap-4x">
+  {% if club_list %}
-        <fieldset>
-          <label for="club-name-input">{% trans %}Name{% endtrans %}</label>
-          <input
-            id="club-name-input"
-            type="text"
-            name="club-name"
-            x-model.debounce.500ms="clubName"
-          />
-        </fieldset>
-        <fieldset class="grow">
-          <legend>{% trans %}Club state{% endtrans %}</legend>
-          <div class="row">
-            <input type="radio" id="filter-active-clubs" x-model="clubStatus" value="active">
-            <label for="filter-active-clubs">{% trans %}Active{% endtrans %}</label>
-          </div>
-          <div class="row">
-            <input type="radio" id="filter-inactive-clubs" x-model="clubStatus" value="inactive">
-            <label for="filter-inactive-clubs">{% trans %}Inactive{% endtrans %}</label>
-          </div>
-          <div class="row">
-            <input type="radio" id="filter-all-clubs" x-model="clubStatus" value="both">
-            <label for="filter-all-clubs">{% trans %}All clubs{% endtrans %}</label>
-          </div>
-        </fieldset>
-      </div>
-    </form>
     <h3>{% trans %}Club list{% endtrans %}</h3>
-    {% if user.has_perm("club.add_club") %}
+    <ul>
-      <br>
+      {%- for club in club_list %}
-      <a href="{{ url('club:club_new') }}" class="btn btn-blue">
+        {{ display_club(club) }}
-        <i class="fa fa-plus"></i> {% trans %}New club{% endtrans %}
+      {%- endfor %}
-      </a>
+    </ul>
-    {% endif %}
+  {% else %}
-    <section class="aria-busy-grow" :aria-busy="loading" id="club-list">
+    {% trans %}There is no club in this website.{% endtrans %}
-      <template x-for="club of clubs" :key="club.id">
+  {% endif %}
-        <div class="card">
-          <a :href="club.url">
-            <template x-if="club.logo">
-              <img class="club-image" :src="club.logo" :alt="`logo ${club.name}`">
-            </template>
-            <template x-if="!club.logo">
-              <i class="fa-regular fa-image fa-4x club-image"></i>
-            </template>
-          </a>
-          <div class="content">
-            <a :href="club.url">
-              <h4 x-text="`${club.name} ${club.is_active ? '' : '({% trans %}inactive{% endtrans %})'}`"></h4>
-            </a>
-            <template x-for="paragraph of getParagraphs(club.short_description)">
-              <p x-text="paragraph"></p>
-            </template>
-          </div>
-        </div>
-      </template>
-    </section>
-    {{ paginate_alpine("currentPage", "nbPages") }}
-  </main>
 {% endblock %}
 
 

club/tests/test_club.py

@@ -1,15 +1,12 @@
 from datetime import timedelta
 
 import pytest
-from django.test import Client
-from django.urls import reverse
 from django.utils.timezone import localdate
 from model_bakery import baker
 from model_bakery.recipe import Recipe
 
 from club.models import Club, Membership
 from core.baker_recipes import subscriber_user
-from core.models import User
 
 
 @pytest.mark.django_db
@@ -28,10 +25,3 @@ def test_club_queryset_having_board_member():
 
     club_ids = Club.objects.having_board_member(user).values_list("id", flat=True)
     assert set(club_ids) == {clubs[1].id, clubs[2].id}
-
-
-@pytest.mark.django_db
-def test_club_list(client: Client):
-    client.force_login(baker.make(User))
-    res = client.get(reverse("club:club_list"))
-    assert res.status_code == 200

club/tests/test_club_controller.py

@@ -59,14 +59,6 @@ class TestClubSearch(TestCase):
         ids = {d["id"] for d in response.json()["results"]}
         assert ids == {c.id for c in [self.clubs[0], self.clubs[1], self.clubs[3]]}
 
-    def test_club_search_profile(self):
-        self.client.force_login(self.user)
-        url = reverse("api:search_club_profile")
-        response = self.client.get(url, {"search": "AE"})
-        assert response.status_code == 200
-        ids = {d["id"] for d in response.json()["results"]}
-        assert ids == {c.id for c in [self.clubs[0], self.clubs[1], self.clubs[3]]}
-
 
 @pytest.mark.django_db
 class TestFetchClub:

club/views.py

@@ -42,7 +42,7 @@ from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
-from django.views.generic import DetailView, TemplateView, View
+from django.views.generic import DetailView, ListView, View
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.edit import CreateView, DeleteView, UpdateView
 
@@ -180,10 +180,15 @@ class ClubTabsMixin(TabedViewMixin):
         return tab_list
 
 
-class ClubListView(TemplateView):
+class ClubListView(ListView):
     """List the Clubs."""
 
+    model = Club
     template_name = "club/club_list.jinja"
+    queryset = (
+        Club.objects.filter(parent=None).order_by("name").prefetch_related("children")
+    )
+    context_object_name = "club_list"
 
 
 class ClubView(ClubTabsMixin, DetailView):

core/static/bundled/core/components/nfc-input-index.ts

@@ -26,6 +26,7 @@ export class NfcInput extends inheritHtmlElement("input") {
         window.alert(gettext("Unsupported NFC card"));
       });
 
+      // biome-ignore lint/correctness/noUndeclaredVariables: browser API
       ndef.addEventListener("reading", (event: NDEFReadingEvent) => {
         this.removeAttribute("scan");
         this.node.value = event.serialNumber.replace(/:/g, "").toUpperCase();

core/templates/core/base/navbar.jinja

@@ -5,8 +5,9 @@
     <details name="navbar" class="menu">
       <summary class="head">{% trans %}Associations & Clubs{% endtrans %}</summary>
       <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='ae') }}">{% trans %}AE{% endtrans %}</a></li>
-        <li><a href="{{ url("club:club_list") }}">{% trans %}AE's clubs{% 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">

core/views/user.py

@@ -248,15 +248,14 @@ class UserTabsMixin(TabedViewMixin):
                     "name": _("Groups"),
                 }
             )
-        can_view_account = (
+        if (
             hasattr(user, "customer")
             and user.customer
             and (
                 user == self.request.user
                 or self.request.user.has_perm("counter.view_customer")
             )
-        )
+        ):
-        if can_view_account or user.preferences.show_my_stats:
             tab_list.append(
                 {
                     "url": reverse("core:user_stats", kwargs={"user_id": user.id}),
@@ -264,7 +263,6 @@ class UserTabsMixin(TabedViewMixin):
                     "name": _("Stats"),
                 }
             )
-        if can_view_account:
             tab_list.append(
                 {
                     "url": reverse("core:user_account", kwargs={"user_id": user.id}),
@@ -351,7 +349,7 @@ class UserGodfathersTreeView(UserTabsMixin, CanViewMixin, DetailView):
         return kwargs
 
 
-class UserStatsView(UserTabsMixin, UserPassesTestMixin, DetailView):
+class UserStatsView(UserTabsMixin, CanViewMixin, DetailView):
     """Display a user's stats."""
 
     model = User
@@ -359,20 +357,15 @@ class UserStatsView(UserTabsMixin, UserPassesTestMixin, DetailView):
     context_object_name = "profile"
     template_name = "core/user_stats.jinja"
     current_tab = "stats"
-    queryset = User.objects.exclude(customer=None).select_related(
+    queryset = User.objects.exclude(customer=None).select_related("customer")
-        "customer", "_preferences"
-    )
 
-    def test_func(self):
+    def dispatch(self, request, *arg, **kwargs):
-        profile: User = self.get_object()
+        profile = self.get_object()
-        return (
+        if not (
-            profile == self.request.user
+            profile == request.user or request.user.has_perm("counter.view_customer")
-            or self.request.user.has_perm("counter.view_customer")
+        ):
-            or (
+            raise PermissionDenied
-                self.request.user.can_view(profile)
+        return super().dispatch(request, *arg, **kwargs)
-                and profile.preferences.show_my_stats
-            )
-        )
 
     def get_context_data(self, **kwargs):
         kwargs = super().get_context_data(**kwargs)

locale/fr/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-03-20 16:24+0100\n"
+"POT-Creation-Date: 2026-03-10 10:28+0100\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -310,36 +310,16 @@ msgid "The list of all clubs existing at UTBM."
 msgstr "La liste de tous les clubs existants à l'UTBM"
 
 #: club/templates/club/club_list.jinja
-msgid "Filters"
+msgid "inactive"
-msgstr "Filtres"
+msgstr "inactif"
-
-#: club/templates/club/club_list.jinja
-msgid "Name"
-msgstr "Nom"
-
-#: club/templates/club/club_list.jinja
-msgid "Club state"
-msgstr "Etat du club"
-
-#: club/templates/club/club_list.jinja
-msgid "Active"
-msgstr "Actif"
-
-#: club/templates/club/club_list.jinja
-msgid "Inactive"
-msgstr "Inactif"
-
-#: club/templates/club/club_list.jinja
-msgid "All clubs"
-msgstr "Tous les clubs"
 
 #: club/templates/club/club_list.jinja core/templates/core/user_tools.jinja
 msgid "New club"
 msgstr "Nouveau club"
 
 #: club/templates/club/club_list.jinja
-msgid "inactive"
+msgid "There is no club in this website."
-msgstr "inactif"
+msgstr "Il n'y a pas de club dans ce site web."
 
 #: club/templates/club/club_members.jinja
 msgid "Club members"
@@ -1880,6 +1860,10 @@ msgstr "L'AE"
 msgid "AE's clubs"
 msgstr "Les clubs de L'AE"
 
+#: core/templates/core/base/navbar.jinja
+msgid "Others UTBM's Associations"
+msgstr "Les autres associations de l'UTBM"
+
 #: core/templates/core/base/navbar.jinja
 msgid "Big event"
 msgstr "Grandes Activités"

package.json

@@ -8,6 +8,8 @@
     "compile-dev": "vite build --mode development",
     "serve": "vite build --mode development --watch --minify false",
     "openapi": "openapi-ts",
+    "analyse-dev": "vite-bundle-visualizer --mode development",
+    "analyse-prod": "vite-bundle-visualizer --mode production",
     "check": "tsc && biome check --write"
   },
   "keywords": [],
@@ -33,9 +35,10 @@
     "@types/cytoscape-cxtmenu": "^3.4.5",
     "@types/cytoscape-klay": "^3.1.5",
     "@types/js-cookie": "^3.0.6",
-    "rollup-plugin-visualizer": "^7.0.1",
     "typescript": "^5.9.3",
-    "vite": "^8.0.0"
+    "vite": "^7.3.1",
+    "vite-bundle-visualizer": "^1.2.1",
+    "vite-plugin-static-copy": "^3.2.0"
   },
   "dependencies": {
     "@alpinejs/sort": "^3.15.8",

sith/settings.py

@@ -355,6 +355,7 @@ SITH_TWITTER = "@ae_utbm"
 # AE configuration
 SITH_MAIN_CLUB_ID = env.int("SITH_MAIN_CLUB_ID", default=1)
 SITH_PDF_CLUB_ID = env.int("SITH_PDF_CLUB_ID", default=2)
+SITH_LAUNDERETTE_CLUB_ID = env.int("SITH_LAUNDERETTE_CLUB_ID", default=84)
 
 # Main root for club pages
 SITH_CLUB_ROOT_PAGE = "clubs"
@@ -482,6 +483,13 @@ SITH_LOG_OPERATION_TYPE = [
 
 SITH_PEDAGOGY_UTBM_API = "https://extranet1.utbm.fr/gpedago/api/guide"
 
+SITH_ECOCUP_CONS = env.int("SITH_ECOCUP_CONS", default=1151)
+
+SITH_ECOCUP_DECO = env.int("SITH_ECOCUP_DECO", default=1152)
+
+# The limit is the maximum difference between cons and deco possible for a customer
+SITH_ECOCUP_LIMIT = 3
+
 # Defines pagination for cash summary
 SITH_COUNTER_CASH_SUMMARY_LENGTH = 50
 
@@ -504,6 +512,7 @@ SITH_PRODUCT_SUBSCRIPTION_ONE_SEMESTER = env.int(
 SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS = env.int(
     "SITH_PRODUCT_SUBSCRIPTION_TWO_SEMESTERS", default=2
 )
+SITH_PRODUCTTYPE_SUBSCRIPTION = env.int("SITH_PRODUCTTYPE_SUBSCRIPTION", default=2)
 
 # Number of weeks before the end of a subscription when the subscriber can resubscribe
 SITH_SUBSCRIPTION_END = 10

vite.config.mts

@@ -1,17 +1,14 @@
+// biome-ignore lint/correctness/noNodejsModules: this is backend side
 import { parse, resolve } from "node:path";
 import inject from "@rollup/plugin-inject";
 import { glob } from "glob";
-import { visualizer } from "rollup-plugin-visualizer";
+import type { Rollup } from "vite";
-import {
+import { type AliasOptions, defineConfig, type UserConfig } from "vite";
-  type AliasOptions,
-  defineConfig,
-  type PluginOption,
-  type Rollup,
-  type UserConfig,
-} from "vite";
 import tsconfig from "./tsconfig.json";
 
 const outDir = resolve(__dirname, "./staticfiles/generated/bundled");
+const vendored = resolve(outDir, "vendored");
+const nodeModules = resolve(__dirname, "node_modules");
 const collectedFiles = glob.sync(
   "./!(static)/static/bundled/**/*?(-)index.?(m)[j|t]s?(x)",
 );
@@ -45,6 +42,7 @@ function getRelativeAssetPath(path: string): string {
   return relativePath.join("/");
 }
 
+// biome-ignore lint/style/noDefaultExport: this is recommended by documentation
 export default defineConfig((config: UserConfig) => {
   return {
     base: "/static/bundled/",
@@ -88,7 +86,6 @@ export default defineConfig((config: UserConfig) => {
         Alpine: "alpinejs",
         htmx: "htmx.org",
       }),
-      visualizer({ filename: ".bundle-size-report.html" }) as PluginOption,
     ],
   } satisfies UserConfig;
 });