Commit 5a0070ee by Will Daly

Ensure that all validation errors are marked.

parent f1f91671
...@@ -393,7 +393,7 @@ OpenAssessment.RubricCriterion.prototype = { ...@@ -393,7 +393,7 @@ OpenAssessment.RubricCriterion.prototype = {
validate: function() { validate: function() {
var isValid = true; var isValid = true;
$.each(this.optionContainer.getAllItems(), function() { $.each(this.optionContainer.getAllItems(), function() {
isValid = (isValid && this.validate()); isValid = (this.validate() && isValid);
}); });
return isValid; return isValid;
}, },
......
...@@ -232,7 +232,9 @@ OpenAssessment.StudioView.prototype = { ...@@ -232,7 +232,9 @@ OpenAssessment.StudioView.prototype = {
**/ **/
validate: function() { validate: function() {
return this.settingsView.validate() && this.rubricView.validate(); var settingsValid = this.settingsView.validate();
var rubricValid = this.rubricView.validate();
return settingsValid && rubricValid;
}, },
/** /**
......
...@@ -147,7 +147,9 @@ OpenAssessment.EditPeerAssessmentView.prototype = { ...@@ -147,7 +147,9 @@ OpenAssessment.EditPeerAssessmentView.prototype = {
**/ **/
validate: function() { validate: function() {
return this.startDatetimeControl.validate() && this.dueDatetimeControl.validate(); var startValid = this.startDatetimeControl.validate();
var dueValid = this.dueDatetimeControl.validate();
return startValid && dueValid;
}, },
/** /**
...@@ -297,7 +299,9 @@ OpenAssessment.EditSelfAssessmentView.prototype = { ...@@ -297,7 +299,9 @@ OpenAssessment.EditSelfAssessmentView.prototype = {
**/ **/
validate: function() { validate: function() {
return this.startDatetimeControl.validate() && this.dueDatetimeControl.validate(); var startValid = this.startDatetimeControl.validate();
var dueValid = this.dueDatetimeControl.validate();
return startValid && dueValid;
}, },
/** /**
......
...@@ -202,7 +202,7 @@ OpenAssessment.EditRubricView.prototype = { ...@@ -202,7 +202,7 @@ OpenAssessment.EditRubricView.prototype = {
var isValid = true; var isValid = true;
$.each(this.getAllCriteria(), function() { $.each(this.getAllCriteria(), function() {
isValid = (isValid && this.validate()); isValid = (this.validate() && isValid);
}); });
return isValid; return isValid;
......
...@@ -208,14 +208,14 @@ OpenAssessment.EditSettingsView.prototype = { ...@@ -208,14 +208,14 @@ OpenAssessment.EditSettingsView.prototype = {
**/ **/
validate: function() { validate: function() {
// Validate the start and due datetime controls // Validate the start and due datetime controls
var isValid = ( var isValid = true;
this.startDatetimeControl.validate() &&
this.dueDatetimeControl.validate() isValid = (this.startDatetimeControl.validate() && isValid);
); isValid = (this.dueDatetimeControl.validate() && isValid);
// Validate each of the assessment views // Validate each of the assessment views
$.each(this.assessmentViews, function() { $.each(this.assessmentViews, function() {
isValid = (isValid && this.validate()); isValid = (this.validate() && isValid);
}); });
return isValid; return isValid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment