Merge branch 'return_date'

_get_config.html

@@ -28,3 +28,9 @@
 		{{/foreach}}
 	{{/if}}
 {{/foreach}}
+
+{{if $module.config.loan_duration != null}}
+	{{:assign loan_duration=$module.config.loan_duration}}
+{{else}}
+	{{:assign loan_duration=$config_defaut.loan_duration}}
+{{/if}}

_nav.html

@@ -29,6 +29,11 @@
 				<li class="title"><strong>Historique — {{$eqpmt}} ({{$category}})</strong></li>
 			</ul>
 		{{/if}}
+	{{elseif $current == 'historique'}}
+		<ul class="sub">
+			<li {{if $subcurrent == 'tous'}} class="current"{{/if}}><a href="{{$module.url}}global_history.html">Tous</a></li>
+			<li {{if $subcurrent == 'prêts'}} class="current"{{/if}}><a href="{{$module.url}}loan_history.html">Prêts</a></li>
+		</ul>
 	{{elseif $current == 'archives'}}
 		{{if $subsubcurrent == 'historique'}}
 			<ul class="sub">
@@ -54,6 +59,7 @@
 			<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>
+			<li {{if $subcurrent == 'divers'}} class="current"{{/if}}><a href="{{$module.url}}config/misc.html">Divers</a></li>
 		</ul>
 	{{/if}}
 </nav>

default.json

@@ -33,5 +33,6 @@
 			"label" : "Retour de Location/Emprunt",
 			"type" : "retour"
 		}
-	]
+	],
+	"loan_duration" : "30"
 }

global_history.html

@@ -6,7 +6,7 @@
 
 {{:admin_header title="Historique des mouvements" custom_css="./style.css" current="module_equipment"}}
 
-{{:include file="./_nav.html" current="historique"}}
+{{:include file="./_nav.html" current="historique" subcurrent="tous"}}
 
 {{* récupérer la config des entrées/sorties *}}
 {{:include file="./_get_config.html" keep="config"}}

loan_history.html

@@ -0,0 +1,97 @@
+{{* -*- brindille -*- *}}
+
+{{:admin_header title="Matériels hors de l'asso" custom_css="../style.css" current="module_equipment"}}
+{{:include file="./_nav.html" current="historique" subcurrent="prêts"}}
+
+{{* lecture config (défaut ou enregistrée) *}}
+{{:include file="./_get_config.html" keep="config"}}
+
+{{#foreach from=$config.output_nature key="key"}}
+	{{if $type == 'temporaire'}}
+		{{:assign var="output_types." value=$key|quote_sql}}
+	{{/if}}
+{{/foreach}}
+{{:assign output_ops=$output_types|implode:","}}
+{{:assign output_ops="("|cat:$output_ops|cat:")"}}
+
+{{:assign premier=true}}
+{{#select
+		users.nom AS nom,
+		users.id AS user,
+		mvt.key AS mvt_key,
+		json_extract(mat.document, '$.name') AS mat_name,
+		json_extract(mvt.document, '$.date') AS out_date,
+		json_extract(mvt.document, '$.amount') AS out_amount,
+		json_extract(mvt.document, '$.return_date') AS return_date,
+		json_extract(mvt.document, '$.amount') - IFNULL(SUM(json_extract(retour.document, '$.amount')), 0) AS remain
+	FROM module_data_equipment AS mvt
+	INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
+	LEFT JOIN module_data_equipment AS links ON mvt.key = json_extract(links.document, '$.temp_key')
+	LEFT JOIN module_data_equipment AS retour ON retour.key = json_extract(links.document, '$.return')
+	INNER JOIN module_data_equipment AS mat ON mat.key = json_extract(mvt.document, '$.equipment')
+	WHERE
+		json_extract(mvt.document, '$.type') = 'movement'
+	AND
+		json_extract(mvt.document, '$.operation') IN !op
+	GROUP BY mvt.key
+	HAVING remain != 0
+	ORDER BY out_date, nom
+	;
+	!op = $output_ops
+}}
+	{{if $premier}}
+		<table class="list">
+			<thead>
+				<tr>
+					<th>Matériel</th>
+					<th>Date sortie</th>
+					<th>Quantité</th>
+					<th>Membre</th>
+					<th>Date retour</th>
+					<th>Reste à rendre</th>
+					<th>Remarque</th>
+					<th class="actions"></th>
+				</tr>
+			</thead>
+			<tbody>
+		{{:assign premier=false}}
+	{{/if}}
+
+	{{if $return_date != null}}
+		{{:assign ts_retour=$return_date|strtotime}}
+		{{:assign nb_jours="floor((%d-%d)/(60*60*24))"|math:$now:$ts_retour}}
+	{{/if}}
+	<tr>
+		<td>{{$mat_name}}</td>
+		<td>{{$out_date|date_short}}</td>
+		<td>{{$out_amount}}</td>
+		<td>{{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$nom}}</td>
+		<td>{{$return_date|date_short}}</td>
+		<td>{{$remain}}</td>
+		<td>
+			{{if $return_date != null}}
+			{{if $nb_jours > 0}}
+				{{:tag color="darkred" label="Retard %s jours"|args:$nb_jours}}
+			{{elseif $nb_jours < 0}}
+				{{:assign delai="abs(%d)"|math:$nb_jours}}
+				{{"Reste %s jours"|args:$delai}}
+			{{else}}
+				{{:tag color="darkgreen" label="À rendre aujourdh'ui"}}
+			{{/if}}
+			{{/if}}
+		</td>
+		<td>
+			{{:linkbutton
+				label="Retour"
+				href="movements/output_return.html?key=%s&prop=1"|args:$mvt_key
+				shape="reset"
+				target="_dialog"}}
+		</td>
+	</tr>
+{{else}}
+	<p class="block alert">Aucun mouvement.</p>
+{{/select}}
+	</tbody>
+</table>
+
+{{:admin_footer}}

movements/copy_movement.html

@@ -14,7 +14,7 @@
 {{/load}}
 
 {{* récupérer la config des entrées/sorties *}}
-{{:include file="../_get_config.html" keep="config, directions"}}
+{{:include file="../_get_config.html" keep="config, directions, loan_duration"}}
 {{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt_new.direction:$mvt_new.operation}}
 
 {{* interdire de dupliquer un retour => utiliser le bouton « Retour » *}}
@@ -93,6 +93,11 @@
 	{{:assign var="mvt_new.amount" value=$_POST.amount}}
 	{{:assign var="mvt_new.date" value=$_POST.date|parse_date}}
 	{{:assign var="mvt_new.comment" value=$_POST.comment}}
+	{{if $_POST.set_return_date != null}}
+		{{:assign return_date=$_POST.return_date}}
+	{{else}}
+		{{:assign return_date=null}}
+	{{/if}}
 
 	{{*
 		lister les mouvements
@@ -198,6 +203,7 @@
 		user=$user.id
 		storage=$_POST.storage
 		transactions=$transactions
+		return_date=$return_date|parse_date
 	}}
 	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
 {{/form}}
@@ -272,6 +278,22 @@
 				{{/if}}
 			{{/if}}
 			{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
+			{{if $mvt_new.direction == "output" && $type_mvt == "temporaire"}}
+				{{if $mvt_new.return_date != null}}
+					{{:assign checked="checked"}}
+					{{:assign visibility="visible"}}
+					{{:assign return_date=$mvt_new.return_date}}
+				{{else}}
+					{{:assign visibility="hidden"}}
+					{{:assign ts_sortie=$mvt_new.date|strtotime}}
+					{{:assign ts_retour="%d+%d*(60*60*24)"|math:$ts_sortie:$loan_duration}}
+					{{:assign return_date=$ts_retour|date_short}}
+				{{/if}}
+				{{: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" checked="%s"|args:$checked}}
+				<div id="div_return_date" style="visibility:{{$visibility}}">
+					{{:input type="date" name="return_date" label="Date de retour" default=$return_date}}
+				</div>
+			{{/if}}
 		</dl>
 	</fieldset>
 
@@ -282,3 +304,14 @@
 </form>
 
 {{:admin_footer}}
+
+<script type="text/javascript" src="../scripts.js"></script>
+<script type="text/javascript">
+function changeVisibility(evt, idcheck = 'f_set_return_date_1', fields = ['div_return_date']) {
+	toggleVisibility(idcheck, fields);
+}
+
+(function () {
+	document.getElementById('f_set_return_date_1').onclick = changeVisibility;
+})();
+</script>

movements/modify_movement.html

@@ -13,7 +13,7 @@
 {{/load}}
 
 {{* récupérer la config des entrées/sorties *}}
-{{:include file="../_get_config.html" keep="config, directions"}}
+{{:include file="../_get_config.html" keep="config, directions, loan_duration"}}
 {{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt_new.direction:$mvt_new.operation}}
 
 {{if $mvt_new.direction == "input"}}
@@ -84,6 +84,11 @@
 	{{:assign var="mvt_new.amount" value=$_POST.amount}}
 	{{:assign var="mvt_new.date" value=$_POST.date|parse_date}}
 	{{:assign var="mvt_new.comment" value=$_POST.comment}}
+	{{if $_POST.set_return_date != null}}
+		{{:assign return_date=$_POST.return_date}}
+	{{else}}
+		{{:assign return_date=null}}
+	{{/if}}
 
 	{{*
 		lister les mouvements
@@ -215,6 +220,7 @@
 		user=$user_id
 		storage=$_POST.storage
 		transactions=$transactions
+		return_date=$return_date|parse_date
 	}}
 	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
 {{/form}}
@@ -298,6 +304,23 @@
 				{{/if}}
 			{{/if}}
 			{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
+			{{if $mvt_new.direction == "output" && $type_mvt == "temporaire"}}
+				{{if $mvt_new.return_date != null}}
+					{{:assign checked="checked"}}
+					{{:assign visibility="visible"}}
+					{{:assign return_date=$mvt_new.return_date}}
+				{{else}}
+					{{:assign visibility="hidden"}}
+					{{:assign ts_sortie=$mvt_new.date|strtotime}}
+					{{:assign ts_retour="%d+%d*(60*60*24)"|math:$ts_sortie:$loan_duration}}
+					{{:assign return_date=$ts_retour|date_short}}
+				{{/if}}
+				{{: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" checked="%s"|args:$checked}}
+				<div id="div_return_date" style="visibility:{{$visibility}}">
+					{{:input type="date" name="return_date" label="Date de retour" default=$return_date}}
+					<input type="hidden" id="loan_duration" name="loan_duration" value="{{$loan_duration}}">
+				</div>
+			{{/if}}
 		</dl>
 	</fieldset>
 
@@ -308,3 +331,22 @@
 </form>
 
 {{:admin_footer}}
+
+<script type="text/javascript" src="../scripts.js"></script>
+<script type="text/javascript">
+function changeVisibility(evt, idcheck = 'f_set_return_date_1', fields = ['div_return_date']) {
+	toggleVisibility(idcheck, fields);
+}
+
+function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_date', id_loan_duration='loan_duration') {
+	const loan_duration = document.getElementById(id_loan_duration).value;
+	let nbsec = getDate(id_date) + loan_duration*24*60*60;
+	const date_retour = new Date(nbsec * 1000);
+	document.getElementById(id_return_date).value = date_retour.toLocaleDateString();
+}
+
+(function () {
+	document.getElementById('f_set_return_date_1').onclick = changeVisibility;
+	document.getElementById('f_date').onchange = changeReturnDate;
+})();
+</script>

movements/movement.schema.json

@@ -46,6 +46,11 @@
 			"items": {
 				"type": "integer"
 			}
+		},
+		"return_date" : {
+			"description": "Date de retour du matériel",
+			"type" : ["null", "string"],
+			"format" : "date"
 		}
 	},
 	"required": ["type", "direction", "operation", "amount", "equipment", "date", "comment"]

movements/movement_details.html

@@ -101,6 +101,10 @@
 		{{else}}—
 		{{/if}}
 	</dd>
+	{{if $mvt.return_date != null}}
+		<dt>Date de retour</dt>
+		<dd>{{$mvt.return_date|date_short}}</dd>
+	{{/if}}
 </dl>
 
 <form method="post" action="">

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, loan_duration"}}
 
 {{* types de sorties *}}
 {{#foreach from=$config.output_nature key=key}}
@@ -31,6 +31,15 @@
 	{{/if}}
 
 	{{:assign var="type_mvt" from="config.output_nature.%s.type"|args:$_POST.operation}}
+	{{if $type_mvt != "temporaire" && $_POST.set_return_date != null}}
+		{{:error message="On ne peut associer une date de retour qu'à une sortie temporaire"}}
+	{{/if}}
+	{{if $_POST.set_return_date != null}}
+		{{:assign return_date=$_POST.return_date}}
+	{{else}}
+		{{:assign return_date=null}}
+	{{/if}}
+
 	{{if $_POST.user|count > 1}}
 		{{:error message="Un membre au plus peut être associé à une sortie"}}
 	{{/if}}
@@ -142,6 +151,7 @@
 		date=$_POST.date|parse_date
 		comment=$_POST.remarques|trim
 		user=$user.id
+		return_date=$return_date|parse_date
 	}}
 	{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=1&msg=sortie"|args:$_GET.key}}
 {{/form}}
@@ -156,6 +166,8 @@
 {{:assign dispo="%d-%d"|math:$equipment.stock:$equipment.out}}
 
 {{if $dispo > 0}}
+	{{:assign ts_retour="%d+%d*(60*60*24)"|math:$now:$loan_duration}}
+	{{:assign date_retour=$ts_retour|date_short}}
 
 	{{* formulaire de sortie de matériel *}}
 	<form method="post" action="">
@@ -194,6 +206,11 @@
 					max=1
 				}}
 				{{: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"}}
+				<div id="div_return_date" style="visibility:hidden">
+					{{:input type="date" id="return_date" name="return_date" label="Date de retour" default=$date_retour}}
+					<input type="hidden" id="loan_duration" name="loan_duration" value="{{$loan_duration}}">
+				</div>
 			</dl>
 		</fieldset>
 		<p class="submit">
@@ -206,3 +223,23 @@
 
 {{:form_errors}}
 {{:admin_footer}}
+
+<script type="text/javascript" src="../scripts.js"></script>
+<script type="text/javascript">
+function changeVisibility(evt, idcheck = 'f_set_return_date_1', fields = ['div_return_date']) {
+	toggleVisibility(idcheck, fields);
+}
+
+function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_date', id_loan_duration='loan_duration') {
+	const loan_duration = document.getElementById(id_loan_duration).value;
+	let nbsec = getDate(id_date) + loan_duration*24*60*60;
+	const date_retour = new Date(nbsec * 1000);
+	document.getElementById(id_return_date).value = date_retour.toLocaleDateString();
+}
+
+(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;
+})();
+</script>

scripts.js

@@ -25,3 +25,30 @@ function disableColumSort(liste) {
 		}
 	}
 }
+
+function toggleVisibility(idcheck, fields) {
+	const elem = document.getElementById(idcheck);
+	for (let id of fields) {
+		const field = document.getElementById(id);
+		if (elem.checked) {
+			field.style.visibility = "visible";
+		} else {
+			field.style.visibility = "hidden";
+		}
+	}
+}
+
+/**
+ * renvoyer la valeur en secondes d'une date au format j/m/a
+ * @param {string} date
+ */
+function str2sec(date) {
+	const jma = date.split('/');
+	const dd = new Date(jma[2], jma[1]-1, jma[0]);
+	return dd.getTime()/1000;
+}
+
+// renvoyer la valeur en secondes d'un champ date
+function getDate(idelem) {
+	return str2sec(document.getElementById(idelem).value);
+}

snippets/user_details.html

@@ -44,6 +44,7 @@
 			eqpmt.key as eqpmt_key,
 			json_extract(eqpmt.document, '$.name') AS eqpmt_name,
 			json_extract(mvt.document, '$.amount') AS qte,
+			json_extract(mvt.document, '$.return_date') AS return_date,
 			json_extract(mvt.document, '$.operation') AS operation
 			FROM {!$module.table} AS mvt
 			INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
@@ -65,9 +66,17 @@
 			{{if $premier}}
 				{{:assign premier=false}}
 				{{:assign total=0}}
+				{{:assign nb_jours=0}}
 				{{:assign old_eqpmt_key=$eqpmt_key}}
 				{{:assign var="ligne.date" value=$date}}
 				{{:assign var="ligne.materiel" value=$eqpmt_name}}
+				{{:assign var="ligne.return_date" value=$return_date}}
+				{{:assign var="ligne.retard" value="0"}}
+				{{if $return_date != null}}
+					{{:assign ts_retour=$return_date|strtotime}}
+					{{:assign nb_jours="floor((%d-%d)/(60*60*24))"|math:$now:$ts_retour}}
+					{{:assign var="ligne.retard" value=$nb_jours}}
+				{{/if}}
 			{{/if}}
 
 			{{if $eqpmt_key != $old_eqpmt_key}}
@@ -76,9 +85,17 @@
 					{{:assign var="lignes." value=$ligne}}
 				{{/if}}
 				{{:assign total=0}}
+				{{:assign nb_jours=0}}
 				{{:assign old_eqpmt_key=$eqpmt_key}}
 				{{:assign var="ligne.date" value=$date}}
 				{{:assign var="ligne.materiel" value=$eqpmt_name}}
+				{{:assign var="ligne.return_date" value=$return_date}}
+				{{:assign var="ligne.retard" value="0"}}
+				{{if $return_date != null}}
+					{{:assign ts_retour=$return_date|strtotime}}
+					{{:assign nb_jours="floor((%d-%d)/(60*60*24))"|math:$now:$ts_retour}}
+					{{:assign var="ligne.retard" value=$nb_jours}}
+				{{/if}}
 			{{/if}}
 
 			{{if $direction == "output"}}
@@ -101,6 +118,8 @@
 						<th>Date</th>
 						<th>Matériel</th>
 						<th>Quantité</th>
+						<th>Date de retour</th>
+						<th>Remarque</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -109,6 +128,17 @@
 							<td>{{$date|date_short}}</td>
 							<td>{{$materiel}}</td>
 							<td>{{$qte}}</td>
+							<td>{{$return_date|date_short}}</td>
+							<td>
+								{{if $retard < 0}}
+									{{:assign delai="abs(%d)"|math:$retard}}
+									{{"Reste %s jours"|args:$delai}}
+								{{elseif $retard >0 }}
+									{{:tag color="darkred" label="Retard %s jours"|args:$retard}}
+								{{else}}
+									{{:tag color="darkgreen" label="À rendre aujourdh'ui"}}
+								{{/if}}
+							</td>
 						</tr>
 					{{/foreach}}
 				</tbody>