Feature: Filter resources by language.

src/includes/entrepreneur/resources/list.pug

@@ -41,27 +41,27 @@ container.block_list.flex.flex_espace
 
         sib-form#more_criterias(
             data-src=`${endpoints.resources}`,
-            fields='header_criterias, format, publication_year, country, language.name, fields'
+            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.name='Language'
+            label-language='Language'
             label-fields='Field'
             widget-header_criterias='cs-section_header'
 
-            range-language.name=`${endpoints.languages}`
+            range-language=`${endpoints.languages}`
             range-fields=`${endpoints.fields}`
             range-format=`${endpoints.formats}`
 
-            multiple-language.name='sib-multiple-select'
-            widget-language.name='sib-form-auto-completion'
+            multiple-language='sib-form-dropdown'
+            widget-language='sib-form-auto-completion'
 
             multiple-format='sib-form-dropdown'
             widget-format='sib-form-auto-completion'
 
-            multiple-fields='sib-multiple-select'
+            multiple-fields='sib-form-dropdown'
             widget-fields='sib-form-auto-completion'
                             
             naked
@@ -91,24 +91,32 @@ 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.name, field',
-        search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language.name, field)',  
+        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)',  
         search-range-format=`${endpoints.formats}`
+        search-range-language=`${endpoints.languages}`
+
 
         search-widget-search_for_a_resource="hidden-widget"
         search-widget-more_criterias_hidden="hidden-widget"
-        search-widget-format='sib-form-dropdown'
+        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'
+
  
         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-language.name="hidden-widget"
+        widget-language="hidden-widget"
         widget-author="cs-display-property"
         widget-format='cs-display-multiple-property'
         label-format=''
         multiple-format
+        label-language=''
+        multiple-language
         
         paginate-by="5"
     )
@@ -126,27 +134,33 @@ 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.name, field',
-        search-fields='search_for_a_resource(name, description, author),  more_criterias_hidden(format, publication_year, country, language.name, field)',  
-
+        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)',  
         search-range-format=`${endpoints.formats}`
+        search-range-language=`${endpoints.languages}`
+
 
         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'
 
+ 
         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-language.name="hidden-widget"
+        widget-language="hidden-widget"
         widget-author="cs-display-property"
         widget-format='cs-display-multiple-property'
         label-format=''
         multiple-format
-
+        label-language=''
+        multiple-language
+        
         paginate-by="5"
     )
 
@@ -164,27 +178,33 @@ 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.name, field',
-        search-fields='search_for_a_resource(name, description, author),  more_criterias_hidden(format, publication_year, country, language.name, field)',  
-
+       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)',  
         search-range-format=`${endpoints.formats}`
+        search-range-language=`${endpoints.languages}`
+
 
         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'
 
+ 
         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-language.name="hidden-widget"
+        widget-language="hidden-widget"
         widget-author="cs-display-property"
         widget-format='cs-display-multiple-property'
         label-format=''
         multiple-format
-
+        label-language=''
+        multiple-language
+        
         paginate-by="5"
     )
 
@@ -202,27 +222,33 @@ 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.name, field',
-        search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language.name, field)',  
-
+       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)',  
         search-range-format=`${endpoints.formats}`
+        search-range-language=`${endpoints.languages}`
+
 
         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'
 
+ 
         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-language.name="hidden-widget"
+        widget-language="hidden-widget"
         widget-author="cs-display-property"
         widget-format='cs-display-multiple-property'
         label-format=''
         multiple-format
-
+        label-language=''
+        multiple-language
+        
         paginate-by="5"
     )
 
@@ -239,27 +265,33 @@ 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.name, field',
-        search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language.name, field)',  
-
+        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)',  
         search-range-format=`${endpoints.formats}`
+        search-range-language=`${endpoints.languages}`
+
 
         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'
 
+ 
         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-language.name="hidden-widget"
+        widget-language="hidden-widget"
         widget-author="cs-display-property"
         widget-format='cs-display-multiple-property'
         label-format=''
         multiple-format
-
+        label-language=''
+        multiple-language
+        
         paginate-by="5"
     )
     

src/scripts/coopstarter.js

@@ -48,6 +48,11 @@ function actualizePagination() {
   }
 }
 
+//Manage select hidden to fullfill them with more "more criterias" selection
+function selectHiddenManagement() {
+  //Need to refactor the part
+}
+
 jQuery(document).ready(function($) {
   // Get the element with id="defaultOpen" and click on it
   document.getElementById("defaultOpen").click();
@@ -165,21 +170,34 @@ 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"]`
+          `select[name="language"]`
         );
-        language_hidden_fields = document.querySelectorAll(
-          'hidden-widget[name="more_criterias_hidden"] input[name="language.name"]'
+        language_hidden_field = document.querySelectorAll(
+          'hidden-widget[name="more_criterias_hidden"] select[name="language"]'
         );
 
         language_field_search.onchange = function() {
-          language_hidden_fields.forEach(language_field => {
-            language_field.setAttribute(
-              "value",
-              language_field_search.options[language_field_search.selectedIndex]
-                .text
-            );
+          let option_selected = language_field_search.querySelector(
+            "option:checked"
+          );
+          
+          language_hidden_field.forEach(function(select_hidden) {
+            options_hidden = select_hidden.getElementsByTagName("option");
+            for (let option_hidden of options_hidden) {
+              //Removing the selected attribute from previous selection
+              option_hidden.removeAttribute("selected");
+
+              if (option_hidden.value == option_selected.value) {
+                //Actually selecting the option if it is the good one
+                option_hidden.setAttribute("selected", "selected");
+                select_hidden.setAttribute('value', option_selected.value)
+              }
+
+              //Trigerring a reload of the associated form
+              let parent_form = select_hidden.closest('sib-form');
+              parent_form.component.inputChange();
+            }
             actualizePagination();
             form.querySelector("sib-form").component.inputChange();
           });