From f71be3a9a1caa65686c061ffd4169dd7086c136a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Ba=C3=B1ales?= Date: Mon, 3 Dec 2018 11:34:14 -0300 Subject: [PATCH] Add "inclusive" definition --- app/components/table-filters/pablo-number-range.js | 4 ++-- .../components/table-filters/pablo-number-range.emblem | 1 + tests/dummy/app/i18n/translations.coffee | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/components/table-filters/pablo-number-range.js b/app/components/table-filters/pablo-number-range.js index 4ab2d4b..1be2123 100644 --- a/app/components/table-filters/pablo-number-range.js +++ b/app/components/table-filters/pablo-number-range.js @@ -15,8 +15,8 @@ export default Component.extend({ filter_text: Ember.computed('{lower_bound,upper_bound,display_addition,inclusive}', function () { var lower_limit, upper_limit, range, isInclusive; isInclusive = this.get('inclusive'); - lower_limit = this.get('lower_bound') || '-'; - upper_limit = this.get('upper_bound') || '-'; + lower_limit = this.get('lower_bound') || 'a'; + upper_limit = this.get('upper_bound') || 'b'; range = isInclusive ? `[${lower_limit}, ${upper_limit}]` : `(${lower_limit}, ${upper_limit})`; if (this.get('display_addition')) { range += " " + this.get('display_addition'); diff --git a/app/templates/components/table-filters/pablo-number-range.emblem b/app/templates/components/table-filters/pablo-number-range.emblem index 716da5f..3a3d72e 100644 --- a/app/templates/components/table-filters/pablo-number-range.emblem +++ b/app/templates/components/table-filters/pablo-number-range.emblem @@ -14,6 +14,7 @@ ui-dropdown class='left basic labeled top left pointing icon select-number' acti .ui.pointing.red.basic.label {{error}} .item ui-checkbox class='item' checked=inclusive label=(t 'number.range.inclusive') onChange=(action 'toggle_inclusive') + ui-popup tagName="i" class="info circle icon" html=(t 'number.range.inclusive_explanation') .divider .options-container diff --git a/tests/dummy/app/i18n/translations.coffee b/tests/dummy/app/i18n/translations.coffee index 3289681..639f25f 100644 --- a/tests/dummy/app/i18n/translations.coffee +++ b/tests/dummy/app/i18n/translations.coffee @@ -67,4 +67,5 @@ window.$translations = range: between: 'Between' inclusive: 'inclusive' + inclusive_explanation: 'Include the lower and upper limits as valid elements. [a, b] means all the "x" elements that a <= x <= b; (a, b) means all the "x" elements that a < x < b.' lower_larger_than_upper_error: 'lower limit (%{lower}) cannot be greater than the upper limit (%{upper}).'