Amélioration présentation

config/add_movement_type.html

@@ -146,6 +146,13 @@
 					<li><b>retour</b> : le matériel <strong>non propriété de l'asso</strong> est rendu à son propriétaire (ex : retour de location ou d'emprunt)</li>
 				</ul>
 			</div>
+			<div class="help block tarif">
+				<h3>Tarification</h3>
+				<ul>
+					<li>Une sortie temporaire gratuite sera classée dans l'onglet Prêt</li>
+					<li>Une sortie temporaire payante sera classée dans l'onglet Locations</li>
+				</ul>
+			</div>
 		</fieldset>
 		<p class="submit">
 			{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
@@ -160,8 +167,10 @@ function toggleTarif(event) {
 	const value = output_fieldstype.value;
 	if (value == 'temporaire') {
 		g.toggle('#tarif', true);
+		g.toggle('div.tarif', true);
 	} else {
 		g.toggle('#tarif', false);
+		g.toggle('div.tarif', false);
 	}
 }
 toggleTarif();

config/modify_movement_type.html

@@ -101,10 +101,21 @@
 				{{:input type="text" name="name" label="Libellé" default=$default_label required=true maxlength="100"}}
 			{{/if}}
 			{{if $sortie_temp}}
+				<div>
 					{{:input type="radio-btn" name="tarif" value="gratuit" label="Gratuit" required=true default=$fee prefix_title=Tarif}}
 					{{:input type="radio-btn" name="tarif" value="payant" label="Payant" required=true default=$fee}}
+				</div>
 			{{/if}}
 		</dl>
+		{{if $sortie_temp}}
+			<div class="help block">
+				<h3>Tarification</h3>
+				<ul>
+					<li>Une sortie temporaire gratuite sera classée dans l'onglet Prêt</li>
+					<li>Une sortie temporaire payante sera classée dans l'onglet Locations</li>
+				</ul>
+			</div>
+		{{/if}}
 		<p class="submit">
 			{{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}
 		</p>

equipment_history.html

@@ -318,8 +318,8 @@
 			<td>{{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$user_details}}</td>
 		{{/if}}
 		<td>{{$storage}}</td>
-		<td class="num nosort">{{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}}</td>
+		<td class="num nosort">{{if $nb_files > 0}}{{$nb_files}}{{/if}}</td>
-		<td class="num">{{if $transactions|count > 0}}{{:icon shape="money"}}{{/if}}</td>
+		<td class="num">{{if $transactions|count > 0}}{{"Oui"}}{{/if}}</td>
 		<td class="actions">
 			{{if $current != "archives"}}
 				{{if $direction == "output" && $type_mvt == "temporaire"}}

loan_movements.html

@@ -205,8 +205,8 @@
 		<td class="num">{{$amount}}</td>
 		<td>{{:link href="/admin/users/details.php?id=%s"|args:$user_id label="%s"|args:$user}}</td>
 		<td>{{$stockage}}</td>
-		<td class="num">{{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}}</td>
+		<td class="num">{{if $nb_files > 0}}{{$nb_files}}{{/if}}</td>
-		<td class="num">{{if $transactions != null}}{{:icon shape="money"}}{{/if}}</td>
+		<td class="num">{{if $transactions != null}}{{"Oui"}}{{/if}}</td>
 		<td>{{$comment}}</td>
 		<td class="actions">
 			{{if $_GET.output_type == "loan"}}

member_loan.html

@@ -48,7 +48,7 @@
 
 {{:assign premier=true}}
 {{#select
-	nom, user, GROUP_CONCAT(mat_name) AS materiel, SUM(remain) AS quantite
+	nom, user, GROUP_CONCAT(mat_name, ", ") AS materiel, SUM(remain) AS quantite
 	FROM
 	(SELECT users.nom AS nom,
 		users.id AS user,

movements/add_new_equipment.html

@@ -134,19 +134,19 @@
 		<fieldset class="entree">
 			<legend>Informations obligatoires</legend>
 			<dl>
+				{{: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}}
+				{{:input type="text" name="name" label="Désignation" required=true}}
 				{{if $input_labels|count == 1}}
 					{{: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é" min=1 required=true default=1}}
 				{{if $categories|count == 1}}
 					{{: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}}
 			</dl>
 		</fieldset>
 		<fieldset>

movements/input_equipment.html

@@ -106,13 +106,13 @@
 	<fieldset class="entree">
 		<legend>Informations obligatoires</legend>
 		<dl>
+			{{: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 $input_labels|count == 1}}
 				{{:input type="select" name="operation" label="Type d'entrée" required=true options=$input_labels}}
 			{{else}}
 				{{:input type="select" name="operation" label="Type d'entrée" 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}}
 		</dl>
 	</fieldset>
 	<fieldset class="entree">

movements/input_return.html

@@ -204,9 +204,9 @@
 	<fieldset>
 		<legend>Retour de matériel</legend>
 		<dl>
-			{{:input type="select" name="operation" label="Type de mouvement" required=true options=$return_label}}
 			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
 			{{:input type="number" name="amount" label="Quantité" min=1 max=$present required=true default=1}}
+			{{:input type="select" name="operation" label="Type de mouvement" required=true options=$return_label}}
 			{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false}}
 		</dl>
 	</fieldset>

movements/modify_movement.html

@@ -291,13 +291,13 @@
 	<fieldset>
 		<legend>Informations obligatoires</legend>
 		<dl>
+			{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
+			{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
 			{{if $mvt_new.direction == "input"}}
 				{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
 			{{else}}
 				{{:input type="select" name="operation" label="Type" required=true options=$output_labels|sort default=$mvt_new.operation}}
 			{{/if}}
-			{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}}
-			{{:input type="number" name="amount" label="Quantité" min=1 required=true default=$mvt_new.amount}}
 		</dl>
 	</fieldset>
 

movements/output_equipment.html

@@ -204,33 +204,18 @@
 		<fieldset class="sortie">
 			<legend>Informations obligatoires</legend>
 			<dl>
+				{{: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}}
 				{{if $output_labels|count == 1}}
 					{{:input type="select" name="operation" label="Type de sortie" required=true options=$output_labels}}
 				{{else}}
 					{{:input type="select" name="operation" label="Type de sortie" 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}}
-				<div id="rent_user">
-				{{if $_GET.output_type == null || $_GET.output_type == "rent"}}
-					{{:input
-						type="list"
-						name="user"
-						label="Membre destinataire"
-						target="!users/selector.php"
-						multiple=true
-						max=1
-						required=true
-					}}
-				{{/if}}
-				</div>
 			</dl>
 		</fieldset>
 		<fieldset class="entree">
-			<legend>Informations facultatives</legend>
+			<legend>Autres informations</legend>
 			<dl>
-				<div id="loan_user">
-				{{if $_GET.output_type != "rent"}}
 				{{:input
 					type="list"
 					name="user"
@@ -239,8 +224,6 @@
 					multiple=true
 					max=1
 				}}
-				{{/if}}
-				</div>
 				{{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
 				{{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}}
 				{{:input id="set_return_date" type="checkbox" value=1 name="set_return_date" label="Fixer une date de retour" help="Cocher pour fixer une date de retour"}}
@@ -275,23 +258,9 @@ function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_da
 	setReturnDate(id_date, id_return_date, id_loan_duration);
 }
 
-function toggleUserDiv(event) {
-	const operation = document.getElementById('f_operation').value;
-	console.log('paid_keys=' + paid_keys + ', operation=' + operation);
-	if (paid_keys.includes(operation)) {
-		g.toggle('#rent_user', true);
-		g.toggle('#loan_user', false);
-	} else {
-		g.toggle('#rent_user', false);
-		g.toggle('#loan_user', true);
-	}
-}
-toggleUserDiv();
-
 (function () {
 	document.getElementById('f_set_return_date_1').checked = false;
 	document.getElementById('f_set_return_date_1').onclick = changeVisibility;
 	document.getElementById('f_date').onchange = changeReturnDate;
-	document.getElementById('f_operation').onchange = toggleUserDiv;
 })();
 </script>

movements/output_return.html

@@ -214,9 +214,9 @@
 	<fieldset>
 		<legend>Informations obligatoires</legend>
 		<dl>
-			{{:input type="select" name="operation" label="Type de mouvement" required=true options=$return_label}}
 			{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
 			{{:input type="number" name="amount" label="Quantité" min=1 max=$exterieur required=true default=1}}
+			{{:input type="select" name="operation" label="Type de mouvement" required=true options=$return_label}}
 		</dl>
 	</fieldset>
 	<fieldset class="entree">