#1367 Add validation to the course grade options so that the instruct…

…or must select at least one option
EnterStudios · Feb 16, 2016 · 11824bd · 11824bd
1 parent 3015b84
commit 11824bd
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 4 deletions.
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.properties b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.properties
@@ -263,6 +263,8 @@ settingspage.displaycoursegrade.preview-percentage-first = 88%
 settingspage.displaycoursegrade.preview-percentage-second = (88%)
 settingspage.displaycoursegrade.preview-points-first = 176/200
 settingspage.displaycoursegrade.preview-points-second = [176/200]
+settingspage.displaycoursegrade.instructions = Choose the options for formatting the course grade. You must choose at least one option.
+settingspage.displaycoursegrade.notenough = Display course grade is selected but you didn't select any formatting options.
 
 settingspage.categories.none = No categories
 settingspage.categories.categoriesonly = Categories only

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java
@@ -76,6 +76,27 @@ public void onValidate() {
 					}
 				}
 
+				// validate the course grade display settings
+				if (model.getGradebookInformation().isCourseGradeDisplayed()) {
+					int displayOptions = 0;
+
+					if (model.getGradebookInformation().isCourseLetterGradeDisplayed()) {
+						displayOptions++;
+					}
+
+					if (model.getGradebookInformation().isCourseAverageDisplayed()) {
+						displayOptions++;
+					}
+
+					if (model.getGradebookInformation().isCoursePointsDisplayed()) {
+						displayOptions++;
+					}
+
+					if (displayOptions == 0) {
+						error(getString("settingspage.displaycoursegrade.notenough"));
+					}
+				}
+
 			}
 
 			@Override

diff --git a/...kng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.html b/...kng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.html
@@ -30,7 +30,11 @@ <h3 class="panel-title">
 				</div>
 
 				<div class="form-group" wicket:id="courseGradeType">
-					<div class="col-sm-offset-2 col-sm-10">
+
+					<p class="instruction"><wicket:message key="settingspage.displaycoursegrade.instructions" /></p>
+					<p class="messageError" wicket:id="minimumOptions">minimum options message</p>
+
+					<div class="col-sm-offset-1 col-sm-20">
 
 						<div class="checkbox">
 							<label>

diff --git a/...kng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.java b/...kng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.java
@@ -15,6 +15,7 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.ResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.sakaiproject.gradebookng.business.GradebookNgBusinessService;
 import org.sakaiproject.gradebookng.tool.model.GbSettings;
@@ -30,6 +31,7 @@ public class SettingsGradeReleasePanel extends Panel {
 	IModel<GbSettings> model;
 
 	Label preview;
+	Label minimumOptions;
 
 	public SettingsGradeReleasePanel(final String id, final IModel<GbSettings> model) {
 		super(id, model);
@@ -103,8 +105,9 @@ public boolean isVisible() {
 
 			@Override
 			protected void onUpdate(final AjaxRequestTarget target) {
-				// update preview
+				// update preview and validation
 				target.add(SettingsGradeReleasePanel.this.preview);
+				target.add(SettingsGradeReleasePanel.this.minimumOptions);
 			}
 		};
 		letterGrade.setOutputMarkupId(true);
@@ -117,8 +120,9 @@ protected void onUpdate(final AjaxRequestTarget target) {
 
 			@Override
 			protected void onUpdate(final AjaxRequestTarget target) {
-				// update preview
+				// update preview and validation
 				target.add(SettingsGradeReleasePanel.this.preview);
+				target.add(SettingsGradeReleasePanel.this.minimumOptions);
 			}
 		};
 		percentage.setOutputMarkupId(true);
@@ -131,13 +135,46 @@ protected void onUpdate(final AjaxRequestTarget target) {
 
 			@Override
 			protected void onUpdate(final AjaxRequestTarget target) {
-				// update preview
+				// update preview and validation
 				target.add(SettingsGradeReleasePanel.this.preview);
+				target.add(SettingsGradeReleasePanel.this.minimumOptions);
 			}
 		};
 		points.setOutputMarkupId(true);
 		courseGradeType.add(points);
 
+		// minimum options label. only shows if we have too few selected
+		this.minimumOptions = new Label("minimumOptions", new ResourceModel("settingspage.displaycoursegrade.notenough")) {
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public boolean isVisible() {
+				final GradebookInformation settings = SettingsGradeReleasePanel.this.model.getObject().getGradebookInformation();
+
+				// validation label
+				if (settings.isCourseGradeDisplayed()) {
+					int displayOptions = 0;
+					if (settings.isCourseLetterGradeDisplayed()) {
+						displayOptions++;
+					}
+					if (settings.isCourseAverageDisplayed()) {
+						displayOptions++;
+					}
+					if (settings.isCoursePointsDisplayed()) {
+						displayOptions++;
+					}
+					if (displayOptions == 0) {
+						System.out.println("visible");
+						return true;
+					}
+				}
+				return false;
+			}
+
+		};
+		this.minimumOptions.setOutputMarkupPlaceholderTag(true);
+		courseGradeType.add(this.minimumOptions);
+
 		// preview model, uses settings to determine out what to display
 		final Model<String> previewModel = new Model<String>() {
 			private static final long serialVersionUID = 1L;