diff --git a/_calcul_dispo.html b/_calcul_dispo.html
index 36289fd..bd60cd0 100644
--- a/_calcul_dispo.html
+++ b/_calcul_dispo.html
@@ -17,21 +17,21 @@
{{* le matériel paramètre *}}
{{#load key=$_GET.key}}
{{:assign var="equipments.%s.category"|args:$key value=$category}}
- {{:assign var="equipments.%s.designation"|args:$key value=$designation}}
+ {{:assign var="equipments.%s.name"|args:$key value=$name}}
{{:assign var="in_equipments." value="'%s'"|args:$key}}
{{/load}}
{{elseif $_GET.cat_key}}
{{* matériels de la catégorie paramètre *}}
{{#load type="equipment" where="$$.category = :category_key" :category_key=$_GET.cat_key}}
{{:assign var="equipments.%s.category"|args:$key value=$category}}
- {{:assign var="equipments.%s.designation"|args:$key value=$designation}}
+ {{:assign var="equipments.%s.name"|args:$key value=$name}}
{{:assign var="in_equipments." value="'%s'"|args:$key}}
{{/load}}
{{else}}
{{* tous les matériels *}}
{{#load type="equipment"}}
{{:assign var="equipments.%s.category"|args:$key value=$category}}
- {{:assign var="equipments.%s.designation"|args:$key value=$designation}}
+ {{:assign var="equipments.%s.name"|args:$key value=$name}}
{{:assign var="in_equipments." value="'%s'"|args:$key}}
{{/load}}
{{/if}}
diff --git a/equipment.schema.json b/equipment.schema.json
index 4757344..e843e86 100644
--- a/equipment.schema.json
+++ b/equipment.schema.json
@@ -10,10 +10,10 @@
"description": "Clé de la catégorie",
"type": "string"
},
- "designation": {
+ "name": {
"description": "Désignation du matériel",
"type": "string"
}
},
- "required": ["type", "category", "designation"]
+ "required": ["type", "category", "name"]
}
diff --git a/historique.html b/historique.html
index 3ba9c20..88a13aa 100644
--- a/historique.html
+++ b/historique.html
@@ -26,11 +26,11 @@
{{#load type="category" where="key = :cle" :cle=$equipment.category assign="category"}}
{{else}}
- {{:error message="Le matériel %s n'appartient à aucune catégorie"|args:$equipment.designation}}
+ {{:error message="Le matériel %s n'appartient à aucune catégorie"|args:$equipment.name}}
{{/load}}
{{:admin_header title="Gestion des matériels" current="module_equipment"}}
-{{:include file="./_nav.html" current="inventaire" subcurrent=$proprio subsubcurrent="historique" eqpmt=$equipment.designation category=$category.name}}
+{{:include file="./_nav.html" current="inventaire" subcurrent=$proprio subsubcurrent="historique" eqpmt=$equipment.name category=$category.name}}
{{if $_GET.ok}}
{{if $_GET.msg == "modification"}}
diff --git a/inventaire.html b/inventaire.html
index 56bb67d..ecff02f 100644
--- a/inventaire.html
+++ b/inventaire.html
@@ -43,7 +43,7 @@
{{if $mat_present}}
{{#list
select="
- $$.designation AS 'Matériel' ;
+ $$.name AS 'Matériel' ;
"" AS 'Catégorie' ;
"" AS 'Stock' ;
"" AS 'Sorti' ;
@@ -69,7 +69,7 @@
{{/if}}
- {{$designation}} |
+ {{$name}} |
{{$cat_name}} |
{{$stock}} |
{{if $exterieur == null}}0{{else}}{{$exterieur}}{{/if}} |
diff --git a/inventaire_nonprop.html b/inventaire_nonprop.html
index d94ad9e..9e3f76d 100644
--- a/inventaire_nonprop.html
+++ b/inventaire_nonprop.html
@@ -43,7 +43,7 @@
{{if $mat_present}}
{{#list
select="
- $$.designation AS 'Matériel' ;
+ $$.name AS 'Matériel' ;
"" AS 'Catégorie' ;
"" AS 'Quantité'
"
@@ -65,7 +65,7 @@
{{/if}}
- {{$designation}} |
+ {{$name}} |
{{$cat_name}} |
{{$qte}} |
diff --git a/modifier_materiel.html b/modifier_materiel.html
index e711a59..a437903 100644
--- a/modifier_materiel.html
+++ b/modifier_materiel.html
@@ -26,9 +26,9 @@
{{* catégorie change : vérifier le nom *}}
{{#load key=$equipment_key}}
- {{if $designation|trim|tolower != $_POST.designation|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 *}}
- {{#load type="equipment" where="$$.designation = :name" :name=$_POST.designation|trim|tolower|ucfirst limit=1}}
+ {{#load type="equipment" where="$$.name = :name" :name=$_POST.name|trim|tolower|ucfirst limit=1}}
{{:assign chgt_ok=false}}
{{/load}}
{{else}}
@@ -38,7 +38,7 @@
{{else}}
{{* catégorie ne change pas => vérifier le nom *}}
- {{#load type="equipment" where="$$.designation = :name" :name=$_POST.designation|trim|tolower|ucfirst limit=1}}
+ {{#load type="equipment" where="$$.name = :name" :name=$_POST.name|trim|tolower|ucfirst limit=1}}
{{:assign chgt_ok=false}}
{{/load}}
{{/if}}
@@ -51,7 +51,7 @@
{{:save
key=$equipment_key
category=$category.key
- designation=$_POST.designation|trim|tolower|ucfirst
+ name=$_POST.name|trim|tolower|ucfirst
}}
{{:redirect force="index.html?ok=1&msg=modification&prop=%s"|args:$_GET.prop}}
{{/form}}
@@ -69,7 +69,7 @@
{{:input type="select" name="category" label="Catégorie" default=$default_category required=true options=$categories}}
- {{:input type="text" name="designation" label="Désignation" default=$equipment.designation required=true}}
+ {{:input type="text" name="name" label="Désignation" default=$equipment.name required=true}}
diff --git a/mouvements/ajouter_entree.html b/mouvements/ajouter_entree.html
index 2617854..8f677c9 100644
--- a/mouvements/ajouter_entree.html
+++ b/mouvements/ajouter_entree.html
@@ -35,14 +35,14 @@
{{/if}}
{{* vérifier l'existence d'un matériel de même nom *}}
- {{#load type="equipment" where="$$.designation = :name COLLATE U_NOCASE" :name=$_POST.designation|trim limit=1}}}}
+ {{#load type="equipment" where="$$.name = :name COLLATE U_NOCASE" :name=$_POST.name|trim limit=1}}}}
{{:assign equipment_key=$key}}
{{:assign var=nom_cat from="categories.%s"|args:$category}}
{{:assign present=true}}
{{/load}}
{{:assign var=post_cat from="categories.%s"|args:$_POST.category}}
- {{:assign post_mat=$_POST.designation|trim|tolower|ucfirst}}
+ {{:assign post_mat=$_POST.name|trim|tolower|ucfirst}}
{{if $present}}
{{* voir si le matériel existe dans une autre catégorie *}}
{{if $nom_cat != $post_cat}}
@@ -59,7 +59,7 @@
validate_schema="../equipment.schema.json"
type="equipment"
category=$_POST.category
- designation=$post_mat
+ name=$post_mat
}}
{{/if}}
@@ -109,7 +109,7 @@
{{:input type="select" name="category" label="Catégorie" options=$categories required=true}}
- {{:input type="text" name="designation" label="Désignation" required=true}}
+ {{:input type="text" name="name" label="Désignation" required=true}}
{{:input type="textarea" name="remarques" label="Remarques" cols="40", rows="3" required=false}}
diff --git a/mouvements/dupliquer_mouvement.html b/mouvements/dupliquer_mouvement.html
index 1d755ad..eab5c6a 100644
--- a/mouvements/dupliquer_mouvement.html
+++ b/mouvements/dupliquer_mouvement.html
@@ -128,7 +128,7 @@
{{else}}
« {{$mvt_new.output_nature}}
{{/if}}
- de {{$eqpmt.designation}} (qté : {{$mvt_new.amount}}) à la date du {{$mvt_new.date|date_short}} »
+ de {{$eqpmt.name}} (qté : {{$mvt_new.amount}}) à la date du {{$mvt_new.date|date_short}} »
{{else}}
{{* vérification réussie : enregistrer le mouvement modifié *}}
@@ -162,7 +162,7 @@
{{* formulaire de copie du mouvement *}}
|