SAM-3081 (sakaiproject#3701)

Regression: Multiple Choice answers missing when revising assessment
fk-snyk · Jan 9, 2017 · 574d49c · 574d49c
1 parent 8b4f62d
commit 574d49c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/samigo/samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceMultipleCorrect.jsp b/samigo/samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceMultipleCorrect.jsp
@@ -27,26 +27,26 @@ include file for displaying multiple choice questions
   <h:dataTable value="#{question.itemTextArray}" var="itemText">
    <h:column>
    <h:dataTable value="#{itemText.answerArraySorted}" var="answer" width="100%">
-    <h:column rendered="#{answer.text!=null && answer.text!=''}">
+    <h:column>
       <h:graphicImage id="image6" rendered="#{answer.isCorrect}"
         alt="#{evaluationMessages.alt_correct}" url="/images/delivery/checkmark.gif" >
        </h:graphicImage>
       <h:graphicImage id="image7" rendered="#{!answer.isCorrect}"
         alt=" " url="/images/delivery/spacer.gif" >
        </h:graphicImage>
     </h:column>
-    <h:column rendered="#{answer.text!=null && answer.text!=''}">
-      <h:outputText value="#{answer.label}" escape="false"
+    <h:column>
+      <h:outputText value="#{answer.label}. " escape="false"
         rendered="#{question.hint == '***'}" />
     </h:column>
-    <h:column rendered="#{answer.text!=null && answer.text!=''}"><%-- checkbox or radio button, select answer --%>
+    <h:column><%-- checkbox or radio button, select answer --%>
       <h:selectManyCheckbox value="#{question.hint}" disabled="true"
           rendered="#{question.hint != '***'}">
-        <f:selectItem itemLabel="#{answer.label}"
+        <f:selectItem itemLabel="#{answer.label}. "
           itemValue="#{answer.sequence}"/>
       </h:selectManyCheckbox>
     </h:column>
-    <h:column rendered="#{answer.text!=null && answer.text!=''}">
+    <h:column>
       <h:outputText styleClass="mcAnswerText" value="#{answer.text}" escape="false" />
     </h:column>
    </h:dataTable>

diff --git a/samigo/samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceSingleCorrect.jsp b/samigo/samigo-app/src/webapp/jsf/evaluation/item/displayMultipleChoiceSingleCorrect.jsp
@@ -27,26 +27,26 @@ include file for displaying multiple choice single correct survey questions
   <h:dataTable value="#{question.itemTextArray}" var="itemText">
    <h:column>
    <h:dataTable value="#{itemText.answerArraySorted}" var="answer" width="100%">
-    <h:column rendered="#{answer.text!=null && answer.text!=''}">
+    <h:column>
       <h:graphicImage id="image8" rendered="#{answer.isCorrect || (question.partialCreditFlag && answer.partialCredit gt 0)}"
          alt="#{evaluationMessages.alt_correct}" url="/images/delivery/checkmark.gif" >
       </h:graphicImage>
       <h:graphicImage id="image9" rendered="#{!answer.isCorrect}"
         alt=" " url="/images/delivery/spacer.gif" >
        </h:graphicImage>
     </h:column>
-    <h:column rendered="#{answer.text!=null && answer.text!=''}">
-      <h:outputText value="#{answer.label}" escape="false"
+    <h:column>
+      <h:outputText value="#{answer.label}. " escape="false"
         rendered="#{question.hint == '***'}" />
     </h:column>
-    <h:column rendered="#{answer.text!=null && answer.text!=''}"><%-- radio button, select answer --%>
+    <h:column><%-- radio button, select answer --%>
       <h:selectOneRadio value="#{question.hint}"  disabled="true"
         rendered="#{question.hint != '***'}">
-        <f:selectItem itemLabel="#{answer.label}"
+        <f:selectItem itemLabel="#{answer.label}. "
           itemValue="#{answer.sequence}"/>
       </h:selectOneRadio>
     </h:column>
-    <h:column rendered="#{answer.text!=null && answer.text!=''}">
+    <h:column>
       <h:outputText styleClass="mcAnswerText" value="#{answer.text}" escape="false" >
       	<f:converter converterId="org.sakaiproject.tool.assessment.jsf.convert.AnswerSurveyConverter" />
       </h:outputText>