Modification condition archivage matériel

_get_config.html

@@ -6,7 +6,7 @@
 *}}
 
 {{* config par défaut *}}
-{{:read file="./defaut.json" assign="config_defaut"}}
+{{:read file="./default.json" assign="config_defaut"}}
 {{:assign config_defaut=$config_defaut|json_decode}}
 
 {{:assign var="directions.input" value="entrée"}}

_inventory.html

@@ -34,7 +34,7 @@
 	{{:assign condition="1"}}
 {{else}}
 	{{:assign cat_key=$_GET.cat_key|quote_sql}}
-	{{:assign condition="$$.category == %s"|args:$cat_key}}
+	{{:assign condition="$$.category = %s"|args:$cat_key}}
 {{/if}}
 
 {{#list
@@ -63,21 +63,21 @@
 				{{:linkbutton
 				label="Sortie"
 				shape="minus"
-				href="mouvements/sorties/stock_disponible.html?key=%s"|args:$key
+				href="movements/output_equipment.html?key=%s"|args:$key
 				target="_dialog"}}
 			{{/if}}
 			{{:linkbutton
 			label="Entrée"
 			shape="plus"
-			href="mouvements/entrees/repertorie.html?key=%s"|args:$key
+			href="movements/input_equipment.html?key=%s"|args:$key
 			target="_dialog"}}
 			{{:linkbutton
 			label="Historique"
-			href="historique.html?key=%s&prop=1"|args:$key
+			href="equipment_history.html?key=%s&prop=1"|args:$key
 			shape="table"}}
 			{{:linkbutton
 			label="Modifier"
-			href="modifier_materiel.html?key=%s&prop=1&stock=%s"|args:$key:$col3
+			href="modify_equipment.html?key=%s&prop=1"|args:$key
 			shape="edit"
 			target="_dialog"}}
 		</td>

_nav.html

@@ -6,7 +6,7 @@
 			{{if $subsubcurrent == null && $cat == 0}}
 				{{:linkbutton label="Ajouter une catégorie" shape="plus" href="categories/add_category.html" target="_dialog"}}
 			{{else}}
-				{{:linkbutton label="Ajouter un nouveau matériel" shape="plus" href="mouvements/ajouter_entree.html" target="_dialog"}}
+				{{:linkbutton label="Ajouter un nouveau matériel" shape="plus" href="movements/add_new_equipment.html" target="_dialog"}}
 			{{/if}}
 		</aside>
 	{{/if}}
@@ -46,8 +46,8 @@
 			</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"}}
+				{{:linkbutton label="Ajouter un type d'entrée" shape="plus" href="config/add_movement_type.html?dir=input" target="_dialog"}}
+				{{:linkbutton label="Ajouter un type de sortie" shape="plus" href="config/add_movement_type.html?dir=output" target="_dialog"}}
 			</aside>
 		{{/if}}
 		<ul class="sub">

_temp_inventory.html

@@ -34,7 +34,7 @@
 	{{:assign condition="1"}}
 {{else}}
 	{{:assign cat_key=$_GET.cat_key|quote_sql}}
-	{{:assign condition="$$.category == %s"|args:$cat_key}}
+	{{:assign condition="$$.category = %s"|args:$cat_key}}
 {{/if}}
 
 {{#list
@@ -58,15 +58,15 @@
 			{{:linkbutton
 			label="Entrée"
 			shape="plus"
-			href="mouvements/entrees/repertorie.html?key=%s"|args:$key
+			href="movements/input_equipment.html?key=%s"|args:$key
 			target="_dialog"}}
 			{{:linkbutton
 			label="Historique"
-			href="historique.html?key=%s&prop=0"|args:$key
+			href="equipment_history.html?key=%s&prop=0"|args:$key
 			shape="table"}}
 			{{:linkbutton
 			label="Modifier"
-			href="modifier_materiel.html?key=%s&prop=0"|args:$key
+			href="modify_equipment.html?key=%s&prop=0"|args:$key
 			shape="edit"
 			target="_dialog"}}
 		</td>

archives.html

@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{:admin_header title="Matériels archivés" custom_css=$custom_css current="module_equipment"}}
+{{:admin_header title="Matériels archivés" current="module_equipment"}}
 {{:include file="_nav.html" current="archives"}}
 
 {{if $_GET.ok}}
@@ -54,7 +54,7 @@
 		<td class="actions">
 			{{:linkbutton
 				label="Historique"
-				href="historique.html?key=%s&prop=1&current=archives"|args:$key
+				href="equipment_history.html?key=%s&prop=1&current=archives"|args:$key
 				shape="table"}}
 			{{:linkbutton
 				label="Modifier"

config.html

@@ -38,9 +38,9 @@
 					<td class="actions">
 						{{:assign var="locked" from="locked_%ss"|args:$direction}}
 						{{if ! $locked|has:$label}}
-							{{:linkbutton label="Supprimer" shape="delete" href="config/supprimer_type_mouvement.html?dir=%s&op_key=%s"|args:$direction:$key target="_dialog"}}
+							{{:linkbutton label="Supprimer" shape="delete" href="config/delete_movement_type.html?dir=%s&op_key=%s"|args:$direction:$key target="_dialog"}}
 						{{/if}}
-							{{:linkbutton label="Modifier" shape="edit" href="config/modifier_type_mouvement.html?dir=%s&op_key=%s"|args:$direction:$key target="_dialog"}}
+							{{:linkbutton label="Modifier" shape="edit" href="config/modify_movement_type.html?dir=%s&op_key=%s"|args:$direction:$key target="_dialog"}}
 					</td>
 				</tr>
 			{{/foreach}}

equipment_history.html

@@ -124,11 +124,11 @@
 		<aside>
 			{{if $_GET.prop}}
 				{{if $equipment.stock > 0}}
-					{{:linkbutton label="Sortie" shape="minus" href="mouvements/sorties/stock_disponible.html?key=%s"|args:$_GET.key target="_dialog"}}
+					{{:linkbutton label="Sortie" shape="minus" href="movements/output_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
 				{{/if}}
-				{{:linkbutton label="Entrée" shape="plus" href="mouvements/entrees/repertorie.html?key=%s"|args:$_GET.key target="_dialog"}}
+				{{:linkbutton label="Entrée" shape="plus" href="movements/input_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
 		{{else}}
-			{{:linkbutton label="Entrée" shape="plus" href="mouvements/entrees/repertorie.html?key=%s"|args:$_GET.key target="_dialog"}}
+			{{:linkbutton label="Entrée" shape="plus" href="movements/input_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
 		{{/if}}
 		</aside>
 	</nav>
@@ -212,7 +212,7 @@
 							{{if $temp_ext != null && $temp_ext > 0}}
 								{{:linkbutton
 								label="Retour"
-								href="mouvements/output_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
+								href="movements/output_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
 								shape="reset"
 								target="_dialog"}}
 							{{/if}}
@@ -222,18 +222,18 @@
 						{{else}}
 							{{:linkbutton
 								label="Dupliquer"
-								href="mouvements/dupliquer_mouvement.html?key=%s&prop=%s"|args:$key:$_GET.prop
+								href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
 								shape="plus"
 								target="_dialog"}}
 						{{/if}}
 						{{:linkbutton
 							label="Modifier"
-							href="mouvements/modifier_mouvement.html?key=%s"|args:$key
+							href="movements/modify_movement.html?key=%s"|args:$key
 							shape="edit"
 							target="_dialog"}}
 						{{:linkbutton
 							label="Supprimer"
-							href="mouvements/supprimer_mouvement.html?key=%s&prop=%s"|args:$key:$_GET.prop
+							href="movements/delete_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
 							shape="delete"
 							target="_dialog"}}
 					{{/if}}
@@ -305,24 +305,24 @@
 						{{if $temp_in != null && $temp_in > 0}}
 							{{:linkbutton
 							label="Retour"
-							href="mouvements/input_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
+							href="movements/input_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
 							shape="reset"
 							target="_dialog"}}
 						{{/if}}
 					{{/if}}
 					{{:linkbutton
 						label="Dupliquer"
-						href="mouvements/dupliquer_mouvement.html?key=%s&prop=%s"|args:$key:$_GET.prop
+						href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
 						shape="plus"
 						target="_dialog"}}
 					{{:linkbutton
 						label="Modifier"
-						href="mouvements/modifier_mouvement.html?key=%s"|args:$key
+						href="movements/modify_movement.html?key=%s"|args:$key
 						shape="edit"
 						target="_dialog"}}
 					{{:linkbutton
 						label="Supprimer"
-						href="mouvements/supprimer_mouvement.html?key=%s&prop=%s"|args:$key:$_GET.prop
+						href="movements/delete_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
 						shape="delete"
 						target="_dialog"}}
 				</td>

index.html

@@ -1,6 +1,6 @@
 {{* -*- brindille -*- *}}
 
-{{:admin_header title="Gestion des matériels" custom_css=$custom_css current="module_equipment"}}
+{{:admin_header title="Gestion des matériels" current="module_equipment"}}
 
 {{* barre de navigation *}}
 {{if $_GET.prop == null || $_GET.prop}}
@@ -29,10 +29,10 @@
 {{if $result.count == 0}}
 	<p class="block alert">Il n'y a aucune catégorie : vous devez en ajouter.</p>
 {{else}}
-	{{if $_GET.prop == null || $_GET.prop}}
-		{{:include file="./inventaire.html"}}
+	{{if $_GET.prop == null || $_GET.prop == "1"}}
+		{{:include file="./_inventory.html"}}
 	{{else}}
-		{{:include file="./inventaire_nonprop.html"}}
+		{{:include file="./_temp_inventory.html"}}
 	{{/if}}
 {{/if}}
 

modify_equipment.html

@@ -3,7 +3,7 @@
 {{*
 	Paramètres :
 	- key : clé du matériel à modifier
-	- prop : =1 si matériel propriété de l'association
+	- prop : =1 si matériel propriété de l'association, 0 sinon
 *}}
 
 {{:assign equipment_key=$_GET.key|trim}}
@@ -17,9 +17,11 @@
 {{#form on="save"}}
 
 	{{if $_POST.archive == 1}}
-		{{* vérifier si le stock est nul *}}
-		{{if $_GET.stock != 0}}
+		{{* vérifier les qunatités *}}
+		{{if $_GET.prop == 1 && $equipment.stock != 0}}
 			{{:error message="L'archivage n'est possible que si le stock est nul !"}}
+		{{elseif $_GET.prop == 0 && $equipment.notowned != 0}}
+			{{:error message="L'archivage n'est possible que s'il n'y a plus de matériel présent temporairement"}}
 		{{/if}}
 		{{* archiver le matériel *}}
 		{{:save

module.ini

@@ -1,5 +1,5 @@
 name="Gestion des matériels"
-description="Gestion des matériels: stock, entrées, sorties."
+description="Permet de gérer un inventaire de matériels, ainsi que de suivre les prêts (en test)."
 author="Jean-Christophe Engel"
 author_url="https://git.roflcopter.fr/lesanges"
 home_button=false

movements/copy_movement.html

@@ -66,11 +66,11 @@
 	-------------------- Traiter la saisie --------------------
 *}}
 {{#form on="save"}}
+	{{* vérifier la validité de la saisie *}}
 	{{if $_POST.amount <= 0}}
 		{{:error message="La quantité (%s) doit être strictement positive !!"|args:$_POST.amount}}
 	{{/if}}
 
-	{{* vérifier la validité de la saisie *}}
 	{{if $_POST.date|parse_date|strtotime > $now}}
 		{{:error message="Impossible de saisir une date dans le futur (%s)"|args:$_POST.date}}
 	{{/if}}
@@ -135,7 +135,7 @@
 
 	{{* Vérifier la cohérence des mouvements du matériel *}}
 	{{:include
-		file="./valider_modification.html"
+		file="./_validate_modification.html"
 		keep="erreur"
 		movements=$movements_new
 	}}
@@ -192,7 +192,7 @@
 		user=$user.id
 		storage=$_POST.storage
 	}}
-	{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
+	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
 {{/form}}
 
 {{:admin_header title="Dupliquer un mouvement" current="module_equipment"}}

movements/delete_movement.html

@@ -29,7 +29,7 @@
 				{{:assign link_key=$key}}
 			{{/load}}
 			{{if $link_key != null}}
-				{{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
+				{{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
 			{{/if}}
 		{{else}}
 			{{:assign dispo=0}}
@@ -62,7 +62,7 @@
 
 					{{* problème ? *}}
 					{{if $dispo < 0 || $nonprop < 0}}
-						{{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
+						{{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
 					{{/if}}
 				{{/if}}
 			{{/load}}
@@ -83,7 +83,7 @@
 				{{:assign link_key=$key}}
 			{{/load}}
 			{{if $link_key != null}}
-				{{:redirect force="../historique.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
+				{{:redirect force="../equipment_history.html?key=%s&prop=%s&err=1&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
 			{{/if}}
 		{{elseif $type_operation == 'retour'}}
 			{{#load type="link" where="$$.return = :key" :key=$_GET.key}}
@@ -148,7 +148,7 @@
 			out=$curr_eqpmt.out
 			notowned=$curr_eqpmt.notowned
 		}}
-		{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
+		{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=suppression"|args:$mvt_suppr.equipment:$_GET.prop}}
 	{{else}}
 		{{* supprimer le matériel *}}
 		{{:delete key=$curr_eqpmt.key}}

movements/input_equipment.html

@@ -8,11 +8,11 @@
 
 {{* barre de navigation *}}
 {{if ! $dialog}}
-	{{:include file="../../_nav.html" current="entrees"}}
+	{{:include file="../_nav.html" current="entrees"}}
 {{/if}}
 
 {{* récupérer la config des entrées/sorties *}}
-{{:include file="../../_get_config.html" keep="config"}}
+{{:include file="../_get_config.html" keep="config"}}
 
 {{* types d'entrées *}}
 {{#foreach from=$config.input_nature key=key}}
@@ -50,7 +50,7 @@
 
 	{{:save
 		key=$equipment.key
-		validate_schema="../../equipment.schema.json"
+		validate_schema="../equipment.schema.json"
 		type="equipment"
 		category=$equipment.category
 		name=$equipment.name
@@ -64,7 +64,7 @@
 	{{:assign mvt_key=""|uuid}}
 	{{:save
 		key=$mvt_key
-		validate_schema="../movement.schema.json"
+		validate_schema="./movement.schema.json"
 		type="movement"
 		direction="input"
 		operation=$_POST.operation
@@ -80,10 +80,10 @@
 	{{else}}
 		{{:assign prop=1}}
 	{{/if}}
-	{{:redirect force="../../historique.html?key=%s&ok=1&msg=entrée&prop=%s"|args:$equipment.key:$prop}}
+	{{:redirect force="../equipment_history.html?key=%s&ok=1&msg=entrée&prop=%s"|args:$equipment.key:$prop}}
 {{/form}}
 
-{{:admin_header title="Entrée de matériel" custom_css="./../../style.css" current="module_equipment"}}
+{{:admin_header title="Entrée de matériel" custom_css="./../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{* formulaire de saisie d'une entrée de matériel *}}

movements/input_return.html

@@ -107,7 +107,7 @@
 
 	{{* Vérifier la cohérence des mouvements du matériel *}}
 	{{:include
-		file="./valider_modification.html"
+		file="./_validate_modification.html"
 		keep="erreur, pb"
 		movements=$movements_new
 	}}
@@ -161,10 +161,10 @@
 		temp_key=$_GET.key
 		return=$mvt_key
 	}}
-	{{:redirect force="../historique.html?ok=1&key=%s&prop=0&msg=retour"|args:$mvt_new.equipment}}
+	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=0&msg=retour"|args:$mvt_new.equipment}}
 {{/form}}
 
-{{:admin_header title="Retour de matériel" custom_css="./../../style.css" current="module_equipment"}}
+{{:admin_header title="Retour de matériel" custom_css="../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{* barre de navigation *}}

movements/modify_movement.html

@@ -126,7 +126,7 @@
 
 	{{* Vérifier la cohérence des mouvements du matériel *}}
 	{{:include
-		file="./valider_modification.html"
+		file="./_validate_modification.html"
 		keep="erreur"
 		movements=$movements_new
 	}}
@@ -175,25 +175,6 @@
 		{{/if}}
 	{{/if}}
 
-	{{if $equipment.stock == 0}}
-		{{* vérifier s'il y a au moins une entrée définitive *}}
-		{{:assign entree_def=false}}
-		{{#foreach from=$config.input_nature key=key}}
-			{{if $type == 'définitif'}}
-				{{:assign var="input_types." value=$key}}
-			{{/if}}
-		{{/foreach}}
-		{{#foreach from=$movements_new}}
-			{{if $operation|in:$input_types}}
-				{{:assign entree_def=true}}
-				{{:break}}
-			{{/if}}
-		{{/foreach}}
-		{{if ! $entree_def}}
-			{{:assign var="equipment.stock" value=null}}
-		{{/if}}
-	{{/if}}
-
 	{{:save
 		key=$equipment.key
 		validate_schema="../equipment.schema.json"
@@ -226,7 +207,7 @@
 		user=$user_id
 		storage=$_POST.storage
 	}}
-	{{:redirect force="../historique.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
+	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
 {{/form}}
 
 {{:admin_header title="Modifier un mouvement" current="module_equipment"}}

movements/output_equipment.html

@@ -6,7 +6,7 @@
 *}}
 
 {{* récupérer la config des entrées/sorties *}}
-{{:include file="../../_get_config.html" keep="config"}}
+{{:include file="../_get_config.html" keep="config"}}
 
 {{* types de sorties *}}
 {{#foreach from=$config.output_nature key=key}}
@@ -119,7 +119,7 @@
 
 	{{:save
 		key=$equipment.key
-		validate_schema="../../equipment.schema.json"
+		validate_schema="../equipment.schema.json"
 		type="equipment"
 		category=$equipment.category
 		name=$equipment.name
@@ -133,7 +133,7 @@
 	{{:assign mvt_key=""|uuid}}
 	{{:save
 		key=$mvt_key
-		validate_schema="../movement.schema.json"
+		validate_schema="./movement.schema.json"
 		type="movement"
 		direction="output"
 		operation=$_POST.operation
@@ -143,13 +143,13 @@
 		comment=$_POST.remarques|trim
 		user=$user.id
 	}}
-	{{:redirect force="../../historique.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}}
+	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}}
 {{/form}}
 
-{{:admin_header title="Sortie de matériel" custom_css="./../../style.css" current="module_equipment"}}
+{{:admin_header title="Sortie de matériel" custom_css="./../style.css" current="module_equipment"}}
 {{if ! $dialog}}
 	{{* barre de navigation *}}
-	{{:include file="../../_nav.html" current="sorties"}}
+	{{:include file="../_nav.html" current="sorties"}}
 {{/if}}
 
 {{#load key=$equipment.category assign="category"}}{{/load}}

movements/output_return.html

@@ -107,7 +107,7 @@
 
 	{{* Vérifier la cohérence des mouvements du matériel *}}
 	{{:include
-		file="./valider_modification.html"
+		file="./_validate_modification.html"
 		keep="erreur, pb"
 		movements=$movements_new
 	}}
@@ -162,13 +162,13 @@
 		return=$mvt_key
 	}}
 	{{if $_GET.user == null}}
-		{{:redirect force="../historique.html?ok=1&key=%s&prop=1&msg=retour"|args:$mvt_new.equipment}}
+		{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=retour"|args:$mvt_new.equipment}}
 	{{else}}
 		{{:redirect force="/admin/users/details.php?id=%s"|args:$_GET.user}}
 	{{/if}}
 {{/form}}
 
-{{:admin_header title="Retour de matériel" custom_css="./../../style.css" current="module_equipment"}}
+{{:admin_header title="Retour de matériel" custom_css="../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{* barre de navigation *}}

snippets/user_details.html

@@ -80,7 +80,7 @@
 						{{if $direction == "output" && $type_mvt == "temporaire"}}
 							{{:linkbutton
 							label="Retour"
-							href="%smouvements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id
+							href="%smovements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id
 							shape="history"
 							target="_dialog"}}
 						{{/if}}

storage/delete_storage.html

@@ -17,7 +17,7 @@
 {{/form}}
 
 
-{{:admin_header title="Lieux de stockage" custom_css="./style.css" current="module_equipment"}}
+{{:admin_header title="Lieux de stockage" custom_css="../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{#load key=$_GET.key limit="1" assign="store"}}{{/load}}

style.css

@@ -2,13 +2,6 @@
 	margin-top : 0.5em;
 }
 
-/*
-.informations legend {
-	font-weight: bold;
-	border-bottom : solid 1px;
-	margin-bottom : 0.5em;
-}
-*/
 .informations dt::after {
 	content: ' :';
 }