From 83c4a46342cb76d8c58816413b4180fc854a3644 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Oct 2025 17:21:14 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Ajout=20fichier=20oubli=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/misc.html | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 config/misc.html diff --git a/config/misc.html b/config/misc.html new file mode 100644 index 0000000..6c36be2 --- /dev/null +++ b/config/misc.html @@ -0,0 +1,34 @@ +{{* -*- brindille -*- *}} + +{{:admin_header title="Configuration" current="module_equipment"}} + +{{#form on="save"}} + {{:save + key="config" + loan_duration=$_POST.loan_duration + }} +{{/form}} + +{{* barre de navigation *}} +{{:include file="../_nav.html" current="config" subcurrent="divers"}} + +{{if $_GET.ok}} +

Configuration enregistrée.

+{{/if}} + +{{* lecture config (défaut ou enregistrée) *}} +{{:include file="../_get_config.html" keep="loan_duration"}} + +
+
+ Autres paramètres +
+ {{:input type="number" name="loan_duration" label="Durée de prêt par défaut" min=1 required=true default=$loan_duration help="Durée en nombre de jours"}} + +
+
+

+ {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}} +

+
+{{:admin_footer}} From 2f8a3a9db841c4aefc0a614b335a45726853a4d9 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Oct 2025 17:35:18 +0100 Subject: [PATCH 2/3] Correction erreur jointure --- loan_history.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loan_history.html b/loan_history.html index 42006aa..7b446f8 100644 --- a/loan_history.html +++ b/loan_history.html @@ -40,7 +40,7 @@ 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.table} AS mvt - INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id + LEFT JOIN users ON json_extract(mvt.document, '$.user') = users.id LEFT JOIN {!$module.table} AS links ON mvt.key = json_extract(links.document, '$.temp_key') LEFT JOIN {!$module.table} AS retour ON retour.key = json_extract(links.document, '$.return') INNER JOIN {!$module.table} AS mat ON mat.key = json_extract(mvt.document, '$.equipment') From 6e2a9104ef9fccd4ab2043c414d88f0aa1dacf6c Mon Sep 17 00:00:00 2001 From: Jean-Christophe Engel Date: Wed, 29 Oct 2025 17:35:50 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Correction=20erreur=20suppression=20membre?= =?UTF-8?q?=20associ=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- movements/modify_movement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/movements/modify_movement.html b/movements/modify_movement.html index 4f32141..67e9601 100644 --- a/movements/modify_movement.html +++ b/movements/modify_movement.html @@ -202,7 +202,7 @@ {{* enregistrer le mouvement modifié *}} {{if $user == null}} - {{:assign user_id=$mvt_new.user}} + {{:assign user_id=null}} {{else}} {{:assign user_id=$user.id}} {{/if}}