Mutualisation E/S et petites simplifications
This commit is contained in:
parent
55e649ce0d
commit
262d1935ca
10 changed files with 126 additions and 193 deletions
|
|
@ -1,5 +1,10 @@
|
|||
{{* -*- brindille -*- *}}
|
||||
|
||||
{{*
|
||||
paramètres :
|
||||
- dir : input ou output
|
||||
*}}
|
||||
|
||||
{{* barre de navigation *}}
|
||||
{{if ! $dialog}}
|
||||
{{:include file="../_nav.html" current="config" subcurrent="typesES"}}
|
||||
|
|
@ -8,49 +13,35 @@
|
|||
{{* Traiter l'envoi du formulaire *}}
|
||||
|
||||
{{* lecture config (défaut ou enregistrée) *}}
|
||||
{{:include file="../_get_config.html" keep="config"}}
|
||||
{{:include file="../_get_config.html" keep="config, directions"}}
|
||||
|
||||
{{#form on="save"}}
|
||||
{{* vérifier l'existence d'une entrée de même nom et générer le résultat *}}
|
||||
{{#foreach from=$config.input_nature key=key}}
|
||||
{{if $label|trim|tolower == $_POST.input_fields.label|trim|tolower}}
|
||||
{{:error message="Ce libellé d'entrée est déjà présent"}}
|
||||
{{* vérifier s'il existe un type de mouvement de même nom *}}
|
||||
{{#foreach from=$directions key="direction"}}
|
||||
{{:assign var="nature" from="config.%s_nature"|args:$direction}}
|
||||
{{#foreach from=$nature key="key"}}
|
||||
{{:assign var="fields" from="_POST.%s_fields"|args:$_GET.dir}}
|
||||
{{if $label|trim|tolower == $fields.label|trim|tolower}}
|
||||
{{:error message="Ce libellé est déjà présent"}}
|
||||
{{/if}}
|
||||
{{:assign var="%s_nature.key"|args:$direction value=$key}}
|
||||
{{:assign var="%s_nature.label"|args:$direction value=$label}}
|
||||
{{:assign var="%s_nature.type"|args:$direction value=$type}}
|
||||
{{:assign var="%s_natures."|args:$direction from="%s_nature"|args:$direction}}
|
||||
{{/foreach}}
|
||||
|
||||
{{* ajouter le nouveau type de mouvement *}}
|
||||
{{if $_GET.dir == $direction}}
|
||||
{{:assign var="newlabel" from="_POST.%s_fields.label|args:$direction}}
|
||||
{{:assign newlabel=$newlabel|trim|tolower|ucfirst}}
|
||||
{{:assign var="%s_nature.key"|args:$direction value=""|uuid}}
|
||||
{{:assign var="%s_nature.label"|args:$direction value=$newlabel}}
|
||||
{{:assign var="%s_nature.type"|args:$direction from="_POST.%s_fields.type"|args:$direction}}
|
||||
{{:assign var="%s_natures."|args:$direction from="%s_nature"|args:$direction}}
|
||||
{{/if}}
|
||||
{{:assign var="input_nature.key" value=$key}}
|
||||
{{:assign var="input_nature.label" value=$label}}
|
||||
{{:assign var="input_nature.type" value=$type}}
|
||||
{{:assign var="input_natures." from=input_nature}}
|
||||
|
||||
{{/foreach}}
|
||||
|
||||
{{* ajouter la nouvelle entrée *}}
|
||||
{{if $_GET.dir == 'input'}}
|
||||
{{:assign input_label=$_POST.input_fields.label|trim|tolower|ucfirst}}
|
||||
{{:assign var="input_nature.key" value=""|uuid}}
|
||||
{{:assign var="input_nature.label" value=$_POST.input_fields.label|trim|tolower|ucfirst}}
|
||||
{{:assign var="input_nature.type" value=$_POST.input_fields.type}}
|
||||
{{:assign var="input_natures." from=input_nature}}
|
||||
{{/if}}
|
||||
|
||||
{{* vérifier l'existence d'une sortie de même nom et générer le résultat *}}
|
||||
{{#foreach from=$config.output_nature key=key}}
|
||||
{{if $label|trim|tolower == $_POST.output_fields.label|trim|tolower}}
|
||||
{{:error message="Ce libellé de sortie est déjà présent"}}
|
||||
{{/if}}
|
||||
{{:assign var="output_nature.key" value=$key}}
|
||||
{{:assign var="output_nature.label" value=$label}}
|
||||
{{:assign var="output_nature.type" value=$type}}
|
||||
{{:assign var="output_natures." from=output_nature}}
|
||||
{{/foreach}}
|
||||
|
||||
{{* ajouter la nouvelle sortie *}}
|
||||
{{if $_GET.dir == 'output'}}
|
||||
{{:assign output_label=$_POST.output_fields.label|trim|tolower|ucfirst}}
|
||||
{{:assign var="output_nature.key" value=""|uuid}}
|
||||
{{:assign var="output_nature.label" value=$_POST.output_fields.label|trim|tolower|ucfirst}}
|
||||
{{:assign var="output_nature.type" value=$_POST.output_fields.type}}
|
||||
{{:assign var="output_natures." from=output_nature}}
|
||||
{{/if}}
|
||||
|
||||
{{:save
|
||||
key="config"
|
||||
validate_schema="../config.schema.json"
|
||||
|
|
|
|||
|
|
@ -12,38 +12,25 @@
|
|||
{{/if}}
|
||||
|
||||
{{* lecture config (défaut ou enregistrée) *}}
|
||||
{{:include file="../_get_config.html" keep="config"}}
|
||||
{{:include file="../_get_config.html" keep="config, directions"}}
|
||||
|
||||
{{#form on="save"}}
|
||||
{{:assign input_nature=null}}
|
||||
{{#foreach from=$config.input_nature key=key}}
|
||||
{{:assign var="input_nature.key" value=$key}}
|
||||
{{if $_GET.dir == 'input'}}
|
||||
{{if $key == $_GET.op_key}}
|
||||
{{:assign var="input_nature.label" value=$_POST.name|trim|tolower|ucfirst}}
|
||||
{{#foreach from=$directions key="direction"}}
|
||||
{{:assign var="nature" from="config.%s_nature"|args:$direction}}
|
||||
{{#foreach from=$nature key="key"}}
|
||||
{{:assign var="%s_nature.key"|args:$direction value=$key}}
|
||||
{{if $_GET.dir == $direction}}
|
||||
{{if $key == $_GET.op_key}}
|
||||
{{:assign var="%s_nature.label"|args:$direction value=$_POST.name|trim|tolower|ucfirst}}
|
||||
{{else}}
|
||||
{{:assign var="%s_nature.label"|args:$direction value=$label}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{:assign var="input_nature.label" value=$label}}
|
||||
{{:assign var="%s_nature.label"|args:$direction value=$label}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{:assign var="input_nature.label" value=$label}}
|
||||
{{/if}}
|
||||
{{:assign var="input_nature.type" value=$type}}
|
||||
{{:assign var="input_natures." from=input_nature}}
|
||||
{{/foreach}}
|
||||
|
||||
{{#foreach from=$config.output_nature key=key}}
|
||||
{{:assign var="output_nature.key" value=$key}}
|
||||
{{if $_GET.dir == 'output'}}
|
||||
{{if $key == $_GET.op_key}}
|
||||
{{:assign var="output_nature.label" value=$_POST.name|trim|tolower|ucfirst}}
|
||||
{{else}}
|
||||
{{:assign var="output_nature.label" value=$label}}
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{:assign var="output_nature.label" value=$label}}
|
||||
{{/if}}
|
||||
{{:assign var="output_nature.type" value=$type}}
|
||||
{{:assign var="output_natures." from=output_nature}}
|
||||
{{:assign var="%s_nature.type"|args:$direction value=$type}}
|
||||
{{:assign var="%s_natures."|args:$direction from="%s_nature"|args:$direction}}
|
||||
{{/foreach}}
|
||||
{{/foreach}}
|
||||
|
||||
{{:save
|
||||
|
|
|
|||
|
|
@ -12,25 +12,19 @@
|
|||
{{/if}}
|
||||
|
||||
{{* lecture config (défaut ou enregistrée) *}}
|
||||
{{:include file="../_get_config.html" keep="config"}}
|
||||
{{:include file="../_get_config.html" keep="config, directions"}}
|
||||
|
||||
{{#form on="delete"}}
|
||||
{{#foreach from=$config.input_nature key=key}}
|
||||
{{if $_GET.dir == 'input' && $key != $_GET.op_key || $_GET.dir == 'output'}}
|
||||
{{:assign var="input_nature.key" value=$key}}
|
||||
{{:assign var="input_nature.label" value=$label}}
|
||||
{{:assign var="input_nature.type" value=$type}}
|
||||
{{:assign var="input_natures." from=input_nature}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
|
||||
{{#foreach from=$config.output_nature key=key}}
|
||||
{{if $_GET.dir == 'output' && $key != $_GET.op_key || $_GET.dir == 'input'}}
|
||||
{{:assign var="output_nature.key" value=$key}}
|
||||
{{:assign var="output_nature.label" value=$label}}
|
||||
{{:assign var="output_nature.type" value=$type}}
|
||||
{{:assign var="output_natures." from=output_nature}}
|
||||
{{/if}}
|
||||
{{#foreach from=$directions key="direction"}}
|
||||
{{:assign var="nature" from="config.%s_nature"|args:$direction}}
|
||||
{{#foreach from=$nature key="key"}}
|
||||
{{if $_GET.dir == $direction && $key != $_GET.op_key || $_GET.dir != $direction}}
|
||||
{{:assign var="%s_nature.key"|args:$direction value=$key}}
|
||||
{{:assign var="%s_nature.label"|args:$direction value=$label}}
|
||||
{{:assign var="%s_nature.type"|args:$direction value=$type}}
|
||||
{{:assign var="%s_natures."|args:$direction from="%s_nature"|args:$direction}}
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
{{/foreach}}
|
||||
|
||||
{{:save
|
||||
|
|
@ -45,16 +39,11 @@
|
|||
{{:admin_header title="Gestion des matériels" current="module_equipment"}}
|
||||
{{:form_errors}}
|
||||
|
||||
{{if $_GET.dir == 'input'}}
|
||||
{{:delete_form
|
||||
legend="Supprimer cette entrée ?"
|
||||
warning="Supprimer l'entrée « %s » ?"|args:$_GET.mvt
|
||||
}}
|
||||
{{else}}
|
||||
{{:delete_form
|
||||
legend="Supprimer cette sortie ?"
|
||||
warning="Supprimer la sortie « %s » ?"|args:$_GET.mvt
|
||||
}}
|
||||
{{/if}}
|
||||
{{:assign var="mvt_label" from="config.%s_nature.%s.label"|args:$_GET.dir:$_GET.op_key}}
|
||||
{{:assign var="dir_label" from="directions.%s"|args:$_GET.dir}}
|
||||
{{:delete_form
|
||||
legend="Supprimer cette %s ?"|args:$dir_label
|
||||
warning="Supprimer « %s » ?"|args:$mvt_label
|
||||
}}
|
||||
|
||||
{{:admin_footer}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue