Merge pull request #3794 from camptocamp/f_3520

Fix rules operator translation
camptocamp · Apr 23, 2018 · 2da3f1a · 2da3f1a
2 parents bafa6f8 + 95682a5
commit 2da3f1a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/src/directives/partials/rule.html b/src/directives/partials/rule.html
@@ -244,7 +244,7 @@
           <span>{{ ruleCtrl.timeToDate(ruleCtrl.rule.upperBoundary) }}</span>
         </div>
         <div ng-switch-default>
-          <span>{{ ruleCtrl.rule.operator }}</span>
+          <span>{{ ruleCtrl.operatorsShortFormat[ruleCtrl.rule.operator] }}</span>
           <span>{{ ruleCtrl.timeToDate(ruleCtrl.rule.getExpression()) }}</span>
         </div>
       </div>
@@ -291,7 +291,7 @@
           <span>{{ ruleCtrl.rule.upperBoundary }}</span>
         </div>
         <div ng-switch-default>
-          <span>{{ ruleCtrl.rule.operator }}</span>
+          <span>{{ ruleCtrl.operatorsShortFormat[ruleCtrl.rule.operator] }}</span>
           <span>{{ ruleCtrl.rule.getExpression() }}</span>
         </div>
       </div>

diff --git a/src/directives/rule.js b/src/directives/rule.js
@@ -154,6 +154,23 @@ ngeo.RuleController = class {
       [tot.EQUALS]: gettextCatalog.getString('Is equal to')
     };
 
+    /**
+     * @type {Object.<string, string>}
+     * @export
+     */
+    this.operatorsShortFormat = {
+      [ot.EQUAL_TO]: '=',
+      [ot.GREATER_THAN]: '>',
+      [ot.GREATER_THAN_OR_EQUAL_TO]: '>=',
+      [ot.LESSER_THAN]: '<',
+      [ot.LESSER_THAN_OR_EQUAL_TO]: '<=',
+      [ot.NOT_EQUAL_TO]: '!=',
+      [ot.LIKE]: '~',
+      [tot.BEGINS]: '>=',
+      [tot.ENDS]: '<=',
+      [tot.EQUALS]: '='
+    };
+
     /**
      * Time property used when the rule is of type 'date|datetime' and uses
      * a range of date.

diff --git a/src/rule/rule.js b/src/rule/rule.js
@@ -362,8 +362,8 @@ ngeo.rule.Rule.SpatialOperatorType = {
  * @enum {string}
  */
 ngeo.rule.Rule.TemporalOperatorType = {
-  BEGINS: '>=',
-  DURING: '..',
-  ENDS: '<=',
-  EQUALS: '='
+  BEGINS: 'time_start',
+  DURING: 'time_during',
+  ENDS: 'time_end',
+  EQUALS: 'time_equal'
 };