From b7daa15a34fd962a2bc51ac2c4722656944bb7bb Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Fri, 13 Sep 2019 11:51:53 +0200
Subject: [PATCH] WIP: More criterias filtering.
---
src/includes/entrepreneur/resources/list.pug | 23 ++++++++++----------
src/scripts/coopstarter.js | 12 +++++++---
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 92a2467c..3cb4aab1 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -23,7 +23,7 @@ div.container_min
widget-author='cs-display-property'
naked
- )
+ )
div#keyword_submit.button__actions
div.button_base.ico_gauche Search
@@ -35,6 +35,7 @@ div.container_min
widget-instance_database_only='cs-display-checkbox'
class-instance_database_only = 'ss-list checkbox'
+
naked
)
@@ -91,7 +92,7 @@ div.side-block.block_log
sib-display#step1.resource_by_step(
data-src=`${endpoints.steps}1/resources/`,
- fields='name, format, publication_year, description, country, language.name, field, steps',
+ fields='name, author, format, publication_year, description, country, language.name, field, steps',
search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language.name, field, steps)',
search-widget-search_for_a_resource="hidden-widget"
@@ -103,7 +104,7 @@ div.side-block.block_log
widget-description='cs-display-property'
widget-field='cs-display-property'
widget-language.name="hidden-widget"
- widget-author="hidden-widget"
+ widget-author="cs-display-property"
widget-steps="hidden-widget"
widget-format='cs-display-multiple-property'
label-format=''
@@ -124,7 +125,7 @@ div.side-block.block_log
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/`,
- fields='name, format, publication_year, description, country, language.name, field, steps',
+ fields='name, author, format, publication_year, description, country, language.name, field, steps',
search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language.name, field, steps)',
search-widget-search_for_a_resource="hidden-widget"
@@ -136,7 +137,7 @@ div.side-block.block_log
widget-description='cs-display-property'
widget-field='cs-display-property'
widget-language.name="hidden-widget"
- widget-author="hidden-widget"
+ widget-author="cs-display-property"
widget-steps="hidden-widget"
widget-format='cs-display-multiple-property'
label-format=''
@@ -158,7 +159,7 @@ div.side-block.block_log
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/`,
- fields='name, format, publication_year, description, country, language.name, field, steps',
+ fields='name, author, format, publication_year, description, country, language.name, field, steps',
search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language.name, field, steps)',
search-widget-search_for_a_resource="hidden-widget"
@@ -170,7 +171,7 @@ div.side-block.block_log
widget-description='cs-display-property'
widget-field='cs-display-property'
widget-language.name="hidden-widget"
- widget-author="hidden-widget"
+ widget-author="cs-display-property"
widget-steps="hidden-widget"
widget-format='cs-display-multiple-property'
label-format=''
@@ -192,7 +193,7 @@ div.side-block.block_log
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/`,
- fields='name, format, publication_year, description, country, language.name, field, steps',
+ fields='name, author, format, publication_year, description, country, language.name, field, steps',
search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language.name, field, steps)',
search-widget-search_for_a_resource="hidden-widget"
@@ -204,7 +205,7 @@ div.side-block.block_log
widget-description='cs-display-property'
widget-field='cs-display-property'
widget-language.name="hidden-widget"
- widget-author="hidden-widget"
+ widget-author="cs-display-property"
widget-steps="hidden-widget"
widget-format='cs-display-multiple-property'
label-format=''
@@ -225,7 +226,7 @@ div.side-block.block_log
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/`,
- fields='name, format, publication_year, description, country, language.name, field, steps',
+ fields='name, author, format, publication_year, description, country, language.name, field, steps',
search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language.name, field, steps)',
search-widget-search_for_a_resource="hidden-widget"
@@ -237,7 +238,7 @@ div.side-block.block_log
widget-description='cs-display-property'
widget-field='cs-display-property'
widget-language.name="hidden-widget"
- widget-author="hidden-widget"
+ widget-author="cs-display-property"
widget-steps="hidden-widget"
widget-format='cs-display-multiple-property'
label-format=''
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 4fea36a6..b343d81f 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -51,7 +51,6 @@ jQuery(document).ready(function($) {
refreshList("improvement-dialog-form", "pending-resources");
const logoutButtons = document.getElementsByClassName("logout-button");
- console.log(logoutButtons);
for (var i = 0; i < logoutButtons.length; i++) {
logoutButtons[i].addEventListener("click", function() {
window.dispatchEvent(
@@ -74,6 +73,8 @@ jQuery(document).ready(function($) {
"populate",
e => {
//To retrieve keyword
+ //https://git.happy-dev.fr/startinblox/framework/sib-core/issues/379
+ //TODO: Wait for a solution to filter with multiple value with "OR" instead of "AND".
let keyword_form = document.getElementById("search-by-keyword");
let keyword_field = keyword_form.querySelector(`input[name="keyword"]`);
@@ -97,6 +98,8 @@ jQuery(document).ready(function($) {
window.setTimeout(() => {
//To retrieve format
+ //TODO: How we should filled the hidden field with multiple value?
+ //TODO: The hidden search field set with one value doesn't work
let format_field_search = more_criterias_form.querySelector(
`select[name="format"]`
);
@@ -116,6 +119,7 @@ jQuery(document).ready(function($) {
};
//To retrieve language
+ //TODO: How we should filled the hidden field?
let language_field_search = more_criterias_form.querySelector(
`select[name="language.name"]`
);
@@ -154,6 +158,8 @@ jQuery(document).ready(function($) {
// };
//To retrieve year of publication
+ //WARNING: If the user want to select "20" to get 21century made, he will get no result.
+ //I think it is a UX problem.
let year_field_search = more_criterias_form.querySelector(
`input[name="publication_year"]`
);
@@ -178,13 +184,13 @@ jQuery(document).ready(function($) {
country_field_search.addEventListener("input", function() {
country_hidden_fields.forEach(country_field => {
- country_field.setAttribute("value", countryr_field_search.value);
+ country_field.setAttribute("value", country_field_search.value);
form.querySelector("sib-form").component.inputChange();
});
});
});
},
- 2000
+ 4000
);
});
});
--
GitLab