SAK-50424 Samigo answers are always shown when grading an exam (sakai…

…project#12824)
botimer · Aug 26, 2024 · 65bab00 · 65bab00
1 parent 575c4c9
commit 65bab00
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 12 deletions.
diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverCalculatedQuestion.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverCalculatedQuestion.jsp
@@ -73,7 +73,7 @@ should be included in file importing DeliveryMessages
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
   <f:verbatim><br /></f:verbatim>
-  <h:panelGroup rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'}" >
+  <h:panelGroup rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true') || delivery.actionString=='gradeAssessment'}" >
     <f:verbatim><b></f:verbatim>
     <h:outputLabel for="answerKeyMC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.ans_key}: " />
       <f:verbatim></b></f:verbatim>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverExtendedMatchingItems.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverExtendedMatchingItems.jsp
@@ -91,8 +91,9 @@ should be included in file importing DeliveryMessages
        rendered="#{delivery.actionString=='reviewAssessment'
              || delivery.actionString=='gradeAssessment'}"
       >
-        <h:column rendered="#{delivery.feedback eq 'true' &&
-           delivery.feedbackComponent.showCorrectResponse && !delivery.noFeedback=='true'}">
+        <h:column rendered="#{(delivery.feedback eq 'true' && delivery.feedbackComponent.showCorrectResponse && 
+              delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true') 
+              || delivery.actionString=='gradeAssessment'}">
           <h:graphicImage id="image"
             rendered="#{responseAndCorrectStatus.isCorrect eq 'true'}"
             alt="#{deliveryMessages.alt_correct}" url="/images/checkmark.gif" >

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverFillInNumeric.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverFillInNumeric.jsp
@@ -92,7 +92,7 @@ should be included in file importing DeliveryMessages
 <f:verbatim><br /></f:verbatim>
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true') || delivery.actionString=='gradeAssessment'}" >
     <h:panelGroup>
       <h:outputLabel for="answerKeyMC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.ans_key}: " />
       <h:outputText id="answerKeyMC" value="#{question.key}" escape="false"/>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverFillInTheBlank.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverFillInTheBlank.jsp
@@ -73,7 +73,7 @@ should be included in file importing DeliveryMessages
 <f:verbatim><br /></f:verbatim>
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true') || delivery.actionString=='gradeAssessment'}" >
     <h:panelGroup>
       <h:outputLabel for="answerKeyMC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.ans_key}: " />
       <h:outputText id="answerKeyMC" value="#{question.key}" escape="true"/>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverImageMapQuestion.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverImageMapQuestion.jsp
@@ -75,7 +75,7 @@ should be included in file importing DeliveryMessages
 
 <!-- Donï¿½t needed KEY in this question type or key should be the image with some sqares on it -->
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && !delivery.noFeedback=='true'}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true') || delivery.actionString=='gradeAssessment'}" >
 	<h:outputLabel styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.ans_key}: " />
 
 	<h:dataTable value="#{question.matchingArray}" var="matching">

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverMatching.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverMatching.jsp
@@ -88,7 +88,7 @@ should be included in file importing DeliveryMessages
 </h:panelGroup>
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true') || delivery.actionString=='gradeAssessment'}" >
     <h:panelGroup>
       <h:outputLabel for="answerKeyMC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.ans_key}: " />
       <h:outputText id="answerKeyMC" value="#{question.key}" escape="false" />

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceMultipleCorrect.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceMultipleCorrect.jsp
@@ -92,7 +92,7 @@ should be included in file importing DeliveryMessages
   </h:panelGroup>
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true') || delivery.actionString=='gradeAssessment'}" >
     <h:panelGroup>
       <h:outputLabel for="answerKeyMC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.ans_key}#{deliveryMessages.column} " />
       <h:outputText id="answerKeyMC" value="#{question.key}" escape="false" />

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceSingleCorrect.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverMultipleChoiceSingleCorrect.jsp
@@ -154,7 +154,7 @@ should be included in file importing DeliveryMessages
 </h:panelGroup>
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true' && question.itemData.typeId != 3}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true' && question.itemData.typeId != 3) || delivery.actionString=='gradeAssessment'}" >
     <h:panelGroup>
       <h:outputLabel for="answerKeyMC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.ans_key}#{deliveryMessages.column} " />
       <h:outputText id="answerKeyMC" value="#{question.key}" escape="false" />

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswer.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswer.jsp
@@ -68,7 +68,7 @@ should be included in file importing DeliveryMessages
 
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'&& question.modelAnswerIsNotEmpty}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'&& question.modelAnswerIsNotEmpty) || delivery.actionString=='gradeAssessment'}" >
     <h:panelGroup> 
       <h:outputLabel for="modelSC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.model}" />
       <h:outputText id="modelSC" value=" #{question.key} " escape="false"/>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverShortAnswerLink.jsp
@@ -63,7 +63,7 @@ should be included in file importing DeliveryMessages
              && delivery.navigation ne '1'}" />
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'&& question.modelAnswerIsNotEmpty}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'&& question.modelAnswerIsNotEmpty) || delivery.actionString=='gradeAssessment'}" >
     <h:panelGroup>
       <h:outputLabel for="answerKeyMC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.model} " />
 	    <h:outputText  value="#{question.key}" escape="false"/>

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverTrueFalse.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/item/deliverTrueFalse.jsp
@@ -89,7 +89,7 @@ should be included in file importing DeliveryMessages
 </h:panelGroup>
 
 <h:panelGroup rendered="#{delivery.feedback eq 'true'}">
-  <h:panelGrid rendered="#{delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true'}" >
+  <h:panelGrid rendered="#{(delivery.feedbackComponent.showCorrectResponse && delivery.feedbackComponent.showCorrection && !delivery.noFeedback=='true') || delivery.actionString=='gradeAssessment'}" >
     <h:panelGroup>
       <h:outputLabel for="answerKeyMC" styleClass="answerkeyFeedbackCommentLabel" value="#{deliveryMessages.ans_key}#{deliveryMessages.column} " />
       <h:outputText id="answerKeyMC" escape="false" value="#{question.key}"/>