diff --git a/package.json b/package.json
index 49a2148bd34ab4aaab199238b7a7e15ec293ee23..1fea6aeb227d2eaa2d2f3d6e73b4f774732c173c 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
"copy-js": "cp ./src/scripts/*.js ./www/scripts/",
"copy-fonts": "cp -R ./src/fonts ./www",
"copy-images": "cp -R ./src/images ./www",
- "watch": "run-p scss pug copy-js copy-fonts copy-images",
+ "watch-js": "onchange -i -k './src/scrips/*.js' -- npm run",
+ "watch": "run-p scss pug copy-fonts copy-images copy-js watch-js",
"serve": "node server.js"
},
"devDependencies": {
@@ -29,6 +30,7 @@
"@webcomponents/webcomponentsjs": "^1.2.7",
"include-media": "^1.4.9",
"normalize.css": "^8.0.0",
+ "onchange": "^6.1.0",
"simple-line-icons": "^2.4.1"
}
}
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 25f15b5049c7d4fd3a8fe4a04551743fe7d20c06..e605891a84e2b9c2f28db54253bee4b5e4992912 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -17,6 +17,11 @@ sib-widget(name='cs-steps-resources-multiple')
p ${value.publication_year}
p ${value.description}
+sib-widget(name='cs-steps-header')
+ template
+ div
+ p #[b ${label} :] ${value}
+
sib-widget(name='cs-display-link')
template
p
@@ -118,3 +123,9 @@ sib-widget(name='cs-account-picture')
sib-widget(name='cs-profile-picture')
template
img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Coopstarter")
+
+
+ sib-widget(name="hidden-widget")
+ template
+ div(data-content style="display:none;")
+
\ No newline at end of file
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index ce0a0ceeef823cad6f30707c3ee942fa58b60983..6a555021412fd6c3e456c7210e607788fac2704f 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -15,53 +15,281 @@ h2.title_form Search for a resource
//It seems that we don't have likes and dislikes data : sould i ignore them for the moment?
-//
+div.block_log.block_list
+ h2.title_form Search for a resource
+ sib-form#search-by-keyword(
+ data-src=`${endpoints.resources}`,
+ fields='keyword(name_keyword, description, author)'
+ label-keyword="Search by author, name..."
+ widget-keyword="sib-form-placeholder-text"
-#circles
- sib-widget(name="group-by-steps")
- template
- strong(data-content)
- p.p_entete(data-title) ${value.name}
+ widget-description='cs-display-property'
+ widget-name_keyword='cs-display-property'
+ widget-author='cs-display-property'
+ )
- sib-display#circles-list(
+ sib-form#circles-list(
data-src=`${endpoints.resources}`,
- fields='keyword(name, description, author),\
- steps.name,\
- more_criterias( format, publication_year, country, language.name, fields, steps)'
-
- search-fields="keyword, instance_database_only,\
- more_criterias(header_criterias, format, publication_year, country, language, field, step)"
- search-label-keyword="Search by author, name..."
- search-label-header_criterias='More criterias'
- search-label-format='Format'
- search-label-publication_year='Year of publication'
- search-label-country='Country of publication'
- search-label-language='Language'
- search-label-field='Field'
- search-label-step='Step of : Staring up a cooperative business'
- search-widget-keyword="sib-form-placeholder-text"
- search-widget-instance_database_only='cs-display-checkbox'
- search-widget-header_criterias='cs-section_header'
-
- search-range-language=`${endpoints.languages}`
- search-range-field=`${endpoints.fields}`
- search-range-step=`${endpoints.step}`
-
- search-multiple-language='sib-multiple-select'
- search-widget-language='sib-form-auto-completion'
-
- search-multiple-field='sib-multiple-select'
- search-widget-field='sib-form-auto-completion'
-
- search-multiple-step='sib-multiple-select'
- search-widget-step='sib-form-auto-completion'
+ fields='more_criterias( format, publication_year, country, language.name, fields, steps)'
+
+ label-header_criterias='More criterias'
+ label-format='Format'
+ label-publication_year='Year of publication'
+ label-country='Country of publication'
+ label-language.name='Language'
+ label-fields='Field'
+ label-steps='Step of : Staring up a cooperative business'
+ widget-instance_database_only='cs-display-checkbox'
+ widget-header_criterias='cs-section_header'
+
+ range-language.name=`${endpoints.languages}`
+ range-fields=`${endpoints.fields}`
+ range-steps=`${endpoints.steps}`
+ range-format=`${endpoints.formats}`
+
+ multiple-language='sib-multiple-select'
+ widget-language='sib-form-auto-completion'
+
+ multiple-field='sib-multiple-select'
+ widget-field='sib-form-auto-completion'
+
+ multiple-step='sib-multiple-select'
+ widget-step='sib-form-auto-completion'
+
+
+ naked
+ )
+
+//- form
+//- div
+//- label(for="name") Enter your name
+//- input(type="text" name="name" id="name" )
+
+//- div
+//- button(value="Search")
+
+
+
+
+#circles
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}1/`,
+ fields='name'
+
+ label-name ='Step 1 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display#step1.resource_by_step(
+ data-src=`${endpoints.steps}1/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}2/`,
+ fields='name'
+
+ label-name ='Step 2 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}2/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}3/`,
+ fields='name'
+
+ label-name ='Step 3 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}3/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}4/`,
+ fields='name'
+
+ label-name ='Step 4 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}4/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}5/`,
+ fields='name'
+
+ label-name ='Step 5 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}5/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
)
+//- search-fields="keyword, instance_database_only,\
+//- more_criterias(header_criterias, format, publication_year, country, language, field, step)"
+//- search-label-keyword="Search by author, name..."
+//- search-label-header_criterias='More criterias'
+//- search-label-format='Format'
+//- search-label-publication_year='Year of publication'
+//- search-label-country='Country of publication'
+//- search-label-language='Language'
+//- search-label-field='Field'
+//- search-label-step='Step of : Staring up a cooperative business'
+//- search-widget-keyword="sib-form-placeholder-text"
+//- search-widget-instance_database_only='cs-display-checkbox'
+//- search-widget-header_criterias='cs-section_header'
+//- search-range-language=`${endpoints.languages}`
+//- search-range-field=`${endpoints.fields}`
+//- search-range-step=`${endpoints.step}`
+
+//- search-multiple-language='sib-multiple-select'
+//- search-widget-language='sib-form-auto-completion'
+
+//- search-multiple-field='sib-multiple-select'
+//- search-widget-field='sib-form-auto-completion'
+
+//- search-multiple-step='sib-multiple-select'
+//- search-widget-step='sib-form-auto-completion'
+
+//- widget-description='cs-display-property'
+//- widget-name='cs-display-property'
div.side-block
p Can't find the ressource you need ?
div.button__actions
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 3526ae6756e2ea91dde0c020085e41d779860fc4..ebf57127038f0c6321f8d49118ade04d4b6cb637 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -36,32 +36,61 @@ function refreshList(formId, listId) {
});
}
-jQuery(document).ready(function($) {
- // Get the element with id="defaultOpen" and click on it
- document.getElementById("defaultOpen").click();
+jQuery(document).ready(function($) {
+ // Get the element with id="defaultOpen" and click on it
+ document.getElementById("defaultOpen").click();
- let userAccountDataSrc = document.getElementById("user-account-picture");
- linkDatasetToField(userAccountDataSrc, "validation-form", "reviewer");
- linkDatasetToField(userAccountDataSrc, "improvement-dialog-form", "reviewer");
- linkDatasetToField(userAccountDataSrc, "refusal-dialog-form", "reviewer");
+ let userAccountDataSrc = document.getElementById("user-account-picture");
+ linkDatasetToField(userAccountDataSrc, 'validation-form', 'reviewer');
+ linkDatasetToField(userAccountDataSrc, 'improvement-dialog-form', 'reviewer');
+ linkDatasetToField(userAccountDataSrc, 'refusal-dialog-form', 'reviewer');
- refreshList("resource-creation-form", "resources-history");
- refreshList("validation-form", "pending-resources");
- refreshList("refusal-dialog-form", "pending-resources");
- refreshList("improvement-dialog-form", "pending-resources");
+ refreshList("resource-creation-form", "resources-history");
+ refreshList("validation-form", "pending-resources");
+ refreshList("refusal-dialog-form", "pending-resources");
+ refreshList("improvement-dialog-form", "pending-resources");
- const logoutButtons = document.getElementsByClassName("logout-button");
- for (var i = 0; i < logoutButtons.length; i++) {
- logoutButtons[i].addEventListener("click", function() {
- window.dispatchEvent(
- new CustomEvent("requestNavigation", {
- detail: { route: "splash-index" }
- })
- );
- document.querySelector("sib-auth").logout();
- setTimeout(function() {
- location.reload();
- }, 1000);
+ const logoutButton = document.getElementById('logout-button');
+ logoutButton.addEventListener('click', function() {
+ window.dispatchEvent(
+ new CustomEvent('requestNavigation', { detail: { route: 'splash-index' } })
+ );
+ document.querySelector('sib-auth').logout();
+ setTimeout(function(){ location.reload(); }, 1000);
+ })
+
+ //In the entrepreneur dashboard, we set data from the display form to the hidden ones.
+ let keyword_form = document.getElementById('search-by-keyword');
+ keyword_form.addEventListener("populate", event => {
+ let keyword_field = keyword_form.querySelector(`input[name="keyword"]`);
+
+ console.log(keyword_field)
+ let displays = document.querySelectorAll('.resource_by_step');
+ displays.forEach(display => {
+ console.log('display', display);
+ display.addEventListener('populate', event => {
+ let hidden_fields= display.querySelectorAll('hidden-widget[name="search_for_a_resource"] input')
+ console.log('Hiddent fields of display:', hidden_fields);
+ keyword_field.addEventListener("input", function(){
+ hidden_fields.forEach(hidden_field => {
+ hidden_field.setAttribute("value", keyword_field.value)
+ console.log(hidden_fields)
+ console.log("element.value", hidden_field.value)
+ console.log("keyword_field.value", keyword_field.value)
+ });
+ });
+ });
+
+ let hidden_fields= display.querySelectorAll('hidden-widget[name="search_for_a_resource"] input')
+ console.log('Hiddent fields of display:', hidden_fields);
+ keyword_field.addEventListener("input", function(){
+ hidden_fields.forEach(hidden_field => {
+ hidden_field.setAttribute("value", keyword_field.value)
+ console.log(hidden_fields)
+ console.log("element.value", hidden_field.value)
+ console.log("keyword_field.value", keyword_field.value)
+ });
+ });
+ });
});
- }
-});
+ });