From 00388f86ba023107182c57a6003e7c320d4d0bfd Mon Sep 17 00:00:00 2001
From: Jean-Christophe Engel <lesanges@zaclys.net>
Date: Fri, 18 Apr 2025 17:55:17 +0200
Subject: [PATCH] =?UTF-8?q?D=C3=A9placement=20gestion=20lieu=20stockage=20?=
 =?UTF-8?q?dans=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _nav.html                   | 12 +++++------
 storage/add_storage.html    |  2 +-
 storage/index.html          |  5 +++--
 storage/modify_storage.html | 40 +++++++++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 storage/modify_storage.html

diff --git a/_nav.html b/_nav.html
index 220cdaa..78b0cb5 100644
--- a/_nav.html
+++ b/_nav.html
@@ -15,7 +15,6 @@
 		<li {{if $current == 'inventaire'}} class="current"{{/if}}><a href="{{$module.url}}index.html?prop=1">Inventaire</a></li>
 		<li {{if $current == 'historique'}} class="current"{{/if}}><a href="{{$module.url}}global_history.html">Historique</a></li>
 		<li {{if $current == 'archives'}} class="current"{{/if}}><a href="{{$module.url}}archives.html">Archives</a></li>
-		<li {{if $current == 'storage'}} class="current"{{/if}}><a href="{{$module.url}}storage/index.html">Stockage</a></li>
 		<li {{if $current == 'config'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Configuration</a></li>
 	</ul>
 
@@ -36,23 +35,24 @@
 				<li class="title"><strong>Historique — {{$eqpmt}} ({{$category}})</strong></li>
 			</ul>
 		{{/if}}
-	{{elseif $current == 'storage'}}
-		<aside>
-			{{:linkbutton label="Ajouter un lieu de stockage" shape="plus" href="add_storage.html" target="_dialog"}}
-		</aside>
 	{{elseif $current == 'config'}}
 		{{if $subcurrent == 'categories'}}
 			<aside>
 				{{:linkbutton label="Ajouter une catégorie" shape="plus" href="add_category.html" target="_dialog"}}
 			</aside>
+		{{elseif $subcurrent == 'storage'}}
+			<aside>
+				{{:linkbutton label="Ajouter un lieu de stockage" shape="plus" href="add_storage.html" target="_dialog"}}
+			</aside>
 		{{elseif $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" >
+		<ul class="sub">
 			<li {{if $subcurrent == 'categories'}} class="current"{{/if}}><a href="{{$module.url}}categories/index.html">Catégories</a></li>
+			<li {{if $subcurrent == 'storage'}} class="current"{{/if}}><a href="{{$module.url}}storage/index.html">Lieux de stockage</a></li>
 			<li {{if $subcurrent == 'typesES'}} class="current"{{/if}}><a href="{{$module.url}}config.html">Types d'entrées/sorties</a></li>
 		</ul>
 	{{/if}}
diff --git a/storage/add_storage.html b/storage/add_storage.html
index fa64acc..922f350 100644
--- a/storage/add_storage.html
+++ b/storage/add_storage.html
@@ -16,7 +16,7 @@
 		key=""|uuid
 	    validate_schema="storage.schema.json"
 		type="storage"
-		name=$_POST.name|tolower|ucwords
+		name=$_POST.name|trim|ucwords
 		location=$_POST.location
 	}}
 	{{:redirect force="index.html?ok=1&msg=ajout"}}
diff --git a/storage/index.html b/storage/index.html
index 80d2758..62ae527 100644
--- a/storage/index.html
+++ b/storage/index.html
@@ -4,9 +4,9 @@
 	Afficher les lieux de stockage
 *}}
 
-{{:admin_header title="Lieux de stockage" custom_css="./style.css" current="module_equipment"}}
+{{:admin_header title="Configuration" current="module_equipment"}}
 
-{{:include file="../_nav.html" current="storage"}}
+{{:include file="../_nav.html" current="config" subcurrent="storage"}}
 
 {{if $_GET.ok}}
 	{{if $_GET.msg == "ajout"}}
@@ -33,6 +33,7 @@
 		<td>{{$name}}</td>
 		<td>{{$location}}</td>
 		<td class="actions">
+			{{:linkbutton label="Modifier" shape="edit" href="modify_storage.html?key=%s"|args:$key target="_dialog"}}
 			{{:linkbutton label="Supprimer" shape="delete" href="delete_storage.html?key=%s"|args:$key target="_dialog"}}
 		</td>
 	</tr>
diff --git a/storage/modify_storage.html b/storage/modify_storage.html
new file mode 100644
index 0000000..6730f69
--- /dev/null
+++ b/storage/modify_storage.html
@@ -0,0 +1,40 @@
+{{* -*- brindille -*- *}}
+
+{{#load key=$_GET.key assign="storage"}}
+{{else}}
+	{{:error message="Lieu de stockage introuvable"}}
+{{/load}}
+
+{{* Traiter l'envoi du formulaire *}}
+{{#form on="save"}}
+	{{* Vérifier s'il existe déjà un le lieu de stockage avec le même nom *}}
+	{{#load type="storage" where="$$.name = :name COLLATE U_NOCASE" :name=$_POST.name|trim limit=1}}
+		{{:error message="Modification impossible car ce nom (« %s ») est déjà utilisé !"|args:$name|trim}}
+	{{/load}}
+
+	{{:save
+		key=$storage.key
+		validate_schema="storage.schema.json"
+		type="storage"
+		name=$_POST.name|trim|ucwords
+		location=$_POST.location
+	}}
+	{{:redirect force="./index.html?ok=1&msg=modification"}}
+{{/form}}
+
+{{:admin_header title="Modifier un lieu de stockage" current="module_equipment"}}
+{{:form_errors}}
+
+{{* formulaire de modification d'un lieu de stockage *}}
+<form method="post" action="" data-focus="1">
+	<fieldset class="modif_storage">
+		<legend>Modifier le lieu de stockage « {{$storage.name}} »</legend>
+		<dl>
+			{{:input type="text" name="name" label="Nom" default=$storage.name required=true maxlength="100"}}
+			{{:input type="textarea" name="location" label="Emplacement" cols="40", rows="3" required=false}}
+		</dl>
+		<p class="submit">
+			{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
+		</p>
+	</fieldset>
+</form>