Mise-à-jour README

README.md

@@ -3,8 +3,12 @@
 Ce module permet de gérer les matériels de l'association: stock,
 entrées, sorties, classés par catégorie.
 
-Un matériel peut entrer temporairement (location, emprunt, ...) ou
-définitivement dans l'association (achat, ...).
+Un matériel peut entrer dans l'association :
+- temporairement (location, emprunt, ...)
+- définitivement (achat, ...)
+
+Dans les deux cas, il est possible de lui associer une écriture de la
+compta ou un fichier.
 
 Un matériel appartenant à l'association peut sortir :
 - temporairement (prêt, ...) : il est possible de lui associer un lieu

_get_config.html

@@ -1,9 +1,8 @@
 {{* -*- brindille -*- *}}
 
 {{*
-	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
+	Récupérer la config
+	résultat : config_defaut, directions, config.input_nature et config.output_nature
 *}}
 
 {{* config par défaut *}}
@@ -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}}

_inventory.html

@@ -71,6 +71,10 @@
 			shape="plus"
 			href="movements/input_equipment.html?key=%s"|args:$key
 			target="_dialog"}}
+ 			{{:linkbutton
+			label="Historique"
+			href="equipment_history.html?key=%s&prop=1"|args:$key
+			shape="table"}}
 			{{:linkbutton
 			label="Modifier"
 			href="modify_equipment.html?key=%s&prop=1"|args:$key
@@ -84,7 +88,10 @@
 
 <script type="text/javascript" src="scripts.js"></script>
 <script type="text/javascript">
-	(function () {
-		disableColumSort(document.querySelector("table[class=list]"));
-	})();
+(function () {
+	let table = document.querySelector("table[class=list]");
+	if (table != null) {
+		disableColumSort(table);
+	}
+})();
 </script>

_temp_inventory.html

@@ -60,6 +60,10 @@
 			shape="plus"
 			href="movements/input_equipment.html?key=%s"|args:$key
 			target="_dialog"}}
+ 			{{:linkbutton
+			label="Historique"
+			href="equipment_history.html?key=%s&prop=0"|args:$key
+			shape="table"}}
 			{{:linkbutton
 			label="Modifier"
 			href="modify_equipment.html?key=%s&prop=0"|args:$key

config/add_movement_type.html

@@ -12,16 +12,16 @@
 
 {{*	Traiter l'envoi du formulaire *}}
 
-{{* lecture config par défaut *}}
-{{:include file="../_get_config.html" keep="config, directions" default=true}}
+{{* lecture config *}}
+{{:include file="../_get_config.html" keep="config, directions, config_defaut"}}
 
 {{#form on="save"}}
-	{{* vérifier s'il existe un type de mouvement de même nom *}}
+	{{* vérifier s'il existe un libellé de même nom dans la même direction *}}
 	{{#foreach from=$directions key="direction"}}
 		{{:assign var="nature" from="config.%s_nature"|args:$direction}}
 		{{#foreach from=$nature key="key"}}
 			{{:assign var="fields" from="_POST.%s_fields"|args:$_GET.dir}}
-			{{if $label|trim|tolower == $fields.label|trim|tolower}}
+			{{if $_GET.dir == $direction && $label|trim|tolower == $fields.label|trim|tolower}}
 				{{:error message="Ce libellé est déjà présent"}}
 			{{/if}}
 			{{:assign var="%s_nature.key"|args:$direction value=$key}}
@@ -39,7 +39,6 @@
 			{{:assign var="%s_nature.type"|args:$direction from="_POST.%s_fields.type"|args:$direction}}
 			{{:assign var="%s_natures."|args:$direction from="%s_nature"|args:$direction}}
 		{{/if}}
-
 	{{/foreach}}
 
 	{{:save
@@ -56,7 +55,7 @@
 
 {{if $_GET.dir == 'input'}}
 	{{* types d'entrées *}}
-	{{#foreach from=$config.input_nature}}
+	{{#foreach from=$config_defaut.inputs}}
 		{{:assign var='input_types.%s'|args:$type value=$type}}
 	{{/foreach}}
 	<form method="post" action="">
@@ -95,7 +94,7 @@
 	</form>
 {{else}}
 	{{* types de sorties *}}
-	{{#foreach from=$config.output_nature}}
+	{{#foreach from=$config_defaut.outputs}}
 		{{:assign var='output_types.%s'|args:$type value=$type}}
 	{{/foreach}}
 

equipment_history.html

@@ -28,6 +28,7 @@
 {{else}}
 	{{:error message="Le matériel %s n'appartient à aucune catégorie"|args:$equipment.name}}
 {{/load}}
+
 {{:admin_header title="Gestion des matériels" custom_css="./style.css" current="module_equipment"}}
 
 {{if $_GET.current != null}}
@@ -112,20 +113,20 @@
 			{{:assign nonproprio="%d-%d"|math:$nonproprio:$amount}}
 		{{/if}}
 	{{/if}}
-	{{:assign dispo="%d-%d"|math:$stock:$exterieur}}
+	{{:assign dispo_final="%d-%d"|math:$stock:$exterieur}}
 	{{:assign var="quantites.%s.stock"|args:$id value=$stock}}
 	{{:assign var="quantites.%s.exterieur"|args:$id value=$exterieur}}
-	{{:assign var="quantites.%s.dispo"|args:$id value=$dispo}}
+	{{:assign var="quantites.%s.dispo"|args:$id value=$dispo_final}}
 	{{:assign var="quantites.%s.nonproprio"|args:$id value=$nonproprio}}
 {{/load}}
 
 {{if $current != "archives"}}
 	<nav class="tabs">
 		<aside>
-			{{if $_GET.prop && $equipment.stock > 0}}
-					{{:linkbutton label="Sortie" title="Enregistrer une sortie de ce matériel" shape="minus" href="movements/output_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
+			{{if $_GET.prop && $dispo_final > 0}}
+				{{:linkbutton label="Sortie" shape="minus" href="movements/output_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
 			{{/if}}
-			{{:linkbutton label="Entrée" title="Enregistrer une entrée de ce matériel" shape="plus" href="movements/input_equipment.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"}}
 		</aside>
 	</nav>
 {{/if}}
@@ -144,9 +145,9 @@
 	{{#select
 		mvt.key AS mvt_key,
 		json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(mvt2.document, '$.amount')), 0) AS reste
-		FROM module_data_equipment AS mvt
-		LEFT JOIN module_data_equipment AS link ON mvt.key = json_extract(link.document, '$.temp_key')
-		LEFT JOIN module_data_equipment AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
+		FROM {!$module.table} AS mvt
+		LEFT JOIN {!$module.table} AS link ON mvt.key = json_extract(link.document, '$.temp_key')
+		LEFT JOIN {!$module.table} AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
 		WHERE
 			json_extract(mvt.document, '$.operation') IN !op
 		AND json_extract(mvt.document, '$.equipment') = :eqpmt_key
@@ -176,11 +177,12 @@
 				THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage)
 				ELSE ''
 			END AS 'Stockage';
-		$$.comment AS 'Commentaire'
+			'' AS 'Documents';
+			$$.transactions AS 'Écritures'
 		"|args:$config.user_fields.name_sql
 		equipment=$equipment_key
 		order=1
-	}}
+		}}
 		{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$direction:$operation}}
 		{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}}
 
@@ -190,6 +192,12 @@
 			{{:assign var="stock" from="quantites.%s.stock"|args:$id}}
 			{{:assign var="exterieur" from="quantites.%s.exterieur"|args:$id}}
 			{{:assign var="dispo" from="quantites.%s.dispo"|args:$id}}
+
+			{{:assign file_path="%s/%s/"|args:$module.storage_root:$key}}
+			{{:assign file_path=$file_path|cat:"%"}}
+			{{#select count(*) AS nb FROM files WHERE path LIKE :file_path ; :file_path=$file_path}}
+				{{:assign nb_files=$nb}}
+			{{/select}}
 			<tr>
 				<td>{{$date|date_short}}</td>
 				<td>{{$col2}}</td>
@@ -200,7 +208,8 @@
 				<td class="num nosort">{{$dispo}}</td>
 				<td>{{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$col8}}</td>
 				<td>{{$col9}}</td>
-				<td>{{$comment}}</td>
+				<td class="num nosort">{{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}}</td>
+				<td class="num">{{if $transactions|count > 0}}{{:icon shape="money"}}{{/if}}</td>
 				<td class="actions">
 					{{if $current != "archives"}}
 						{{if $direction == "output" && $type_mvt == "temporaire"}}
@@ -208,37 +217,24 @@
 							{{if $temp_ext != null && $temp_ext > 0}}
 								{{:linkbutton
 								label="Retour"
-								title="Enregistrer un retour de sortie temporaire"
 								href="movements/output_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
 								shape="reset"
 								target="_dialog"}}
 							{{/if}}
 						{{/if}}
-						{{if $direction == "input" && $type_mvt == "retour"}}
-							{{* interdire dupliquer *}}
-						{{else}}
-							{{:linkbutton
-								label="Dupliquer"
-								href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
-								shape="plus"
-								target="_dialog"}}
-						{{/if}}
 						{{:linkbutton
-							label="Modifier"
-							href="movements/modify_movement.html?key=%s"|args:$key
-							shape="edit"
-							target="_dialog"}}
-						{{:linkbutton
-							label="Supprimer"
-							href="movements/delete_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
-							shape="delete"
-							target="_dialog"}}
+							label="Détails"
+							href="movements/movement_details.html?key=%s&prop=%s"|args:$key:$_GET.prop
+							shape="eye"
+						}}
 					{{/if}}
 				</td>
 			</tr>
 		{{/if}}
 	{{/list}}
-
+	{{if $dispo_final === 0}}
+		<span class="help">Il n'y a aucun matériel disponible, il n'est donc pas possible d'effectuer une sortie</span>
+	{{/if}}
 {{else}}
 	{{* calculer la quantité présente temporairement de chaque matériel *}}
 	{{#foreach from=$config.input_nature key=key}}
@@ -252,9 +248,9 @@
 	{{#select
 		mvt.key AS mvt_key,
 		json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(mvt2.document, '$.amount')), 0) AS present
-		FROM module_data_equipment AS mvt
-		LEFT JOIN module_data_equipment AS link ON mvt.key = json_extract(link.document, '$.temp_key')
-		LEFT JOIN module_data_equipment AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
+		FROM {!$module.table} AS mvt
+		LEFT JOIN {!$module.table} AS link ON mvt.key = json_extract(link.document, '$.temp_key')
+		LEFT JOIN {!$module.table} AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
 		WHERE
 			json_extract(mvt.document, '$.operation') IN !op
 		AND json_extract(mvt.document, '$.equipment') = :eqpmt_key
@@ -277,7 +273,9 @@
 				THEN (SELECT $$.name FROM @TABLE as storage WHERE storage.key = @TABLE.$$.storage)
 				ELSE ''
 			END as 'Stockage';
-			$$.comment AS 'Commentaire'"
+			'' AS 'Documents';
+			$$.transactions AS 'Écritures'
+		"
 		equipment=$equipment_key
 		order=1
 	}}
@@ -288,6 +286,12 @@
 			 $direction === "output"&& $op_label|in:$output_types
 		}}
 			{{:assign var="stock" from="quantites.%s.nonproprio"|args:$id}}
+
+			{{:assign file_path="%s/%s/"|args:$module.storage_root:$key}}
+			{{:assign file_path=$file_path|cat:"%"}}
+			{{#select count(*) AS nb FROM files WHERE path LIKE :file_path ; :file_path=$file_path}}
+				{{:assign nb_files=$nb}}
+			{{/select}}
 			<tr>
 				<td>{{$date|date_short}}</td>
 				<td>{{$col2}}</td>
@@ -295,38 +299,24 @@
 				<td class="num">{{$amount}}</td>
 				<td class="num nosort">{{$stock}}</td>
 				<td>{{$col6}}</td>
-				<td>{{$comment}}</td>
+				<td class="num nosort">{{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}}</td>
+				<td class="num">{{if $transactions|count > 0}}{{:icon shape="money"}}{{/if}}</td>
 				<td class="actions">
 					{{if $direction == "input" && $type_mvt == "temporaire"}}
 						{{:assign var="temp_in" from="present.%s"|args:$key}}
 						{{if $temp_in != null && $temp_in > 0}}
 							{{:linkbutton
 							label="Retour"
-							title="Enregistrer un retour d'entrée temporaire"
 							href="movements/input_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
 							shape="reset"
 							target="_dialog"}}
 						{{/if}}
 					{{/if}}
-					{{if $direction == "output" && $type_mvt == "retour"}}
-						{{* interdire dupliquer *}}
-					{{else}}
-						{{:linkbutton
-							label="Dupliquer"
-							href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
-							shape="plus"
-							target="_dialog"}}
-					{{/if}}
 					{{:linkbutton
-						label="Modifier"
-						href="movements/modify_movement.html?key=%s"|args:$key
-						shape="edit"
-						target="_dialog"}}
-					{{:linkbutton
-						label="Supprimer"
-						href="movements/delete_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
-						shape="delete"
-						target="_dialog"}}
+						label="Détails"
+						href="movements/movement_details.html?key=%s&prop=%s"|args:$key:$_GET.prop
+						shape="eye"
+					}}
 				</td>
 			</tr>
 		{{/if}}
@@ -337,7 +327,10 @@
 
 <script type="text/javascript" src="scripts.js"></script>
 <script type="text/javascript">
-	(function () {
-		disableColumSort(document.querySelector("table[class=list]"));
-	})();
+(function () {
+	let table = document.querySelector("table[class=list]");
+	if (table != null) {
+		disableColumSort(table);
+	}
+})();
 </script>

global_history.html

@@ -88,7 +88,10 @@
 
 <script type="text/javascript" src="scripts.js"></script>
 <script type="text/javascript">
-	(function () {
-		disableColumSort(document.querySelector("table[class=list]"));
-	})();
+(function () {
+	let table = document.querySelector("table[class=list]");
+	if (table != null) {
+		disableColumSort(table);
+	}
+})();
 </script>

movements/copy_movement.html

@@ -202,7 +202,12 @@
 	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
 {{/form}}
 
-{{:admin_header title="Dupliquer un mouvement" custom_css="./../style.css" current="module_equipment"}}
+{{if $mvt_new.direction == "input"}}
+	{{:assign mvt_label="entrée"}}
+{{else}}
+	{{:assign mvt_label="sortie"}}
+{{/if}}
+{{:admin_header title="Dupliquer une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{*
@@ -261,9 +266,7 @@
 				}}
 			{{/if}}
 			{{if $mvt_new.direction == "input"}}
-				{{if $storage != null}}
-					{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
-				{{/if}}
+				{{:input type="select" name="storage" default=$mvt_new.storage label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
 				{{if $type_mvt != "retour"}}
 					{{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
 				{{/if}}

movements/input_return.html

@@ -32,9 +32,9 @@
 
 {{#select
 	json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(mvt2.document, '$.amount')), 0) AS present
-	FROM module_data_equipment AS mvt
-	LEFT JOIN module_data_equipment AS link ON mvt.key = json_extract(link.document, '$.temp_key')
-	LEFT JOIN module_data_equipment AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
+	FROM {!$module.table} AS mvt
+	LEFT JOIN {!$module.table} AS link ON mvt.key = json_extract(link.document, '$.temp_key')
+	LEFT JOIN {!$module.table} AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
 	WHERE
 	json_extract(mvt.document, '$.operation') IN !op
 	AND mvt.key = :mvt_key

movements/modify_movement.html

@@ -219,7 +219,12 @@
 	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
 {{/form}}
 
-{{:admin_header title="Modifier un mouvement" custom_css="./../style.css" current="module_equipment"}}
+{{if $mvt_new.direction == "input"}}
+	{{:assign mvt_label="entrée"}}
+{{else}}
+	{{:assign mvt_label="sortie"}}
+{{/if}}
+{{:admin_header title="Modifier une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
 {{:form_errors}}
 
 {{*
@@ -232,11 +237,6 @@
 	{{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}}
 		{{:assign var="user.%s"|args:$id value=$nom}}
 	{{/select}}
-	{{#load type="link" where="$$.direction="output" AND $$.temp_key = :mvt_key" :mvt_key=$mvt_new.key limit=1}}
-		{{:assign retour=true}}
-	{{else}}
-		{{:assign retour=false}}
-	{{/load}}
 {{/if}}
 
 {{#load type="storage" order="$$.name"}}
@@ -274,10 +274,11 @@
 			{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
 		</dl>
 	</fieldset>
+
 	<fieldset class="entree">
 		<legend>Informations facultatives</legend>
 		<dl>
-			{{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}}
+			{{if $prop == 1 && $mvt_new.direction == "output"}}
 				{{:input
 					type="list"
 					name="user"

movements/movement_details.html

@@ -0,0 +1,109 @@
+{{* -*- brindille -*- *}}
+
+{{*
+	Afficher les détails d'un mouvement et donner la possibilité :
+	- d'associer des fichiers
+	- de modifier, supprimer ou dupliquer le mouvement
+	paramètres :
+	- key		: clé du mouvement
+	- prop = 1 si matériel appartient à l'asso
+*}}
+
+{{:admin_header title="Détails du mouvement" custom_css="../style.css" current="module_equipment"}}
+{{:form_errors}}
+
+{{* récupérer les infos du mouvement *}}
+{{#load key=$_GET.key assign="mvt"}}
+{{else}}
+	{{:error message="Aucun mouvement avec la clé %s"|args:$_GET.key}}
+{{/load}}
+
+{{* récupérer la config des entrées/sorties *}}
+{{:include file="../_get_config.html" keep="config, directions"}}
+{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt.direction:$mvt.operation}}
+
+{{* récupérer les infos du matériel associé *}}
+{{#load key=$mvt.equipment assign="equipment"}}
+{{else}}
+	{{:error message="Aucun matériel avec la clé « %s »"|args:$mvt.equipment}}
+{{/load}}
+
+{{*
+	-------------------- Afficher les informations du mouvement --------------------
+*}}
+
+{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$mvt.direction:$mvt.operation}}
+{{#load key=$equipment.category assign="category"}}{{/load}}
+{{#load key=$mvt.storage assign="storage"}}{{/load}}
+{{#select !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt.user}}
+	{{:assign user_name=$nom}}
+{{/select}}
+
+<nav class="tabs">
+	{{:linkbutton
+		label="Modifier ce mouvement"
+		href="modify_movement.html?key=%s"|args:$_GET.key
+		shape="edit"
+		target="_dialog"}}
+	{{:linkbutton
+		label="Supprimer ce mouvement"
+		href="delete_movement.html?key=%s&prop=%s"|args:$_GET.key:$_GET.prop
+		shape="delete"
+		target="_dialog"}}
+	{{if $type_mvt != "retour"}}
+		{{:linkbutton
+			label="Dupliquer ce mouvement"
+			href="copy_movement.html?key=%s&prop=%s"|args:$_GET.key:$_GET.prop
+			shape="plus"
+			target="_dialog"}}
+	{{/if}}
+</nav>
+
+<dl class="describe">
+	<dt>Opération</dt>
+	<dd>{{$op_label}}</dd>
+	<dt>Matériel</dt>
+	<dd>{{$equipment.name}}</dd>
+	<dt>Catégorie</dt>
+	<dd>{{$category.name}}</dd>
+	<dt>Date</dt>
+	<dd>{{$mvt.date|date_short}}</dd>
+	<dt>Quantité</dt>
+	<dd>{{$mvt.amount}}</dd>
+	{{if $mvt.direction == "output" && $type_mvt != "retour"}}
+		<dt>Membre destinataire</dt>
+		<dd>
+			{{if $mvt.user != null}}
+				{{$user_name}}
+			{{else}}—
+			{{/if}}
+		</dd>
+	{{/if}}
+	{{if $mvt.direction == "input"}}
+		<dt>Lieu de stockage</dt>
+		<dd>
+			{{if $storage != null}}
+				{{$storage.name}}
+			{{else}}—
+			{{/if}}
+		</dd>
+	{{/if}}
+	<dt>Écritures liées</dt>
+	<dd>
+		{{#foreach from=$mvt.transactions item="trans"}}
+			{{:link class="num" href="!acc/transactions/details.php?id=%d"|args:$trans label=$trans}}
+		{{else}}—
+		{{/foreach}}
+	</dd>
+	<dt>Remarques</dt>
+	<dd>{{if $mvt.comment != null}}
+		{{$mvt.comment}}
+		{{else}}—
+		{{/if}}
+	</dd>
+</dl>
+
+<form method="post" action="">
+	{{:admin_files path=$_GET.key upload=true edit=true use_trash=false}}
+</form>
+{{:admin_footer}}

movements/output_return.html

@@ -32,9 +32,9 @@
 
 {{#select
 	json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(mvt2.document, '$.amount')), 0) AS exterieur
-	FROM module_data_equipment AS mvt
-	LEFT JOIN module_data_equipment AS link ON mvt.key = json_extract(link.document, '$.temp_key')
-	LEFT JOIN module_data_equipment AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
+	FROM {!$module.table} AS mvt
+	LEFT JOIN {!$module.table} AS link ON mvt.key = json_extract(link.document, '$.temp_key')
+	LEFT JOIN {!$module.table} AS mvt2 ON mvt2.key = json_extract(link.document, '$.return')
 	WHERE
 	json_extract(mvt.document, '$.operation') IN !op
 	AND mvt.key = :mvt_key

snippets/user_details.html

@@ -30,97 +30,110 @@
 {{/load}}
 
 {{if $table_presente}}
+	{{* Matériels attribués temporairement *}}
 	{{* vérifier la présence des types d'entrées et de sorties requis *}}
 	{{if $output_types|has_key:"temporaire" && $input_types|has_key:"retour"}}
+
+		{{*
+			Calculer les quantités de matériel en prêt
+		*}}
+		{{:assign premier=true}}
 		{{#select
+			json_extract(mvt.document, '$.direction') AS direction,
+			json_extract(mvt.document, '$.date') AS date,
 			eqpmt.key as eqpmt_key,
-			json_extract(eqpmt.document, '$.name') as eqpmt_name,
-			mvt.key AS mvt_key,
-			json_extract(mvt.document, '$.direction') as direction,
-			json_extract(mvt.document, '$.operation') as operation,
-			json_extract(mvt.document, '$.date') as date,
-			json_extract(mvt.document, '$.amount') as amount
-			FROM module_data_equipment AS mvt
+			json_extract(eqpmt.document, '$.name') AS eqpmt_name,
+			json_extract(mvt.document, '$.amount') AS qte,
+			json_extract(mvt.document, '$.operation') AS operation
+			FROM {!$module.table} AS mvt
 			INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
-			INNER JOIN module_data_equipment AS eqpmt
-			ON json_extract(mvt.document, '$.equipment') = eqpmt.key
-			WHERE users.id = :user
-			AND (json_extract(mvt.document, '$.operation') IN !output_types
-				 OR json_extract(mvt.document, '$.operation') IN !input_types)
-			ORDER BY date
+			INNER JOIN {!$module.table} AS eqpmt ON json_extract(mvt.document, '$.equipment') = eqpmt.key
+			WHERE
+				users.id = :user
+			AND
+				json_extract(mvt.document, '$.type') = 'movement'
+			AND
+				(json_extract(mvt.document, '$.operation') IN !output_types
+				OR
+				json_extract(mvt.document, '$.operation') IN !input_types)
+			ORDER BY eqpmt_name, date
 			;
 			:user = $user.id
 			!output_types=$output_types.temporaire
 			!input_types=$input_types.retour
-			assign="temp_mat."
 		}}
+			{{if $premier}}
+				{{:assign premier=false}}
+				{{:assign total=0}}
+				{{:assign old_eqpmt_key=$eqpmt_key}}
+				{{:assign var="ligne.date" value=$date}}
+				{{:assign var="ligne.materiel" value=$eqpmt_name}}
+			{{/if}}
+
+			{{if $eqpmt_key != $old_eqpmt_key}}
+				{{if $total > 0}}
+					{{:assign var="ligne.qte" value=$total}}
+					{{:assign var="lignes." value=$ligne}}
+				{{/if}}
+				{{:assign total=0}}
+				{{:assign old_eqpmt_key=$eqpmt_key}}
+				{{:assign var="ligne.date" value=$date}}
+				{{:assign var="ligne.materiel" value=$eqpmt_name}}
+			{{/if}}
+
+			{{if $direction == "output"}}
+				{{:assign total="%d+%d"|math:$total:$qte}}
+			{{else}}
+				{{:assign total="%d-%d"|math:$total:$qte}}
+			{{/if}}
 		{{/select}}
-	{{/if}}
 
-	{{if $temp_mat|count != 0}}
-		<h3 class="ruler">Matériels attribués temporairement</h3>
-		<table class="list">
-			<thead>
-				<tr>
-					<td>Date</td>
-					<td>Opération</td>
-					<td>Matériel</td>
-					<td>Quantité</td>
-					<td>Total</td>
-					<td class="actions"></td>
-				</tr>
-			</thead>
-			<tbody>
-				{{#foreach from=$temp_mat}}
-					{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$direction:$operation}}
-					{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}}
-					{{:assign var="total" from="reste.%s"|args:$eqpmt_key}}
-					{{if $total == null}}
-						{{:assign total=0}}
-					{{/if}}
-					{{if $direction == 'input' && $type_mvt == 'retour'}}
-						{{:assign var="reste.%s"|args:$eqpmt_key value="%d-%d"|math:$total:$amount}}
-					{{elseif $direction == 'output' && $type_mvt == 'temporaire'}}
-						{{:assign var="reste.%s"|args:$eqpmt_key value="%d+%d"|math:$total:$amount}}
-					{{/if}}
-					{{:assign var="total" from="reste.%s"|args:$eqpmt_key}}
+		{{if $total > 0}}
+			{{:assign var="ligne.qte" value=$total}}
+			{{:assign var="lignes." value=$ligne}}
+		{{/if}}
+
+		{{if $lignes|count > 0}}
+			<h3 class="ruler">Matériels attribués temporairement</h3>
+			<table class="list" id="liste_temporaires">
+				<thead>
 					<tr>
-						<td>{{$date|date_short}}</td>
-						<td>{{$op_label}}</td>
-						<td>{{$eqpmt_name}}</td>
-						<td>{{$amount}}</td>
-						<td>{{$total}}</td>
-						<td class="actions">
-							{{if $direction == "output" && $type_mvt == "temporaire"}}
-								{{:linkbutton
-								label="Retour"
-								href="%smovements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id
-								shape="history"
-								target="_dialog"}}
-							{{/if}}
-						</td>
+						<th>Date</th>
+						<th>Matériel</th>
+						<th>Quantité</th>
 					</tr>
-				{{/foreach}}
-			</tbody>
-		</table>
+				</thead>
+				<tbody>
+					{{#foreach from=$lignes}}
+						<tr>
+							<td>{{$date|date_short}}</td>
+							<td>{{$materiel}}</td>
+							<td>{{$qte}}</td>
+						</tr>
+					{{/foreach}}
+				</tbody>
+			</table>
+		{{/if}}
 	{{/if}}
 
-	{{* vérifier la présence des types d'entrées et de sorties requis *}}
-	{{ if $output_types|has_key:"définitif"}}
+	{{* Matériels attribués définitivement *}}
+	{{* vérifier la présence des types de sorties requis *}}
+	{{if $output_types|has_key:"définitif"}}
 		{{#select
 			eqpmt.key as eqpmt_key,
 			json_extract(eqpmt.document, '$.name') as eqpmt_name,
 			json_extract(mvt.document, '$.direction') as direction,
 			json_extract(mvt.document, '$.operation') as operation,
-			json_extract(mvt.document, '$.date') as date,
-			json_extract(mvt.document, '$.amount') as amount
-			FROM module_data_equipment AS mvt
+			MIN(json_extract(mvt.document, '$.date')) as date,
+			SUM(json_extract(mvt.document, '$.amount')) as amount
+			FROM {!$module.table} AS mvt
 			INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
-			INNER JOIN module_data_equipment AS eqpmt
+			INNER JOIN {!$module.table} AS eqpmt
 			ON json_extract(mvt.document, '$.equipment') = eqpmt.key
 			WHERE users.id = :user
 			AND json_extract(mvt.document, '$.operation') IN !output_types
-			ORDER BY date DESC
+			GROUP BY eqpmt_key, operation
+			ORDER BY eqpmt_name, date
 			;
 			:user = $user.id
 			!output_types=$output_types.définitif
@@ -134,11 +147,11 @@
 		<table class="list">
 			<thead>
 				<tr>
-					<td>Date</td>
-					<td>Opération</td>
-					<td>Matériel</td>
-					<td>Quantité</td>
-					<td>Total</td>
+					<th>Date</th>
+					<th>Matériel</th>
+					<th>Opération</th>
+					<th>Quantité</th>
+					<th>Total</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -155,8 +168,8 @@
 					{{:assign var="total" from="reste.%s"|args:$eqpmt_key}}
 					<tr>
 						<td>{{$date|date_short}}</td>
-						<td>{{$op_label}}</td>
 						<td>{{$eqpmt_name}}</td>
+						<td>{{$op_label}}</td>
 						<td>{{$amount}}</td>
 						<td>{{$total}}</td>
 					</tr>