From 8b7d8d95fe46db63baa149384e4fe705b87c1ad9 Mon Sep 17 00:00:00 2001 From: josecebe Date: Mon, 14 Jan 2019 09:47:46 +0100 Subject: [PATCH] SAK-34529 Incorrect tab display when accessing student submission via User Activity Report --- .../src/webapp/WEB-INF/faces-config.xml | 4 - .../jsf/evaluation/gradeStudentResult.jsp | 2 +- .../gradeStudentResultFromSectionActivity.jsp | 282 ------------------ .../jsf/section-activity/sectionActivity.jsp | 6 +- 4 files changed, 4 insertions(+), 290 deletions(-) delete mode 100644 samigo/samigo-app/src/webapp/jsf/evaluation/gradeStudentResultFromSectionActivity.jsp diff --git a/samigo/samigo-app/src/webapp/WEB-INF/faces-config.xml b/samigo/samigo-app/src/webapp/WEB-INF/faces-config.xml index c1a88197756d..45776a096645 100755 --- 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 @@ studentScores /jsf/evaluation/gradeStudentResult.jsp - - gradeStudentResultFromSectionActivity - /jsf/evaluation/gradeStudentResultFromSectionActivity.jsp - totalScores /jsf/evaluation/totalScores.jsp diff --git a/samigo/samigo-app/src/webapp/jsf/evaluation/gradeStudentResult.jsp b/samigo/samigo-app/src/webapp/jsf/evaluation/gradeStudentResult.jsp index c1bdb75242d2..e5cbfed39695 100755 --- 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) - + <%@ 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 deleted file mode 100644 index 6f74980f7322..000000000000 --- a/samigo/samigo-app/src/webapp/jsf/evaluation/gradeStudentResultFromSectionActivity.jsp +++ /dev/null @@ -1,282 +0,0 @@ -<%@ page contentType="text/html;charset=utf-8" pageEncoding="utf-8" %> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://www.sakaiproject.org/samigo" prefix="samigo" %> -<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %> - - - - - - <%= request.getAttribute("html.head") %> - <h:outputText - value="#{evaluationMessages.title_total}" /> - - - - "> - - - - -
- - - - - - - - - - <%@ include file="/jsf/evaluation/evaluationHeadings.jsp" %> - -

- - -

-

- - - - - - - - - - - - - - - - - -

- - - -

- -

 -
- - - - -
-

- -

 - -
- - - - - - -

- - - - - - -

- - - - - - -
- - -
- - -

- -

- -
-
- -
- - - - - " - escape="false" /> -

- - - - -<%--SAK-3776 --%> - - - -
- -

- -
- - - - <%@ include file="/jsf/evaluation/item/displayAudioRecording.jsp" %> - - - - - - <%@ include file="/jsf/evaluation/item/displayFileUpload.jsp" %> - - - - - - <%@ include file="/jsf/delivery/item/deliverFillInNumeric.jsp" %> - - - - - - - <%@ include file="/jsf/delivery/item/deliverFillInTheBlank.jsp" %> - - - - - - <%@ include file="/jsf/delivery/item/deliverMatching.jsp" %> - - - - - - <%@ include file="/jsf/delivery/item/deliverMultipleChoiceSingleCorrect.jsp" %> - - - - - - <%@ include file="/jsf/delivery/item/deliverMultipleChoiceMultipleCorrect.jsp" %> - - - - - - <%@ include file="/jsf/delivery/item/deliverShortAnswerLink.jsp" %> - - - - - - <%@ include file="/jsf/delivery/item/deliverTrueFalse.jsp" %> - - -
- -
- - - - - <%@ include file="/jsf/evaluation/gradeStudentResultAttachment.jsp" %> - -
- - - - -
- - - - - - - - - - - - - -

- - - - - - - - - - - -

- -
- - - - \ No newline at end of file diff --git a/samigo/samigo-app/src/webapp/jsf/section-activity/sectionActivity.jsp b/samigo/samigo-app/src/webapp/jsf/section-activity/sectionActivity.jsp index c6db9a1373a3..69517c8ca8e5 100644 --- 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 @@ - + @@ -86,7 +86,7 @@ - + @@ -119,7 +119,7 @@ - +