From 5fa431e29ba50280e2f374cb08fd6dc1fdae3ea6 Mon Sep 17 00:00:00 2001
From: imperosol <thgirod@hotmail.com>
Date: Tue, 21 Jan 2025 16:01:50 +0100
Subject: [PATCH] Visually differentiate closed UVs from the others

---
 locale/fr/LC_MESSAGES/django.po            | 19 +++++++++++--------
 pedagogy/api.py                            |  2 +-
 pedagogy/static/pedagogy/css/pedagogy.scss |  7 +++++--
 pedagogy/templates/pedagogy/guide.jinja    | 14 ++++++++++----
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 0cfef902..10fe885d 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -935,10 +935,6 @@ msgstr "rôle"
 msgid "description"
 msgstr "description"
 
-#: club/models.py
-msgid "past member"
-msgstr "ancien membre"
-
 #: club/models.py
 msgid "Email address"
 msgstr "Adresse email"
@@ -3308,8 +3304,8 @@ msgstr "Nom d'utilisateur, email, ou numéro de compte AE"
 
 #: core/views/forms.py
 msgid ""
-"Profile: you need to be visible on the picture, in order to be recognized "
-"(e.g. by the barmen)"
+"Profile: you need to be visible on the picture, in order to be recognized (e."
+"g. by the barmen)"
 msgstr ""
 "Photo de profil: vous devez être visible sur la photo afin d'être reconnu "
 "(par exemple par les barmen)"
@@ -3919,8 +3915,8 @@ msgstr ""
 #: counter/templates/counter/mails/account_dump.jinja
 msgid "If you think this was a mistake, please mail us at ae@utbm.fr."
 msgstr ""
-"Si vous pensez qu'il s'agit d'une erreur, veuillez envoyer un mail à "
-"ae@utbm.fr."
+"Si vous pensez qu'il s'agit d'une erreur, veuillez envoyer un mail à ae@utbm."
+"fr."
 
 #: counter/templates/counter/mails/account_dump.jinja
 msgid ""
@@ -4948,6 +4944,10 @@ msgstr "Département"
 msgid "Credit type"
 msgstr "Type de crédit"
 
+#: pedagogy/templates/pedagogy/guide.jinja
+msgid "closed uv"
+msgstr "uv fermée"
+
 #: pedagogy/templates/pedagogy/macros.jinja
 msgid " not rated "
 msgstr "non noté"
@@ -5990,3 +5990,6 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée."
 #, python-format
 msgid "Maximum characters: %(max_length)s"
 msgstr "Nombre de caractères max: %(max_length)s"
+
+#~ msgid "past member"
+#~ msgstr "ancien membre"
diff --git a/pedagogy/api.py b/pedagogy/api.py
index ce1fdde0..9ad0c3f6 100644
--- a/pedagogy/api.py
+++ b/pedagogy/api.py
@@ -46,4 +46,4 @@ class UvController(ControllerBase):
     )
     @paginate(PageNumberPaginationExtra, page_size=100)
     def fetch_uv_list(self, search: Query[UvFilterSchema]):
-        return search.filter(UV.objects.values())
+        return search.filter(UV.objects.order_by("code").values())
diff --git a/pedagogy/static/pedagogy/css/pedagogy.scss b/pedagogy/static/pedagogy/css/pedagogy.scss
index a4ebb370..51656615 100644
--- a/pedagogy/static/pedagogy/css/pedagogy.scss
+++ b/pedagogy/static/pedagogy/css/pedagogy.scss
@@ -47,11 +47,14 @@ $large-devices: 992px;
     }
   }
 
-  #dynamic_view {
+  #uv-list {
     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;
diff --git a/pedagogy/templates/pedagogy/guide.jinja b/pedagogy/templates/pedagogy/guide.jinja
index 79b66c24..460fdcc5 100644
--- a/pedagogy/templates/pedagogy/guide.jinja
+++ b/pedagogy/templates/pedagogy/guide.jinja
@@ -85,7 +85,7 @@
         </div>
       </div>
     </form>
-    <table id="dynamic_view">
+    <table id="uv-list">
       <thead>
         <tr>
           <td>{% trans %}UV{% endtrans %}</td>
@@ -102,11 +102,17 @@
           {% endif %}
         </tr>
       </thead>
-      <tbody id="dynamic_view_content" :aria-busy="loading">
+      <tbody :aria-busy="loading">
         <template x-for="uv in uvs.results" :key="uv.id">
-          <tr @click="window.location.href = `/pedagogy/uv/${uv.id}`" class="clickable">
+          <tr
+            @click="window.location.href = `/pedagogy/uv/${uv.id}`"
+            class="clickable"
+            :class="{closed: uv.semester === 'CLOSED'}"
+          >
             <td><a :href="`/pedagogy/uv/${uv.id}`" x-text="uv.code"></a></td>
-            <td x-text="uv.title"></td>
+            <td class="title"
+                x-text="uv.title + (uv.semester === 'CLOSED' ? ' ({% trans %}closed uv{% endtrans %})' : '')"
+            ></td>
             <td x-text="uv.department"></td>
             <td x-text="uv.credit_type"></td>
             <td><i :class="uv.semester.includes('AUTUMN') && 'fa fa-leaf'"></i></td>