Merge pull request sakaiproject#120 from jonespm/SAM-2470

SAM-2470 - Copying from question pool displaying qusetion pool numbers w...
botimer · Jan 28, 2015 · eff900e · eff900e
2 parents 23efc2d + 15298ff
commit eff900e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/PrintMessages.properties b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/PrintMessages.properties
@@ -40,6 +40,7 @@ size_xlarge=X-Large
 show_intros_titles=Show Description/Intro, Part's Title & Information
 show_answer_key=Show Answer Key
 show_answer_feedback=Show Answer Key with Feedback
+show_answer_sequence=Show Numbered Sequences
 apply_settings=Apply Settings
 answer_key=Answer Key
 answer_point=Answer Point Value

diff --git a/...p/src/java/org/sakaiproject/tool/assessment/ui/bean/print/settings/PrintSettingsBean.java b/...p/src/java/org/sakaiproject/tool/assessment/ui/bean/print/settings/PrintSettingsBean.java
@@ -15,6 +15,7 @@ public class PrintSettingsBean implements Serializable {
 	private String fontSize = "3";
 	private Boolean showPartIntros = Boolean.TRUE;
 	private Boolean showKeysFeedback = Boolean.FALSE;
+	private Boolean showSequence = Boolean.FALSE;
 
 	public PrintSettingsBean() {
 		//nothing
@@ -79,4 +80,18 @@ public void setShowKeysFeedback(Boolean showKeysFeedback) {
 		this.showKeysFeedback = showKeysFeedback;
 	}
 
+    /**
+	 * @return true if sequence should be shown
+	 */
+	public Boolean getShowSequence() {
+		return showSequence;
+	}
+
+	/**
+	 * @param set if the sequence should be shown
+	 */
+	public void setShowSequence(Boolean showSequence) {
+		this.showSequence = showSequence;
+	}
+
 }
diff --git a/samigo/samigo-app/src/webapp/jsf/print/printAssessment.jsp b/samigo/samigo-app/src/webapp/jsf/print/printAssessment.jsp
@@ -97,16 +97,23 @@ document.links[newindex].onclick();
 		  <h:selectBooleanCheckbox id="showFeedback" value="#{printSettings.showKeysFeedback}" />
 		  <h:outputText value="#{printMessages.show_answer_feedback}" />
 		</label>
-		      
-		&nbsp;&nbsp;&nbsp;
-		        
+        
+        &nbsp;&nbsp;&nbsp;
+
 		<label>
           <h:selectBooleanCheckbox id="showPartIntros" value="#{printSettings.showPartIntros}" />
           <h:outputText value="#{printMessages.show_intros_titles}" />
         </label>
 
         &nbsp;&nbsp;&nbsp;
 
+        <label>
+		  <h:selectBooleanCheckbox id="showSequence" value="#{printSettings.showSequence}" />
+		  <h:outputText value="#{printMessages.show_answer_sequence}" />
+		</label>
+
+		&nbsp;&nbsp;&nbsp;
+
         <h:outputText value="#{printMessages.font_size}:" />
         <h:selectOneMenu id="fontSize" value="#{printSettings.fontSize}">
           <f:selectItem itemLabel="#{printMessages.size_xsmall}" itemValue="1" />
@@ -116,11 +123,9 @@ document.links[newindex].onclick();
           <f:selectItem itemLabel="#{printMessages.size_xlarge}" itemValue="5" />
         </h:selectOneMenu>
 
-        &nbsp;&nbsp;&nbsp;
-
-        <h:commandButton action="#{pdfAssessment.prepDocumentPDF}" value="#{printMessages.apply_settings}" />
         <br />
 
+        <h:commandButton action="#{pdfAssessment.prepDocumentPDF}" value="#{printMessages.apply_settings}" />
         <h:outputText value="<input type='button' onclick='print(); return false;' value='#{printMessages.print_html}' />" escape="false" />
         <h:commandButton action="#{pdfAssessment.getPDFAttachment}" value="#{printMessages.print_pdf}" />
       </p>
@@ -185,7 +190,7 @@ document.links[newindex].onclick();
                                 columnClasses="col-printQNum, col-printQues" rowClasses="item" border="0">           
             <h:column>
               <h:outputText value="<h3>" escape="false" />
-                <h:outputText id="number" escape="false" value="#{question.sequence}" />
+                <h:outputText id="number" escape="false" value="#{question.sequence}" rendered="#{printSettings.showSequence}"/>
               <h:outputText value="</h3>" escape="false" />
             </h:column>