diff --git a/archives.html b/archives.html index 75ddcde..64d72c3 100644 --- a/archives.html +++ b/archives.html @@ -27,10 +27,6 @@ }} -
-

Inventaire des matériels archivés

-
- {{* filtrer selon la catégorie *}} {{if $_GET.cat_key == null}} {{:assign condition="1"}} diff --git a/categories/add_category.html b/categories/add_category.html index d6f802d..20691ae 100644 --- a/categories/add_category.html +++ b/categories/add_category.html @@ -14,7 +14,7 @@ {{/load}} {{:assign key=""|uuid}} - {{:assign cat_name=$_POST.name|trim|tolower|ucfirst}} + {{:assign cat_name=$_POST.name|trim}} {{:save key=$key validate_schema="./category.schema.json" diff --git a/categories/modify_category.html b/categories/modify_category.html index 7d5fbcb..9d2d315 100644 --- a/categories/modify_category.html +++ b/categories/modify_category.html @@ -8,7 +8,7 @@ {{* Traiter l'envoi du formulaire *}} {{#form on="save"}} {{* 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}} {{/load}} @@ -16,7 +16,7 @@ key=$category.key validate_schema="./category.schema.json" type="category" - name=$_POST.name|trim|tolower|ucfirst + name=$_POST.name|trim }} {{:redirect force="./index.html?ok=1&msg=modification"}} {{/form}} diff --git a/config.html b/config.html index 62e9b02..7928f03 100644 --- a/config.html +++ b/config.html @@ -20,7 +20,7 @@ {{:assign var="locked_%ss."|args:$direction value=$op_label}} {{/load}} -

{{$item|ucfirst}}s

+

{{$item|ucfirst}}s

diff --git a/config/ajouter_type_mouvement.html b/config/ajouter_type_mouvement.html index 810274b..00c3941 100644 --- a/config/ajouter_type_mouvement.html +++ b/config/ajouter_type_mouvement.html @@ -33,7 +33,7 @@ {{* 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 newlabel=$newlabel|trim}} {{: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}} diff --git a/config/modifier_type_mouvement.html b/config/modifier_type_mouvement.html index fe5527d..b5210c3 100644 --- a/config/modifier_type_mouvement.html +++ b/config/modifier_type_mouvement.html @@ -21,7 +21,7 @@ {{: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}} + {{:assign var="%s_nature.label"|args:$direction value=$_POST.name|trim}} {{else}} {{:assign var="%s_nature.label"|args:$direction value=$label}} {{/if}} diff --git a/modifier_materiel.html b/modifier_materiel.html index f4b29a7..10c0ce2 100644 --- a/modifier_materiel.html +++ b/modifier_materiel.html @@ -39,7 +39,7 @@ {{#load key=$equipment_key}} {{if $name|trim|tolower != $_POST.name|trim|tolower}} {{* 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}} {{/load}} {{else}} @@ -49,7 +49,7 @@ {{else}} {{* 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}} {{/load}} {{/if}} @@ -62,7 +62,7 @@ {{:save key=$equipment_key category=$category.key - name=$_POST.name|trim|tolower|ucfirst + name=$_POST.name|trim }} {{/if}} diff --git a/mouvements/ajouter_entree.html b/mouvements/ajouter_entree.html index 18b6392..0724244 100644 --- a/mouvements/ajouter_entree.html +++ b/mouvements/ajouter_entree.html @@ -40,7 +40,7 @@ {{/load}} {{:assign var=nom_cat from="categories.%s"|args:$equipment.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}} {{if $present}}