From 79a37198920beb6a99c74aaeaa20b0633ee4f3cf Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Mon, 18 Nov 2024 20:47:48 +0100
Subject: [PATCH] =?UTF-8?q?am=C3=A9liorations=20mineures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _nav.html               |  1 +
 inventaire.html         |  9 +++++----
 inventaire_nonprop.html | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/_nav.html b/_nav.html
index c49a597..43be605 100644
--- a/_nav.html
+++ b/_nav.html
@@ -15,6 +15,7 @@
 			<li {{if $subcurrent == 'proprio'}} class="current"{{/if}}><a href="{{$module.url}}index.html?prop=1">Matériels permanents</a></li>
 			<li {{if $subcurrent == 'nonproprio'}} class="current"{{/if}}><a href="{{$module.url}}index.html?prop=0">Matériels temporaires</a></li>
 		</ul>
+
 		{{if $subsubcurrent == 'mouvements'}}
 			<ul class="sub">
 				<li class="title"><strong>{{$eqpmt}} ({{$category}})</strong></li>
diff --git a/inventaire.html b/inventaire.html
index b1f8038..085bcda 100644
--- a/inventaire.html
+++ b/inventaire.html
@@ -7,18 +7,18 @@
 *}}
 
 {{* Extraire et compiler les infos de la base *}}
-{{:include file="./_calcul_dispo.html" keep="cumul_mvt,category_keys,equipments"}}
+{{:include file="./_calcul_dispo.html" keep="cumul_mvt,equipments"}}
 
 {{* Vérifier s'il y a au moins un matériel propriété de l'asso *}}
-{{:assign mat_prop=false}}
+{{:assign mat_present=false}}
 {{#foreach from=$equipments key=key item=eqpmt}}
 	{{if $eqpmt|has_key:"stock"}}
-		{{:assign mat_prop=true}}
+		{{:assign mat_present=true}}
 		{{:break}}
 	{{/if}}
 {{/foreach}}
 
-{{if $mat_prop}}
+{{if $mat_present}}
 
 	{{* Sélecteur catégories *}}
 	<fieldset class="shortForm" style="width: 30%;">
@@ -39,6 +39,7 @@
 	</fieldset>
 
 	<h2>Matériels propriété de l'association</h2>
+
 	{{#list
 		select="
 		$$.date AS 'Date' ;
diff --git a/inventaire_nonprop.html b/inventaire_nonprop.html
index dfba20d..e468028 100644
--- a/inventaire_nonprop.html
+++ b/inventaire_nonprop.html
@@ -7,18 +7,18 @@
 *}}
 
 {{* Extraire et compiler les infos de la base *}}
-{{:include file="./_calcul_dispo.html" keep="cumul_mvt,category_keys,equipments"}}
+{{:include file="./_calcul_dispo.html" keep="cumul_mvt,equipments"}}
 
 {{* Vérifier s'il y a au moins un matériel non propriété de l'asso *}}
-{{:assign mat_non_prop=false}}
+{{:assign mat_present=false}}
 {{#foreach from=$equipments key=key item=eqpmt}}
 	{{if $eqpmt|has_key:"nonproprio"}}
-		{{:assign mat_non_prop=true}}
+		{{:assign mat_present=true}}
 		{{:break}}
 	{{/if}}
 {{/foreach}}
 
-{{if $mat_non_prop}}
+{{if $mat_present}}
 
 	{{* Sélecteur catégories *}}
 	<fieldset class="shortForm" style="width: 30%;">
@@ -90,7 +90,7 @@
 				shape="table"}}
 				{{:linkbutton
 				label="Modifier"
-				href="modifier_materiel.html?key=%s&prop=0"|args:$equipment
+				href="%smodifier_materiel.html?key=%s&prop=0"|args:$module.url:$equipment
 				shape="edit"
 				target="_dialog"}}
 			</td>