SAK-34529 Incorrect tab display when accessing student submission via…

… User Activity Report
K-Class · Aug 7, 2019 · 8b7d8d9 · 8b7d8d9
1 parent 27b1a08
commit 8b7d8d9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 290 deletions.
diff --git a/samigo/samigo-app/src/webapp/WEB-INF/faces-config.xml b/samigo/samigo-app/src/webapp/WEB-INF/faces-config.xml
@@ -1223,10 +1223,6 @@
       <from-outcome>studentScores</from-outcome>
       <to-view-id>/jsf/evaluation/gradeStudentResult.jsp</to-view-id>
     </navigation-case>
-     <navigation-case>
-		<from-outcome>gradeStudentResultFromSectionActivity</from-outcome>
-		<to-view-id>/jsf/evaluation/gradeStudentResultFromSectionActivity.jsp</to-view-id>
-	 </navigation-case>
     <navigation-case>
       <from-outcome>totalScores</from-outcome>
       <to-view-id>/jsf/evaluation/totalScores.jsp</to-view-id>

diff --git a/samigo/samigo-app/src/webapp/jsf/evaluation/gradeStudentResult.jsp b/samigo/samigo-app/src/webapp/jsf/evaluation/gradeStudentResult.jsp
@@ -109,7 +109,7 @@ function toPoint(id)
   <h:inputHidden id="studentid" value="#{studentScores.studentId}" />
   <h:inputHidden id="studentName" value="#{studentScores.studentName}" />
   <h:inputHidden id="gradingData" value="#{studentScores.assessmentGradingId}" />
-  <h:inputHidden id="itemId" value="#{studentScores.itemId}" />
+  <h:inputHidden id="itemId" value="#{totalScores.firstItem}" />
 
   <!-- HEADINGS -->
   <%@ include file="/jsf/evaluation/evaluationHeadings.jsp" %>

diff --git a/samigo/samigo-app/src/webapp/jsf/evaluation/gradeStudentResultFromSectionActivity.jsp b/samigo/samigo-app/src/webapp/jsf/evaluation/gradeStudentResultFromSectionActivity.jsp
diff --git a/samigo/samigo-app/src/webapp/jsf/section-activity/sectionActivity.jsp b/samigo/samigo-app/src/webapp/jsf/section-activity/sectionActivity.jsp
@@ -53,7 +53,7 @@
         </h:commandLink>
      </f:facet>
      <h:panelGroup rendered="#{!pageData.anonymousGrading}">
-		<h:commandLink title ="#{sectionActivityMessages.assessment_name}" action="gradeStudentResultFromSectionActivity" immediate="true" >
+		<h:commandLink title ="#{sectionActivityMessages.assessment_name}" action="studentScores" immediate="true" >
 		  <h:outputText value="#{pageData.assessmentName}"/>
 		   <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.evaluation.ResetTotalScoreListener" />
 		   <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.evaluation.TotalScoreListener" />
@@ -86,7 +86,7 @@
           </h:commandLink>    
       </f:facet>
       <h:panelGroup rendered="#{!pageData.anonymousGrading}">
-		<h:commandLink title ="#{sectionActivityMessages.assessment_name}" action="gradeStudentResultFromSectionActivity" immediate="true" >
+		<h:commandLink title ="#{sectionActivityMessages.assessment_name}" action="studentScores" immediate="true" >
 		  <h:outputText value="#{pageData.assessmentName}"/>
 		   <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.evaluation.ResetTotalScoreListener" />
 		   <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.evaluation.TotalScoreListener" />
@@ -119,7 +119,7 @@
       </h:commandLink> 
       </f:facet>
 	 <h:panelGroup rendered="#{!pageData.anonymousGrading}">
-		<h:commandLink title ="#{sectionActivityMessages.assessment_name}" action="gradeStudentResultFromSectionActivity" immediate="true" >
+		<h:commandLink title ="#{sectionActivityMessages.assessment_name}" action="studentScores" immediate="true" >
 		  <h:outputText value="#{pageData.assessmentName}"/>
 		   <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.evaluation.ResetTotalScoreListener" />
 		   <f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.evaluation.TotalScoreListener" />