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

Amélioration cohérence infos formulaires

Browse source
This commit is contained in:
Jean-Christophe Engel 2025-10-16 12:12:16 +02:00
parent 36f840b3c6
commit 5848d73196
3 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
movements/copy_movement.html
View file

@ -202,7 +202,12 @@
{{: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"}} {{if $mvt_new.direction == "input"}}
{{:assign mvt_label="entrée"}}
{{else}}
{{:assign mvt_label="sortie"}}
{{/if}}
{{:admin_header title="Dupliquer une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
{{:form_errors}} {{:form_errors}}
{{* {{*
@ -261,9 +266,7 @@
}} }}
{{/if}} {{/if}}
{{if $mvt_new.direction == "input"}} {{if $mvt_new.direction == "input"}}
{{if $storage != null}} {{:input type="select" name="storage" default=$mvt_new.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 $type_mvt != "retour"}} {{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"}} {{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}}
{{/if}} {{/if}}

15
movements/modify_movement.html
View file

@ -219,7 +219,12 @@
{{: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"}} {{if $mvt_new.direction == "input"}}
{{:assign mvt_label="entrée"}}
{{else}}
{{:assign mvt_label="sortie"}}
{{/if}}
{{:admin_header title="Modifier une %s"|args:$mvt_label custom_css="./../style.css" current="module_equipment"}}
{{:form_errors}} {{:form_errors}}
{{* {{*
@ -232,11 +237,6 @@
{{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}} {{#select id, !name as nom FROM users WHERE id=:id; !name=$config.user_fields.name_sql :id=$mvt_new.user}}
{{:assign var="user.%s"|args:$id value=$nom}} {{:assign var="user.%s"|args:$id value=$nom}}
{{/select}} {{/select}}
{{#load type="link" where="$$.direction="output" AND $$.temp_key = :mvt_key" :mvt_key=$mvt_new.key limit=1}}
{{:assign retour=true}}
{{else}}
{{:assign retour=false}}
{{/load}}
{{/if}} {{/if}}
{{#load type="storage" order="$$.name"}} {{#load type="storage" order="$$.name"}}
@ -274,10 +274,11 @@
{{: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> </dl>
</fieldset> </fieldset>
<fieldset class="entree"> <fieldset class="entree">
<legend>Informations facultatives</legend> <legend>Informations facultatives</legend>
<dl> <dl>
{{if $prop == 1 && $mvt_new.direction == "output" && ! $retour}} {{if $prop == 1 && $mvt_new.direction == "output"}}
{{:input {{:input
type="list" type="list"
name="user" name="user"

32
movements/movement_details.html
View file

@ -70,20 +70,24 @@
<dd>{{$mvt.date|date_short}}</dd> <dd>{{$mvt.date|date_short}}</dd>
<dt>Quantité</dt> <dt>Quantité</dt>
<dd>{{$mvt.amount}}</dd> <dd>{{$mvt.amount}}</dd>
<dt>Membre destinataire</dt> {{if $mvt.direction == "output" && $type_mvt != "retour"}}
<dd> <dt>Membre destinataire</dt>
{{if $mvt.user != null}} <dd>
{{$user_name}} {{if $mvt.user != null}}
{{else}}— {{$user_name}}
{{/if}} {{else}}—
</dd> {{/if}}
<dt>Lieu de stockage</dt> </dd>
<dd> {{/if}}
{{if $storage != null}} {{if $mvt.direction == "input"}}
{{$storage.name}} <dt>Lieu de stockage</dt>
{{else}}— <dd>
{{/if}} {{if $storage != null}}
</dd> {{$storage.name}}
{{else}}—
{{/if}}
</dd>
{{/if}}
<dt>Écritures liées</dt> <dt>Écritures liées</dt>
<dd> <dd>
{{#foreach from=$mvt.transactions item="trans"}} {{#foreach from=$mvt.transactions item="trans"}}