From 20f8a028e834d3cefd60be5f1bd77e341bff6b89 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 16 Sep 2019 12:48:57 +0200
Subject: [PATCH] Feature: Filter by Fields.
---
src/includes/entrepreneur/resources/list.pug | 92 ++++++++++----------
src/scripts/coopstarter.js | 8 +-
2 files changed, 48 insertions(+), 52 deletions(-)
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index b901bcde..6421aceb 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -41,18 +41,18 @@ container.block_list.flex.flex_espace
sib-form#more_criterias(
data-src=`${endpoints.resources}`,
- fields='header_criterias, format, publication_year, country, language, field'
+ fields='header_criterias, format, publication_year, country, language, fields'
label-header_criterias='More criterias'
label-format='Format:'
label-publication_year='Year of publication'
label-country='Country of publication'
label-language='Language'
- label-field='Field'
+ label-fields='Field'
widget-header_criterias='cs-section_header'
range-language=`${endpoints.languages}`
- range-field=`${endpoints.fields}`
+ range-fields=`${endpoints.fields}`
range-format=`${endpoints.formats}`
multiple-language='sib-form-dropdown'
@@ -61,8 +61,8 @@ container.block_list.flex.flex_espace
multiple-format='sib-form-dropdown'
widget-format='sib-form-auto-completion'
- multiple-field='sib-form-dropdown'
- widget-field='sib-form-auto-completion'
+ multiple-fields='sib-form-dropdown'
+ widget-fields='sib-form-auto-completion'
naked
)
@@ -91,11 +91,11 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/`,
- fields='name, author, format, publication_year, description, country, language, field',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, field)',
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
- search-range-field=`${endpoints.fields}`
+ search-range-fields=`${endpoints.fields}`
search-widget-search_for_a_resource="hidden-widget"
@@ -104,15 +104,15 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-language='sib-form-dropdown'
search-widget-language='sib-form-auto-completion'
- search-multiple-field='sib-form-dropdown'
- search-widget-field='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
widget-name='cs-display-property'
widget-country='cs-display-property'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
- widget-field='cs-display-property'
+ widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="cs-display-property"
widget-format='cs-display-multiple-property'
@@ -120,8 +120,8 @@ container.block_list.flex.flex_espace
multiple-format
label-language=''
multiple-language
- label-field=''
- multiple-field
+ label-fields=''
+ multiple-fields
paginate-by="5"
)
@@ -139,11 +139,11 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/`,
- fields='name, author, format, publication_year, description, country, language, field',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, field)',
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
- search-range-field=`${endpoints.fields}`
+ search-range-fields=`${endpoints.fields}`
search-widget-search_for_a_resource="hidden-widget"
@@ -152,15 +152,15 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-language='sib-form-dropdown'
search-widget-language='sib-form-auto-completion'
- search-multiple-field='sib-form-dropdown'
- search-widget-field='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
widget-name='cs-display-property'
widget-country='cs-display-property'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
- widget-field='cs-display-property'
+ widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="cs-display-property"
widget-format='cs-display-multiple-property'
@@ -168,8 +168,8 @@ container.block_list.flex.flex_espace
multiple-format
label-language=''
multiple-language
- label-field=''
- multiple-field
+ label-fields=''
+ multiple-fields
paginate-by="5"
)
@@ -188,11 +188,11 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/`,
- fields='name, author, format, publication_year, description, country, language, field',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, field)',
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
- search-range-field=`${endpoints.fields}`
+ search-range-fields=`${endpoints.fields}`
search-widget-search_for_a_resource="hidden-widget"
@@ -201,15 +201,15 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-language='sib-form-dropdown'
search-widget-language='sib-form-auto-completion'
- search-multiple-field='sib-form-dropdown'
- search-widget-field='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
widget-name='cs-display-property'
widget-country='cs-display-property'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
- widget-field='cs-display-property'
+ widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="cs-display-property"
widget-format='cs-display-multiple-property'
@@ -217,8 +217,8 @@ container.block_list.flex.flex_espace
multiple-format
label-language=''
multiple-language
- label-field=''
- multiple-field
+ label-fields=''
+ multiple-fields
paginate-by="5"
)
@@ -237,28 +237,28 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/`,
- fields='name, author, format, publication_year, description, country, language, field',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, field)',
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
- search-range-field=`${endpoints.fields}`
+ search-range-fields=`${endpoints.fields}`
+
search-widget-search_for_a_resource="hidden-widget"
search-widget-more_criterias_hidden="hidden-widget"
-
search-multiple-format='sib-form-dropdown'
search-widget-format='sib-form-auto-completion'
search-multiple-language='sib-form-dropdown'
search-widget-language='sib-form-auto-completion'
- search-multiple-field='sib-form-dropdown'
- search-widget-field='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
widget-name='cs-display-property'
widget-country='cs-display-property'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
- widget-field='cs-display-property'
+ widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="cs-display-property"
widget-format='cs-display-multiple-property'
@@ -266,8 +266,8 @@ container.block_list.flex.flex_espace
multiple-format
label-language=''
multiple-language
- label-field=''
- multiple-field
+ label-fields=''
+ multiple-fields
paginate-by="5"
)
@@ -285,11 +285,11 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/`,
- fields='name, author, format, publication_year, description, country, language, field',
- search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, field)',
+ fields='name, author, format, publication_year, description, country, language, fields',
+ search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
- search-range-field=`${endpoints.fields}`
+ search-range-fields=`${endpoints.fields}`
search-widget-search_for_a_resource="hidden-widget"
@@ -298,15 +298,15 @@ container.block_list.flex.flex_espace
search-widget-format='sib-form-auto-completion'
search-multiple-language='sib-form-dropdown'
search-widget-language='sib-form-auto-completion'
- search-multiple-field='sib-form-dropdown'
- search-widget-field='sib-form-auto-completion'
+ search-multiple-fields='sib-form-dropdown'
+ search-widget-fields='sib-form-auto-completion'
widget-name='cs-display-property'
widget-country='cs-display-property'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
- widget-field='cs-display-property'
+ widget-fields='hidden-widget'
widget-language="hidden-widget"
widget-author="cs-display-property"
widget-format='cs-display-multiple-property'
@@ -314,8 +314,8 @@ container.block_list.flex.flex_espace
multiple-format
label-language=''
multiple-language
- label-field=''
- multiple-field
+ label-fields=''
+ multiple-fields
paginate-by="5"
)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 78e572b9..76f69067 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -211,10 +211,10 @@ jQuery(document).ready(function($) {
//To retrieve field
let field_field_search = more_criterias_form.querySelector(
- `select[name="field"]`
+ `select[name="fields"]`
);
let field_hidden_field = document.querySelectorAll(
- 'hidden-widget[name="more_criterias_hidden"] select[name="field"]'
+ 'hidden-widget[name="more_criterias_hidden"] select[name="fields"]'
);
field_field_search.onchange = function() {
@@ -231,12 +231,8 @@ jQuery(document).ready(function($) {
if (option_hidden.value == option_selected.value) {
//Actually selecting the option if it is the good one
- console.log("match")
option_hidden.setAttribute("selected", "selected");
select_hidden.setAttribute('value', option_selected.value)
- console.log("option_hidden.value", option_hidden.value)
- console.log("option_selected.value", option_selected.value)
-
}
//Trigerring a reload of the associated form
--
GitLab