From 8c92fa65c7c3a78c1114514b96b1a9b7c45ffb75 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 28 Dec 2018 15:31:58 +0100
Subject: [PATCH] Affichage
---
.../studio/javascript/app/ElementForm.js | 2 +-
.../externs/studio/lang/lang-en.json | 4 +-
.../externs/studio/lang/lang-fr.json | 2 +
.../externs/studio/templates/ElementForm.html | 68 +++++++++++--------
4 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/src/vitis/client/javascript/externs/studio/javascript/app/ElementForm.js b/src/vitis/client/javascript/externs/studio/javascript/app/ElementForm.js
index a6a52ba3..c5e29d59 100755
--- a/src/vitis/client/javascript/externs/studio/javascript/app/ElementForm.js
+++ b/src/vitis/client/javascript/externs/studio/javascript/app/ElementForm.js
@@ -284,7 +284,7 @@ nsVFB.ElementForm.prototype.helperDirective = function () {
$(element)["popover"]({
"trigger": "hover",
"container": "body",
- "title": "HelperBox",
+ "title": "Aide",
"content": function () {
return attrs.text;
}
diff --git a/src/vitis/client/javascript/externs/studio/lang/lang-en.json b/src/vitis/client/javascript/externs/studio/lang/lang-en.json
index ca2c8719..50dec792 100755
--- a/src/vitis/client/javascript/externs/studio/lang/lang-en.json
+++ b/src/vitis/client/javascript/externs/studio/lang/lang-en.json
@@ -155,10 +155,12 @@
"Height": "Height :",
"Required": "Required",
"displayOnly": "Display only",
+ "Default": "Default",
"DefaultValue": "Default value",
"Value": "Value",
+ "ValueHelp": "Pour mettre à jour la valeur d'un champ en fonction d'un autre, utilisez une expression complexe utilisant les valeurs du formulaire ex : \"= {{id_com}} == 75000\", ex : \"= int({{puissance}}) + int({{portee}}) == 1000\"",
"Visible": "Visible",
- "VisibleHelp": "Utilisez le gestionnaire de sources de données (bouton en bas à droite) pour ajouter ou modifier une source données"
+ "VisibleHelp": "Pour afficher/cacher le champ utilisez true/false ou une expression complexe utilisant les valeurs du formulaire ex : \"= {{id_com}} == 75000\", ex : \"= int({{puissance}}) + int({{portee}}) == 1000\""
},
"BusinessObject": {
"BusinessObject": "Business object",
diff --git a/src/vitis/client/javascript/externs/studio/lang/lang-fr.json b/src/vitis/client/javascript/externs/studio/lang/lang-fr.json
index ae9fd62b..0c657e4d 100755
--- a/src/vitis/client/javascript/externs/studio/lang/lang-fr.json
+++ b/src/vitis/client/javascript/externs/studio/lang/lang-fr.json
@@ -161,8 +161,10 @@
"Height": "Hauteur :",
"Required": "Requis",
"displayOnly": "Uniquement en consultation",
+ "Default": "Défaut",
"DefaultValue": "Valeur par défaut",
"Value": "Valeur",
+ "ValueHelp": "Pour mettre à jour la valeur d'un champ en fonction d'un autre, utilisez une expression complexe utilisant les valeurs du formulaire ex : \"= {{id_com}} == 75000\", ex : \"= int({{puissance}}) + int({{portee}}) == 1000\"",
"Visible": "Visible",
"VisibleHelp": "Pour afficher/cacher le champ utilisez true/false ou une expression complexe utilisant les valeurs du formulaire ex : \"= {{id_com}} == 75000\", ex : \"= int({{puissance}}) + int({{portee}}) == 1000\""
},
diff --git a/src/vitis/client/javascript/externs/studio/templates/ElementForm.html b/src/vitis/client/javascript/externs/studio/templates/ElementForm.html
index f1b2cff9..0391c838 100755
--- a/src/vitis/client/javascript/externs/studio/templates/ElementForm.html
+++ b/src/vitis/client/javascript/externs/studio/templates/ElementForm.html
@@ -75,7 +75,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Label.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<textarea ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label" rows="3"></textarea>
</div>
<div id="div_slider_Form">
@@ -115,7 +115,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Radio.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<select ng-disabled="locker"
ng-model="model.default_value"
ng-change="model.default_value = model.default_value === 'true' ? true : model.default_value === 'false' ? false : model.default_value"
@@ -167,7 +167,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.TextArea.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<textarea ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label" rows="3"></textarea>
</div>
<div id="div_slider_Form">
@@ -387,7 +387,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Select.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<!--Source de donnees-->
@@ -796,7 +796,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Date.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div id="div_slider_Form">
@@ -819,7 +819,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Date.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div id="div_slider_Form">
@@ -895,7 +895,7 @@
<input ng-disabled="locker" ng-model="model.nb_rows" id="Element_Form_rows_input" type="number" min="0" class="form-control" placeholder="{{::ctrl.text.Component.TinyMce.Row_PH}}" aria-describedby="Element_Form_rows_label">
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<textarea ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label" rows="3"></textarea>
</div>
<div class="checkbox checkbox_margin">
@@ -915,7 +915,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.ColorPicker.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div id="div_slider_Form">
@@ -935,7 +935,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Hidden.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<textarea ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label" rows="3"></textarea>
</div>
</div>
@@ -964,7 +964,7 @@
<input ng-disabled="locker" ng-model="model.options.precision" id="Element_Form_prec_input" type="number" min="0" class="form-control" placeholder="{{::ctrl.text.Component.Slider.Precision_PH}}" aria-describedby="Element_Form_prec_label">
</div>-->
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="number" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div id="div_slider_Form">
@@ -988,7 +988,7 @@
<input ng-disabled="locker" ng-model="model.pattern" id="Element_Form_label_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Text.Pattern_PH}}" aria-describedby="Element_Form_pattern_label">
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<textarea ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label" rows="3"></textarea>
</div>
<div id="div_slider_Form">
@@ -1016,7 +1016,7 @@
<input ng-disabled="locker" ng-model="model.pattern" id="Element_Form_label_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Password.Pattern_PH}}" aria-describedby="Element_Form_pattern_label">
</div>
<!--<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>-->
<div id="div_slider_Form">
@@ -1044,7 +1044,7 @@
<input ng-disabled="locker" ng-model="model.pattern" id="Element_Form_label_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.URL.Pattern_PH}}" aria-describedby="Element_Form_pattern_label">
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div id="div_slider_Form">
@@ -1072,7 +1072,7 @@
<input ng-disabled="locker" ng-model="model.pattern" id="Element_Form_label_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.URL.Pattern_PH}}" aria-describedby="Element_Form_pattern_label">
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div id="div_slider_Form">
@@ -1225,7 +1225,7 @@
</div>-->
<hr>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<textarea ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label" rows="5"></textarea>
</div>
</div>
@@ -1385,7 +1385,7 @@
</div>-->
<hr>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<textarea ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label" rows="5"></textarea>
</div>
</div>
@@ -1477,7 +1477,7 @@
</div>-->
<hr>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<textarea ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label" rows="5"></textarea>
</div>
</div>
@@ -1544,7 +1544,7 @@
<input ng-disabled="locker" ng-model="model.max" id="Element_Form_max_input" type="number" min="0" class="form-control" placeholder="{{::ctrl.text.Component.Number.Maximum_PH}}" aria-describedby="Element_Form_max_label">
</div>-->
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="number" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div class="checkbox checkbox_margin">
@@ -1572,7 +1572,7 @@
<input ng-disabled="locker" ng-model="model.max" id="Element_Form_max_input" type="number" min="0" class="form-control" placeholder="{{::ctrl.text.Component.Number.Maximum_PH}}" aria-describedby="Element_Form_max_label">
</div>-->
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="number" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div class="checkbox checkbox_margin">
@@ -1627,7 +1627,7 @@
<input ng-disabled="locker" ng-model="model.name" id="Element_Form_name_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Number.Name_PH}}" aria-describedby="Element_Form_name_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
<div id="div_slider_Form">
@@ -1708,7 +1708,7 @@
<input ng-disabled="locker" ng-model="model.target" id="Element_Form_target_input" type="text" class="form-control" placeholder="{{::ctrl.text.Component.Link.Target_PH}}" aria-describedby="Element_Form_target_label" required>
</div>
<div class="input-group element-margin input-group-xs">
- <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Value}}</span>
+ <span class="input-group-addon" id="Element_Form_value_label">{{::ctrl.text.Component.General.Default}}</span>
<input ng-disabled="locker" ng-model="model.default_value" id="Element_Form_value_input" type="text" class="form-control" aria-describedby="Element_Form_value_label"></input>
</div>
</div>
@@ -2178,19 +2178,33 @@
<!-- Default -->
<div ng-switch-default>
</div>
- <!-- Champ visible -->
- <div>
- <div ng-if="model.type != 'undefined'" class="input-group element-margin input-group-xs">
+
+ <!-- Options avancées -->
+ <div ng-if="model.type != 'undefined'">
+ <label>{{::ctrl.text.Component.Select.Advanced}}</label>
+ <!-- Valeur -->
+ <div class="input-group element-margin input-group-xs">
+ <span id="Element_Form_dynamic_value_label" class="input-group-addon">{{::ctrl.text.Component.General.Value}}</span>
+ <input ng-disabled="locker"
+ ng-model="model.dynamic_value"
+ id="Element_Form_value_input"
+ type="text"
+ class="form-control"
+ aria-describedby="Element_Form_dynamic_value_label"
+ data-app-helper-icon
+ data-text="{{::ctrl.text.Component.General.ValueHelp}}">
+ </div>
+ <!-- Champ visible -->
+ <div class="input-group element-margin input-group-xs">
<span id="Element_Form_visible_label" class="input-group-addon">{{::ctrl.text.Component.General.Visible}}</span>
- <textarea ng-disabled="locker"
+ <input ng-disabled="locker"
ng-model="model.visible"
id="Element_Form_visible_input"
type="text"
class="form-control"
aria-describedby="Element_Form_visible_label"
data-app-helper-icon
- data-text="{{::ctrl.text.Component.General.VisibleHelp}}"
- rows="3"></textarea>
+ data-text="{{::ctrl.text.Component.General.VisibleHelp}}">
</div>
</div>
</div>
--
GitLab