@@ -89,19 +59,6 @@
comparator: '=' // =, !=, >, >=, <, <=
}
},
- computed: {
- comparatorSymbol() {
- switch(this.comparator) {
- case '=': return '=';
- case '!=': return '≠';
- case '>': return '>';
- case '>=': return '≥';
- case '<': return '<';
- case '<=': return '≤';
- default: return '';
- }
- }
- },
watch: {
'query': {
handler() {
@@ -110,6 +67,41 @@
deep: true
}
},
+ created() {
+ this.comparatorsObject = {
+ '=': {
+ symbol: '=',
+ label: this.$i18n.get('is_equal_to'),
+ enabled: this.filterTypeOptions.comparators.indexOf('=') < 0 ? 'no' : 'yes'
+ },
+ '!=': {
+ symbol: '≠',
+ label: this.$i18n.get('is_not_equal_to'),
+ enabled: this.filterTypeOptions.comparators.indexOf('!=') < 0 ? 'no' : 'yes'
+ },
+ '>': {
+ symbol: '>',
+ label: this.$i18n.get('greater_than'),
+ enabled: this.filterTypeOptions.comparators.indexOf('>') < 0 ? 'no' : 'yes'
+ },
+ '>=': {
+ symbol: '≥',
+ label: this.$i18n.get('greater_than_or_equal_to'),
+ enabled: this.filterTypeOptions.comparators.indexOf('>=') < 0 ? 'no' : 'yes'
+ },
+ '<': {
+ symbol: '<',
+ label: this.$i18n.get('less_than'),
+ enabled: this.filterTypeOptions.comparators.indexOf('<') < 0 ? 'no' : 'yes'
+ },
+ '<=': {
+ symbol: '≤',
+ label: this.$i18n.get('less_than_or_equal_to'),
+ enabled: this.filterTypeOptions.comparators.indexOf('<=') < 0 ? 'no' : 'yes'
+ },
+ };
+ this.comparator = this.filterTypeOptions.comparators[0];
+ },
mounted() {
this.updateSelectedValues();
},
@@ -165,15 +157,25 @@
height: auto;
align-items: stretch;
- @media screen and (min-width: 769px) and (max-width: 1500px) {
+ @supports not (contain: inline-size) {
+ @media screen and (min-width: 769px) and (max-width: 1500px) {
+ flex-wrap: wrap;
+ height: 60px;
+ }
+ }
+
+ @container filterscomponentslist (max-width: 170px) {
flex-wrap: wrap;
- align-items: center;
height: 60px;
+
+ .dropdown {
+ flex-grow: 2 !important;
+ }
}
.dropdown {
width: auto;
- flex-grow: 2;
+ flex-grow: 0;
.dropdown-trigger button {
padding: 2px 0.5em 2px 0.5em !important;
diff --git a/src/views/admin/components/filter-types/numeric/class-tainacan-numeric.php b/src/views/admin/components/filter-types/numeric/class-tainacan-numeric.php
index b973d8460..e5bb818c7 100644
--- a/src/views/admin/components/filter-types/numeric/class-tainacan-numeric.php
+++ b/src/views/admin/components/filter-types/numeric/class-tainacan-numeric.php
@@ -16,7 +16,8 @@ class Numeric extends Filter_Type {
$this->set_form_component('tainacan-filter-form-numeric');
$this->set_use_max_options(false);
$this->set_default_options([
- 'step' => 1
+ 'step' => 1,
+ 'comparators' => [ '=', '!=', '>', '>=', '<', '<=' ]
]);
$this->set_preview_template('
@@ -77,6 +78,10 @@ class Numeric extends Filter_Type {
'step' => [
'title' => __( 'Step', 'tainacan' ),
'description' => __( 'The amount to be increased or decreased when clicking on the filter control buttons. This also defines whether the input accepts decimal numbers.', 'tainacan' ),
+ ],
+ 'comparators' => [
+ 'title' => __( 'Enabled comparators', 'tainacan' ),
+ 'description' => __( 'A list of comparators to be available in the filter, such as equal, greater than, smaller than, etc.', 'tainacan' ),
]
];
}
@@ -89,13 +94,24 @@ class Numeric extends Filter_Type {
if ( !in_array($filter->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
return true;
- if ( empty($this->get_option('step')) ) {
- return [
+ $errors = [];
+
+ if ( empty($this->get_option('step')) )
+ $errors[] = [
'step' => __('"Step" value is required','tainacan')
];
- }
- return true;
+ if ( empty($this->get_option('comparators')) )
+ $errors[] = [
+ 'comparators' => __('"Comparators" array is required', 'tainacan')
+ ];
+
+ if ( count( $this->get_option('comparators') ) < 1 )
+ $errors[] = [
+ 'comparators' => __('At least one comparator should be provided', 'tainacan')
+ ];
+
+ return count($errors) ? $errors : true;
}
}
@@ -134,6 +150,8 @@ class Numeric_Helper {
case '<=':
$filter_arguments['label'] = '≤ ' . $filter_arguments['label'][0];
break;
+ default:
+ $filter_arguments['label'] = $filter_arguments['label'][0];
}
}
diff --git a/src/views/admin/components/filter-types/numerics-intersection/FormNumericsIntersection.vue b/src/views/admin/components/filter-types/numerics-intersection/FormNumericsIntersection.vue
new file mode 100644
index 000000000..bcab48793
--- /dev/null
+++ b/src/views/admin/components/filter-types/numerics-intersection/FormNumericsIntersection.vue
@@ -0,0 +1,410 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/admin/components/filter-types/numerics-intersection/TainacanFilterNumericsIntersection.vue b/src/views/admin/components/filter-types/numerics-intersection/TainacanFilterNumericsIntersection.vue
new file mode 100644
index 000000000..8a7520420
--- /dev/null
+++ b/src/views/admin/components/filter-types/numerics-intersection/TainacanFilterNumericsIntersection.vue
@@ -0,0 +1,150 @@
+
+
+
+
+ {{ $i18n.get('label_until') }}
+
+
+
+
+
+
+
+
diff --git a/src/views/admin/components/filter-types/numerics-intersection/class-tainacan-numerics-intersection.php b/src/views/admin/components/filter-types/numerics-intersection/class-tainacan-numerics-intersection.php
new file mode 100644
index 000000000..3451cf38d
--- /dev/null
+++ b/src/views/admin/components/filter-types/numerics-intersection/class-tainacan-numerics-intersection.php
@@ -0,0 +1,148 @@
+set_name( __('Numerics Intersection', 'tainacan') );
+ $this->set_supported_types(['float']);
+ $this->set_component('tainacan-filter-numerics-intersection');
+ $this->set_form_component('tainacan-filter-form-numerics-intersection');
+ $this->set_default_options([
+ 'step' => 1,
+ 'secondary_filter_metadatum_id' => '',
+ 'secondary_filter_metadatum_name' => '',
+ 'first_comparator' => '>=',
+ 'second_comparator' => '<=',
+ 'accept_numeric_interval' => 'no'
+ ]);
+ $this->set_use_max_options(false);
+ $this->set_preview_template('
+
+ ');
+ }
+
+ public function get_form_labels(){
+ return [
+ 'step' => [
+ 'title' => __( 'Step', 'tainacan' ),
+ 'description' => __( 'The amount to be increased or decreased when clicking on the filter control buttons. This also defines whether the input accepts decimal numbers.', 'tainacan' ),
+ ],
+ 'secondary_filter_metadatum_id' => [
+ 'title' => __( 'Second numeric metadatum', 'tainacan' ),
+ 'description' => __( 'The other metadatum to which this filter will compare values to find if there is an intersection of numeric values.', 'tainacan' ),
+ ],
+ 'secondary_filter_metadatum_name' => [
+ 'title' => __( 'Second numeric metadatum', 'tainacan' ),
+ 'description' => __( 'Label of the other metadatum to which this filter will compare values to find if there is an intersection of numeric values.', 'tainacan' ),
+ ],
+ 'first_comparator' => [
+ 'title' => __( 'First comparator', 'tainacan' ),
+ 'description' => __( 'Comparator to be used for checking the first metadata value.', 'tainacan' ),
+ ],
+ 'second_comparator' => [
+ 'title' => __( 'Second comparator', 'tainacan' ),
+ 'description' => __( 'Comparator to be used for checking the second metadata value.', 'tainacan' ),
+ ],
+ 'accept_numeric_interval' => [
+ 'title' => __( 'Accept numeric interval', 'tainacan' ),
+ 'description' => __( 'If checked, the filter will accept numeric intervals as values.', 'tainacan' ),
+ ]
+ ];
+ }
+
+
+ /**
+ * @param \Tainacan\Entities\Filter $filter
+ * @return array|bool true if is validate or array if has error
+ */
+ public function validate_options(\Tainacan\Entities\Filter $filter) {
+
+ if ( !in_array($filter->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )
+ return true;
+
+ $errors = [];
+
+ if ( empty($this->get_option('secondary_filter_metadatum_id')) )
+ $errors['secondary_filter_metadatum_id'] = __('The secondary numeric metadatum is required.','tainacan');
+
+ if ( empty($this->get_option('first_comparator')) )
+ $errors['first_comparator'] = __('The first comparator is required.','tainacan');
+
+ if ( empty($this->get_option('second_comparator')) )
+ $errors['second_comparator'] = __('The second comparator is required.','tainacan');
+
+ if ( empty($this->get_option('accept_numeric_interval')) )
+ $errors['accept_numeric_interval'] = __('The filter should define if it accepts a numeric interval.','tainacan');
+
+ return count($errors) > 0 ? $errors : true;
+ }
+
+}
+
+class Numerics_Intersection_Interval_Helper {
+ use \Tainacan\Traits\Singleton_Instance;
+
+ protected function init() {
+ add_filter( 'tainacan-api-items-tainacan-filter-numerics-intersection-filter-arguments', [$this, 'format_filter_arguments']);
+ }
+
+ function format_filter_arguments( $filter_arguments ) {
+ if (
+ !isset($filter_arguments['compare']) ||
+ !isset($filter_arguments['label'])
+ ) {
+ return $filter_arguments;
+ }
+
+ if (
+ is_array($filter_arguments['label']) &&
+ count($filter_arguments['label']) === 2
+ ) {
+ $filter_arguments['label'] = $filter_arguments['label'][0] . ' - ' . $filter_arguments['label'][1];
+ }
+ if (
+ isset( $filter_arguments['filter'] ) &&
+ isset( $filter_arguments['filter']['metadatum'] ) &&
+ isset( $filter_arguments['filter']['metadatum']['metadatum_name'] )
+ ) {
+ $filter_arguments['filter']['name'] = $filter_arguments['filter']['metadatum']['metadatum_name'];
+ }
+ if (
+ isset( $filter_arguments['filter'] ) &&
+ isset( $filter_arguments['filter']['filter_type_options'] ) &&
+ isset( $filter_arguments['filter']['filter_type_options']['secondary_filter_metadatum_name'] ) &&
+ !empty( $filter_arguments['filter']['filter_type_options']['secondary_filter_metadatum_name'] )
+ ) {
+ $filter_arguments['filter']['name'] = $filter_arguments['filter']['name'] . ' - ' . $filter_arguments['filter']['filter_type_options']['secondary_filter_metadatum_name'];
+ }
+ return $filter_arguments;
+ }
+}
+Numerics_Intersection_Interval_Helper::get_instance();
\ No newline at end of file
diff --git a/src/views/admin/components/filter-types/selectbox/TainacanFilterSelectbox.vue b/src/views/admin/components/filter-types/selectbox/TainacanFilterSelectbox.vue
index e7a260793..48773a048 100644
--- a/src/views/admin/components/filter-types/selectbox/TainacanFilterSelectbox.vue
+++ b/src/views/admin/components/filter-types/selectbox/TainacanFilterSelectbox.vue
@@ -6,7 +6,7 @@
v-if="!isLoadingOptions"
:model-value="selected"
:aria-labelledby="'filter-label-id-' + filter.id"
- :placeholder="$i18n.get('label_selectbox_init')"
+ :placeholder="filter.placeholder ? filter.placeholder : $i18n.get('label_selectbox_init')"
expanded
@update:model-value="($event) => { resetPage(); onSelect($event) }">