diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug index ace42e665e13ef0143374ecbc07b7bfc0042c481..2294e3f8c22698c8ccdde5081d822494ff53d464 100644 --- a/src/includes/components/widgets.pug +++ b/src/includes/components/widgets.pug @@ -190,15 +190,15 @@ sib-widget(name='cs-section_introduction') sib-widget(name='cs-account-picture') template figure.avatar - img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Profile picture") + img(src="\${value || '/images/alien.jpg'}", alt="Profile picture") sib-widget(name='cs-profile-picture') template - img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Profile picture") + img(src="\${value || '/images/alien.jpg'}", alt="Profile picture") sib-widget(name='cs-preview-picture') template - img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Preview of the resource") + img(src="\${value || '/images/alien.jpg'}", alt="Preview of the resource") sib-widget(name="hidden-widget") template @@ -252,5 +252,3 @@ sib-widget(name="cs-display-email-button") sib-widget(name="iframe-video-resource") template div ${value} - - diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug index c4cae05cc9f17f3cc864fb7aa590f09c26bf5198..195021e2fa2b66c6f3fe864813c4908b6693c32e 100644 --- a/src/includes/entrepreneur/dashboard.pug +++ b/src/includes/entrepreneur/dashboard.pug @@ -24,10 +24,9 @@ section#home dialog#entrepreneur-request-create.no-sidebar.container include ./requests/create.pug - dialog#entrepreneur-request-validation.no-sidebar.container - p=`${data.YouRequestHasBeenSubmitted}` - p.flex - sib-link(next='entrepreneur-resource-list', class='button_base') Ok + dialog#entrepreneur-request-validation.no-sidebar + include ./request-submitted.pug + dialog#entrepreneur-resource-detail.no-sidebar include resources/detail.pug diff --git a/src/includes/entrepreneur/request-submitted.pug b/src/includes/entrepreneur/request-submitted.pug new file mode 100644 index 0000000000000000000000000000000000000000..3ce4acd4933c59c3a244d1ac6e7780631c2212bb --- /dev/null +++ b/src/includes/entrepreneur/request-submitted.pug @@ -0,0 +1,5 @@ +div.block_log.block_creat_count.no_shadow + sib-link(class="backlink", next="entrepreneur-dashboard") + i.fas.fa-times + p=`${data.YouRequestHasBeenSubmitted}` + \ No newline at end of file diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug index e0e6a2e0bc575f93eb944844712c2fef7bcd3760..5a5358b3bc1170b706e5950624fd7ab560f81227 100644 --- a/src/includes/entrepreneur/resources/list.pug +++ b/src/includes/entrepreneur/resources/list.pug @@ -127,6 +127,7 @@ container.block_list search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -134,6 +135,8 @@ container.block_list search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -181,6 +184,7 @@ container.block_list search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -188,6 +192,8 @@ container.block_list search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -233,6 +239,7 @@ container.block_list search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -240,6 +247,8 @@ container.block_list search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -286,6 +295,7 @@ container.block_list search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -293,6 +303,8 @@ container.block_list search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -339,6 +351,7 @@ container.block_list search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -346,6 +359,8 @@ container.block_list search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -392,6 +407,7 @@ container.block_list search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -399,6 +415,8 @@ container.block_list search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' diff --git a/src/includes/head.pug b/src/includes/head.pug index 73072a18521c4dcad05662cc4492b1946bdd4d0e..a65340bc7c3358c68c97b971a8ace263a4385c0a 100644 --- a/src/includes/head.pug +++ b/src/includes/head.pug @@ -25,6 +25,7 @@ head { "entrepreneurProfile": "http://happy-dev.fr/owl/#entrepreneur_profile", "mentorProfile": "http://happy-dev.fr/owl/#mentor_profile", - "account": "http://happy-dev.fr/owl/#account" + "account": "http://happy-dev.fr/owl/#account", + "picture":"foaf:depiction" } diff --git a/src/includes/mentor/resources/database.pug b/src/includes/mentor/resources/database.pug index 566e10cafb7d889e239984523f2c41e288f3a016..4e69ee403aabefc014d39c2c440133878afac3ea 100644 --- a/src/includes/mentor/resources/database.pug +++ b/src/includes/mentor/resources/database.pug @@ -119,6 +119,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -126,6 +127,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -172,6 +175,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -179,6 +183,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -226,6 +232,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -233,6 +240,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -280,6 +289,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -287,6 +297,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -333,6 +345,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -340,6 +353,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -386,6 +401,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -393,6 +409,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug index d54c92f6d42730a030473f5a30e98184ccd0c926..0b3f488802a40b789ea780b069cacb7500d042fe 100644 --- a/src/includes/public/resources/list.pug +++ b/src/includes/public/resources/list.pug @@ -112,6 +112,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -119,6 +120,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -166,6 +169,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -173,6 +177,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -221,6 +227,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -228,6 +235,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -275,6 +284,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -282,6 +292,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -329,6 +341,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -336,6 +349,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' @@ -382,6 +397,7 @@ container.block_list.flex.flex_espace search-range-language=`${endpoints.languages}` search-range-fields=`${endpoints.fields}` search-range-type=`${endpoints.types}` + search-range-country=`${endpoints.countries}` search-widget-more_criterias_hidden="hidden-widget" search-widget-search_for_a_resource="hidden-widget" @@ -389,6 +405,8 @@ container.block_list.flex.flex_espace search-widget-type='sib-form-auto-completion' search-multiple-format='sib-form-dropdown' search-widget-format='sib-form-auto-completion' + search-multiple-country='sib-form-dropdown' + search-widget-country='sib-form-auto-completion' search-multiple-language='sib-form-dropdown' search-widget-language='sib-form-auto-completion' search-multiple-fields='sib-form-dropdown' diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js index 28dbd00e78e2c52448da14760d0889fa5dbb3f6d..088d8562ef1cee589145b0728c03594a56140d7d 100644 --- a/src/scripts/coopstarter.js +++ b/src/scripts/coopstarter.js @@ -101,13 +101,38 @@ async function refreshList(formId, listId) { let list = document.getElementById(listId); if (list) { - let listProxy = await list.component.resource + let listProxy = await list.component.resource; + + // Refresh du cache sur la liste listProxy.clearCache(); list.dataset.src = list.dataset.src; } }); } +/** + * Refresh user and account information after a form submission + * @param {String} formId - Id of the sumitted form + * @param {String} listId - Id of the user object to refresh + */ +async function refreshUser(formId, listId) { + let form = document.getElementById(formId); + form.addEventListener("save", async function() { + let list = document.getElementById(listId); + + if (list) { + let listProxy = await list.component.resource; + let account = await listProxy['account']; + + // Refresh du cache sur le User + listProxy.clearCache(); + account.clearCache(); + + list.dataset.src = list.dataset.src; + } + }); +} + /** * Remove pagination when there is no resource in a step group. */ @@ -144,15 +169,21 @@ function refreshPagination() { * @param {HTMLElement} option_selected - Option selcted to set in hidden select. */ function selectHiddenManagement(select_hidden, option_selected) { + console.log("option_selected in selectHiddenManagement", option_selected) + console.log("select_hidden in selectHiddenManagement", 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"); - + console.log("option_hidden.value",option_hidden.value) + console.log("option_selected.value",option_selected.value) if (option_hidden.value == option_selected.value) { +console.log("we change the value") //Actually selecting the option if it is the good one option_hidden.setAttribute("selected", "selected"); select_hidden.setAttribute("value", option_selected.value); + console.log("select_hidden", select_hidden) + break; } } @@ -230,12 +261,12 @@ function InitManagementForType() { str = option_hidden.value if (str.substr(str.length - 10) == 'types/1/"}') { - //Actually selecting the option if it is the good one option_hidden.setAttribute("selected", "selected"); select_hidden.setAttribute("value", option_hidden.value); } } + //Trigerring a reload of the associated form let parent_form = select_hidden.closest("sib-form"); parent_form.component.inputChange(); @@ -494,15 +525,18 @@ function addProperFilterToSearchComponents(targetId) { let instance_only = baseElement.querySelectorAll( ".instance_database_only" )[0]; - let checkbox_instance_only = instance_only.querySelector("input"); - if (checkbox_instance_only) { - checkbox_instance_only.onclick = function() { - if (this.checked) { - //We have to retrieve all data-scr needed to make them pointed only on the instance. - //How to? - } - }; + if (instance_only){ + let checkbox_instance_only = instance_only.querySelector("input"); + if (checkbox_instance_only) { + checkbox_instance_only.onclick = function() { + if (this.checked) { + //We have to retrieve all data-scr needed to make them pointed only on the instance. + //How to? + } + }; + } } + //MORE CRITERIAS const more_criterias_form = baseElement.querySelectorAll( @@ -544,7 +578,7 @@ function addProperFilterToSearchComponents(targetId) { let language_field_search = more_criterias_form.querySelector( `select[name="language"]` ); - language_hidden_field = baseElement.querySelectorAll( + let language_hidden_field = baseElement.querySelectorAll( 'hidden-widget[name="more_criterias_hidden"] select[name="language"]' ); @@ -568,7 +602,7 @@ function addProperFilterToSearchComponents(targetId) { 'hidden-widget[name="more_criterias_hidden"] select[name="fields"]' ); - if (language_field_search) { + if (field_field_search) { field_field_search.onchange = function() { let option_selected = field_field_search.querySelector( "option:checked" @@ -600,18 +634,22 @@ function addProperFilterToSearchComponents(targetId) { //To retrieve the country let country_field_search = more_criterias_form.querySelector( - `input[name="country"]` + `select[name="country"]` ); let country_hidden_fields = baseElement.querySelectorAll( - 'hidden-widget[name="more_criterias_hidden"] input[name="country"]' + 'hidden-widget[name="more_criterias_hidden"] select[name="country"]' ); if (country_field_search) { - country_field_search.addEventListener("input", function() { - country_hidden_fields.forEach(field => { - inputHiddenManagement(field, country_field_search, form); + country_field_search.onchange = function() { + let option_selected = country_field_search.querySelector( + "option:checked" + ); + + country_hidden_fields.forEach(function(select_hidden) { + selectHiddenManagement(select_hidden, option_selected); }); - }); + }; } }, 1000); }); @@ -767,28 +805,24 @@ jQuery(document).ready(function($) { //On form submission, we sometimes have to refresh a list. refreshList("resource_creation_form", "resources_history"); + refreshList("resource_edition_form", "resources_history"); refreshList("validation_form", "pending_resources"); refreshList("refusal_dialog_form", "pending_resources"); refreshList("improvement_dialog_form", "pending_resources"); - initFileUpload("entrepreneur_profile_creation", "account.picture"); - refreshList("entrepreneur_profile_creation", "entrepreneur_info"); - refreshList("entrepreneur_profile_creation", "entrepreneur_contact"); - refreshList("entrepreneur_profile_creation", "entrepreneur_account_picture"); - initFileUpload("mentor_profile_creation", "account.picture"); - refreshList("mentor_profile_creation", "mentor_info"); - refreshList("mentor_profile_creation", "mentor_complementary"); - refreshList("mentor_profile_creation", "mentor_contact"); - refreshList("mentor_profile_creation", "mentor_account_picture"); - initFileUpload("entrepreneur_profile_edition", "account.picture"); - refreshList("entrepreneur_profile_edition", "entrepreneur_info"); - refreshList("entrepreneur_profile_edition", "entrepreneur_contact"); - refreshList("entrepreneur_profile_edition", "entrepreneur_account_picture"); - initFileUpload("mentor_profile_edition", "account.picture"); - refreshList("mentor_profile_edition", "mentor_info"); - refreshList("mentor_profile_edition", "mentor_complementary"); - refreshList("mentor_profile_edition", "mentor_contact"); - refreshList("mentor_profile_edition", "mentor_account_picture"); - refreshRequestList("change_status_request", "request_list"); + refreshUser("entrepreneur_profile_creation", "entrepreneur_info"); + refreshUser("entrepreneur_profile_creation", "entrepreneur_contact"); + refreshUser("entrepreneur_profile_creation", "entrepreneur_account_picture"); + refreshUser("mentor_profile_creation", "mentor_info"); + refreshUser("mentor_profile_creation", "mentor_complementary"); + refreshUser("mentor_profile_creation", "mentor_contact"); + refreshUser("mentor_profile_creation", "mentor_account_picture"); + refreshUser("entrepreneur_profile_edition", "entrepreneur_info"); + refreshUser("entrepreneur_profile_edition", "entrepreneur_contact"); + refreshUser("entrepreneur_profile_edition", "entrepreneur_account_picture"); + refreshUser("mentor_profile_edition", "mentor_info"); + refreshUser("mentor_profile_edition", "mentor_complementary"); + refreshUser("mentor_profile_edition", "mentor_contact"); + refreshUser("mentor_profile_edition", "mentor_account_picture"); addProperFilterToSearchComponents("entrepreneur-resource-list"); addProperFilterToSearchComponents("mentor-database"); @@ -864,7 +898,10 @@ jQuery(document).ready(function($) { //Init the form file behaviour initFileUpload("resource_creation_form", "preview_image"); initFileUpload("resource_edition_form", "preview_image"); + + initFileUpload("mentor_profile_creation", "account.picture"); initFileUpload("mentor_profile_edition", "account.picture"); + refreshRequestList("change_status_request", "request_list"); //Manage the accordion in request mentor dashboard. manageAccordionForRequest(); @@ -916,9 +953,8 @@ jQuery(document).ready(function($) { //manage accordion for "More criteria" manageAccordionMoreCriteria(); - //Init the form file behaviour - // initFileUpload(); initFileUpload("entrepreneur_profile_edition", "account.picture"); + initFileUpload("entrepreneur_profile_creation", "account.picture"); //Correct the native default of pagination refreshPagination(); diff --git a/src/styles/index.scss b/src/styles/index.scss index 7680cc54bea22354f32b73c4b2bf267bd73dd8ea..1d4508babdd871dc1e1e1fc8a511a012f13f237f 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1559,7 +1559,7 @@ sib-set-default[name="submitter_info"]{ } /* XXXXXXXXXXXXXXXXXXXXXXXXX Modal XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ #confirm_suppress, #confirm_status_change, #resource-validation-process, -#resource-validation-process-confirmation { +#resource-validation-process-confirmation, #entrepreneur-request-validation { border: none; top: 0; padding: 0; diff --git a/translation/fr.yml b/translation/fr.yml index 4f1c30f930d2fab62ff5c8c14c6f1afb05fcbef4..bc80771aadef27d9ebf876a0c3489a2d393a8a86 100644 --- a/translation/fr.yml +++ b/translation/fr.yml @@ -68,6 +68,12 @@ MandatoryInformation : Informations obligatoires ComplementaryInformation : Informations complémentaires WithThisResourceBeAbleTo : Grâce à cette ressource, vous serez en mesure de WatchThePresentation : Regarder la présentation +SearchForResource : Chercher une resource +CantFindRessourceYouNeed : Vous ne trouvez pas la resource dont vous avez besoin ? +MakeRequest: Faire une requête +Thanks : Merci! +ConfirmSendBrokenLink : La personne qui a soumit cette ressource sera avertie que le lien est brisé. +YouRequestHasBeenSubmitted : Votre requête a été soumise. WhatValidationProcess : Qu'est-ce qu'un processus de validation ? ContributorUploadResourceToDatabase: Le contributeur télécharge une ressource dans la base de données ResourceSentToQualifiedPeersForValidation : La ressource est envoyée à des pairs qualifiés pour validation.