Compare commits
No commits in common. "main" and "v0.53" have entirely different histories.
17 changed files with 113 additions and 219 deletions
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
{{*
|
||||
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
|
||||
*}}
|
||||
|
||||
|
|
@ -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}}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
{{#form on="delete"}}
|
||||
{{* 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"}}
|
||||
{{else}}
|
||||
{{* supprimer la catégorie sélectionnée*}}
|
||||
|
|
|
|||
|
|
@ -27,17 +27,15 @@
|
|||
{{:assign category_key=$key}}
|
||||
{{* voir s'il y a des matériels dans cette catégorie *}}
|
||||
{{: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}}
|
||||
{{:assign materiel_present=false}}
|
||||
{{/load}}
|
||||
<tr>
|
||||
<th>{{$name}}</th>
|
||||
<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="Supprimer" href="delete_category.html?key=%s"|args:$key shape="delete" target="_dialog"}}
|
||||
</td>
|
||||
</tr>
|
||||
{{else}}
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
{{* Traiter l'envoi du formulaire *}}
|
||||
|
||||
{{* lecture config par défaut *}}
|
||||
{{:include file="../_get_config.html" keep="config, directions" default=true}}
|
||||
{{* lecture config (défaut ou enregistrée) *}}
|
||||
{{:include file="../_get_config.html" keep="config, directions"}}
|
||||
|
||||
{{#form on="save"}}
|
||||
{{* vérifier s'il existe un type de mouvement de même nom *}}
|
||||
|
|
|
|||
|
|
@ -122,10 +122,14 @@
|
|||
{{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}}
|
||||
{{: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 $_GET.prop}}
|
||||
{{if $equipment.stock > 0}}
|
||||
{{:linkbutton label="Sortie" shape="minus" href="movements/output_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>
|
||||
</nav>
|
||||
{{/if}}
|
||||
|
|
@ -193,7 +197,7 @@
|
|||
<tr>
|
||||
<td>{{$date|date_short}}</td>
|
||||
<td>{{$col2}}</td>
|
||||
<td class="nosort">{{$op_label}}</td>
|
||||
<td>{{$op_label}}</td>
|
||||
<td class="num">{{$amount}}</td>
|
||||
<td class="num nosort">{{$stock}}</td>
|
||||
<td class="num nosort">{{$exterieur}}</td>
|
||||
|
|
@ -208,7 +212,6 @@
|
|||
{{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"}}
|
||||
|
|
@ -291,7 +294,7 @@
|
|||
<tr>
|
||||
<td>{{$date|date_short}}</td>
|
||||
<td>{{$col2}}</td>
|
||||
<td class="nosort">{{$op_label}}</td>
|
||||
<td>{{$op_label}}</td>
|
||||
<td class="num">{{$amount}}</td>
|
||||
<td class="num nosort">{{$stock}}</td>
|
||||
<td>{{$col6}}</td>
|
||||
|
|
@ -302,21 +305,16 @@
|
|||
{{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="Dupliquer"
|
||||
href="movements/copy_movement.html?key=%s&prop=%s"|args:$key:$_GET.prop
|
||||
shape="plus"
|
||||
target="_dialog"}}
|
||||
{{:linkbutton
|
||||
label="Modifier"
|
||||
href="movements/modify_movement.html?key=%s"|args:$key
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
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_url="https://gitea.zaclys.com/lesanges"
|
||||
home_button=true
|
||||
|
|
|
|||
|
|
@ -88,12 +88,6 @@
|
|||
notowned=$notowned
|
||||
}}
|
||||
{{/if}}
|
||||
|
||||
{{* documents liés *}}
|
||||
{{#foreach from=$_POST.transactions item="value"}}
|
||||
{{:assign var="transactions." value=$value|intval}}
|
||||
{{/foreach}}
|
||||
|
||||
{{* Enregistrer le mouvement *}}
|
||||
{{:assign mvt_key=""|uuid}}
|
||||
{{:assign var="operation" from="input_labels.%d"|args:$_POST.type_operation}}
|
||||
|
|
@ -108,7 +102,6 @@
|
|||
date=$_POST.date|parse_date
|
||||
comment=$_POST.remarques|trim
|
||||
storage=$_POST.storage
|
||||
transactions=$transactions
|
||||
}}
|
||||
|
||||
{{if $type_mvt == "temporaire"}}
|
||||
|
|
@ -131,30 +124,22 @@
|
|||
<form method="post" action="">
|
||||
|
||||
<fieldset class="entree">
|
||||
<legend>Informations obligatoires</legend>
|
||||
<legend>Enregistrer une entrée de matériel</legend>
|
||||
<dl>
|
||||
{{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}}
|
||||
{{:input type="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
|
||||
{{: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}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
||||
<fieldset>
|
||||
<legend>Informations facultatives</legend>
|
||||
<legend>Sélectionner une catégorie et indiquer le nom du nouveau matériel</legend>
|
||||
<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}}
|
||||
{{: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}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
|
|
|||
|
|
@ -17,11 +17,6 @@
|
|||
{{: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}}
|
||||
|
||||
{{* 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 $type_mvt == "temporaire"}}
|
||||
{{:assign prop=0}}
|
||||
|
|
@ -29,7 +24,11 @@
|
|||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{if $type_mvt == "retour"}}
|
||||
{{:assign prop=0}}
|
||||
{{else}}
|
||||
{{:assign prop=1}}
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{* infos pour affichage *}}
|
||||
|
|
@ -47,7 +46,7 @@
|
|||
{{if $mvt_new.direction == "input"}}
|
||||
{{* types d'entrées *}}
|
||||
{{#foreach from=$config.input_nature key=key}}
|
||||
{{if $_GET.prop && $type == "définitif" ||
|
||||
{{if $_GET.prop && $type != "temporaire" ||
|
||||
! $_GET.prop && $type == "temporaire"
|
||||
}}
|
||||
{{:assign var="input_labels.%s"|args:$key value=$label}}
|
||||
|
|
@ -56,12 +55,13 @@
|
|||
{{else}}
|
||||
{{* types de sorties *}}
|
||||
{{#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}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
{{/if}}
|
||||
|
||||
{{*
|
||||
-------------------- Traiter la saisie --------------------
|
||||
*}}
|
||||
|
|
@ -177,13 +177,7 @@
|
|||
out=$equipment.out
|
||||
notowned=$equipment.notowned
|
||||
}}
|
||||
|
||||
{{* documents liés *}}
|
||||
{{#foreach from=$_POST.transactions item="value"}}
|
||||
{{:assign var="transactions." value=$value|intval}}
|
||||
{{/foreach}}
|
||||
|
||||
{{* enregistrer le nouveau mouvement *}}
|
||||
{{* vérification réussie : enregistrer le nouveau mouvement *}}
|
||||
{{:assign mvt_key=""|uuid}}
|
||||
{{:save
|
||||
key=$mvt_key
|
||||
|
|
@ -197,7 +191,6 @@
|
|||
comment=$mvt_new.comment
|
||||
user=$user.id
|
||||
storage=$_POST.storage
|
||||
transactions=$transactions
|
||||
}}
|
||||
{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=copie"|args:$eqpmt_key:$prop}}
|
||||
{{/form}}
|
||||
|
|
@ -226,16 +219,16 @@
|
|||
{{* formulaire de copie du mouvement *}}
|
||||
<form method="post" action="">
|
||||
<fieldset class="informations">
|
||||
<legend>Matériel</legend>
|
||||
<legend>Informations matériel</legend>
|
||||
<dl class="describe">
|
||||
<dt>Désignation</dt>
|
||||
<dt>Matériel</dt>
|
||||
<dd>{{$equipment.name}}</dd>
|
||||
<dt>Catégorie</dt>
|
||||
<dd>{{$category.name}}</dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>Informations obligatoires</legend>
|
||||
<legend>Créer une copie du mouvement</legend>
|
||||
<dl>
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
|
||||
|
|
@ -244,11 +237,6 @@
|
|||
{{/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>
|
||||
<fieldset class="entree">
|
||||
<legend>Informations facultatives</legend>
|
||||
<dl>
|
||||
{{if $prop == 1 && $mvt_new.direction == "output"}}
|
||||
{{:input
|
||||
type="list"
|
||||
|
|
@ -264,9 +252,6 @@
|
|||
{{if $storage != null}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
{{/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}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
|
||||
</dl>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@
|
|||
- 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 *}}
|
||||
{{:include file="../_get_config.html" keep="config"}}
|
||||
|
||||
|
|
@ -24,6 +29,7 @@
|
|||
|
||||
{{* Traiter l'envoi du formulaire *}}
|
||||
{{#form on="save"}}
|
||||
|
||||
{{* vérifier la quantité saisie *}}
|
||||
{{if $_POST.amount <= 0}}
|
||||
{{: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}}
|
||||
{{/if}}
|
||||
|
||||
{{* documents liés *}}
|
||||
{{#foreach from=$_POST.transactions item="value"}}
|
||||
{{:assign var="transactions." value=$value|intval}}
|
||||
{{/foreach}}
|
||||
|
||||
{{:save
|
||||
key=$equipment.key
|
||||
validate_schema="../equipment.schema.json"
|
||||
|
|
@ -72,7 +73,6 @@
|
|||
date=$_POST.date|parse_date
|
||||
comment=$_POST.remarques|trim
|
||||
storage=$_POST.storage
|
||||
transactions=$transactions
|
||||
}}
|
||||
{{:assign var=type_entree from="config.input_nature.%s.type"|args:$_POST.operation}}
|
||||
{{if $type_entree == "temporaire"}}
|
||||
|
|
@ -90,36 +90,25 @@
|
|||
{{#load type="storage" order="$$.name"}}
|
||||
{{:assign var="storage.%s"|args:$key value=$name}}
|
||||
{{/load}}
|
||||
|
||||
<form method="post" action="">
|
||||
<fieldset class="informations">
|
||||
<legend>Matériel</legend>
|
||||
<legend>Informations matériel</legend>
|
||||
<dl class="describe">
|
||||
<dt>Désignation</dt>
|
||||
<dt>Matériel</dt>
|
||||
<dd>{{$equipment.name}}</dd>
|
||||
<dt>Catégorie</dt>
|
||||
<dd>{{$category.name}}</dd>
|
||||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="entree">
|
||||
<legend>Informations obligatoires</legend>
|
||||
<legend>Enregistrer une entrée de matériel</legend>
|
||||
<dl>
|
||||
{{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="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$input_labels|sort}}
|
||||
{{: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">
|
||||
<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"}}
|
||||
{{if $storage != null}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default_empty="— Aucun —" options=$storage required=false}}
|
||||
{{/if}}
|
||||
{{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
|
|
|||
|
|
@ -188,9 +188,9 @@
|
|||
|
||||
<form method="post" action="">
|
||||
<fieldset class="informations">
|
||||
<legend>Matériel</legend>
|
||||
<legend>Informations matériel</legend>
|
||||
<dl class="describe">
|
||||
<dt>Désignation</dt>
|
||||
<dt>Matériel</dt>
|
||||
<dd>{{$equipment.name}}</dd>
|
||||
<dt>Catégorie</dt>
|
||||
<dd>{{$category.name}}</dd>
|
||||
|
|
|
|||
|
|
@ -46,10 +46,7 @@
|
|||
{{#foreach from=$directions key="direction"}}
|
||||
{{:assign var="nature" from="config.%s_nature"|args:$direction}}
|
||||
{{#foreach from=$nature key="key"}}
|
||||
{{if $type_mvt != "retour" && $type != "retour" ||
|
||||
$type_mvt == "retour" && $type == "retour"}}
|
||||
{{:assign var="%s_labels.%s"|args:$direction:$key value=$label}}
|
||||
{{/if}}
|
||||
{{:assign var="%s_labels.%s"|args:$direction:$key value=$label}}
|
||||
{{/foreach}}
|
||||
{{/foreach}}
|
||||
|
||||
|
|
@ -178,11 +175,6 @@
|
|||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{* documents liés *}}
|
||||
{{#foreach from=$_POST.transactions item="value"}}
|
||||
{{:assign var="transactions." value=$value|intval}}
|
||||
{{/foreach}}
|
||||
|
||||
{{:save
|
||||
key=$equipment.key
|
||||
validate_schema="../equipment.schema.json"
|
||||
|
|
@ -214,7 +206,6 @@
|
|||
comment=$mvt_new.comment
|
||||
user=$user_id
|
||||
storage=$_POST.storage
|
||||
transactions=$transactions
|
||||
}}
|
||||
{{:redirect force="../equipment_history.html?ok=1&key=%s&prop=%s&msg=modification"|args:$eqpmt_key:$prop}}
|
||||
{{/form}}
|
||||
|
|
@ -246,24 +237,16 @@
|
|||
{{* formulaire de modification du mouvement *}}
|
||||
<form method="post" action="">
|
||||
<fieldset class="informations">
|
||||
<legend>Matériel</legend>
|
||||
<legend>Informations matériel</legend>
|
||||
<dl class="describe">
|
||||
<dt>Désignation</dt>
|
||||
<dt>Matériel</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>
|
||||
<legend>Informations obligatoires</legend>
|
||||
<legend>Modifier un mouvement</legend>
|
||||
<dl>
|
||||
{{if $mvt_new.direction == "input"}}
|
||||
{{:input type="select" name="operation" label="Type" required=true options=$input_labels|sort default=$mvt_new.operation}}
|
||||
|
|
@ -272,11 +255,6 @@
|
|||
{{/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>
|
||||
<fieldset class="entree">
|
||||
<legend>Informations facultatives</legend>
|
||||
<dl>
|
||||
{{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}}
|
||||
{{:input
|
||||
type="list"
|
||||
|
|
@ -292,9 +270,6 @@
|
|||
{{if $storage != null}}
|
||||
{{:input type="select" name="storage" label="Lieu de stockage" default=$mvt_new.storage default_empty="— Aucun —" options=$storage required=false}}
|
||||
{{/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}}
|
||||
{{:input type="textarea" name="comment" label="Remarques" cols="40", rows="3" required=false default=$mvt_new.comment}}
|
||||
</dl>
|
||||
|
|
|
|||
|
|
@ -40,12 +40,6 @@
|
|||
"storage": {
|
||||
"description": "clé du lieu de stockage",
|
||||
"type": ["string", "null"]
|
||||
},
|
||||
"transactions": {
|
||||
"type": ["array", "null"],
|
||||
"items": {
|
||||
"type": "integer"
|
||||
}
|
||||
}
|
||||
},
|
||||
"required": ["type", "direction", "operation", "amount", "equipment", "date", "comment"]
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@
|
|||
{{* formulaire de sortie de matériel *}}
|
||||
<form method="post" action="">
|
||||
<fieldset class="informations">
|
||||
<legend>Matériel</legend>
|
||||
<legend>Informations matériel</legend>
|
||||
<dl class="describe">
|
||||
<dt>Matériel</dt>
|
||||
<dd>{{$equipment.name}}</dd>
|
||||
|
|
@ -171,20 +171,11 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="sortie">
|
||||
<legend>Informations obligatoires</legend>
|
||||
<legend>Enregistrer une sortie</legend>
|
||||
<dl>
|
||||
{{if $output_labels|count == 1}}
|
||||
{{: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="select" name="operation" label="Type" required=true default_empty="— Aucun —" options=$output_labels|sort}}
|
||||
{{: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}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
<fieldset class="entree">
|
||||
<legend>Informations facultatives</legend>
|
||||
<dl>
|
||||
{{:input
|
||||
type="list"
|
||||
name="user"
|
||||
|
|
|
|||
|
|
@ -151,9 +151,7 @@
|
|||
date=$_POST.date|parse_date
|
||||
comment=$_POST.comment|trim
|
||||
user=$mvt_new.user
|
||||
storage=$_POST.storage
|
||||
}}
|
||||
|
||||
{{* enregistrer la liaison entre le retour et la sortie temporaire *}}
|
||||
{{:save
|
||||
key=""|uuid
|
||||
|
|
@ -192,15 +190,11 @@
|
|||
{{* infos de la catégorie *}}
|
||||
{{#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="">
|
||||
<fieldset class="informations">
|
||||
<legend>Matériel</legend>
|
||||
<legend>Informations matériel</legend>
|
||||
<dl class="describe">
|
||||
<dt>Désignation</dt>
|
||||
<dt>Matériel</dt>
|
||||
<dd>{{$equipment.name}}</dd>
|
||||
<dt>Catégorie</dt>
|
||||
<dd>{{$category.name}}</dd>
|
||||
|
|
@ -209,19 +203,11 @@
|
|||
</dl>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>Informations obligatoires</legend>
|
||||
<legend>Retour de « {{$equipment.name}} (Catégorie : {{$category.name}}) »</legend>
|
||||
<dl>
|
||||
{{: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="number" name="amount" label="Quantité" min=1 max=$exterieur required=true default=1}}
|
||||
</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}}
|
||||
</dl>
|
||||
</fieldset>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ function disableColumSort(liste) {
|
|||
let columns = liste.querySelectorAll("tbody > tr > td");
|
||||
|
||||
// chercher la ligne de titres
|
||||
let titles = liste.querySelectorAll("thead > tr > th");
|
||||
let titles = liste.querySelectorAll("thead > tr > td");
|
||||
|
||||
// désactiver le tri
|
||||
for (let i = 0; i < titles.length; ++i) {
|
||||
|
|
|
|||
|
|
@ -30,32 +30,29 @@
|
|||
{{/load}}
|
||||
|
||||
{{if $table_presente}}
|
||||
{{* 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"}}
|
||||
{{#select
|
||||
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
|
||||
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}}
|
||||
{{#select
|
||||
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
|
||||
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 $temp_mat|count != 0}}
|
||||
<h3 class="ruler">Matériels attribués temporairement</h3>
|
||||
|
|
@ -105,29 +102,26 @@
|
|||
</table>
|
||||
{{/if}}
|
||||
|
||||
{{* vérifier la présence des types d'entrées et 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
|
||||
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
|
||||
ORDER BY date DESC
|
||||
;
|
||||
:user = $user.id
|
||||
!output_types=$output_types.définitif
|
||||
assign="def_mat."
|
||||
}}
|
||||
{{/select}}
|
||||
{{/if}}
|
||||
{{#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
|
||||
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
|
||||
ORDER BY date DESC
|
||||
;
|
||||
:user = $user.id
|
||||
!output_types=$output_types.définitif
|
||||
assign="def_mat."
|
||||
}}
|
||||
{{/select}}
|
||||
|
||||
{{if $def_mat|count != 0}}
|
||||
<h3 class="ruler">Matériels attribués définitivement</h3>
|
||||
|
|
|
|||
|
|
@ -21,6 +21,6 @@
|
|||
}
|
||||
|
||||
/* 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.);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue