diff --git a/modules/backend/lang/en/lang.php b/modules/backend/lang/en/lang.php index bf250a7d4..92567e3f3 100644 --- a/modules/backend/lang/en/lang.php +++ b/modules/backend/lang/en/lang.php @@ -440,7 +440,8 @@ return [ 'filter' => [ 'all' => 'all', 'options_method_not_exists' => "The model class :model must define a method :method() returning options for the ':filter' filter.", - 'date_all' => 'all period' + 'date_all' => 'all periods', + 'number_all' => 'all numbers', ], 'import_export' => [ 'upload_csv_file' => '1. Upload a CSV file', diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php index 21b3f457d..038104032 100644 --- a/modules/backend/widgets/Filter.php +++ b/modules/backend/widgets/Filter.php @@ -135,6 +135,12 @@ class Filter extends WidgetBase } } + break; + case 'number': + if (is_numeric($scope->value)) { + $params['number'] = $scope->value; + } + break; case 'numberrange': if ($scope->value && is_array($scope->value) && count($scope->value) === 2 && @@ -144,25 +150,14 @@ class Filter extends WidgetBase $min = $scope->value[0]; $max = $scope->value[1]; - if($min) { - $params['minStr'] = $min; - $params['min'] = $min; - } - else { - $params['minStr'] = ''; - $params['min'] = null; - } + $params['minStr'] = $min ? $min : ''; + $params['min'] = $min ? $min : null; - if($max) { - $params['maxStr'] = $max; - $params['max'] = $max; - } - else { - $params['maxStr'] = '∞'; - $params['max'] = null; - } + $params['maxStr'] = $max ? $max : '∞'; + $params['max'] = $max ? $max : null; } - break + + break; } return $this->makePartial('scope_'.$scope->type, $params); @@ -230,8 +225,22 @@ class Filter extends WidgetBase $this->setScopeValue($scope, $dates); break; + case 'number': + $numbers = $this->numbersFromAjax(post('options.numbers')); + + if (!empty($numbers)) { + list($number) = $numbers; + } + else { + $number = null; + } + + $this->setScopeValue($scope, $number); + break; + case 'numberrange': $numbers = $this->numbersFromAjax(post('options.numbers')); + if (!empty($numbers)) { list($min, $max) = $numbers; @@ -242,7 +251,7 @@ class Filter extends WidgetBase } $this->setScopeValue($scope, $numbers); - break; + break; } /* @@ -527,14 +536,6 @@ class Filter extends WidgetBase $scopeObj->{$property} = $value; } - /* - * Ensure number options are set - */ - if (!isset($config['minNumber'])) { - $scopeObj->minNumber = '0'; - $scopeObj->maxNumber = '999999999'; - } - $this->allScopes[$name] = $scopeObj; } } @@ -658,6 +659,24 @@ class Filter extends WidgetBase break; + case 'number': + if (is_numeric($scope->value)) { + /* + * Condition + */ + if ($scopeConditions = $scope->conditions) { + $query->whereRaw(DbDongle::parse(strtr($scopeConditions, [ + ':filtered' => $scope->value, + ]))); + } + /* + * Scope + */ + elseif ($scopeMethod = $scope->scope) { + $query->$scopeMethod($scope->value); + } + } + case 'numberrange': if (is_array($scope->value) && count($scope->value) > 1) { list($min, $max) = array_values($scope->value); @@ -846,7 +865,6 @@ class Filter extends WidgetBase /** * Convert an array from the posted dates * - * @param mixed $scope * @param array $dates * * @return array @@ -881,6 +899,36 @@ class Filter extends WidgetBase return $dates; } + /** + * Convert an array from the posted numbers + * + * @param array $dates + * + * @return array + */ + protected function numbersFromAjax($ajaxNumbers) + { + $numbers = []; + $numberRegex = '/\d/'; + + if (!empty($ajaxNumbers)) { + if (!is_array($ajaxNumbers) && preg_match($numberRegex, $ajaxNumbers)) { + $numbers = [$ajaxNumbers]; + } else { + foreach ($ajaxNumbers as $i => $number) { + if (preg_match($numberRegex, $number)) { + $numbers[] = $number; + } else { + $numbers = []; + break; + } + } + } + } + + return $numbers; + } + /** * @param mixed $scope * diff --git a/modules/backend/widgets/filter/partials/_scope_date.htm b/modules/backend/widgets/filter/partials/_scope_date.htm index bbdf056f2..36f2f30f7 100644 --- a/modules/backend/widgets/filter/partials/_scope_date.htm +++ b/modules/backend/widgets/filter/partials/_scope_date.htm @@ -1,6 +1,6 @@ " + class="filter-scope-date filter-has-popover range " href="javascript:;" data-scope-name="scopeName ?>" data-scope-data=" + + label)) ?>: + + diff --git a/modules/backend/widgets/filter/partials/_scope_numberrange.htm b/modules/backend/widgets/filter/partials/_scope_numberrange.htm new file mode 100644 index 000000000..d6747b86a --- /dev/null +++ b/modules/backend/widgets/filter/partials/_scope_numberrange.htm @@ -0,0 +1,12 @@ + + + label)) ?>: + + diff --git a/modules/system/assets/ui/js/filter.dates.js b/modules/system/assets/ui/js/filter.dates.js index 72b6bfe76..be0c7568d 100644 --- a/modules/system/assets/ui/js/filter.dates.js +++ b/modules/system/assets/ui/js/filter.dates.js @@ -106,7 +106,7 @@ return ' \
\ \ -
\ +
\
\
\
\ @@ -138,7 +138,7 @@ return ' \ \ \ -
\ +
\
\
\
\ diff --git a/modules/system/assets/ui/js/filter.numbers.js b/modules/system/assets/ui/js/filter.numbers.js index fd5d4957e..62271b320 100644 --- a/modules/system/assets/ui/js/filter.numbers.js +++ b/modules/system/assets/ui/js/filter.numbers.js @@ -93,22 +93,27 @@ } /* - * Get popover date template + * Get popover number template */ FilterWidget.prototype.getPopoverNumberTemplate = function () { return ' \ \ \ -
\ +
\
\ - \ +
\ + \ +
\
\ + \ \ @@ -120,18 +125,18 @@ } /* - * Get popover range template + * Get popover number range template */ FilterWidget.prototype.getPopoverNumberRangeTemplate = function () { return ' \ \ \ -
\ +
\
\
\
\ \
\ 1) { - numbers[1] = numbers[1] && numbers[1].match(dateRegex) ? numbers[1] : null + numbers[1] = numbers[1] && numbers[1].match(numberRegex) ? numbers[1] : null if(numbers[0] || numbers[1]) { - var min = numbers[0] ? numbers[0] : '', + var min = numbers[0] ? numbers[0] : '', max = numbers[1] ? numbers[1] : '∞' $setting.text(min + ' → ' + max) diff --git a/modules/system/assets/ui/less/filter.less b/modules/system/assets/ui/less/filter.less index 9ba4cb26b..9d41ab111 100644 --- a/modules/system/assets/ui/less/filter.less +++ b/modules/system/assets/ui/less/filter.less @@ -101,39 +101,7 @@ } } - > .filter-scope-date { - display: inline-block; - padding: (@padding-standard / 2); - .filter-label {} - .filter-setting { - display: inline-block; - .transition(color 0.6s); - } - - &:after { - font-size: 14px; - .icon(@angle-down); - } - - &.active { - .filter-setting { - padding-left: 5px; - padding-right: 5px; - color: #FFF; - background-color: @color-filter-bg-active; - .border-radius(4px); - .transition(~'color 1s, background-color 1s'); - } - } - - &:hover { - color: #000; - .filter-label { color: @color-filter-text; } - &.active .filter-setting { background-color: darken(@color-filter-bg-active, 5%); } - } - } - - > .filter-scope-number { + > .filter-has-popover { display: inline-block; padding: (@padding-standard / 2); .filter-label {} @@ -248,36 +216,7 @@ li.animate-enter { .animation(fadeInDown .5s); } } - &.control-filter-date-popover { - min-width: 190px; - - .filter-buttons { - margin: 0; - padding: 0; - - &:after { - content: ""; - display: block; - clear: both; - } - - .btn { - float: left; - width: 100%; - margin: 0; - border-radius: 0; - text-align: center; - } - } - - &.--range { - .filter-buttons .btn { - width: 50%; - } - } - } - - &.control-filter-number-popover { + &.control-filter-box-popover { min-width: 190px; .filter-buttons {