From 5eb21a313806ebf6cb09eb9c6e41163dc628fd31 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Fri, 29 May 2026 10:48:40 +0200 Subject: [PATCH 1/3] Suppression fichier devenu inutile --- _temp_inventory.html | 90 -------------------------------------------- 1 file changed, 90 deletions(-) delete mode 100644 _temp_inventory.html diff --git a/_temp_inventory.html b/_temp_inventory.html deleted file mode 100644 index d4b29d4..0000000 --- a/_temp_inventory.html +++ /dev/null @@ -1,90 +0,0 @@ -{{* -*- brindille -*- *}} - -{{* - inventaire des entrées/sorties des matériels temporaires -*}} - -{{* filtrer selon la catégorie *}} -{{if $_GET.cat_key == null}} - {{:assign selected_category=$module.config.temp_cat_key}} - {{if $module.config.temp_cat_key != null}} - {{:assign cat_key=$selected_category|quote_sql}} - {{/if}} -{{elseif $_GET.cat_key == -1}} - {{:assign selected_category=null}} - {{:save key="config" temp_cat_key=null}} -{{else}} - {{:assign selected_category=$_GET.cat_key}} - {{:assign cat_key=$selected_category|quote_sql}} - {{:save key="config" temp_cat_key=$selected_category}} -{{/if}} - -{{* condition de filtrage *}} -{{if $selected_category != null}} - {{:assign cat_condition="$$.category = %s"|args:$cat_key}} -{{else}} - {{:assign cat_condition="1"}} -{{/if}} - -{{* Sélecteur catégories *}} -{{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1&prop=0"}} -{{#load type="category" order="$$.name"}} - {{:assign var="categories.%s"|args:$key value=$name}} - {{:assign - var="cat_options." - value=$key - label=$name - href="?cat_key=%s&prop=0"|args:$key - }} -{{/load}} - -
- Filtrer par catégorie - {{:dropdown - title="Filtrer par catégorie" - options=$cat_options - value="%s"|args:$selected_category - }} -
- -
-

Inventaire des matériels empruntés ou loués

-
- -{{#list - select=" - $$.name AS 'Matériel' ; - (SELECT $$.name - FROM @TABLE as cat - WHERE cat.key = @TABLE.$$.category) AS 'Catégorie' ; - $$.notowned AS 'Quantité' - " - type="equipment" - where="$$.status <> 'archived' AND $$.notowned != 0 AND %s"|args:$cat_condition - order=1 - }} - {{:assign var=cat_name from=categories.%s|args:$category}} - - {{:link href="equipment_history.html?key=%s&prop=0"|args:$key" label=$name}} - {{$cat_name}} - {{$col3}} - - {{:linkbutton - label="Entrée" - shape="plus" - href="movements/input_equipment.html?key=%s"|args:$key - target="_dialog"}} - {{:linkbutton - label="Historique" - href="equipment_history.html?key=%s&prop=0"|args:$key - shape="table"}} - {{:linkbutton - label="Modifier" - href="modify_equipment.html?key=%s&prop=0"|args:$key - shape="edit" - target="_dialog"}} - - -{{else}} -

Aucun matériel.

-{{/list}} From e3dc23d6d8ecf656a6ade0c31472a365ed72fced Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Fri, 29 May 2026 10:49:11 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Correction=20erreur=20param=C3=A8tre=20prop?= =?UTF-8?q?ri=C3=A9t=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _inventory.html | 4 ++-- movements/movement_details.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_inventory.html b/_inventory.html index ce8cffc..896634e 100644 --- a/_inventory.html +++ b/_inventory.html @@ -122,11 +122,11 @@ {{:linkbutton label="Mouvements" - href="equipment_history.html?key=%s&prop=1"|args:$key + href="equipment_history.html?key=%s&prop=%s"|args:$key:$selected_prop shape="table"}} {{:linkbutton label="Modifier" - href="modify_equipment.html?key=%s&prop=1"|args:$key + href="modify_equipment.html?key=%s&prop=%s"|args:$key:$selected_prop shape="edit" target="_dialog"}} diff --git a/movements/movement_details.html b/movements/movement_details.html index 7011d81..5135ec9 100644 --- a/movements/movement_details.html +++ b/movements/movement_details.html @@ -68,7 +68,7 @@
Matériel
{{:link href="../equipment_history.html?key=%s&prop=%s"|args:$equipment.key:$_GET.prop label=$equipment.name}}
Catégorie
-
{{:link href="../index.html?cat_key=%s&prop=1"|args:$category.key label=$category.name}}
+
{{:link href="../index.html?cat_key=%s&prop=%s"|args:$category.key:$_GET.prop label=$category.name}}
Date
{{$mvt.date|date_short}}
Quantité
From 3be1f40ffb7aec83b9b41e739252fd4fa7f97c1f Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Fri, 29 May 2026 10:49:36 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Am=C3=A9lioration=20gestion=20config?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _get_config.html | 23 ++++++++++++----------- module.ini | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/_get_config.html b/_get_config.html index 0ebc002..9273f17 100644 --- a/_get_config.html +++ b/_get_config.html @@ -8,21 +8,22 @@ {{* config par défaut *}} {{:read file="./default.json" assign="config_defaut"}} {{:assign config_defaut=$config_defaut|json_decode}} - {{:assign var="directions.input" value="entrée"}} {{:assign var="directions.output" value="sortie"}} {{#foreach from=$directions key="direction"}} + {{* config par défaut *}} + {{:assign var="nature_defaut" from="config_defaut.%ss"|args:$direction}} + {{:assign keys_defaut=$nature_defaut|keys}} + {{#foreach from=$nature_defaut item="elem"}} + {{:assign var="config.%s_nature.%s"|args:$direction:$key value=$elem}} + {{/foreach}} + + {{* config enregistrée *}} {{:assign var="nature" from="module.config.%s_nature"|args:$direction}} - {{if $nature != null}} - {{#foreach from=$nature item="elem"}} + {{#foreach from=$nature item="elem"}} + {{if ! $elem.key|in:$keys_defaut}} {{:assign var="config.%s_nature.%s"|args:$direction:$key value=$elem}} - {{/foreach}} - {{else}} - {{* pas de config enregistrée : utiliser la config par défaut *}} - {{:assign var="nature" from="config_defaut.%ss"|args:$direction}} - {{#foreach from=$nature item="elem"}} - {{:assign var="config.%s_nature.%s"|args:$direction:$key value=$elem}} - {{/foreach}} - {{/if}} + {{/if}} + {{/foreach}} {{/foreach}} diff --git a/module.ini b/module.ini index b64a48c..853d668 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ name="Gestion des matériels" -description="Permet de gérer un inventaire de matériels, ainsi que de suivre les prêts.\nversion 0.7" +description="Permet de gérer un inventaire de matériels, ainsi que de suivre les prêts.\nversion 0.71 author="Jean-Christophe Engel" author_url="https://gitea.zaclys.com/lesanges" home_button=true