From 2bacc7849287915ac80189dbf2da9ff5050be2fc Mon Sep 17 00:00:00 2001 From: Pontoporeia Date: Sun, 10 May 2026 23:22:38 +0200 Subject: [PATCH] =?UTF-8?q?import=20dialog:=20add=20Termin=C3=A9=20button,?= =?UTF-8?q?=20fix=20padding,=20make=20success=20permanent,=20avoid=20POST?= =?UTF-8?q?=20resend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit import dialog: add Terminé button, fix padding, make success permanent, avoid POST resend --- TODO.md | 1 + app/public/assets/css/admin.css | 2 +- app/templates/admin/acces.php | 13 +++++++++++++ app/templates/admin/index.php | 19 ++++++++++++++++++- 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index 4dff1f0..86e0759 100644 --- a/TODO.md +++ b/TODO.md @@ -4,6 +4,7 @@ - [x] Display ALL submitted info in recapitulatif page + email recap - [x] Add "validate your info / contact xamxam@erg.be" note on recap page - [x] Fix CSV import: lecteur interne/externe + promoteurice ULB not imported with correct role/is_external/is_ulb flags +- [x] Add "Terminé" button to import dialog on success (closes dialog + reloads page to clear form) - [x] Replace HTMX+PHP file upload queues with client-side JS - [x] Fix submit button on all forms — add JS/PHP debug logging diff --git a/app/public/assets/css/admin.css b/app/public/assets/css/admin.css index 222a5c0..c8591a6 100644 --- a/app/public/assets/css/admin.css +++ b/app/public/assets/css/admin.css @@ -1082,7 +1082,7 @@ th.admin-ap-col { .admin-dialog .admin-form-footer { display: flex; gap: var(--space-xs); - padding-bottom: var(--space-m); + padding: 0 var(--space-l) var(--space-m); } /* Small/confirmation dialog variant */ diff --git a/app/templates/admin/acces.php b/app/templates/admin/acces.php index fd91655..14cea5e 100644 --- a/app/templates/admin/acces.php +++ b/app/templates/admin/acces.php @@ -519,6 +519,19 @@ +%%%%%%% diff from: somsyvxz 249f7943 "Bulk bar anti-shift, tags icons, AP no-wrap, credits reorder" (rebased revision) +\\\\\\\ to: snsxswsz 5a33fb93 "fix: jury-fieldset.php calling old() with wrong signature for partage" (rebased revision) ++ $linkName = $link['name'] ?? ''; +++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : ''; +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff from: snsxswsz 5a33fb93 "fix: jury-fieldset.php calling old() with wrong signature for partage" (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: ryqustol 90de0848 "import dialog: add Terminé button, fix padding, make success permanent, avoid POST resend" (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: ryqustol a5179270 "import dialog: add Terminé button, fix padding, make success permanent, avoid POST resend" (rebased revision) +++ $linkName = $link['name'] ?? ''; ++ $linkExpiresVal = $link['expires_at'] ? date('Y-m-d\TH:i', strtotime($link['expires_at'])) : ''; ?> diff --git a/app/templates/admin/index.php b/app/templates/admin/index.php index 84a4949..7ddb5e2 100644 --- a/app/templates/admin/index.php +++ b/app/templates/admin/index.php @@ -178,11 +178,27 @@ document.addEventListener('htmx:afterSwap',()=>{document.querySelectorAll('input -

+

+ + +
+ Logs d'importation ( entrées) + +
+ + +
@@ -214,6 +230,7 @@ document.addEventListener('htmx:afterSwap',()=>{document.querySelectorAll('input +