_get_config.html

@@ -2,7 +2,6 @@
 
 {{*
 	Récupérer soit la config enregistrée, soit la config par défaut
-	@param : default = true si config par défaut
 	résultat : config.input_nature et config.output_nature
 *}}
 
@@ -15,7 +14,7 @@
 
 {{#foreach from=$directions key="direction"}}
 	{{:assign var="nature" from="module.config.%s_nature"|args:$direction}}
-	{{if $nature != null && ! $default}}
+	{{if $nature != null}}
 		{{#foreach from=$nature item="elem"}}
 			{{:assign var="item" label=$label type=$type}}
 			{{:assign var="config.%s_nature.%s"|args:$direction:$key value=$item}}

config/add_movement_type.html

@@ -12,8 +12,8 @@
 
 {{*	Traiter l'envoi du formulaire *}}
 
-{{* lecture config par défaut *}}
+{{* lecture config (défaut ou enregistrée) *}}
-{{:include file="../_get_config.html" keep="config, directions" default=true}}
+{{:include file="../_get_config.html" keep="config, directions"}}
 
 {{#form on="save"}}
 	{{* vérifier s'il existe un type de mouvement de même nom *}}

movements/add_new_equipment.html

@@ -126,24 +126,16 @@
 		<fieldset class="entree">
 			<legend>Enregistrer une entrée de matériel</legend>
 			<dl>
-				{{if $input_labels|count == 1}}
+			{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
-					{{:input type="select" name="operation" label="Type" required=true options=$input_labels}}
+			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
-				{{else}}
+			{{:input type="number" name="amount" label="Quantité" min=1 required=true default=1}}
-					{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
-				{{/if}}
-				{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
-				{{:input type="number" name="amount" label="Quantité" min=1 required=true default=1}}
 			</dl>
 		</fieldset>
 
 		<fieldset>
 			<legend>Sélectionner une catégorie et indiquer le nom du nouveau matériel</legend>
 			<dl>
-				{{if $categories|count == 1}}
+				{{:input type="select" name="category" label="Catégorie" default_empty="— Aucune —" options=$categories required=true}}
-					{{:input type="select" name="category" label="Catégorie" options=$categories required=true}}
-				{{else}}
-					{{:input type="select" name="category" label="Catégorie" default_empty="— Aucune —" options=$categories required=true}}
-				{{/if}}
 				{{:input type="text" name="name" label="Désignation" required=true}}
 				{{if $storage != null}}
 					{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}

movements/input_equipment.html

@@ -103,11 +103,7 @@
 	<fieldset class="entree">
 		<legend>Enregistrer une entrée de matériel</legend>
 		<dl>
-			{{if $input_labels|count == 1}}
+			{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
-				{{:input type="select" name="operation" label="Type" required=true options=$input_labels}}
-			{{else}}
-				{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
-			{{/if}}
 			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
 			{{:input type="number" name="amount" label="Quantité" required=true min=1 default=1}}
 				{{if $storage != null}}

movements/output_equipment.html

@@ -173,11 +173,7 @@
 		<fieldset class="sortie">
 			<legend>Enregistrer une sortie</legend>
 			<dl>
-				{{if $output_labels|count == 1}}
+				{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$output_labels|sort}}
-					{{:input type="select" name="operation" label="Type" required=true options=$output_labels}}
-				{{else}}
-					{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$output_labels|sort}}
-				{{/if}}
 				{{:input type="date" name="date" label="Date de sortie" required=true default=$now|date_short}}
 				{{:input type="number" name="amount" label="Quantité" required=true default=1 min=1 max=$dispo}}
 				{{:input

snippets/user_details.html

@@ -30,32 +30,29 @@
 {{/load}}
 
 {{if $table_presente}}
-	{{* vérifier la présence des types d'entrées et de sorties requis *}}
+	{{#select
-	{{if $output_types|has_key:"temporaire" && $input_types|has_key:"retour"}}
+		eqpmt.key as eqpmt_key,
-		{{#select
+		json_extract(eqpmt.document, '$.name') as eqpmt_name,
-			eqpmt.key as eqpmt_key,
+		mvt.key AS mvt_key,
-			json_extract(eqpmt.document, '$.name') as eqpmt_name,
+		json_extract(mvt.document, '$.direction') as direction,
-			mvt.key AS mvt_key,
+		json_extract(mvt.document, '$.operation') as operation,
-			json_extract(mvt.document, '$.direction') as direction,
+		json_extract(mvt.document, '$.date') as date,
-			json_extract(mvt.document, '$.operation') as operation,
+		json_extract(mvt.document, '$.amount') as amount
-			json_extract(mvt.document, '$.date') as date,
+		FROM module_data_equipment AS mvt
-			json_extract(mvt.document, '$.amount') as amount
+		INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
-			FROM module_data_equipment AS mvt
+		INNER JOIN module_data_equipment AS eqpmt
-			INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
+		ON json_extract(mvt.document, '$.equipment') = eqpmt.key
-			INNER JOIN module_data_equipment AS eqpmt
+		WHERE users.id = :user
-			ON json_extract(mvt.document, '$.equipment') = eqpmt.key
+		AND (json_extract(mvt.document, '$.operation') IN !output_types
-			WHERE users.id = :user
+			 OR json_extract(mvt.document, '$.operation') IN !input_types)
-			AND (json_extract(mvt.document, '$.operation') IN !output_types
+		ORDER BY date
-				 OR json_extract(mvt.document, '$.operation') IN !input_types)
+		;
-			ORDER BY date
+		:user = $user.id
-			;
+		!output_types=$output_types.temporaire
-			:user = $user.id
+		!input_types=$input_types.retour
-			!output_types=$output_types.temporaire
+		assign="temp_mat."
-			!input_types=$input_types.retour
+	}}
-			assign="temp_mat."
+	{{/select}}
-		}}
-		{{/select}}
-	{{/if}}
 
 	{{if $temp_mat|count != 0}}
 		<h3 class="ruler">Matériels attribués temporairement</h3>
@@ -105,29 +102,26 @@
 		</table>
 	{{/if}}
 
-	{{* vérifier la présence des types d'entrées et de sorties requis *}}
+	{{#select
-	{{ if $output_types|has_key:"définitif"}}
+		eqpmt.key as eqpmt_key,
-		{{#select
+		json_extract(eqpmt.document, '$.name') as eqpmt_name,
-			eqpmt.key as eqpmt_key,
+		json_extract(mvt.document, '$.direction') as direction,
-			json_extract(eqpmt.document, '$.name') as eqpmt_name,
+		json_extract(mvt.document, '$.operation') as operation,
-			json_extract(mvt.document, '$.direction') as direction,
+		json_extract(mvt.document, '$.date') as date,
-			json_extract(mvt.document, '$.operation') as operation,
+		json_extract(mvt.document, '$.amount') as amount
-			json_extract(mvt.document, '$.date') as date,
+		FROM module_data_equipment AS mvt
-			json_extract(mvt.document, '$.amount') as amount
+		INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
-			FROM module_data_equipment AS mvt
+		INNER JOIN module_data_equipment AS eqpmt
-			INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
+		ON json_extract(mvt.document, '$.equipment') = eqpmt.key
-			INNER JOIN module_data_equipment AS eqpmt
+		WHERE users.id = :user
-			ON json_extract(mvt.document, '$.equipment') = eqpmt.key
+		AND json_extract(mvt.document, '$.operation') IN !output_types
-			WHERE users.id = :user
+		ORDER BY date DESC
-			AND json_extract(mvt.document, '$.operation') IN !output_types
+		;
-			ORDER BY date DESC
+		:user = $user.id
-			;
+		!output_types=$output_types.définitif
-			:user = $user.id
+		assign="def_mat."
-			!output_types=$output_types.définitif
+	}}
-			assign="def_mat."
+	{{/select}}
-		}}
-		{{/select}}
-	{{/if}}
 
 	{{if $def_mat|count != 0}}
 		<h3 class="ruler">Matériels attribués définitivement</h3>