From 9bcfaf5fd57f611dec20f39c01d849493b4675c6 Mon Sep 17 00:00:00 2001
From: Pontoporeia <pontoporeia@happyngreen.fr>
Date: Sun, 10 May 2026 22:40:57 +0200
Subject: [PATCH] =?UTF-8?q?Make=20Auteur(s)=20and=20Acc=C3=A8s=20columns?=
 =?UTF-8?q?=20sortable=20alphabetically=20in=20admin=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TODO.md                              |  2 ++
 app/public/assets/css/form.css       |  1 +
 app/public/partage/recapitulatif.php |  6 ++----
 app/src/Database.php                 |  2 ++
 app/templates/admin/acces.php        | 13 +++++++++++++
 app/templates/admin/index-table.php  |  4 ++--
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/TODO.md b/TODO.md
index a7d7dcd..777d468 100644
--- a/TODO.md
+++ b/TODO.md
@@ -64,3 +64,5 @@
 - [x] Fix promoteurice array repopulation in partage form
   - [x] Fix old() to return raw arrays (not json_encode) for repopulation
   - [x] Handle jury_promoteur[] and jury_promoteur_ulb_name[] as arrays in partage/index.php
+- [x] Make Auteur(s) and Accès columns sortable alphabetically in admin list
+- [x] Merge both .recap-section sections into one + add margin-bottom: var(--space-l)
diff --git a/app/public/assets/css/form.css b/app/public/assets/css/form.css
index 3d3f8be..42c70f4 100644
--- a/app/public/assets/css/form.css
+++ b/app/public/assets/css/form.css
@@ -832,6 +832,7 @@ a.recap-file-name:hover {
   padding-top: var(--space-m);
   width: 100%;
   max-width: 620px;
+  margin-bottom: var(--space-l);
 }
 
 .recap-section h2 {
diff --git a/app/public/partage/recapitulatif.php b/app/public/partage/recapitulatif.php
index a0e02f6..d2d7591 100644
--- a/app/public/partage/recapitulatif.php
+++ b/app/public/partage/recapitulatif.php
@@ -171,10 +171,8 @@ $pageTitle = 'Merci — TFE enregistré';
                 <dd><?= htmlspecialchars($thesis['access_type']) ?></dd>
                 <?php endif; ?>
             </dl>
-        </section>
 
-        <?php if (!empty($files)): ?>
-        <section class="recap-section">
+            <?php if (!empty($files)): ?>
             <h2>Fichiers soumis</h2>
             <ul class="recap-file-list">
                 <?php foreach ($files as $f): ?>
@@ -210,8 +208,8 @@ $pageTitle = 'Merci — TFE enregistré';
                 </li>
                 <?php endforeach; ?>
             </ul>
+            <?php endif; ?>
         </section>
-        <?php endif; ?>
 
     </main>
 </body>
diff --git a/app/src/Database.php b/app/src/Database.php
index 969c5d9..deba4c2 100644
--- a/app/src/Database.php
+++ b/app/src/Database.php
@@ -814,10 +814,12 @@ class Database
         'id'           => 't.id',
         'identifier'   => 't.identifier',
         'title'        => 't.title',
+        'authors'      => 'authors',
         'year'         => 't.year',
         'orientation'  => 'o.name',
         'ap_program'   => 'ap.code',
         'is_published' => 't.is_published',
+        'access_type'  => 'at.name',
         'submitted_at' => 't.submitted_at',
     ];
 
diff --git a/app/templates/admin/acces.php b/app/templates/admin/acces.php
index 636e7fe..223a18c 100644
--- a/app/templates/admin/acces.php
+++ b/app/templates/admin/acces.php
@@ -493,6 +493,19 @@
 +%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
 +\\\\\\\        to: zxryvzkv 27814cea "Improve recap page + fix CSV import for jury roles" (rebased revision)
 ++                        $linkName = $link['name'] ?? '';
+++                        $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: zxryvzkv 27814cea "Improve recap page + fix CSV import for jury roles" (rebased revision)
+\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\        to: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
+-                        $linkName = $link['name'] ?? '';
+-                        $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: somsyvxz 14a3cd10 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebase destination)
+\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\        to: wpspurnq 087c2119 "Make Auteur(s) and Accès columns sortable alphabetically in admin list" (rebased revision)
+                         $linkName = $link['name'] ?? '';
+                         $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
+                         $linkLockedYear = $link['locked_year'] ?? null;
++%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision)
++\\\\\\\        to: wpspurnq 76964b90 "Make Auteur(s) and Accès columns sortable alphabetically in admin list" (rebased revision)
+++                        $linkName = $link['name'] ?? '';
 ++                        $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : '';
                     ?>
                     <tr class="admin-table-row" onclick="event.stopPropagation(); window.open('/partage/<?= urlencode($link['slug']) ?>', '_blank')" style="cursor:pointer">
diff --git a/app/templates/admin/index-table.php b/app/templates/admin/index-table.php
index e484324..0e2ff9f 100644
--- a/app/templates/admin/index-table.php
+++ b/app/templates/admin/index-table.php
@@ -48,12 +48,12 @@ $sortArrow = function(string $col) use ($sortCol, $sortDir): string {
             <th scope="col"><input type="checkbox" onchange="toggleAll(this)"></th>
             <th scope="col"><a href="<?= $sortLink('identifier') ?>" class="admin-sort-link" hx-get="<?= htmlspecialchars($sortLink('identifier')) ?>" hx-target="#admin-table-wrap" hx-swap="innerHTML" hx-indicator="#admin-search-indicator" hx-push-url="true">ID<?= $sortArrow('identifier') ?></a></th>
             <th scope="col"><a href="<?= $sortLink('title') ?>" class="admin-sort-link" hx-get="<?= htmlspecialchars($sortLink('title')) ?>" hx-target="#admin-table-wrap" hx-swap="innerHTML" hx-indicator="#admin-search-indicator" hx-push-url="true">Titre<?= $sortArrow('title') ?></a></th>
-            <th scope="col">Auteur(s)</th>
+            <th scope="col"><a href="<?= $sortLink('authors') ?>" class="admin-sort-link" hx-get="<?= htmlspecialchars($sortLink('authors')) ?>" hx-target="#admin-table-wrap" hx-swap="innerHTML" hx-indicator="#admin-search-indicator" hx-push-url="true">Auteur(s)<?= $sortArrow('authors') ?></a></th>
             <th scope="col"><a href="<?= $sortLink('year') ?>" class="admin-sort-link" hx-get="<?= htmlspecialchars($sortLink('year')) ?>" hx-target="#admin-table-wrap" hx-swap="innerHTML" hx-indicator="#admin-search-indicator" hx-push-url="true">Année<?= $sortArrow('year') ?></a></th>
             <th scope="col"><a href="<?= $sortLink('orientation') ?>" class="admin-sort-link" hx-get="<?= htmlspecialchars($sortLink('orientation')) ?>" hx-target="#admin-table-wrap" hx-swap="innerHTML" hx-indicator="#admin-search-indicator" hx-push-url="true">Orientation<?= $sortArrow('orientation') ?></a></th>
             <th scope="col"><a href="<?= $sortLink('ap_program') ?>" class="admin-sort-link" hx-get="<?= htmlspecialchars($sortLink('ap_program')) ?>" hx-target="#admin-table-wrap" hx-swap="innerHTML" hx-indicator="#admin-search-indicator" hx-push-url="true">AP<?= $sortArrow('ap_program') ?></a></th>
             <th scope="col"><a href="<?= $sortLink('is_published') ?>" class="admin-sort-link" hx-get="<?= htmlspecialchars($sortLink('is_published')) ?>" hx-target="#admin-table-wrap" hx-swap="innerHTML" hx-indicator="#admin-search-indicator" hx-push-url="true">Publié<?= $sortArrow('is_published') ?></a></th>
-            <th scope="col">Accès</th>
+            <th scope="col"><a href="<?= $sortLink('access_type') ?>" class="admin-sort-link" hx-get="<?= htmlspecialchars($sortLink('access_type')) ?>" hx-target="#admin-table-wrap" hx-swap="innerHTML" hx-indicator="#admin-search-indicator" hx-push-url="true">Accès<?= $sortArrow('access_type') ?></a></th>
             <th scope="col">Actions</th>
         </tr>
     </thead>