Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix optionset refresh in projects_questions (#819) #820

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Fix optionset refresh in projects_questions (#819) #820

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions rdmo/projects/static/projects/js/project_questions/services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ angular.module('project_questions')
service.prev = function() {
service.error = null; // reset error when moving to previous questionset
if (service.settings.project_questions_autosave) {
service.save(false).then(function() {
service.save(false, true).then(function() {
back = true;
service.initView(service.page.prev_page);
})
Expand All @@ -865,7 +865,7 @@ angular.module('project_questions')
service.next = function() {
service.error = null; // reset error when moving to next questionset
if (service.settings.project_questions_autosave) {
service.save(false).then(function() {
service.save(false, true).then(function() {
service.initView(service.page.next_page);
})
} else {
Expand All @@ -876,7 +876,7 @@ angular.module('project_questions')
service.jump = function(section, page) {
service.error = null; // reset error before saving
if (service.settings.project_questions_autosave) {
service.save(false).then(function() {
service.save(false, true).then(function() {
if (service.error !== null) {
// pass, dont jump
} else if (angular.isDefined(page)) {
Expand Down Expand Up @@ -916,7 +916,7 @@ angular.module('project_questions')
}
};

service.save = function(proceed) {
service.save = function(proceed, jump) {
service.error = null; // reset error
return service.storeValues().then(function() {
if (service.error !== null) {
Expand All @@ -941,7 +941,6 @@ angular.module('project_questions')
}
}
} else {
console.log('next');
service.next();
}
} else {
Expand All @@ -956,19 +955,20 @@ angular.module('project_questions')
});

// check if we need to refresh the site
angular.forEach([service.page].concat(service.questionsets), function(questionset) {
angular.forEach(questionset.elements, function(element) {
if (element.model == 'questions.question') {
var question = element;
angular.forEach(question.optionsets, function(optionset) {
if (optionset.has_refresh) {
return service.initView(service.page.id);
}
});
}
if (angular.isUndefined(jump) || !jump) {
angular.forEach([service.page].concat(service.questionsets), function(questionset) {
angular.forEach(questionset.elements, function(element) {
if (element.model == 'questions.question') {
var question = element;
angular.forEach(question.optionsets, function(optionset) {
if (optionset.has_refresh) {
return service.initView(service.page.id);
}
});
}
});
});
});

}
// re-evaluate conditions
angular.forEach([service.page].concat(service.questionsets), function(questionset) {
angular.forEach(service.valuesets[questionset.id], function(valuesets, set_prefix) {
Expand Down