Skip to content
Snippets Groups Projects
Commit 76c3ff60 authored by Benoit Alessandroni's avatar Benoit Alessandroni
Browse files

Fixing the assignment of the reviewer information

parent ef65a104
No related branches found
No related tags found
1 merge request!27Fixing the assignment of the reviewer information
......@@ -6,5 +6,4 @@ sib-router(default-route='mentor-resource-list')
sib-ac-checker(permission="acl:Write" bind-resources)
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-edit', use-id)
sib-route(name='resource-creation-confirmation')
sib-route(name='mentor-database')
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-validate', use-id)
\ No newline at end of file
sib-route(name='mentor-database')
\ No newline at end of file
......@@ -17,11 +17,16 @@ section#home
sib-router
sib-ac-checker(permission="acl:Write" bind-resources)
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-detail', use-id)
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-validate', use-id)
dialog#mentor-resource-detail.no-sidebar.container
include resources/detail.pug
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
dialog#mentor-resource-validate.no-sidebar.container
include resources/validate.pug
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
#mentor-resource-create(hidden).no-sidebar.container
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
include resources/create.pug
......@@ -30,10 +35,6 @@ section#home
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
include resources/edit.pug
#mentor-resource-validate(hidden).no-sidebar
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
include resources/validate.pug
#resource-creation-confirmation(hidden).no-sidebar.container
include resources/confirmation.pug
......
......@@ -8,12 +8,12 @@ sib-router
.block_log.block_creat_count
sib-display#detail-view(
bind-resources,
fields='format, steps, content(name, preview_image, description, tags),\
submitter_info(submitter.name, \
submitter.mentor_profile.organisation.name, skills, uri, broken), copyright, specifications(\
fields='name, steps, format, content(preview_image, tags),\
submitter_info(submitter.account.picture, submitter.name, \
submitter.mentor_profile.organisation.name, skills, uri),\
description, copyright, specifications(\
header_specifications, author, country, language.name,\
publication_year, field, type.name, sharing), \
related, improve, refuse',
publication_year, fields, sharing)',
widget-submitter.name='cs-display-resource-property',
widget-author='cs-display-resource-property',
......@@ -24,17 +24,19 @@ sib-router
widget-skills='cs-display-resource-property'
widget-description='cs-display-property'
widget-name='cs-display-property'
widget-type.name="cs-display-resource-property"
widget-publication_year='cs-display-resource-property'
widget-sharing='cs-display-resource-property'
widget-language.name='cs-display-resource-property'
widget-submitter.account.picture='cs-account-picture'
widget-broken='cs-broken-action'
widget-header_specifications='cs-section_header'
label-type.name='Type:'
label-broken='Report broken link'
label-sharing='Access:'
label-language.name='Language:'
label-publication_year='Publication year:'
label-header_specifications='Specifications'
each-label-format="Format:"
label-publication_year='Year of publication:'
label-header_specifications='Resource specifications'
each-label-format=''
label-format=''
multiple-format
......@@ -43,37 +45,43 @@ sib-router
each-label-steps="Step"
multiple-steps
label-related_title="Related resources"
widget-related_title='cs-display-label'
label-related=''
widget-related='cs-display-related-property'
multiple-related
widget-field='cs-display-multiple-property'
label-field=''
each-label-field='Field:'
multiple-field
widget-fields='cs-display-multiple-property'
label-fields=''
each-label-fields='Field:'
multiple-fields
label-skills='With this resource, you will be able to:'
label-uri='Link to resource'
name-uri='original-link'
label-country='Country:',
label-country='Country:'
label-submitter.mentor_profile.organisation.name='Organisation:',
label-author='Author :',
label-submitter.name='Resource posted by:',
label-submitter.name='Resource posted by:'
)
widget-improve='sib-action'
label-improve='Require improvement'
action-improve='improvement-dialog'
class-improve='button_base'
p.p_entete
sib-display.action_button(
bind-resources
fields='improve'
widget-refuse='sib-action'
label-refuse='Report as inappropriate'
action-refuse='refusal-dialog'
class-refuse='button_base'
)
widget-improve='sib-action'
label-improve='Require improvement'
action-improve='improvement-dialog'
class-improve='button_base'
)
p.p_entete
sib-display.action_button(
bind-resources
fields='refuse'
widget-refuse='sib-action'
label-refuse='Report as inappropriate'
action-refuse='refusal-dialog'
class-refuse='button_base'
)
sib-form#validation-form(
sib-form#validation-form.action_button(
bind-resources
nested-field='review'
fields='status, reviewer',
......
......@@ -14,18 +14,21 @@ function openTab(pageName, elmnt) {
elmnt.classList.add("active");
}
function linkDatasetToField(detail, targetForm, inputName) {
const validationForm = document.getElementById(targetForm);
const resourceField = validationForm.querySelector(`input[name="${inputName}"]`);
if (resourceField) {
resourceField.value = JSON.stringify({ '@id': detail.dataset.src });
}
function linkDatasetToField(detail, targetFormName, inputName) {
let targetForm = document.getElementById(targetFormName);
targetForm.addEventListener("populate", event => {
let resourceField = targetForm.querySelector(`input[name="${inputName}"]`);
if (resourceField) {
resourceField.value = JSON.stringify({ '@id': detail.dataset.src });
resourceField.setAttribute('value', JSON.stringify({ '@id': detail.dataset.src }));
}
});
}
function refreshList(formId, listId) {
const form = document.getElementById(formId);
let form = document.getElementById(formId);
form.addEventListener("save", event => {
const list = document.getElementById(listId);
let list = document.getElementById(listId);
list.dataset.src = list.dataset.src;
});
}
......@@ -33,19 +36,16 @@ function refreshList(formId, listId) {
jQuery(document).ready(function($) {
// Get the element with id="defaultOpen" and click on it
document.getElementById("defaultOpen").click();
const detail = document.getElementById("detail-view");
detail.addEventListener("populate", event => {
const userAccountDataSrc = document.getElementById("user-account-picture");
linkDatasetToField(userAccountDataSrc, 'validation-form', 'reviewer');
linkDatasetToField(userAccountDataSrc, 'refusal-dialog-form', 'reviewer');
linkDatasetToField(userAccountDataSrc, 'improvement-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");
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");
const logoutButton = document.getElementById('logout-button');
logoutButton.addEventListener('click', function() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment