From a0293c3e921e4a409308f575c795a13937433bd2 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 8 Oct 2025 14:41:31 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Simplification=20op=C3=A9rations=20cat?= =?UTF-8?q?=C3=A9gories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- categories/delete_category.html | 2 +- categories/index.html | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/categories/delete_category.html b/categories/delete_category.html index 203bb60..7430344 100644 --- a/categories/delete_category.html +++ b/categories/delete_category.html @@ -7,7 +7,7 @@ {{#form on="delete"}} {{* Vérifier s'il reste des matériels dans cette catégorie *}} - {{#load type="equipment" category=$_GET.key assign="equipment"}} + {{#load type="equipment" category=$_GET.key limit="1"}} {{:redirect force="./index.html?err=1&msg=suppression"}} {{else}} {{* supprimer la catégorie sélectionnée*}} diff --git a/categories/index.html b/categories/index.html index aac2a00..0eb43d0 100644 --- a/categories/index.html +++ b/categories/index.html @@ -27,15 +27,17 @@ {{:assign category_key=$key}} {{* voir s'il y a des matériels dans cette catégorie *}} {{:assign materiel_present=true}} - {{#load type="equipment" where="$$.category = :category_key" :category_key=$category_key}} + {{#load type="equipment" where="$$.category = :category_key" :category_key=$category_key limit=1}} {{else}} {{:assign materiel_present=false}} {{/load}} {{$name}} + {{if ! $materiel_present}} + {{:linkbutton label="Supprimer" href="delete_category.html?key=%s"|args:$key shape="delete" target="_dialog"}} + {{/if}} {{:linkbutton label="Modifier" href="modify_category.html?key=%s"|args:$key shape="edit" target="_dialog"}} - {{:linkbutton label="Supprimer" href="delete_category.html?key=%s"|args:$key shape="delete" target="_dialog"}} {{else}} From a56ab4b4ed44d4a75e8da09f213d02f27673ea08 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 8 Oct 2025 14:46:48 +0200 Subject: [PATCH 2/3] Correction style colonne non triable --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index 2193b11..39ae075 100644 --- a/style.css +++ b/style.css @@ -21,6 +21,6 @@ } /* désactiver rétroaction pour colonnes non triables */ -table.list > thead td[class~=nosort] a:hover { +table.list > thead th[class~=nosort] a:hover { background-color : rgba(var(--gSecondColor), 0.); } From 8c81d07efc5e8e6b3fc792ab0b28fcd2b9348158 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 8 Oct 2025 14:47:20 +0200 Subject: [PATCH 3/3] Inhiber tri colonne operation --- equipment_history.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/equipment_history.html b/equipment_history.html index ecf5a97..3ce6424 100644 --- a/equipment_history.html +++ b/equipment_history.html @@ -193,7 +193,7 @@ {{$date|date_short}} {{$col2}} - {{$op_label}} + {{$op_label}} {{$amount}} {{$stock}} {{$exterieur}} @@ -291,7 +291,7 @@ {{$date|date_short}} {{$col2}} - {{$op_label}} + {{$op_label}} {{$amount}} {{$stock}} {{$col6}}