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

simplification casse et améliorations présentation

Browse Source
This commit is contained in:
Jean-Christophe Engel 2025-03-27 11:20:55 +01:00
parent 5c7e6e9b0f
commit 610af4e6a8
8 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archives.html
View File

@ -27,10 +27,6 @@
}} }}
</fieldset> </fieldset>
<div class="shortFormLeft">
<p class="help">Inventaire des matériels archivés</p>
</div>
{{* filtrer selon la catégorie *}} {{* filtrer selon la catégorie *}}
{{if $_GET.cat_key == null}} {{if $_GET.cat_key == null}}
{{:assign condition="1"}} {{:assign condition="1"}}

2
categories/add_category.html
View File

@ -14,7 +14,7 @@
{{/load}} {{/load}}
{{:assign key=""|uuid}} {{:assign key=""|uuid}}
{{:assign cat_name=$_POST.name|trim|tolower|ucfirst}} {{:assign cat_name=$_POST.name|trim}}
{{:save {{:save
key=$key key=$key
validate_schema="./category.schema.json" validate_schema="./category.schema.json"

4
categories/modify_category.html
View File

@ -8,7 +8,7 @@
{{* Traiter l'envoi du formulaire *}} {{* Traiter l'envoi du formulaire *}}
{{#form on="save"}} {{#form on="save"}}
{{* Vérifier s'il existe déjà une catégorie avec le même nom *}} {{* Vérifier s'il existe déjà une catégorie avec le même nom *}}
{{#load type="category" where="$$.name = :name" :name=$_POST.name|trim|tolower|ucfirst limit=1}} {{#load type="category" where="$$.name = :name COLLATE U_NOCASE" :name=$_POST.name|trim limit=1}}
{{:error message="Modification impossible car ce nom de catégorie (« %s ») existe déjà !"|args:$name|trim}} {{:error message="Modification impossible car ce nom de catégorie (« %s ») existe déjà !"|args:$name|trim}}
{{/load}} {{/load}}
@ -16,7 +16,7 @@
key=$category.key key=$category.key
validate_schema="./category.schema.json" validate_schema="./category.schema.json"
type="category" type="category"
name=$_POST.name|trim|tolower|ucfirst name=$_POST.name|trim
}} }}
{{:redirect force="./index.html?ok=1&msg=modification"}} {{:redirect force="./index.html?ok=1&msg=modification"}}
{{/form}} {{/form}}

2
config.html
View File

@ -20,7 +20,7 @@
{{:assign var="locked_%ss."|args:$direction value=$op_label}} {{:assign var="locked_%ss."|args:$direction value=$op_label}}
{{/load}} {{/load}}
<h2>{{$item|ucfirst}}s</h2> <h2 class="ruler">{{$item|ucfirst}}s</h2>
<table class="list"> <table class="list">
<thead> <thead>
<tr> <tr>

2
config/ajouter_type_mouvement.html
View File

@ -33,7 +33,7 @@
{{* ajouter le nouveau type de mouvement *}} {{* ajouter le nouveau type de mouvement *}}
{{if $_GET.dir == $direction}} {{if $_GET.dir == $direction}}
{{:assign var="newlabel" from="_POST.%s_fields.label"|args:$direction}} {{:assign var="newlabel" from="_POST.%s_fields.label"|args:$direction}}
{{:assign newlabel=$newlabel|trim|tolower|ucfirst}} {{:assign newlabel=$newlabel|trim}}
{{:assign var="%s_nature.key"|args:$direction value=""|uuid}} {{:assign var="%s_nature.key"|args:$direction value=""|uuid}}
{{:assign var="%s_nature.label"|args:$direction value=$newlabel}} {{: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_nature.type"|args:$direction from="_POST.%s_fields.type"|args:$direction}}

2
config/modifier_type_mouvement.html
View File

@ -21,7 +21,7 @@
{{:assign var="%s_nature.key"|args:$direction value=$key}} {{:assign var="%s_nature.key"|args:$direction value=$key}}
{{if $_GET.dir == $direction}} {{if $_GET.dir == $direction}}
{{if $key == $_GET.op_key}} {{if $key == $_GET.op_key}}
{{:assign var="%s_nature.label"|args:$direction value=$_POST.name|trim|tolower|ucfirst}} {{:assign var="%s_nature.label"|args:$direction value=$_POST.name|trim}}
{{else}} {{else}}
{{:assign var="%s_nature.label"|args:$direction value=$label}} {{:assign var="%s_nature.label"|args:$direction value=$label}}
{{/if}} {{/if}}

6
modifier_materiel.html
View File

@ -39,7 +39,7 @@
{{#load key=$equipment_key}} {{#load key=$equipment_key}}
{{if $name|trim|tolower != $_POST.name|trim|tolower}} {{if $name|trim|tolower != $_POST.name|trim|tolower}}
{{* le nom change => vérifier l'existence d'un matériel du même nom *}} {{* le nom change => vérifier l'existence d'un matériel du même nom *}}
{{#load type="equipment" where="$$.name = :name" :name=$_POST.name|trim|tolower|ucfirst limit=1}} {{#load type="equipment" where="$$.name = :name COLLATE U_NOCASE" :name=$_POST.name|trim limit=1}}
{{:assign chgt_ok=false}} {{:assign chgt_ok=false}}
{{/load}} {{/load}}
{{else}} {{else}}
@ -49,7 +49,7 @@
{{else}} {{else}}
{{* catégorie ne change pas => vérifier le nom *}} {{* catégorie ne change pas => vérifier le nom *}}
{{#load type="equipment" where="$$.name = :name" :name=$_POST.name|trim|tolower|ucfirst limit=1}} {{#load type="equipment" where="$$.name = :name COLLATE U_NOCASE" :name=$_POST.name|trim limit=1}}
{{:assign chgt_ok=false}} {{:assign chgt_ok=false}}
{{/load}} {{/load}}
{{/if}} {{/if}}
@ -62,7 +62,7 @@
{{:save {{:save
key=$equipment_key key=$equipment_key
category=$category.key category=$category.key
name=$_POST.name|trim|tolower|ucfirst name=$_POST.name|trim
}} }}
{{/if}} {{/if}}

2
mouvements/ajouter_entree.html
View File

@ -40,7 +40,7 @@
{{/load}} {{/load}}
{{:assign var=nom_cat from="categories.%s"|args:$equipment.category}} {{:assign var=nom_cat from="categories.%s"|args:$equipment.category}}
{{:assign var=post_cat from="categories.%s"|args:$_POST.category}} {{:assign var=post_cat from="categories.%s"|args:$_POST.category}}
{{:assign post_mat=$_POST.name|trim|tolower|ucfirst}} {{:assign post_mat=$_POST.name|trim}}
{{:assign var="type_mvt" from="config.input_nature.%s.type"|args:$_POST.operation}} {{:assign var="type_mvt" from="config.input_nature.%s.type"|args:$_POST.operation}}
{{if $present}} {{if $present}}