réorganisation (cf remarques Bohwaz)

This commit is contained in:
Jean-Christophe Engel 2023-12-05 19:17:08 +01:00
parent 6006bdd169
commit 0e669a7c21
23 changed files with 279 additions and 236 deletions

View file

@ -1,22 +1,18 @@
{{#restrict section="accounting" level="write" block=true}}{{/restrict}}
{{:admin_header title="Gestion des matériels" current="module_equipment"}}
{{:admin_header title="Entrée de matériel" current="module_equipment"}}
{{if $_GET.dialog === null}}
{{* barre de navigation *}}
{{* barre de navigation *}}
{{if ! $dialog}}
{{:include file="../../_nav.html" current="entrees"}}
{{else}}
<header class="header">
<h1>Entrée de matériel</h1>
</header>
{{/if}}
{{* récupérer la config des entrées/sorties *}}
{{:include file="../../_get_config.html" keep="config"}}
{{* types d'entrées *}}
{{#foreach from=$config.inputNature item="elem"}}
{{#foreach from=$config.input_nature item="elem"}}
{{if $elem.type == 'retour'}}
{{:assign var='types_entrees.' value="%s"|args:$elem.label}}
{{:assign var='input_types.' value="%s"|args:$elem.label}}
{{/if}}
{{/foreach}}
@ -44,21 +40,21 @@
{{* Enregistrer le mouvement *}}
{{:assign mvt_key=""|uuid}}
{{:assign var="operation" from="types_entrees.%d|args:$_POST.type_operation}}
{{:assign var="operation" from="input_types.%d|args:$_POST.type_operation}}
{{:save
key=$mvt_key
validate_schema="../movement.schema.json"
type="movement"
direction="entrée"
inputNature=$operation
direction="input"
input_nature=$operation
amount=$_POST.quantite|intval
equipment=$equipment.key
date=$_POST.date|parse_date
comment=$_POST.remarques|trim
}}
{{:redirect force="index.html?ok=1&msg=Entrée de « %s » enregistrée"|args:$equipment.designation}}
{{:redirect force="index.html?ok=1&msg=entrée"}}
{{else}}
{{:form_errors}}
{{/form}}
@ -87,16 +83,20 @@
<form method="post" action="">
<fieldset class="entree">
<legend>Ajouter une entrée pour un retour de matériel</legend>
{{:input type="select" name="type_operation" label="Type" required=true options=$types_entrees}}
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
{{:input type="number" name="quantite" label="Quantité" required=true default=1}}
<legend>Ajouter une entrée pour un retour de matériel</legend>
<dl>
{{:input type="select" name="type_operation" label="Type" required=true options=$input_types}}
{{:input type="date" name="date" label="Date" required=true default=$now|date_short}}
{{:input type="number" name="quantite" label="Quantité" required=true default=1}}
</dl>
</fieldset>
<fieldset>
<fieldset>
<legend>Matériel</legend>
<dl>
{{:input type="select_groups" name="equipment" label="Matériel" required=true options=$temporaire}}
{{:input type="textarea" name="remarques" label="Remarques" cols="40", rows="3" required=false}}
</fieldset>
</dl>
</fieldset>
<p class="submit">