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

Simplification ajouter_entree et amélioration retour

Browse Source
This commit is contained in:
Jean-Christophe Engel 2024-11-18 11:10:47 +01:00
parent 4d0bcc1bdd
commit c20be00ea4
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mouvements/ajouter_entree.html
View File

@ -19,11 +19,8 @@
{{* lister les catégories et les matériels disponibles *}}
{{#load type="category" assign="category" order="$$.name"}}
{{:assign nom_cat=$category.name}}
{{*:assign nom_cat=$category.name*}}
{{:assign var="categories.%s"|args:$category.key value=$category.name}}
{{#load type="equipment" where="$$.category = :key" :key=$category.key assign="equipment"}}
{{:assign var="equipments.%s.%s"|args:$nom_cat:$equipment.key value=$equipment.designation}}
{{/load}}
{{/load}}
{{* Traiter l'envoi du formulaire *}}
@ -34,21 +31,19 @@
{{:error message="La quantité (%s) doit être strictement positive !!"|args:$_POST.quantite}}
{{/if}}
{{:assign var=post_cat from="categories.%s"|args:$_POST.category}}
{{:assign post_mat=$_POST.designation|trim|tolower|ucfirst}}
{{* vérifier l'existence d'un matériel de même nom *}}
{{:assign post_mat=$_POST.designation|trim|tolower|ucfirst}}
{{:assign present=false}}
{{#foreach from=$equipments key=nom_cat item=eqpmt}}
{{#foreach from=$eqpmt key=key item=nom}}
{{if $_POST.designation|trim|tolower == $nom|tolower}}
{{#load type="equipment"}}
{{if $_POST.designation|trim|tolower == $designation|tolower}}
{{:assign equipment_key=$key}}
{{:assign var=nom_cat from="categories.%s"|args:$category}}
{{:assign present=true}}
{{:break}}
{{/if}}
{{/foreach}}
{{if $present}}{{:break}}{{/if}}
{{/foreach}}
{{/load}}
{{:assign var=post_cat from="categories.%s"|args:$_POST.category}}
{{if $present}}
{{* voir si le matériel existe dans une autre catégorie *}}
{{if $nom_cat != $post_cat}}
@ -64,7 +59,7 @@
key=$equipment_key
validate_schema="../equipment.schema.json"
type="equipment"
category=$category.key
category=$_POST.category
designation=$post_mat
}}
{{/if}}
@ -86,7 +81,12 @@
}}
{{:assign msg="Ajout de l'entrée « %s (%d) en date du %s » effectué"|args:$post_mat:$_POST.quantite:$_POST.date}}
{{:assign var=type_entree from="config.input_nature.%s"|args:$operation}}
{{if $type_entree == "temporaire"}}
{{:redirect force="../inventaire_nonprop.html?ok=1&msg=%s"|args:$msg}}
{{else}}
{{:redirect force="../index.html?ok=1&msg=%s"|args:$msg}}
{{/if}}
{{else}}
{{:form_errors}}
{{/form}}