From 60d6bb79b306676e8a9e71347e4be2b3a79ce8d5 Mon Sep 17 00:00:00 2001 From: Bruno Da Silva Date: Wed, 21 Mar 2018 16:38:30 +0000 Subject: [PATCH] search widget : date widget UI tests SVN:b1162[5490] --- application/nicewebpage.class.inc.php | 1 + dictionaries/en.dictionary.itop.ui.php | 20 +++++++++++++++++++- js/search/search_form_criteria_numeric.js | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php index d33218c4c..890ec2763 100644 --- a/application/nicewebpage.class.inc.php +++ b/application/nicewebpage.class.inc.php @@ -58,6 +58,7 @@ class NiceWebPage extends WebPage $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js'); $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js'); $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js'); + $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js'); $this->add_dict_entries('UI:Combo'); diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php index 0efb28ee5..49c776d6b 100644 --- a/dictionaries/en.dictionary.itop.ui.php +++ b/dictionaries/en.dictionary.itop.ui.php @@ -1401,18 +1401,32 @@ When associated with a trigger, each action is given an "order" number, specifyi 'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => '>=', 'UI:Search:Criteria:Operator:Numeric:LessThan' => '<', 'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => '<=', - 'UI:Search:Criteria:Operator:Numeric:DifferentThan' => 'Not', + 'UI:Search:Criteria:Operator:Numeric:Different' => '≠', 'UI:Search:Criteria:Operator:Numeric:Between' => 'Between:', + // - DateTime widget + 'UI:Search:Criteria:Operator:DateTime:Between' => 'Between:', // - Criteria titles // - Default widget 'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty', 'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty', 'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s', + + 'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s', + 'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s', + 'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s', + 'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s', + 'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s', + 'UI:Search:Criteria:Title:Default:Between' => '%1$s between (%2$s)', + 'UI:Search:Criteria:Title:Default:BetweenDays' => '%1$s between (%2$s)', // - String widget 'UI:Search:Criteria:Title:String:Contains' => '%1$s contains %2$s', 'UI:Search:Criteria:Title:String:StartsWith' => '%1$s starts with %2$s', 'UI:Search:Criteria:Title:String:EndsWith' => '%1$s ends with %2$s', + // - Numeric widget +// 'UI:Search:Criteria:Title:Numeric:Equals' => '%1$s equals %2$s', + // - DateTime widget + 'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s', // - External key widget 'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined', 'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined', @@ -1427,4 +1441,8 @@ When associated with a trigger, each action is given an "order" number, specifyi // - 'UI:Search:Value:Filter:Placeholder' => 'Filter...', 'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none', + + // - Widget other translations + 'UI:Search:Criteria:DateTime:From' => 'From', + 'UI:Search:Criteria:DateTime:Until' => 'Until', )); diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js index 3b357c50b..a03c56451 100644 --- a/js/search/search_form_criteria_numeric.js +++ b/js/search/search_form_criteria_numeric.js @@ -42,7 +42,7 @@ $(function() // 'dropdown_group':1, }, '!=': { - 'label': Dict.S('UI:Search:Criteria:Operator:Numeric:DifferentThan'), + 'label': Dict.S('UI:Search:Criteria:Operator:Numeric:Different'), 'code': 'different', 'rank': 500, // 'dropdown_group':1,