lesanges/equipment
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lesanges:main
Branches Tags
lesanges:main
lesanges:linked_transactions
lesanges:v0.57
lesanges:v0.56
lesanges:v0.55
lesanges:v0.54
lesanges:v0.53
lesanges:v0.52
lesanges:v0.51
lesanges:v0.50
lesanges:v0.49
lesanges:v0.48
lesanges:v0.47
lesanges:v0.46
lesanges:v0.45
lesanges:v0.44
lesanges:v0.43
lesanges:v0.42
lesanges:v0.41
lesanges:v0.4
lesanges:v0.3
lesanges:v0.2
lesanges:0.1
..
compare: lesanges:v0.52
Branches Tags
lesanges:main
lesanges:linked_transactions
lesanges:v0.57
lesanges:v0.56
lesanges:v0.55
lesanges:v0.54
lesanges:v0.53
lesanges:v0.52
lesanges:v0.51
lesanges:v0.50
lesanges:v0.49
lesanges:v0.48
lesanges:v0.47
lesanges:v0.46
lesanges:v0.45
lesanges:v0.44
lesanges:v0.43
lesanges:v0.42
lesanges:v0.41
lesanges:v0.4
lesanges:v0.3
lesanges:v0.2
lesanges:0.1

No commits in common. "main" and "v0.52" have entirely different histories.
main ... v0.52

17 changed files with 191 additions and 349 deletions
Show stats Expand all files Collapse all files

3
_get_config.html
View file

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

2
categories/delete_category.html
View file

@ -7,7 +7,7 @@
{{#form on="delete"}} {{#form on="delete"}}
{{* Vérifier s'il reste des matériels dans cette catégorie *}} {{* Vérifier s'il reste des matériels dans cette catégorie *}}
{{#load type="equipment" category=$_GET.key limit="1"}} {{#load type="equipment" category=$_GET.key assign="equipment"}}
{{:redirect force="./index.html?err=1&msg=suppression"}} {{:redirect force="./index.html?err=1&msg=suppression"}}
{{else}} {{else}}
{{* supprimer la catégorie sélectionnée*}} {{* supprimer la catégorie sélectionnée*}}

6
categories/index.html
View file

@ -27,17 +27,15 @@
{{:assign category_key=$key}} {{:assign category_key=$key}}
{{* voir s'il y a des matériels dans cette catégorie *}} {{* voir s'il y a des matériels dans cette catégorie *}}
{{:assign materiel_present=true}} {{:assign materiel_present=true}}
{{#load type="equipment" where="$$.category = :category_key" :category_key=$category_key limit=1}} {{#load type="equipment" where="$$.category = :category_key" :category_key=$category_key}}
{{else}} {{else}}
{{:assign materiel_present=false}} {{:assign materiel_present=false}}
{{/load}} {{/load}}
<tr> <tr>
<th>{{$name}}</th> <th>{{$name}}</th>
<td class="actions"> <td class="actions">
{{if ! $materiel_present}}
{{:linkbutton label="Supprimer" href="delete_category.html?key=%s"|args:$key shape="delete" target="_dialog"}}
{{/if}}
{{:linkbutton label="Modifier" href="modify_category.html?key=%s"|args:$key shape="edit" target="_dialog"}} {{:linkbutton label="Modifier" href="modify_category.html?key=%s"|args:$key shape="edit" target="_dialog"}}
{{:linkbutton label="Supprimer" href="delete_category.html?key=%s"|args:$key shape="delete" target="_dialog"}}
</td> </td>
</tr> </tr>
{{else}} {{else}}

4
config/add_movement_type.html
View file

@ -12,8 +12,8 @@
{{* Traiter l'envoi du formulaire *}} {{* 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"}} {{#form on="save"}}
{{* vérifier s'il existe un type de mouvement de même nom *}} {{* vérifier s'il existe un type de mouvement de même nom *}}

32
equipment_history.html
View file

@ -122,10 +122,14 @@
{{if $current != "archives"}} {{if $current != "archives"}}
<nav class="tabs"> <nav class="tabs">
<aside> <aside>
{{if $_GET.prop && $equipment.stock > 0}} {{if $_GET.prop}}
{{: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 $equipment.stock > 0}}
{{/if}} {{:linkbutton label="Sortie" shape="minus" href="movements/output_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
{{: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"}} {{/if}}
{{:linkbutton label="Entrée" shape="plus" href="movements/input_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
{{else}}
{{:linkbutton label="Entrée" shape="plus" href="movements/input_equipment.html?key=%s"|args:$_GET.key target="_dialog"}}
{{/if}}
</aside> </aside>
</nav> </nav>
{{/if}} {{/if}}
@ -193,7 +197,7 @@
<tr> <tr>
<td>{{$date|date_short}}</td> <td>{{$date|date_short}}</td>
<td>{{$col2}}</td> <td>{{$col2}}</td>
<td class="nosort">{{$op_label}}</td> <td>{{$op_label}}</td>
<td class="num">{{$amount}}</td> <td class="num">{{$amount}}</td>
<td class="num nosort">{{$stock}}</td> <td class="num nosort">{{$stock}}</td>
<td class="num nosort">{{$exterieur}}</td> <td class="num nosort">{{$exterieur}}</td>
@ -208,7 +212,6 @@
{{if $temp_ext != null && $temp_ext > 0}} {{if $temp_ext != null && $temp_ext > 0}}
{{:linkbutton {{:linkbutton
label="Retour" label="Retour"
title="Enregistrer un retour de sortie temporaire"
href="movements/output_return.html?key=%s&prop=%s"|args:$key:$_GET.prop href="movements/output_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
shape="reset" shape="reset"
target="_dialog"}} target="_dialog"}}
@ -291,7 +294,7 @@
<tr> <tr>
<td>{{$date|date_short}}</td> <td>{{$date|date_short}}</td>
<td>{{$col2}}</td> <td>{{$col2}}</td>
<td class="nosort">{{$op_label}}</td> <td>{{$op_label}}</td>
<td class="num">{{$amount}}</td> <td class="num">{{$amount}}</td>
<td class="num nosort">{{$stock}}</td> <td class="num nosort">{{$stock}}</td>
<td>{{$col6}}</td> <td>{{$col6}}</td>
@ -302,21 +305,16 @@
{{if $temp_in != null && $temp_in > 0}} {{if $temp_in != null && $temp_in > 0}}
{{:linkbutton {{:linkbutton
label="Retour" label="Retour"
title="Enregistrer un retour d'entrée temporaire"
href="movements/input_return.html?key=%s&prop=%s"|args:$key:$_GET.prop href="movements/input_return.html?key=%s&prop=%s"|args:$key:$_GET.prop
shape="reset" shape="reset"
target="_dialog"}} target="_dialog"}}
{{/if}} {{/if}}
{{/if}} {{/if}}
{{if $direction == "output" && $type_mvt == "retour"}} {{:linkbutton
{{* interdire dupliquer *}} label="Dupliquer"
{{else}} href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
{{:linkbutton shape="plus"
label="Dupliquer" target="_dialog"}}
href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
shape="plus"
target="_dialog"}}
{{/if}}
{{:linkbutton {{:linkbutton
label="Modifier" label="Modifier"
href="movements/modify_movement.html?key=%s"|args:$key href="movements/modify_movement.html?key=%s"|args:$key

2
module.ini
View file

@ -1,5 +1,5 @@
name="Gestion des matériels" name="Gestion des matériels"
description="Permet de gérer un inventaire de matériels, ainsi que de suivre les prêts." description="Permet de gérer un inventaire de matériels, ainsi que de suivre les prêts (en test)."
author="Jean-Christophe Engel" author="Jean-Christophe Engel"
author_url="https://gitea.zaclys.com/lesanges" author_url="https://gitea.zaclys.com/lesanges"
home_button=true home_button=true

31
movements/add_new_equipment.html
View file

@ -88,12 +88,6 @@
notowned=$notowned notowned=$notowned
}} }}
{{/if}} {{/if}}
{{* documents liés *}}
{{#foreach from=$_POST.transactions item="value"}}
{{:assign var="transactions." value=$value|intval}}
{{/foreach}}
{{* Enregistrer le mouvement *}} {{* Enregistrer le mouvement *}}
{{:assign mvt_key=""|uuid}} {{:assign mvt_key=""|uuid}}
{{:assign var="operation" from="input_labels.%d"|args:$_POST.type_operation}} {{:assign var="operation" from="input_labels.%d"|args:$_POST.type_operation}}
@ -108,7 +102,6 @@
date=$_POST.date|parse_date date=$_POST.date|parse_date
comment=$_POST.remarques|trim comment=$_POST.remarques|trim
storage=$_POST.storage storage=$_POST.storage
transactions=$transactions
}} }}
{{if $type_mvt == "temporaire"}} {{if $type_mvt == "temporaire"}}
@ -131,30 +124,22 @@
<form method="post" action=""> <form method="post" action="">
<fieldset class="entree"> <fieldset class="entree">
<legend>Informations obligatoires</legend> <legend>Enregistrer une entrée de matériel</legend>
<dl> <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}}
{{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> </dl>
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>Informations facultatives</legend> <legend>Sélectionner une catégorie et indiquer le nom du nouveau matériel</legend>
<dl> <dl>
{{:input type="select" name="category" label="Catégorie" default_empty="— Aucune —" options=$categories required=true}}
{{:input type="text" name="name" label="Désignation" required=true}}
{{if $storage != null}} {{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}} {{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
{{/if}} {{/if}}
{{: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 type="textarea" name="remarques" label="Remarques" cols="40", rows="3" required=false}}
</dl> </dl>
</fieldset> </fieldset>

48
movements/copy_movement.html
View file

@ -17,11 +17,6 @@
{{:include file="../_get_config.html" keep="config, directions"}} {{:include file="../_get_config.html" keep="config, directions"}}
{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$mvt_new.direction:$mvt_new.operation}} {{: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 » *}}
{{if $type_mvt == "retour"}}
{{:error message="Opération interdite !"}}
{{/if}}
{{if $mvt_new.direction == "input"}} {{if $mvt_new.direction == "input"}}
{{if $type_mvt == "temporaire"}} {{if $type_mvt == "temporaire"}}
{{:assign prop=0}} {{:assign prop=0}}
@ -29,7 +24,11 @@
{{:assign prop=1}} {{:assign prop=1}}
{{/if}} {{/if}}
{{else}} {{else}}
{{:assign prop=1}} {{if $type_mvt == "retour"}}
{{:assign prop=0}}
{{else}}
{{:assign prop=1}}
{{/if}}
{{/if}} {{/if}}
{{* infos pour affichage *}} {{* infos pour affichage *}}
@ -47,7 +46,7 @@
{{if $mvt_new.direction == "input"}} {{if $mvt_new.direction == "input"}}
{{* types d'entrées *}} {{* types d'entrées *}}
{{#foreach from=$config.input_nature key=key}} {{#foreach from=$config.input_nature key=key}}
{{if $_GET.prop && $type == "définitif" || {{if $_GET.prop && $type != "temporaire" ||
! $_GET.prop && $type == "temporaire" ! $_GET.prop && $type == "temporaire"
}} }}
{{:assign var="input_labels.%s"|args:$key value=$label}} {{:assign var="input_labels.%s"|args:$key value=$label}}
@ -56,12 +55,13 @@
{{else}} {{else}}
{{* types de sorties *}} {{* types de sorties *}}
{{#foreach from=$config.output_nature key=key}} {{#foreach from=$config.output_nature key=key}}
{{if $_GET.prop && $type != "retour"}} {{if $_GET.prop && $type != "retour" ||
! $_GET.prop && $type == "retour"
}}
{{:assign var="output_labels.%s"|args:$key value=$label}} {{:assign var="output_labels.%s"|args:$key value=$label}}
{{/if}} {{/if}}
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
{{* {{*
-------------------- Traiter la saisie -------------------- -------------------- Traiter la saisie --------------------
*}} *}}
@ -177,13 +177,7 @@
out=$equipment.out out=$equipment.out
notowned=$equipment.notowned notowned=$equipment.notowned
}} }}
{{* vérification réussie : enregistrer le nouveau mouvement *}}
{{* documents liés *}}
{{#foreach from=$_POST.transactions item="value"}}
{{:assign var="transactions." value=$value|intval}}
{{/foreach}}
{{* enregistrer le nouveau mouvement *}}
{{:assign mvt_key=""|uuid}} {{:assign mvt_key=""|uuid}}
{{:save {{:save
key=$mvt_key key=$mvt_key
@ -197,12 +191,11 @@
comment=$mvt_new.comment comment=$mvt_new.comment
user=$user.id user=$user.id
storage=$_POST.storage storage=$_POST.storage
transactions=$transactions
}} }}
{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}} {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
{{/form}} {{/form}}
{{:admin_header title="Dupliquer un mouvement" custom_css="./../style.css" current="module_equipment"}} {{:admin_header title="Dupliquer un mouvement" current="module_equipment"}}
{{:form_errors}} {{:form_errors}}
{{* {{*
@ -225,17 +218,8 @@
{{* formulaire de copie du mouvement *}} {{* formulaire de copie du mouvement *}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations">
<legend>Matériel</legend>
<dl class="describe">
<dt>Désignation</dt>
<dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt>
<dd>{{$category.name}}</dd>
</dl>
</fieldset>
<fieldset> <fieldset>
<legend>Informations obligatoires</legend> <legend>Créer une copie de « {{$op_label}} {{$equipment.name}} (Catégorie : {{$category.name}}) »</legend>
<dl> <dl>
{{if $mvt_new.direction == "input"}} {{if $mvt_new.direction == "input"}}
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}} {{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
@ -244,11 +228,6 @@
{{/if}} {{/if}}
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}} {{: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}} {{: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"}} {{if $prop == 1 && $mvt_new.direction == "output"}}
{{:input {{:input
type="list" type="list"
@ -264,9 +243,6 @@
{{if $storage != null}} {{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}} {{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
{{/if}} {{/if}}
{{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}}
{{/if}} {{/if}}
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}} {{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
</dl> </dl>

37
movements/input_equipment.html
View file

@ -6,6 +6,11 @@
- key : clé du matériel à ajouter - key : clé du matériel à ajouter
*}} *}}
{{* barre de navigation *}}
{{if ! $dialog}}
{{:include file="../_nav.html" current="entrees"}}
{{/if}}
{{* récupérer la config des entrées/sorties *}} {{* récupérer la config des entrées/sorties *}}
{{:include file="../_get_config.html" keep="config"}} {{:include file="../_get_config.html" keep="config"}}
@ -24,6 +29,7 @@
{{* Traiter l'envoi du formulaire *}} {{* Traiter l'envoi du formulaire *}}
{{#form on="save"}} {{#form on="save"}}
{{* vérifier la quantité saisie *}} {{* vérifier la quantité saisie *}}
{{if $_POST.amount <= 0}} {{if $_POST.amount <= 0}}
{{:error message="La quantité (%s) doit être strictement positive !!"|args:$_POST.amount}} {{:error message="La quantité (%s) doit être strictement positive !!"|args:$_POST.amount}}
@ -42,11 +48,6 @@
{{:assign var="equipment.notowned" value="%d+%d"|math:$equipment.notowned:$_POST.amount|intval}} {{:assign var="equipment.notowned" value="%d+%d"|math:$equipment.notowned:$_POST.amount|intval}}
{{/if}} {{/if}}
{{* documents liés *}}
{{#foreach from=$_POST.transactions item="value"}}
{{:assign var="transactions." value=$value|intval}}
{{/foreach}}
{{:save {{:save
key=$equipment.key key=$equipment.key
validate_schema="../equipment.schema.json" validate_schema="../equipment.schema.json"
@ -72,7 +73,6 @@
date=$_POST.date|parse_date date=$_POST.date|parse_date
comment=$_POST.remarques|trim comment=$_POST.remarques|trim
storage=$_POST.storage storage=$_POST.storage
transactions=$transactions
}} }}
{{:assign var=type_entree from="config.input_nature.%s.type"|args:$_POST.operation}} {{:assign var=type_entree from="config.input_nature.%s.type"|args:$_POST.operation}}
{{if $type_entree == "temporaire"}} {{if $type_entree == "temporaire"}}
@ -90,36 +90,25 @@
{{#load type="storage" order="$$.name"}} {{#load type="storage" order="$$.name"}}
{{:assign var="storage.%s"|args:$key value=$name}} {{:assign var="storage.%s"|args:$key value=$name}}
{{/load}} {{/load}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations"> <fieldset class="informations">
<legend>Matériel</legend> <legend>Informations matériel</legend>
<dl class="describe"> <dl class="describe">
<dt>Désignation</dt> <dt>Matériel</dt>
<dd>{{$equipment.name}}</dd> <dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt> <dt>Catégorie</dt>
<dd>{{$category.name}}</dd> <dd>{{$category.name}}</dd>
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="entree"> <fieldset class="entree">
<legend>Informations obligatoires</legend> <legend>Enregistrer une entrée de matériel</legend>
<dl> <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="date" name="date" label="Date" required=true default=$now|date_short}}
{{:input type="number" name="amount" label="Quantité" required=true min=1 default=1}} {{:input type="number" name="amount" label="Quantité" required=true min=1 default=1}}
</dl> {{if $storage != null}}
</fieldset> {{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
<fieldset class="entree"> {{/if}}
<legend>Informations facultatives</legend>
<dl>
{{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
{{/if}}
{{: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 type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}}
</dl> </dl>
</fieldset> </fieldset>

15
movements/input_return.html
View file

@ -187,23 +187,12 @@
{{#load key=$equipment.category assign="category"}}{{/load}} {{#load key=$equipment.category assign="category"}}{{/load}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations">
<legend>Matériel</legend>
<dl class="describe">
<dt>Désignation</dt>
<dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt>
<dd>{{$category.name}}</dd>
<dt>Quantité disponible</dt>
<dd class="num">{{$present}}</dd>
</dl>
</fieldset>
<fieldset> <fieldset>
<legend>Retour de matériel</legend> <legend>Retour de « {{$equipment.name}} (Catégorie : {{$category.name}}) »</legend>
<dl> <dl>
{{:input type="select" name="operation" label="Type" required=true options=$return_label}} {{:input type="select" name="operation" label="Type" required=true options=$return_label}}
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}} {{: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="number" name="amount" label="Quantité" min=1 max=$present required=true default=$present}}
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false}} {{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false}}
</dl> </dl>
</fieldset> </fieldset>

40
movements/modify_movement.html
View file

@ -46,10 +46,7 @@
{{#foreach from=$directions key="direction"}} {{#foreach from=$directions key="direction"}}
{{:assign var="nature" from="config.%s_nature"|args:$direction}} {{:assign var="nature" from="config.%s_nature"|args:$direction}}
{{#foreach from=$nature key="key"}} {{#foreach from=$nature key="key"}}
{{if $type_mvt != "retour" && $type != "retour" || {{:assign var="%s_labels.%s"|args:$direction:$key value=$label}}
$type_mvt == "retour" && $type == "retour"}}
{{:assign var="%s_labels.%s"|args:$direction:$key value=$label}}
{{/if}}
{{/foreach}} {{/foreach}}
{{/foreach}} {{/foreach}}
@ -178,11 +175,6 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
{{* documents liés *}}
{{#foreach from=$_POST.transactions item="value"}}
{{:assign var="transactions." value=$value|intval}}
{{/foreach}}
{{:save {{:save
key=$equipment.key key=$equipment.key
validate_schema="../equipment.schema.json" validate_schema="../equipment.schema.json"
@ -214,12 +206,11 @@
comment=$mvt_new.comment comment=$mvt_new.comment
user=$user_id user=$user_id
storage=$_POST.storage storage=$_POST.storage
transactions=$transactions
}} }}
{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}} {{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
{{/form}} {{/form}}
{{:admin_header title="Modifier un mouvement" custom_css="./../style.css" current="module_equipment"}} {{:admin_header title="Modifier un mouvement" current="module_equipment"}}
{{:form_errors}} {{:form_errors}}
{{* {{*
@ -245,25 +236,8 @@
{{* formulaire de modification du mouvement *}} {{* formulaire de modification du mouvement *}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations">
<legend>Matériel</legend>
<dl class="describe">
<dt>Désignation</dt>
<dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt>
<dd>{{$category.name}}</dd>
{{if $mvt_new.transactions != null}}
<dt>Écritures liées</dt>
<dd>
{{#foreach from=$mvt_new.transactions item="trans"}}
{{:link class="num" href="!acc/transactions/details.php?id=%d"|args:$trans label=$trans}}
{{/foreach}}
</dd>
{{/if}}
</dl>
</fieldset>
<fieldset> <fieldset>
<legend>Informations obligatoires</legend> <legend>Modifier « {{$op_label}} {{$equipment.name}} (Catégorie : {{$category.name}}) »</legend>
<dl> <dl>
{{if $mvt_new.direction == "input"}} {{if $mvt_new.direction == "input"}}
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}} {{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
@ -272,11 +246,6 @@
{{/if}} {{/if}}
{{:input type="date" name="date" label="Date" required=true default=$mvt_new.date}} {{: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}} {{: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" && ! $retour}}
{{:input {{:input
type="list" type="list"
@ -292,9 +261,6 @@
{{if $storage != null}} {{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}} {{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}}
{{/if}} {{/if}}
{{if $type_mvt != "retour"}}
{{:input type="list" name="transactions" default=$mvt_new.transactions label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
{{/if}}
{{/if}} {{/if}}
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}} {{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
</dl> </dl>

6
movements/movement.schema.json
View file

@ -40,12 +40,6 @@
"storage": { "storage": {
"description": "clé du lieu de stockage", "description": "clé du lieu de stockage",
"type": ["string", "null"] "type": ["string", "null"]
},
"transactions": {
"type": ["array", "null"],
"items": {
"type": "integer"
}
} }
}, },
"required": ["type", "direction", "operation", "amount", "equipment", "date", "comment"] "required": ["type", "direction", "operation", "amount", "equipment", "date", "comment"]

15
movements/output_equipment.html
View file

@ -160,7 +160,7 @@
{{* formulaire de sortie de matériel *}} {{* formulaire de sortie de matériel *}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations"> <fieldset class="informations">
<legend>Matériel</legend> <legend>Informations matériel</legend>
<dl class="describe"> <dl class="describe">
<dt>Matériel</dt> <dt>Matériel</dt>
<dd>{{$equipment.name}}</dd> <dd>{{$equipment.name}}</dd>
@ -171,20 +171,11 @@
</dl> </dl>
</fieldset> </fieldset>
<fieldset class="sortie"> <fieldset class="sortie">
<legend>Informations obligatoires</legend> <legend>Enregistrer une sortie</legend>
<dl> <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="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 type="number" name="amount" label="Quantité" required=true default=1 min=1 max=$dispo}}
</dl>
</fieldset>
<fieldset class="entree">
<legend>Informations facultatives</legend>
<dl>
{{:input {{:input
type="list" type="list"
name="user" name="user"

29
movements/output_return.html
View file

@ -151,9 +151,7 @@
date=$_POST.date|parse_date date=$_POST.date|parse_date
comment=$_POST.comment|trim comment=$_POST.comment|trim
user=$mvt_new.user user=$mvt_new.user
storage=$_POST.storage
}} }}
{{* enregistrer la liaison entre le retour et la sortie temporaire *}} {{* enregistrer la liaison entre le retour et la sortie temporaire *}}
{{:save {{:save
key=""|uuid key=""|uuid
@ -192,36 +190,13 @@
{{* infos de la catégorie *}} {{* infos de la catégorie *}}
{{#load key=$equipment.category assign="category"}}{{/load}} {{#load key=$equipment.category assign="category"}}{{/load}}
{{#load type="storage" order="$$.name"}}
{{:assign var="storage.%s"|args:$key value=$name}}
{{/load}}
<form method="post" action=""> <form method="post" action="">
<fieldset class="informations">
<legend>Matériel</legend>
<dl class="describe">
<dt>Désignation</dt>
<dd>{{$equipment.name}}</dd>
<dt>Catégorie</dt>
<dd>{{$category.name}}</dd>
<dt>Quantité disponible</dt>
<dd class="num">{{$exterieur}}</dd>
</dl>
</fieldset>
<fieldset> <fieldset>
<legend>Informations obligatoires</legend> <legend>Retour de « {{$equipment.name}} (Catégorie : {{$category.name}}) »</legend>
<dl> <dl>
{{:input type="select" name="operation" label="Type" required=true options=$return_label}} {{:input type="select" name="operation" label="Type" required=true options=$return_label}}
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}} {{: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="number" name="amount" label="Quantité" min=1 max=$exterieur required=true default=$exterieur}}
</dl>
</fieldset>
<fieldset class="entree">
<legend>Informations facultatives</legend>
<dl>
{{if $storage != null}}
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
{{/if}}
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false}} {{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false}}
</dl> </dl>
</fieldset> </fieldset>

2
scripts.js
View file

@ -8,7 +8,7 @@ function disableColumSort(liste) {
let columns = liste.querySelectorAll("tbody > tr > td"); let columns = liste.querySelectorAll("tbody > tr > td");
// chercher la ligne de titres // chercher la ligne de titres
let titles = liste.querySelectorAll("thead > tr > th"); let titles = liste.querySelectorAll("thead > tr > td");
// désactiver le tri // désactiver le tri
for (let i = 0; i < titles.length; ++i) { for (let i = 0; i < titles.length; ++i) {

266
snippets/user_details.html
View file

@ -19,149 +19,131 @@
{{/foreach}} {{/foreach}}
{{/foreach}} {{/foreach}}
{{* {{#select
vérifier l'existence de la table du module eqpmt.key as eqpmt_key,
eh oui, il se peut qu'elle ne soit pas encore créée si aucune donnée n'a été ajoutée dedans json_extract(eqpmt.document, '$.name') as eqpmt_name,
*}} mvt.key AS mvt_key,
{{#load limit="1"}} json_extract(mvt.document, '$.direction') as direction,
{{:assign table_presente=true}} json_extract(mvt.document, '$.operation') as operation,
{{else}} json_extract(mvt.document, '$.date') as date,
{{:assign table_presente=false}} json_extract(mvt.document, '$.amount') as amount
{{/load}} FROM module_data_equipment 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
;
:user = $user.id
!output_types=$output_types.temporaire
!input_types=$input_types.retour
assign="temp_mat."
}}
{{/select}}
{{if $table_presente}} {{if $temp_mat|count != 0}}
{{* vérifier la présence des types d'entrées et de sorties requis *}} <h3 class="ruler">Matériels attribués temporairement</h3>
{{if $output_types|has_key:"temporaire" && $input_types|has_key:"retour"}} <table class="list">
{{#select <thead>
eqpmt.key as eqpmt_key, <tr>
json_extract(eqpmt.document, '$.name') as eqpmt_name, <td>Date</td>
mvt.key AS mvt_key, <td>Opération</td>
json_extract(mvt.document, '$.direction') as direction, <td>Matériel</td>
json_extract(mvt.document, '$.operation') as operation, <td>Quantité</td>
json_extract(mvt.document, '$.date') as date, <td>Total</td>
json_extract(mvt.document, '$.amount') as amount <td class="actions"></td>
FROM module_data_equipment AS mvt </tr>
INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id </thead>
INNER JOIN module_data_equipment AS eqpmt <tbody>
ON json_extract(mvt.document, '$.equipment') = eqpmt.key {{#foreach from=$temp_mat}}
WHERE users.id = :user {{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$direction:$operation}}
AND (json_extract(mvt.document, '$.operation') IN !output_types {{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}}
OR json_extract(mvt.document, '$.operation') IN !input_types) {{:assign var="total" from="reste.%s"|args:$eqpmt_key}}
ORDER BY date {{if $total == null}}
; {{:assign total=0}}
:user = $user.id {{/if}}
!output_types=$output_types.temporaire {{if $direction == 'input' && $type_mvt == 'retour'}}
!input_types=$input_types.retour {{:assign var="reste.%s"|args:$eqpmt_key value="%d-%d"|math:$total:$amount}}
assign="temp_mat." {{elseif $direction == 'output' && $type_mvt == 'temporaire'}}
}} {{:assign var="reste.%s"|args:$eqpmt_key value="%d+%d"|math:$total:$amount}}
{{/select}} {{/if}}
{{/if}} {{:assign var="total" from="reste.%s"|args:$eqpmt_key}}
{{if $temp_mat|count != 0}}
<h3 class="ruler">Matériels attribués temporairement</h3>
<table class="list">
<thead>
<tr> <tr>
<td>Date</td> <td>{{$date|date_short}}</td>
<td>Opération</td> <td>{{$op_label}}</td>
<td>Matériel</td> <td>{{$eqpmt_name}}</td>
<td>Quantité</td> <td>{{$amount}}</td>
<td>Total</td> <td>{{$total}}</td>
<td class="actions"></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>
</tr> </tr>
</thead> {{/foreach}}
<tbody> </tbody>
{{#foreach from=$temp_mat}} </table>
{{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$direction:$operation}} {{/if}}
{{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}}
{{:assign var="total" from="reste.%s"|args:$eqpmt_key}} {{#select
{{if $total == null}} eqpmt.key as eqpmt_key,
{{:assign total=0}} json_extract(eqpmt.document, '$.name') as eqpmt_name,
{{/if}} json_extract(mvt.document, '$.direction') as direction,
{{if $direction == 'input' && $type_mvt == 'retour'}} json_extract(mvt.document, '$.operation') as operation,
{{:assign var="reste.%s"|args:$eqpmt_key value="%d-%d"|math:$total:$amount}} json_extract(mvt.document, '$.date') as date,
{{elseif $direction == 'output' && $type_mvt == 'temporaire'}} json_extract(mvt.document, '$.amount') as amount
{{:assign var="reste.%s"|args:$eqpmt_key value="%d+%d"|math:$total:$amount}} FROM module_data_equipment AS mvt
{{/if}} INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id
{{:assign var="total" from="reste.%s"|args:$eqpmt_key}} INNER JOIN module_data_equipment AS eqpmt
<tr> ON json_extract(mvt.document, '$.equipment') = eqpmt.key
<td>{{$date|date_short}}</td> WHERE users.id = :user
<td>{{$op_label}}</td> AND json_extract(mvt.document, '$.operation') IN !output_types
<td>{{$eqpmt_name}}</td> ORDER BY date DESC
<td>{{$amount}}</td> ;
<td>{{$total}}</td> :user = $user.id
<td class="actions"> !output_types=$output_types.définitif
{{if $direction == "output" && $type_mvt == "temporaire"}} assign="def_mat."
{{:linkbutton }}
label="Retour" {{/select}}
href="%smovements/output_return.html?key=%s&prop=0&user=%s"|args:$module.url:$mvt_key:$user.id
shape="history" {{if $def_mat|count != 0}}
target="_dialog"}} <h3 class="ruler">Matériels attribués définitivement</h3>
{{/if}} <table class="list">
</td> <thead>
</tr> <tr>
{{/foreach}} <td>Date</td>
</tbody> <td>Opération</td>
</table> <td>Matériel</td>
{{/if}} <td>Quantité</td>
<td>Total</td>
{{* vérifier la présence des types d'entrées et de sorties requis *}} </tr>
{{ if $output_types|has_key:"définitif"}} </thead>
{{#select <tbody>
eqpmt.key as eqpmt_key, {{#foreach from=$def_mat}}
json_extract(eqpmt.document, '$.name') as eqpmt_name, {{:assign var="type_mvt" from="config.%s_nature.%s.type"|args:$direction:$operation}}
json_extract(mvt.document, '$.direction') as direction, {{:assign var="op_label" from="config.%s_nature.%s.label"|args:$direction:$operation}}
json_extract(mvt.document, '$.operation') as operation, {{:assign var="total" from="reste.%s"|args:$eqpmt_key}}
json_extract(mvt.document, '$.date') as date, {{if $total == null}}
json_extract(mvt.document, '$.amount') as amount {{:assign total=0}}
FROM module_data_equipment AS mvt {{/if}}
INNER JOIN users ON json_extract(mvt.document, '$.user') = users.id {{if $direction == 'output' && $type_mvt == 'définitif'}}
INNER JOIN module_data_equipment AS eqpmt {{:assign var="reste.%s"|args:$eqpmt_key value="%d+%d"|math:$total:$amount}}
ON json_extract(mvt.document, '$.equipment') = eqpmt.key {{/if}}
WHERE users.id = :user {{:assign var="total" from="reste.%s"|args:$eqpmt_key}}
AND json_extract(mvt.document, '$.operation') IN !output_types <tr>
ORDER BY date DESC <td>{{$date|date_short}}</td>
; <td>{{$op_label}}</td>
:user = $user.id <td>{{$eqpmt_name}}</td>
!output_types=$output_types.définitif <td>{{$amount}}</td>
assign="def_mat." <td>{{$total}}</td>
}} </tr>
{{/select}} {{/foreach}}
{{/if}} </tbody>
</table>
{{if $def_mat|count != 0}}
<h3 class="ruler">Matériels attribués définitivement</h3>
<table class="list">
<thead>
<tr>
<td>Date</td>
<td>Opération</td>
<td>Matériel</td>
<td>Quantité</td>
<td>Total</td>
</tr>
</thead>
<tbody>
{{#foreach from=$def_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 == 'output' && $type_mvt == 'définitif'}}
{{:assign var="reste.%s"|args:$eqpmt_key value="%d+%d"|math:$total:$amount}}
{{/if}}
{{:assign var="total" from="reste.%s"|args:$eqpmt_key}}
<tr>
<td>{{$date|date_short}}</td>
<td>{{$op_label}}</td>
<td>{{$eqpmt_name}}</td>
<td>{{$amount}}</td>
<td>{{$total}}</td>
</tr>
{{/foreach}}
</tbody>
</table>
{{/if}}
{{/if}} {{/if}}

2
style.css
View file

@ -21,6 +21,6 @@
} }
/* désactiver rétroaction pour colonnes non triables */ /* désactiver rétroaction pour colonnes non triables */
table.list > thead th[class~=nosort] a:hover { table.list > thead td[class~=nosort] a:hover {
background-color : rgba(var(--gSecondColor), 0.); background-color : rgba(var(--gSecondColor), 0.);
} }