From 64eebb61a07bfb2b6d5c2017d8dd2372ec3fab56 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 3 Oct 2019 23:07:09 +0200
Subject: [PATCH] WIP : search by name not working.
---
src/includes/entrepreneur/resources/list.pug | 42 +++++++++-----------
src/includes/mentor/browseDatabase.pug | 42 +++++++++-----------
src/includes/public/resources/list.pug | 20 +++++-----
src/scripts/coopstarter.js | 8 ++--
4 files changed, 51 insertions(+), 61 deletions(-)
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 8bf3c0e9..03810d91 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -113,16 +113,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, author, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -170,16 +169,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -227,16 +225,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -283,16 +280,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -339,16 +335,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -395,16 +390,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index 55ef5a6d..a928c174 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -110,16 +110,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -165,16 +164,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -221,16 +219,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -277,16 +274,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -332,16 +328,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -387,16 +382,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index a9aa1ac3..c6f73aa0 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -99,7 +99,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -155,7 +155,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -212,7 +212,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -268,7 +268,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -324,7 +324,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -379,16 +379,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
search-range-fields=`${endpoints.fields}`
search-range-type=`${endpoints.types}`
-
-
- search-widget-search_for_a_resource="hidden-widget"
+
search-widget-more_criterias_hidden="hidden-widget"
+ search-widget-search_for_a_resource="hidden-widget"
search-multiple-type='sib-form-dropdown'
search-widget-type='sib-form-auto-completion'
search-multiple-format='sib-form-dropdown'
@@ -415,7 +414,8 @@ container.block_list.flex.flex_espace
label-fields=''
multiple-fields
class="panel"
- next='entrepreneur-resource-detail'
+
+ next='public-resource-detail'
paginate-by="5"
)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 0e35778d..ee596942 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -102,7 +102,7 @@ function selectHiddenManagementForType(tab, form) {
let type_hidden_field = form.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] select[name="type"]'
);
-
+
if (tab.classList.contains("active")) {
//Fullfill hidden field
let type_field_search = tab
@@ -146,8 +146,10 @@ function addProperFilterToSearchComponents(targetId) {
//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 = baseElement.querySelectorAll(".search-by-keyword")[0];
- let keyword_field = keyword_form.querySelector(`input[name="keyword"]`);
+ let keyword_form = document.querySelectorAll(".search-by-keyword")[0];
+ let keyword_field = keyword_form.querySelector(
+ `input[name="name_keyword"]`
+ );
let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
let keyword_hidden_fields = baseElement.querySelectorAll(
--
GitLab