From 6757757f6342bd57edc92433e1f9780c4f28eb0d Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Mon, 18 Nov 2024 12:22:23 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20navigation=20inventaire=20p?=
 =?UTF-8?q?rop/non?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _nav.html                      | 12 +++++++++---
 index.html                     | 18 +++++++++++-------
 inventaire.html                |  6 +++---
 inventaire_nonprop.html        | 11 +++--------
 mouvements/ajouter_entree.html |  5 +++--
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/_nav.html b/_nav.html
index 88bb763..c49a597 100644
--- a/_nav.html
+++ b/_nav.html
@@ -6,14 +6,14 @@
 	{{/if}}
 
 	<ul>
-		<li {{if $current == 'inventaire'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Inventaire</a></li>
+		<li {{if $current == 'inventaire'}} class="current"{{/if}}><a href="{{$module.url}}index.html?prop=1">Inventaire</a></li>
 		<li {{if $current == 'config'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Configuration</a></li>
 	</ul>
 
 	{{if $current == 'inventaire'}}
 		<ul class="sub">
-			<li {{if $subcurrent == 'proprio'}} class="current"{{/if}}><a href="{{$module.url}}index.html">Matériels permanents</a></li>
-			<li {{if $subcurrent == 'nonproprio'}} class="current"{{/if}}><a href="{{$module.url}}inventaire_nonprop.html">Matériels temporaires</a></li>
+			<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">
@@ -22,6 +22,12 @@
 			</ul>
 		{{/if}}
 	{{elseif $current == 'config'}}
+		{{if $subcurrent == 'typesES'}}
+			<aside>
+				{{:linkbutton label="Ajouter un type d'entrée" shape="plus" href="config/ajouter_type_mouvement.html?dir=input" target="_dialog"}}
+				{{:linkbutton label="Ajouter un type de sortie" shape="plus" href="config/ajouter_type_mouvement.html?dir=output" target="_dialog"}}
+			</aside>
+		{{/if}}
 		<ul class="sub" >
 			<li {{if $subcurrent == 'categories'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Catégories</a></li>
 			<li {{if $subcurrent == 'typesES'}} class="current"{{/if}}><a href="{{$module.url}}config.html">Types ES</a></li>
diff --git a/index.html b/index.html
index d0360a2..c2b5b9a 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,12 @@
 {{:admin_header title="Gestion des matériels" custom_css=$custom_css current="module_equipment"}}
 
 {{* barre de navigation *}}
-{{:include file="_nav.html" current="inventaire" subcurrent="proprio"}}
+{{if $_GET.prop == null || $_GET.prop}}
+	{{:assign proprio="proprio"}}
+{{else}}
+	{{:assign proprio="nonproprio"}}
+{{/if}}
+{{:include file="_nav.html" current="inventaire" subcurrent="%s"|args:$proprio}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg == "ajout" }}
@@ -24,12 +29,11 @@
 {{if $category_keys|count == 0}}
 	<p class="block alert">Il n'y a aucune catégorie : vous devez en ajouter.</p>
 {{else}}
-{{*
-	<fieldset>
-		{{:linkbutton label="Ajouter un nouveau matériel" shape="plus" href="mouvements/ajouter_entree.html" target="_dialog"}}
-	</fieldset>
-*}}
-	{{:include file="./inventaire.html" print_cat_name=true}}
+	{{if $_GET.prop == null || $_GET.prop}}
+		{{:include file="./inventaire.html"}}
+	{{else}}
+		{{:include file="./inventaire_nonprop.html"}}
+	{{/if}}
 {{/if}}
 
 {{:admin_footer}}
diff --git a/inventaire.html b/inventaire.html
index 5f226c2..b1f8038 100644
--- a/inventaire.html
+++ b/inventaire.html
@@ -26,10 +26,10 @@
 		<nav class="dropdown">
 			<ul>
 				<li><a></a></li>
-				<li{{if $_GET.cat_key == null}} class="selected"{{/if}}><a href="?">Toutes les catégories</a></li>
-				{{#load type="category" assign="category"}}
+				<li{{if $_GET.cat_key == null}} class="selected"{{/if}}><a href="?prop=1">Toutes les catégories</a></li>
+				{{#load type="category" assign="category" order="$$.name"}}
 					<li {{if $_GET.cat_key == $key}}class="selected"{{/if}}>
-						<a href="?cat_key={{$key}}">
+						<a href="?cat_key={{$key}}&prop=1">
 							<strong>{{$category.name}}</strong>
 						</a>
 					</li>
diff --git a/inventaire_nonprop.html b/inventaire_nonprop.html
index b2fb901..dfba20d 100644
--- a/inventaire_nonprop.html
+++ b/inventaire_nonprop.html
@@ -6,11 +6,6 @@
 	- category_keys : catégories dont on veut faire l'inventaire
 *}}
 
-{{:admin_header title="Gestion des matériels" custom_css=$custom_css current="module_equipment"}}
-
-{{* barre de navigation *}}
-{{:include file="_nav.html" current="inventaire" subcurrent="nonproprio"}}
-
 {{* Extraire et compiler les infos de la base *}}
 {{:include file="./_calcul_dispo.html" keep="cumul_mvt,category_keys,equipments"}}
 
@@ -31,10 +26,10 @@
 		<nav class="dropdown">
 			<ul>
 				<li><a></a></li>
-				<li{{if $_GET.cat_key == null}} class="selected"{{/if}}><a href="?">Toutes les catégories</a></li>
-				{{#load type="category" assign="category"}}
+				<li{{if $_GET.cat_key == null}} class="selected"{{/if}}><a href="?prop=0">Toutes les catégories</a></li>
+				{{#load type="category" assign="category" order="$$.name"}}
 					<li {{if $_GET.cat_key == $key}}class="selected"{{/if}}>
-						<a href="?cat_key={{$key}}">
+						<a href="?cat_key={{$key}}&prop=0">
 							<strong>{{$category.name}}</strong>
 						</a>
 					</li>
diff --git a/mouvements/ajouter_entree.html b/mouvements/ajouter_entree.html
index 166e6d0..9fc2e1d 100644
--- a/mouvements/ajouter_entree.html
+++ b/mouvements/ajouter_entree.html
@@ -83,10 +83,11 @@
 	{{:assign msg="Ajout de l'entrée « %s (%d) en date du %s » effectué"|args:$post_mat:$_POST.quantite:$_POST.date}}
 	{{:assign var=type_entree from="config.input_nature.%s"|args:$operation}}
 	{{if $type_entree == "temporaire"}}
-		{{:redirect force="../inventaire_nonprop.html?ok=1&msg=%s"|args:$msg}}
+		{{:assign prop=0}}
 	{{else}}
-		{{:redirect force="../index.html?ok=1&msg=%s"|args:$msg}}
+		{{:assign prop=1}}
 	{{/if}}
+	{{:redirect force="../index.html?prop=%s&ok=1&msg=%s"|args:$prop:$msg}}
 {{else}}
 	{{:form_errors}}
 {{/form}}