diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index e25d7aa03d7b4ce78fc1a26fb3bc038c9f6b84ae..c14c33f221127d8b3cc908c2566aadd4ae47a621 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -109,6 +109,14 @@ sib-widget(name='cs-broken-action')
data-src="\${src}"
next="\${value}"
) <i class="fas fa-heart-broken"></i> ${label}
+
+sib-widget(name='cs-request-status-action')
+ template
+ div
+ sib-link.button_base.pull-right(
+ data-src="\${src}"
+ next="confirm_status_change"
+ ) ${label}
sib-widget(name='cs-section_introduction')
template
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index fd12c07b5d50e89a9d40ad6c37b5a7a570f70089..4fa44af4bc54d2051f0891a000729148b237916a 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -7,8 +7,8 @@ include ../../components/widgets
i.fas.fa-times
div#detail-entrepreneur-loader
- hidden Loading the resources, please wait...
-
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#detail-entrepreneur(
loader-id="detail-entrepreneur-loader"
bind-resources,
@@ -71,7 +71,7 @@ include ../../components/widgets
label-submitter.mentor_profile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
- action-broken='resource-report-broken-link'
+ action-broken='resource-report-broken-link-entrepreneur'
)
//- Add likes here
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 776e3f2e5e25264f285574c1a87a081c099e0931..55cf9245bf94fed89141509ca1de121fd9cb4727 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -1,5 +1,10 @@
include ../../components/widgets
+sib-router
+ sib-route( name='resource-report-broken-link-entrepreneur', use-id)
+
+dialog#resource-report-broken-link-entrepreneur
+ include ./resource-report-broken-link-entrepreneur
div.container_min
h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
@@ -116,18 +121,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- loader-id="step1-loader"
data-src=`${endpoints.steps}1/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'
@@ -139,7 +142,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -175,16 +178,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'
@@ -196,7 +198,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -232,16 +234,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'
@@ -252,7 +253,7 @@ container.block_list.flex.flex_espace
search-widget-fields='sib-form-auto-completion'
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -288,16 +289,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'
@@ -309,7 +309,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -344,16 +344,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'
@@ -365,7 +364,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -400,16 +399,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'
@@ -421,7 +419,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
diff --git a/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug b/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug
new file mode 100644
index 0000000000000000000000000000000000000000..288969241d28984e473810088d5b86c58f5585bb
--- /dev/null
+++ b/src/includes/entrepreneur/resources/resource-report-broken-link-entrepreneur.pug
@@ -0,0 +1,16 @@
+.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="entrepreneur-resource-list")
+ .like
+ p
+ i.fas.fa-times
+
+ h2.title_lead_avenir Thanks!
+ p The submitter of the resource will be advised that this link is broken.
+ sib-form#report-broken-link-entrepreneur(
+ data-src=`${endpoints.brokenlinks}`
+ fields = "resource, submitter"
+ widget-resource='sib-form-hidden'
+ widget-submitter='sib-form-hidden'
+ submit-button='ok'
+ next="entrepreneur-resource-list"
+ )
\ No newline at end of file
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index da53014c24da614e859cba1ccc08a32948f4c8c3..e2f32bf9e94a521b70fd7007a8040e05206f8ada 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -28,7 +28,7 @@ container.block_list.flex.flex_espace
sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
loader-id="resources-mentor-database-loader"
- fields='keyword(name_keyword)'
+ fields='keyword(name_keyword)'
label-name_keyword="Search by name..."
widget-name_keyword="sib-form-placeholder-text"
@@ -98,8 +98,11 @@ container.block_list.flex.flex_espace
//Step 1
div.step
+ div#resources-loader-step1-browse-database
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
- loader-id="resources-loader"
+ loader-id="resources-loader-step1-browse-database"
data-src=`${endpoints.steps}1/`,
fields='name'
class="accordion active"
@@ -112,16 +115,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'
@@ -133,7 +135,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -167,16 +169,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'
@@ -188,7 +189,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -223,16 +224,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'
@@ -244,7 +244,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -279,16 +279,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'
@@ -300,7 +299,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -334,16 +333,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'
@@ -355,7 +353,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -389,16 +387,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'
@@ -410,7 +407,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index c758091c3d4aa339cf511426c51cd48146c4c379..198a850a3b35ce05fb54806682eb33c30e7e4f1a 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -7,7 +7,7 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
fields="account_information(last_name, first_name, mentor_profile.organisation,\
mentor_profile.phone, mentor_profile.languages, mentor_profile.fields),\
about_you(header_about_you, account.picture, mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
- mentor_profile.biography, mentor_profile.skills),\
+ mentor_profile.biography, mentor_profile.skills, resources),\
social_media(header_social_media, mentor_profile.linkedin, mentor_profile.twitter), username"
range-mentor_profile.fields=`${endpoints.fields}`
@@ -39,6 +39,7 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
widget-mentor_profile.skills="sib-form-textarea"
widget-mentor_profile.biography="sib-form-textarea"
widget-username="sib-form-hidden"
+ widget-resources="hidden-widget"
class-mentor_profile.organisation='form-label is-dark'
widget-mentor_profile.organisation='sib-form-auto-completion'
diff --git a/src/includes/mentor/resources/confirmation-status-change.pug b/src/includes/mentor/resources/confirmation-status-change.pug
new file mode 100644
index 0000000000000000000000000000000000000000..b4c9ebf06122c05352820691b5e69dd620cdb683
--- /dev/null
+++ b/src/includes/mentor/resources/confirmation-status-change.pug
@@ -0,0 +1,18 @@
+include ../../components/widgets
+
+.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="mentor-resource-list")
+ .like
+ p
+ i.fas.fa-times
+
+ h2.title_lead_avenir Are you sur you want to archive this request ?
+
+ sib-form#change_status_request(
+ bind-resources
+ fields='button(status, name, description, skills, reviewer)'
+ value-status = "validated"
+ widget-button = "hidden-widget"
+ submit-button = "Archive this request"
+ next="mentor-resource-list"
+ )
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index b9ed142c2bdf143dfe6e8e675d72648e31170f93..cf20f6a78515dd973cbcb056b19221595ccf3042 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -71,7 +71,7 @@ include ../../components/widgets
label-submitter.mentor_profile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
- action-broken='resource-report-broken-link'
+ action-broken='resource-report-broken-link-mentor'
)
//TODO: implement likes here
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index b19559f588c492d43973f562d552ad5280d6bf1f..75c19e5897329875fb2089ff2eb8288db5653dc6 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -2,13 +2,17 @@ include ../../components/widgets
sib-router
sib-route( name='confirm_suppress', use-id)
- sib-route( name='resource-report-broken-link', use-id)
+ sib-route( name='resource-report-broken-link-mentor', use-id)
+ sib-route( name='confirm_status_change', id-prefix=`${endpoints.requests}`, use-id)
dialog#confirm_suppress.no-sidebar
include ./confirmation-deletion
-dialog#resource-report-broken-link
- include ./resource-report-broken-link
+dialog#resource-report-broken-link-mentor
+ include ./resource-report-broken-link-mentor
+
+dialog#confirm_status_change.no-sidebar
+ include ./confirmation-status-change
div.container_min
h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
@@ -62,11 +66,11 @@ div.block_list
div#loader-requests-mentor
hidden
i.fas.fa-spinner.fa-spin
- sib-display.request_accordion(
+ sib-display#request-list.request_accordion(
loader-id="loader-requests-mentor"
data-src=`${endpoints.requests}`
- fields='name, content(description, info(fields, language.name, target, submitter.email), create)',
-
+ fields='name, content(description, info(fields, language.name, target, submitter.email, status))',
+ search-fields='status'
label-target='Target audience:'
label-language.name='Language:'
label-submitter.email="submitter'email :"
@@ -78,10 +82,13 @@ div.block_list
widget-target='cs-display-resource-property'
widget-submitter.email='cs-display-resource-property'
widget-name='accordion-request-resource'
+ search-widget-status='hidden-widget'
+ search-value-status='pending'
+
+ label-status='Dealt with'
+ widget-status='cs-request-status-action'
+ action-status="status"
- label-create='Post a resource'
- action-create="mentor-resource-create"
- widget-create='cs-validate-action'
)
diff --git a/src/includes/mentor/resources/resource-report-broken-link.pug b/src/includes/mentor/resources/resource-report-broken-link-mentor.pug
similarity index 92%
rename from src/includes/mentor/resources/resource-report-broken-link.pug
rename to src/includes/mentor/resources/resource-report-broken-link-mentor.pug
index 568286d98ef289944a42895f2fd9d48bf22d495e..b2f1207b96403bb312e268d5390adc4bfe4b467a 100644
--- a/src/includes/mentor/resources/resource-report-broken-link.pug
+++ b/src/includes/mentor/resources/resource-report-broken-link-mentor.pug
@@ -6,7 +6,7 @@
h2.title_lead_avenir Thanks!
p The submitter of the resource will be advised that this link is broken.
- sib-form#report-broken-link(
+ sib-form#report-broken-link-mentor(
data-src=`${endpoints.brokenlinks}`
fields = "resource, submitter"
widget-resource='sib-form-hidden'
diff --git a/src/includes/mentor/resources/validate.pug b/src/includes/mentor/resources/validate.pug
index e07ef4ffae43f3099e7e3df158947a70bcc37c1e..3b1fee99dd110bcbcb942dff8a9918074f87d380 100644
--- a/src/includes/mentor/resources/validate.pug
+++ b/src/includes/mentor/resources/validate.pug
@@ -72,7 +72,7 @@ sib-router
label-submitter.mentor_profile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
- action-broken='resource-report-broken-link'
+ action-broken='resource-report-broken-link-mentor'
)
p.p_entete
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index f90e586242e74d695a73642ea2a0af14e967d881..84d387e03b90f74ca5897bca30bcd5c221b4e81d 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -7,7 +7,8 @@ include ../../components/widgets
i.fas.fa-times
div#detail-public-loader
- hidden Loading resources, please wait...
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display(
loader-id="detail-public-loader"
@@ -71,7 +72,7 @@ include ../../components/widgets
label-submitter.mentor_profile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
- action-broken='resource-report-broken-link'
+ action-broken='resource-report-broken-link-public'
)
//- Add likes here
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index c986393472edd63c6ebfd7a8bbc6c0ab257f7867..ba13d1bf44e1cbf505687fad7e1ffdef21b35cdc 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -1,5 +1,10 @@
include ../../components/widgets
+sib-router
+ sib-route( name='resource-report-broken-link-public', use-id)
+
+dialog#resource-report-broken-link-public
+ include ./resource-report-broken-link-public
div.container_min
h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
@@ -85,7 +90,11 @@ container.block_list.flex.flex_espace
//Step 1
div.step
+ div#resources-loader-step1-public
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
+ loader-id="resources-loader-step1-public"
data-src=`${endpoints.steps}1/`,
fields='name'
class="accordion active"
@@ -98,7 +107,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}`
@@ -118,7 +127,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -154,7 +163,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}`
@@ -174,7 +183,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -211,7 +220,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}`
@@ -231,7 +240,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -267,7 +276,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}`
@@ -287,7 +296,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -323,7 +332,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}`
@@ -343,7 +352,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -378,16 +387,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'
@@ -399,7 +407,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -414,7 +422,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/includes/public/resources/resource-report-broken-link-public.pug b/src/includes/public/resources/resource-report-broken-link-public.pug
new file mode 100644
index 0000000000000000000000000000000000000000..b2ffd7531735a96505a40a37a1cdbf31d5b3b02c
--- /dev/null
+++ b/src/includes/public/resources/resource-report-broken-link-public.pug
@@ -0,0 +1,16 @@
+.block_log.block_creat_count.no_shadow
+ sib-link(class="backlink", next="public-resource-list")
+ .like
+ p
+ i.fas.fa-times
+
+ h2.title_lead_avenir Thanks!
+ p The submitter of the resource will be advised that this link is broken.
+ sib-form#report-broken-link-public(
+ data-src=`${endpoints.brokenlinks}`
+ fields = "resource, submitter"
+ widget-resource='sib-form-hidden'
+ widget-submitter='sib-form-hidden'
+ submit-button='ok'
+ next="public-resource-list"
+ )
\ No newline at end of file
diff --git a/src/index.pug b/src/index.pug
index 97b326b592cdd829cecca836c67c617cc06b0c98..20604cd66059d2a1260247cafb7a3a7d153d64af 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -51,7 +51,9 @@ script(type='module').
let idToken = await sibAuth.getUserIdToken();
if ( !user ) {
- return;
+ window.dispatchEvent(
+ new CustomEvent('requestNavigation', { detail: { route: 'splash' } })
+ );
}
user = await store.get(user);
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 5c051ad17da144af4577579300ea8157d7f0ee65..2f43bc724231c9e91e2a0a11413422d0d76d7a15 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -1,3 +1,13 @@
+/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXX FUNCTIONS XXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+
+/**
+ * Manage classic tabs.
+ * @param {string} pageName - Id of the tab content
+ * @param {HTMLElement} elmnt - Accordion element
+ */
function openTab(pageName, elmnt) {
// Hide all elements with class="tabcontent" by default */
var i, tabcontent, tablinks;
@@ -14,7 +24,10 @@ function openTab(pageName, elmnt) {
elmnt.classList.add("active");
}
-//Manage the visual of the fake tabs in entrepreneur dashboard.
+/**
+ * Manage the visual of the fake tabs in entrepreneur dashboard.
+ * @param {HTMLElement} elmnt - Active fake tab.
+ */
function openFakeTab(elmnt) {
// Hide all elements with class="tabcontent" by default */
var i, tablinks;
@@ -23,24 +36,40 @@ function openFakeTab(elmnt) {
for (i = 0; i < tablinks.length; i++) {
tablinks[i].classList.remove("active");
}
+
+ // Show the specific tab content
elmnt.classList.add("active");
}
+/**
+ * Set a preview image on load.
+ * @param {event} event - On file loading.
+ */
function loadFile(event) {
+ //Création of the preview
var elt = document.createElement("img");
elt.src = URL.createObjectURL(event.target.files[0]);
+ //Remove the default useless image.
var labeltag = event.target.closest("label");
labeltag.querySelector("input[name='preview_image']").style.display = "none";
+ //If there is already a image previewed, remove it.
if (labeltag.querySelector("img")) {
var oldImage = labeltag.querySelector("img");
labeltag.removeChild(oldImage);
}
+ //Add the previewimage
labeltag.insertAdjacentElement("afterbegin", elt);
}
+/**
+ * Fill datas to a form.
+ * @param {HTMLElment} detail - Element with the datas to retrieve.
+ * @param {string} targetFormName - Id of the form to fill.
+ * @param {string} inputName - Name of the input to fill.
+ */
function linkDatasetToField(detail, targetFormName, inputName) {
let targetForm = document.getElementById(targetFormName);
targetForm.addEventListener("populate", event => {
@@ -55,7 +84,11 @@ function linkDatasetToField(detail, targetFormName, inputName) {
});
}
-//Refresh information after a form submission
+/**
+ * Refresh information after a form submission
+ * @param {String} formId - Id of the sumitted form
+ * @param {String} listId - Id of the list to refresh
+ */
function refreshList(formId, listId) {
let form = document.getElementById(formId);
form.addEventListener("save", event => {
@@ -64,7 +97,9 @@ function refreshList(formId, listId) {
});
}
-//Remove pagination when there is no resource in a step group
+/**
+ * Remove pagination when there is no resource in a step group.
+ */
function refreshPagination() {
var resources_containers = document.querySelectorAll(
".resource_by_step sib-form+div"
@@ -78,13 +113,22 @@ function refreshPagination() {
.textContent == 1)
) {
resources_container.nextSibling.setAttribute("style", "display:none");
- } else if (resources_container.nextSibling) {
- resources_container.nextSibling.setAttribute("style", "display:block");
+ } else if (
+ resources_container.nextSibling &&
+ resources_container
+ .closest(".step")
+ .querySelector(".accordion:not(.active)")
+ ) {
+ resources_container.nextSibling.setAttribute("hidden", "hidden");
}
}
}
-//Manage select hidden to fullfill them with more "more criterias" selection
+/**
+ * Manage select hidden to fullfill them with more "more criterias" selection
+ * @param {HTMLElement} select_hidden - Hidden select to fullfill.
+ * @param {HTMLElement} option_selected - Option selcted to set in hidden select.
+ */
function selectHiddenManagement(select_hidden, option_selected) {
options_hidden = select_hidden.getElementsByTagName("option");
for (let option_hidden of options_hidden) {
@@ -104,7 +148,11 @@ function selectHiddenManagement(select_hidden, option_selected) {
refreshPagination();
}
-//Manage input hidden field to fullfill them with more "more criterias" selection
+/**
+ * Manage input hidden field to fullfill them with more "more criterias" selection
+ * @param {HTMLElement} field - Hidden field to fullfill.
+ * @param {HTMLElement} field_search - Field with the value wanted by the user.
+ */
function inputHiddenManagement(field, field_search) {
field.setAttribute("value", field_search.value);
let parent_form = field.closest("sib-form");
@@ -112,7 +160,11 @@ function inputHiddenManagement(field, field_search) {
refreshPagination();
}
-//Manage select hidden for type to fullfill them with more "more criterias" selection
+/**
+ * Manage select hidden for type to fullfill them with more "more criterias" selection
+ * @param {HTMLElement} tab - Selected type tabs.
+ * @param {HTMLElement} form - Hidden form to fullfill.
+ */
function selectHiddenManagementForType(tab, form) {
let type_hidden_field = form.querySelectorAll(
'hidden-widget[name="more_criterias_hidden"] select[name="type"]'
@@ -143,18 +195,104 @@ function selectHiddenManagementForType(tab, form) {
}
}
-//Manage the report broken links hidden form
-function fillReportBrokenLinkForm(event, userWhoSubmitReport) {
- var formBrokenLink = document.getElementById("report-broken-link");
-
+/**
+ * Manage the report broken links hidden form
+ */
+function fillReportBrokenLinkForm(event, userWhoSubmitReport, formBrokenLink) {
formBrokenLink.querySelector(
"input[name='resource']"
).value = JSON.stringify({ "@id": event.target.dataset.src });
+
formBrokenLink.querySelector(
"input[name='submitter']"
).value = JSON.stringify({ "@id": userWhoSubmitReport });
}
+/**
+ * Manage the accordion for step in entrepreneur dashboard
+ */
+function manageAccordionByStep(){
+ var acc = document.getElementsByClassName("accordion");
+ var i;
+
+ for (i = 0; i < acc.length; i++) {
+ acc[i].addEventListener("click", function() {
+ if (this.classList.contains("active") == true) {
+ this.classList.remove("active");
+ this.nextElementSibling.querySelector(
+ "sib-form + div"
+ ).style.maxHeight = "0px";
+ } else {
+ this.classList.add("active");
+ }
+
+ this.closest(".step")
+ .querySelector("nav")
+ .removeAttribute("hidden");
+ refreshPagination();
+
+ var panel = this.nextElementSibling.querySelector("sib-form + div");
+
+ if (panel.style.maxHeight) {
+ panel.style.maxHeight = null;
+ } else {
+ panel.style.maxHeight = panel.scrollHeight + "px";
+ }
+ });
+ }
+}
+
+/**
+ * Manage the accordion for requested resources in the mentor dashboard
+ */
+function manageAccordionForRequest() {
+ var accRequest = document.querySelectorAll(
+ "#requests accordion-request-resource"
+ );
+
+ for (let i = 0; i < accRequest.length; i++) {
+ accRequest[i].addEventListener("click", function() {
+ /* Toggle between adding and removing the "active" class,
+ to highlight the button that controls the panel */
+ this.classList.toggle("active");
+
+ /* Toggle between hiding and showing the active panel */
+ var panelRequest = this.nextElementSibling;
+ if (!this.classList.contains("active")) {
+ panelRequest.style.maxHeight = null;
+ refreshPagination();
+ } else {
+ panelRequest.style.maxHeight = panelRequest.scrollHeight + "px";
+ }
+ });
+ }
+}
+
+/**
+ * Manage the action of the logout button
+ */
+function manageLogoutButton() {
+ 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);
+ });
+ }
+}
+
+/**
+ * For entrepreneur dashboard only :
+ * As we cannot have multiple imbricated filtering with the native sib-display, we manage it manually.
+ * @param {String} targetId - Id of the element to update
+ */
function addProperFilterToSearchComponents(targetId) {
var baseElement = document.getElementById(targetId);
var forms = baseElement.querySelectorAll(".resource_by_step");
@@ -166,7 +304,7 @@ function addProperFilterToSearchComponents(targetId) {
selectHiddenManagementForType(tab, form);
}
- //On load in dashbord Entrepreneur
+ //Manage the pagination
refreshPagination();
//SEARCH BY KEYWORD
@@ -183,14 +321,23 @@ function addProperFilterToSearchComponents(targetId) {
'hidden-widget[name="search_for_a_resource"] input'
);
- keyword_submit.addEventListener("click", function() {
- keyword_hidden_fields.forEach(hidden_field => {
- hidden_field.setAttribute("value", keyword_field.value);
- let parent_form = hidden_field.closest("sib-form");
- parent_form.component.inputChange();
- refreshPagination();
+ if (keyword_field) {
+ let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
+ let keyword_hidden_fields = baseElement.querySelectorAll(
+ 'hidden-widget[name="search_for_a_resource"] input'
+ );
+
+ keyword_submit.addEventListener("click", function() {
+ keyword_hidden_fields.forEach(hidden_field => {
+ hidden_field.setAttribute("value", keyword_field.value);
+ hidden_field.value = keyword_field.value;
+
+ let parent_form = hidden_field.closest("sib-form");
+ parent_form.component.inputChange();
+ refreshPagination();
+ });
});
- });
+ }
//SEARCH IN DATABASE INSTANCE ONLY
let instance_only = baseElement.querySelectorAll(
@@ -216,12 +363,9 @@ function addProperFilterToSearchComponents(targetId) {
//Manage fake tabs for type
let tabs = baseElement.getElementsByClassName("filter_by_type");
for (let tab of tabs) {
- tab.addEventListener(
- "click",
- function() {
- selectHiddenManagementForType(tab, form)
- }
- );
+ tab.addEventListener("click", function() {
+ selectHiddenManagementForType(tab, form);
+ });
}
//To retrieve format
@@ -323,6 +467,11 @@ function addProperFilterToSearchComponents(targetId) {
});
}
+/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXX ON LOAD XXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+
jQuery(document).ready(function($) {
//Refresh pagination
refreshPagination();
@@ -330,11 +479,16 @@ jQuery(document).ready(function($) {
// Get the element with id="defaultOpen" and click on it
document.getElementById("defaultOpen").click();
+ //Retrieve the current user
let userAccountDataSrc = document.getElementById("user-account-picture");
+
+ //Add the current user as reviewer.
linkDatasetToField(userAccountDataSrc, "validation-form", "reviewer");
linkDatasetToField(userAccountDataSrc, "improvement-dialog-form", "reviewer");
linkDatasetToField(userAccountDataSrc, "refusal-dialog-form", "reviewer");
+ linkDatasetToField(userAccountDataSrc, "change_status_request", "reviewer");
+ //On form submission, we sometime have to refresh a list.
refreshList("resource-creation-form", "resources-history");
refreshList("validation-form", "pending-resources");
refreshList("refusal-dialog-form", "pending-resources");
@@ -353,6 +507,7 @@ jQuery(document).ready(function($) {
refreshList("mentor_profile_edition", "mentor_complementary");
refreshList("mentor_profile_edition", "mentor_contact");
refreshList("mentor_profile_edition", "user-account-picture");
+ refreshList("change_status_request", "request-list");
var header_dropdown = $(".dropdownWrapper"),
drop_choices = header_dropdown.find(".dropdownLabel");
@@ -370,121 +525,78 @@ jQuery(document).ready(function($) {
}
//Manage the logout action
- 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);
- });
- }
+ manageLogoutButton();
- //MENTOR DASHBOARD*************************************************************
+ /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXX MENTOR DASHBOARD XXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
window.setTimeout(() => {
//Manage the form to report broken link.
let detailsMentor = document.getElementById("detail-mentor");
detailsMentor.addEventListener("populate", event => {
var userWhoSubmitReport = userAccountDataSrc.dataset.src
- fillReportBrokenLinkForm(event, userWhoSubmitReport);
+ var formBrokenLink = document.getElementById("report-broken-link-mentor");
+ fillReportBrokenLinkForm(event, userWhoSubmitReport, formBrokenLink);
});
- var forms = document.querySelectorAll("sib-form");
- forms.forEach(form => {
- form.addEventListener("populate", e => {
- var previewImage = document.querySelectorAll(
- "sib-form-file input[name='preview_image']+input"
- );
- var previewlabel = document.querySelectorAll("sib-form-file div");
- for (let item of previewlabel) {
- item.innerHTML="Upload a file"
- }
-
- for (let item of previewImage) {
- item.addEventListener("change", loadFile);
- }
- });
-
- //Manage the accordion in request mentor dashboard.
- var accRequest = document.querySelectorAll(
- "#requests accordion-request-resource"
- );
-
- for (let i = 0; i < accRequest.length; i++) {
- accRequest[i].addEventListener("click", function() {
- /* Toggle between adding and removing the "active" class,
- to highlight the button that controls the panel */
- this.classList.toggle("active");
-
- /* Toggle between hiding and showing the active panel */
- var panelRequest = this.nextElementSibling;
- if (panelRequest.style.maxHeight) {
- panelRequest.style.maxHeight = null;
- } else {
- panelRequest.style.maxHeight = panelRequest.scrollHeight + "px";
- }
- });
- }
-
- //Refresh data list on delete resources
- const deleteButton = document.querySelectorAll("sib-delete");
- for (var i = 0; i < deleteButton.length; i++) {
- deleteButton[i].addEventListener("resourceDeleted", e => {
- const historyList = document.getElementById("resources-history");
- historyList.dataset.src = historyList.dataset.src;
-
- let confirm_suppress = document.getElementById("confirm_suppress");
- confirm_suppress.setAttribute("hidden", "hidden");
-
- //If we supress from the detail resource view, we close this view.
- let mentor_resource_detail = document.getElementById(
- "mentor-resource-detail"
- );
- mentor_resource_detail.setAttribute("hidden", "hidden");
- this.dispatchEvent(
- new CustomEvent("requestNavigation", {
- bubbles: true,
- detail: { route: "actions" }
- })
- );
- });
- }
- });
- }, 2000);
+ var previewImage = document.querySelectorAll(
+ "sib-form-file input[name='preview_image']+input"
+ );
+ var previewlabel = document.querySelectorAll("sib-form-file div");
+ for (let item of previewlabel) {
+ item.innerHTML = "Upload a file";
+ }
- //ENTREPRENEUR DASHBOARD*************************************************************
+ for (let item of previewImage) {
+ item.addEventListener("change", loadFile);
+ }
- window.setTimeout(() => {
+ //Manage the accordion in request mentor dashboard.
+ manageAccordionForRequest()
+
+ //Refresh data list on delete resources
+ const deleteButton = document.querySelectorAll("sib-delete");
+ for (var i = 0; i < deleteButton.length; i++) {
+ deleteButton[i].addEventListener("resourceDeleted", e => {
+ const historyList = document.getElementById("resources-history");
+ historyList.dataset.src = historyList.dataset.src;
+
+ let confirm_suppress = document.getElementById("confirm_suppress");
+ confirm_suppress.setAttribute("hidden", "hidden");
+ //If we supress from the detail resource view, we close this view.
+ let mentor_resource_detail = document.getElementById(
+ "mentor-resource-detail"
+ );
+ mentor_resource_detail.setAttribute("hidden", "hidden");
+ this.dispatchEvent(
+ new CustomEvent("requestNavigation", {
+ bubbles: true,
+ detail: { route: "actions" }
+ })
+ );
+ });
+ };
+
//Manage the form to report broken link.
let detailsEntrepreneur = document.getElementById("detail-entrepreneur");
detailsEntrepreneur.addEventListener("populate", event => {
+ var formBrokenLink = document.getElementById("report-broken-link-entrepreneur");
var userWhoSubmitReport = userAccountDataSrc.dataset.src
-
- fillReportBrokenLinkForm(event, userWhoSubmitReport);
+ fillReportBrokenLinkForm(event, userWhoSubmitReport, formBrokenLink);
});
- //Accordion by step
- var acc = document.getElementsByClassName("accordion");
- var i;
+ }, 3000);
- for (i = 0; i < acc.length; i++) {
- acc[i].addEventListener("click", function() {
- this.classList.toggle("active");
+ /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXX ENTREPRENEUR DASHBOARD XXXXXXXXXXXXXXXXXXXX
+ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
- var panel = this.nextElementSibling.querySelector("sib-form + div");
-
- if (panel.style.maxHeight) {
- panel.style.maxHeight = null;
- } else {
- panel.style.maxHeight = panel.scrollHeight + "px";
- }
- });
- }
+ window.setTimeout(() => {
+ //Manage accordion by step
+ manageAccordionByStep();
+ refreshPagination();
}, 2000);
//In the entrepreneur dashboard, we set data from the display form to the hidden ones.
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 562fca4e965af1baa21efda316fd092117f6fe1e..665ec505d677955d8eccdd35835c106315bb59fa 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1266,7 +1266,7 @@ sib-set-default[name="submitter_info"]{
}
}
/* XXXXXXXXXXXXXXXXXXXXXXXXX Modal XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
-#confirm_suppress, #resource-validation-process,
+#confirm_suppress, #confirm_status_change, #resource-validation-process,
#resource-validation-process-confirmation {
border: none;
top: 0;