From 7162311173dc9047ec42f694c0acb6b42b285216 Mon Sep 17 00:00:00 2001 From: maurercw Date: Sun, 25 Jul 2021 20:56:11 -0400 Subject: [PATCH 1/3] SAK-45827 - gradebook classic jsf upgrade --- app/business/pom.xml | 32 ---------------- app/sakai-tool/pom.xml | 38 +++++++------------ .../src/webapp/META-INF/context.xml | 6 +++ app/sakai-tool/src/webapp/WEB-INF/beans.xml | 6 +++ .../src/webapp/WEB-INF/faces-application.xml | 9 +++-- app/sakai-tool/src/webapp/WEB-INF/web.xml | 10 +++-- .../src/webapp/inc/preludeEmbedded.jspf | 2 +- .../webapp/inc/preludeEmbeddedClassic.jspf | 2 +- app/ui/pom.xml | 29 +++++--------- .../tool/gradebook/jsf/FacesUtil.java | 2 +- .../gradebook/jsf/HtmlSortHeaderRenderer.java | 4 +- .../GradebookItemTableRenderer.java | 2 +- .../GradebookItemTableTag.java | 4 +- .../jsf/spreadsheetUI/SpreadsheetUITag.java | 4 +- .../gradebook/ui/CourseGradeDetailsBean.java | 10 ++--- .../gradebook/ui/GradebookDependentBean.java | 2 +- .../ui/GradebookFilePickerServlet.java | 2 +- .../tool/gradebook/ui/InitializableBean.java | 2 +- .../tool/gradebook/ui/RosterBean.java | 14 +++---- app/ui/src/webapp/WEB-INF/faces-beans.xml | 7 +++- app/ui/src/webapp/WEB-INF/faces-gb-jsf.xml | 7 +++- .../src/webapp/WEB-INF/faces-navigation.xml | 7 +++- app/ui/src/webapp/hideShowColumns.jsp | 2 +- app/ui/src/webapp/inc/appMenu.jspf | 14 +++---- app/ui/src/webapp/overview.jsp | 6 +-- app/ui/src/webapp/roster.jsp | 3 +- 26 files changed, 98 insertions(+), 128 deletions(-) create mode 100644 app/sakai-tool/src/webapp/META-INF/context.xml create mode 100644 app/sakai-tool/src/webapp/WEB-INF/beans.xml diff --git a/app/business/pom.xml b/app/business/pom.xml index eed82f16..ab385991 100644 --- a/app/business/pom.xml +++ b/app/business/pom.xml @@ -68,16 +68,6 @@ provided ${sakai.version} - - - org.sakaiproject.jsf - jsf-tool - - - - org.sakaiproject.jsf - jsf-app - - - org.apache.myfaces.core - myfaces-api - 1.1.5 - - - org.apache.myfaces.core - myfaces-impl - 1.1.5 - - - org.apache.myfaces.tomahawk - tomahawk - 1.1.14 - commons-fileupload @@ -203,11 +177,5 @@ javax.servlet.jsp javax.servlet.jsp-api - - - org.sakaiproject.jsf - myfaces-widgets-depend - pom - diff --git a/app/sakai-tool/pom.xml b/app/sakai-tool/pom.xml index 19898ff5..46a9b6e6 100644 --- a/app/sakai-tool/pom.xml +++ b/app/sakai-tool/pom.xml @@ -33,13 +33,13 @@ - org.sakaiproject.jsf - jsf-tool + org.sakaiproject.jsf2 + jsf2-tool - org.sakaiproject.jsf - jsf-app + org.sakaiproject.jsf2 + jsf2-app javax.faces @@ -97,21 +97,10 @@ provided - - - - org.apache.myfaces.core - myfaces-api - 1.1.10 - - - org.apache.myfaces.core - myfaces-impl - 1.1.10 - + org.apache.myfaces.tomahawk - tomahawk + tomahawk21 1.1.14 @@ -125,16 +114,15 @@ 1.1.2 - - - org.sakaiproject.jsf - myfaces-widgets-depend - pom - - org.sakaiproject.jsf - jsf-spreadsheet + org.sakaiproject.jsf2 + jsf2-spreadsheet + + org.jboss.weld.servlet + weld-servlet-shaded + ${sakai.weld.shaded.version} + diff --git a/app/sakai-tool/src/webapp/META-INF/context.xml b/app/sakai-tool/src/webapp/META-INF/context.xml new file mode 100644 index 00000000..79267c9d --- /dev/null +++ b/app/sakai-tool/src/webapp/META-INF/context.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/app/sakai-tool/src/webapp/WEB-INF/beans.xml b/app/sakai-tool/src/webapp/WEB-INF/beans.xml new file mode 100644 index 00000000..51e8caf9 --- /dev/null +++ b/app/sakai-tool/src/webapp/WEB-INF/beans.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/app/sakai-tool/src/webapp/WEB-INF/faces-application.xml b/app/sakai-tool/src/webapp/WEB-INF/faces-application.xml index e977bc1f..d0236025 100644 --- a/app/sakai-tool/src/webapp/WEB-INF/faces-application.xml +++ b/app/sakai-tool/src/webapp/WEB-INF/faces-application.xml @@ -1,10 +1,13 @@ - - + - org.sakaiproject.jsf.app.SakaiVariableResolver + org.sakaiproject.jsf2.app.SakaiVariableResolver diff --git a/app/sakai-tool/src/webapp/WEB-INF/web.xml b/app/sakai-tool/src/webapp/WEB-INF/web.xml index 678a8e1d..44e22599 100644 --- a/app/sakai-tool/src/webapp/WEB-INF/web.xml +++ b/app/sakai-tool/src/webapp/WEB-INF/web.xml @@ -1,7 +1,9 @@ - + sakai-gradebook-tool Sakai Gradebook Tool Integration @@ -77,7 +79,7 @@ sakai.gradebook.addItem.helper - org.sakaiproject.jsf.util.HelperAwareJsfTool + org.sakaiproject.jsf2.util.HelperAwareJsfTool default diff --git a/app/sakai-tool/src/webapp/inc/preludeEmbedded.jspf b/app/sakai-tool/src/webapp/inc/preludeEmbedded.jspf index 6c683515..2bd7d565 100644 --- a/app/sakai-tool/src/webapp/inc/preludeEmbedded.jspf +++ b/app/sakai-tool/src/webapp/inc/preludeEmbedded.jspf @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %><%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %><%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" -%><%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" +%><%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %><%@ taglib uri="http://sakaiproject.org/jsf/gradebook" prefix="gbx" %> diff --git a/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf b/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf index e78883c2..74160bf6 100644 --- a/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf +++ b/app/sakai-tool/src/webapp/inc/preludeEmbeddedClassic.jspf @@ -2,7 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%> -<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai"%> +<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai"%> <%@ taglib uri="http://sakaiproject.org/jsf/gradebook" prefix="gbx"%> diff --git a/app/ui/pom.xml b/app/ui/pom.xml index 40556062..22ea48e3 100644 --- a/app/ui/pom.xml +++ b/app/ui/pom.xml @@ -86,13 +86,13 @@ - org.sakaiproject.jsf - jsf-tool + org.sakaiproject.jsf2 + jsf2-tool - org.sakaiproject.jsf - jsf-app + org.sakaiproject.jsf2 + jsf2-app - - org.apache.myfaces.core - myfaces-api - 1.1.5 - - - org.apache.myfaces.core - myfaces-impl - 1.1.5 - org.apache.myfaces.tomahawk - tomahawk + tomahawk21 1.1.14 @@ -239,13 +228,13 @@ - org.sakaiproject.jsf - myfaces-widgets-depend + org.sakaiproject.jsf2 + jsf2-widgets-sun-depend pom - org.sakaiproject.jsf - jsf-spreadsheet + org.sakaiproject.jsf2 + jsf2-spreadsheet org.apache.poi diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/FacesUtil.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/FacesUtil.java index 5e148ae4..6f28447f 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/FacesUtil.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/FacesUtil.java @@ -39,7 +39,7 @@ import lombok.extern.slf4j.Slf4j; -import org.sakaiproject.jsf.util.LocaleUtil; +import org.sakaiproject.jsf2.util.LocaleUtil; import org.sakaiproject.tool.gradebook.ui.MessagingBean; /** diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/HtmlSortHeaderRenderer.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/HtmlSortHeaderRenderer.java index c6f2c1b4..7fe23d69 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/HtmlSortHeaderRenderer.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/HtmlSortHeaderRenderer.java @@ -58,8 +58,8 @@ import org.apache.myfaces.component.UserRoleUtils; import org.apache.myfaces.component.html.ext.HtmlDataTable; import org.apache.myfaces.custom.sortheader.HtmlCommandSortHeader; -import org.apache.myfaces.shared_impl.renderkit.html.HTML; -import org.apache.myfaces.shared_impl.renderkit.html.HtmlLinkRendererBase; +import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML; +import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlLinkRendererBase; /** * Based on org.apache.myfaces.custom.sortheader.HtmlSortHeaderRenderer. diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/gradebookItemTable/GradebookItemTableRenderer.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/gradebookItemTable/GradebookItemTableRenderer.java index 973d66bd..0cd3ba36 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/gradebookItemTable/GradebookItemTableRenderer.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/gradebookItemTable/GradebookItemTableRenderer.java @@ -16,7 +16,7 @@ import lombok.extern.slf4j.Slf4j; -import org.apache.myfaces.shared_impl.renderkit.html.HTML; +import org.apache.myfaces.shared_tomahawk.renderkit.html.HTML; import org.sakaiproject.tool.cover.ToolManager; import org.sakaiproject.tool.gradebook.Category; diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/gradebookItemTable/GradebookItemTableTag.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/gradebookItemTable/GradebookItemTableTag.java index 7208ba1f..ca77444c 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/gradebookItemTable/GradebookItemTableTag.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/gradebookItemTable/GradebookItemTableTag.java @@ -5,8 +5,8 @@ import javax.faces.context.FacesContext; import org.apache.myfaces.component.html.ext.HtmlDataTable; -import org.apache.myfaces.taglib.html.HtmlDataTableTag; -import org.sakaiproject.jsf.util.TagUtil; +import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlDataTableTag; +import org.sakaiproject.jsf2.util.TagUtil; public class GradebookItemTableTag extends HtmlDataTableTag { private String sortColumn; diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/spreadsheetUI/SpreadsheetUITag.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/spreadsheetUI/SpreadsheetUITag.java index 47f36759..de8a3e8b 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/spreadsheetUI/SpreadsheetUITag.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/spreadsheetUI/SpreadsheetUITag.java @@ -21,10 +21,10 @@ import javax.faces.component.UIData; import javax.faces.context.FacesContext; -import org.apache.myfaces.taglib.html.HtmlDataTableTag; +import org.apache.myfaces.shared_tomahawk.taglib.html.HtmlDataTableTag; import org.apache.myfaces.component.html.ext.HtmlDataTable; -import org.sakaiproject.jsf.util.TagUtil; +import org.sakaiproject.jsf2.util.TagUtil; public class SpreadsheetUITag extends HtmlDataTableTag { diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/CourseGradeDetailsBean.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/CourseGradeDetailsBean.java index a31947aa..6607c449 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/CourseGradeDetailsBean.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/CourseGradeDetailsBean.java @@ -34,10 +34,10 @@ import org.apache.commons.lang.StringUtils; import org.sakaiproject.component.cover.ServerConfigurationService; -import org.sakaiproject.jsf.spreadsheet.SpreadsheetDataFileWriterCsv; -import org.sakaiproject.jsf.spreadsheet.SpreadsheetDataFileWriterPdf; -import org.sakaiproject.jsf.spreadsheet.SpreadsheetDataFileWriterXls; -import org.sakaiproject.jsf.spreadsheet.SpreadsheetUtil; +import org.sakaiproject.jsf2.spreadsheet.SpreadsheetDataFileWriterCsv; +import org.sakaiproject.jsf2.spreadsheet.SpreadsheetDataFileWriterPdf; +import org.sakaiproject.jsf2.spreadsheet.SpreadsheetDataFileWriterXlsx; +import org.sakaiproject.jsf2.spreadsheet.SpreadsheetUtil; import org.sakaiproject.section.api.coursemanagement.EnrollmentRecord; import org.sakaiproject.service.gradebook.shared.GradebookService; import org.sakaiproject.service.gradebook.shared.StaleObjectModificationException; @@ -468,7 +468,7 @@ else if(this.exportType.equalsIgnoreCase("Excel")){ } SpreadsheetUtil.downloadSpreadsheetData(getSpreadsheetData("excel", fields), getDownloadFileName(getLocalizedString("export_course_grade_prefix")), - new SpreadsheetDataFileWriterXls()); + new SpreadsheetDataFileWriterXlsx()); } else if(this.exportType.equalsIgnoreCase("PDF")){ if(log.isInfoEnabled()) { diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java index d138a88c..31b85541 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java @@ -30,7 +30,7 @@ import org.apache.commons.lang.StringUtils; import org.sakaiproject.component.cover.ServerConfigurationService; -import org.sakaiproject.jsf.util.LocaleUtil; +import org.sakaiproject.jsf2.util.LocaleUtil; import org.sakaiproject.section.api.SectionAwareness; import org.sakaiproject.section.api.coursemanagement.CourseSection; import org.sakaiproject.section.api.facade.Role; diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookFilePickerServlet.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookFilePickerServlet.java index fc0efc8b..343e4cd6 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookFilePickerServlet.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookFilePickerServlet.java @@ -26,7 +26,7 @@ import org.sakaiproject.content.api.FilePickerHelper; import org.sakaiproject.entity.api.Reference; import org.sakaiproject.entity.api.ResourceProperties; -import org.sakaiproject.jsf.util.HelperAwareJsfTool; +import org.sakaiproject.jsf2.util.HelperAwareJsfTool; import org.sakaiproject.tool.api.ToolSession; import org.sakaiproject.tool.cover.SessionManager; diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/InitializableBean.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/InitializableBean.java index 164b467a..ae1721fc 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/InitializableBean.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/InitializableBean.java @@ -16,7 +16,7 @@ package org.sakaiproject.tool.gradebook.ui; -import org.sakaiproject.jsf.model.PhaseAware; +import org.sakaiproject.jsf2.model.PhaseAware; import lombok.extern.slf4j.Slf4j; diff --git a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java index eee9d8a6..7d0deffb 100644 --- a/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java +++ b/app/ui/src/java/org/sakaiproject/tool/gradebook/ui/RosterBean.java @@ -43,10 +43,10 @@ import org.apache.myfaces.component.html.ext.HtmlDataTable; import org.apache.myfaces.custom.sortheader.HtmlCommandSortHeader; import org.sakaiproject.component.cover.ServerConfigurationService; -import org.sakaiproject.jsf.spreadsheet.SpreadsheetDataFileWriterCsv; -import org.sakaiproject.jsf.spreadsheet.SpreadsheetDataFileWriterPdf; -import org.sakaiproject.jsf.spreadsheet.SpreadsheetDataFileWriterXls; -import org.sakaiproject.jsf.spreadsheet.SpreadsheetUtil; +import org.sakaiproject.jsf2.spreadsheet.SpreadsheetDataFileWriterCsv; +import org.sakaiproject.jsf2.spreadsheet.SpreadsheetDataFileWriterPdf; +import org.sakaiproject.jsf2.spreadsheet.SpreadsheetDataFileWriterXlsx; +import org.sakaiproject.jsf2.spreadsheet.SpreadsheetUtil; import org.sakaiproject.section.api.coursemanagement.EnrollmentRecord; import org.sakaiproject.section.api.coursemanagement.User; import org.sakaiproject.service.gradebook.shared.GradebookService; @@ -829,7 +829,7 @@ public void exportXlsNoCourseGrade(final ActionEvent event){ getGradebookBean().postEvent("gradebook.downloadRoster", "/gradebook/" + getGradebookId() + "/" + getAuthzLevel(), false); SpreadsheetUtil.downloadSpreadsheetData(getSpreadsheetData(false, false), getDownloadFileName(getLocalizedString("export_gradebook_prefix")), - new SpreadsheetDataFileWriterXls()); + new SpreadsheetDataFileWriterXlsx()); } public void exportCsvNoCourseGrade(final ActionEvent event){ @@ -866,11 +866,11 @@ public void exportExcel(final ActionEvent event){ if (isUserAbleToGradeAll()) { SpreadsheetUtil.downloadSpreadsheetData(getSpreadsheetData(true, false), getDownloadFileName(getLocalizedString("export_gradebook_prefix")), - new SpreadsheetDataFileWriterXls()); + new SpreadsheetDataFileWriterXlsx()); } else { SpreadsheetUtil.downloadSpreadsheetData(getSpreadsheetData(false, false), getDownloadFileName(getLocalizedString("export_gradebook_prefix")), - new SpreadsheetDataFileWriterXls()); + new SpreadsheetDataFileWriterXlsx()); } } diff --git a/app/ui/src/webapp/WEB-INF/faces-beans.xml b/app/ui/src/webapp/WEB-INF/faces-beans.xml index 9b0b2fce..43185d3f 100644 --- a/app/ui/src/webapp/WEB-INF/faces-beans.xml +++ b/app/ui/src/webapp/WEB-INF/faces-beans.xml @@ -1,6 +1,9 @@ - - + Gradebook context gradebookBean diff --git a/app/ui/src/webapp/WEB-INF/faces-gb-jsf.xml b/app/ui/src/webapp/WEB-INF/faces-gb-jsf.xml index a84552c7..bba83f6e 100644 --- a/app/ui/src/webapp/WEB-INF/faces-gb-jsf.xml +++ b/app/ui/src/webapp/WEB-INF/faces-gb-jsf.xml @@ -1,6 +1,9 @@ - - + org.sakaiproject.tool.gradebook.jsf.iterator org.sakaiproject.tool.gradebook.jsf.iterator.IteratorComponent diff --git a/app/ui/src/webapp/WEB-INF/faces-navigation.xml b/app/ui/src/webapp/WEB-INF/faces-navigation.xml index 1d155134..4d4529ce 100644 --- a/app/ui/src/webapp/WEB-INF/faces-navigation.xml +++ b/app/ui/src/webapp/WEB-INF/faces-navigation.xml @@ -1,6 +1,9 @@ - - + * diff --git a/app/ui/src/webapp/hideShowColumns.jsp b/app/ui/src/webapp/hideShowColumns.jsp index 7d35178a..93500a19 100644 --- a/app/ui/src/webapp/hideShowColumns.jsp +++ b/app/ui/src/webapp/hideShowColumns.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %> +<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %> <% diff --git a/app/ui/src/webapp/inc/appMenu.jspf b/app/ui/src/webapp/inc/appMenu.jspf index 8f555d58..d682ae4b 100644 --- a/app/ui/src/webapp/inc/appMenu.jspf +++ b/app/ui/src/webapp/inc/appMenu.jspf @@ -8,48 +8,48 @@ - + <%-- Roster menu --%> - + <%-- Course Grades menu --%> - + <%-- Gradebook Setup menu --%> - + <%-- Permission Settings --%> - + <%-- Course Grade Options menu --%> - + <%-- Import Grades menu --%> - + diff --git a/app/ui/src/webapp/overview.jsp b/app/ui/src/webapp/overview.jsp index 7975c269..b38a9d34 100644 --- a/app/ui/src/webapp/overview.jsp +++ b/app/ui/src/webapp/overview.jsp @@ -1,7 +1,7 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %> -<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %> +<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
@@ -26,8 +26,8 @@
- - + + diff --git a/app/ui/src/webapp/roster.jsp b/app/ui/src/webapp/roster.jsp index e67ce45a..32eea2cd 100644 --- a/app/ui/src/webapp/roster.jsp +++ b/app/ui/src/webapp/roster.jsp @@ -92,8 +92,7 @@ From c0981f4ec2d506d3806f15306998aea31bfe1903 Mon Sep 17 00:00:00 2001 From: maurercw Date: Mon, 29 Nov 2021 23:07:52 -0500 Subject: [PATCH 2/3] SAK-45827 - move the rendered attribute off of the column and put it on the data, where it actually makes sense --- app/ui/src/webapp/hideShowColumns.jsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/ui/src/webapp/hideShowColumns.jsp b/app/ui/src/webapp/hideShowColumns.jsp index 93500a19..1c255d4c 100644 --- a/app/ui/src/webapp/hideShowColumns.jsp +++ b/app/ui/src/webapp/hideShowColumns.jsp @@ -26,17 +26,17 @@ - + - + - + - + From 1f9e847e5a8618a9486bca2660105a1ea219c9fa Mon Sep 17 00:00:00 2001 From: maurercw Date: Mon, 31 Jan 2022 22:12:48 -0500 Subject: [PATCH 3/3] SAK-45827 - continued gradebook classic jsf upgrade Remove the SpreadsheetUITag stuff and manually build the table Change some of the date/time formatting pieces --- .../src/webapp/WEB-INF/spring-facades.xml | 1 + app/ui/pom.xml | 5 + .../tool/gradebook/bundle/Messages.properties | 4 +- .../tool/gradebook/jsf/PointsConverter.java | 5 +- .../GradebookItemTableTag.java | 19 +- .../spreadsheetUI/SpreadsheetUIRenderer.java | 10 +- .../jsf/spreadsheetUI/SpreadsheetUITag.java | 113 --------- .../tool/gradebook/ui/ConfigurationBean.java | 11 + .../tool/gradebook/ui/RosterBean.java | 233 ++++++++++++++---- app/ui/src/webapp/WEB-INF/tld/gb-jsf.tld | 65 ----- app/ui/src/webapp/addAssignment.jsp | 40 +-- app/ui/src/webapp/assignmentDetails.jsp | 2 +- app/ui/src/webapp/css/gradebook.css | 16 ++ app/ui/src/webapp/editAssignment.jsp | 3 + app/ui/src/webapp/gradebookSetup.jsp | 8 +- app/ui/src/webapp/inc/assignmentEditing.jspf | 18 +- app/ui/src/webapp/inc/bulkNewItems.jspf | 5 +- app/ui/src/webapp/inc/categoryEdit.jspf | 8 +- app/ui/src/webapp/inc/gradingEventLogs.jspf | 2 +- .../webapp/inc/gradingEventLogsInstView.jspf | 2 +- app/ui/src/webapp/instructorView.jsp | 6 +- app/ui/src/webapp/js/datePicker.js | 19 ++ app/ui/src/webapp/js/multiItemAdd.js | 7 +- app/ui/src/webapp/overview.jsp | 42 ++-- app/ui/src/webapp/roster.jsp | 35 +-- .../src/webapp/spreadsheetEntireGBImport.jsp | 6 +- app/ui/src/webapp/spreadsheetImport.jsp | 19 +- app/ui/src/webapp/spreadsheetListing.jsp | 2 +- app/ui/src/webapp/studentView.jsp | 2 +- 29 files changed, 379 insertions(+), 329 deletions(-) delete mode 100644 app/ui/src/java/org/sakaiproject/tool/gradebook/jsf/spreadsheetUI/SpreadsheetUITag.java create mode 100644 app/ui/src/webapp/js/datePicker.js diff --git a/app/sakai-tool/src/webapp/WEB-INF/spring-facades.xml b/app/sakai-tool/src/webapp/WEB-INF/spring-facades.xml index a0675b41..55fd2b8d 100644 --- a/app/sakai-tool/src/webapp/WEB-INF/spring-facades.xml +++ b/app/sakai-tool/src/webapp/WEB-INF/spring-facades.xml @@ -13,6 +13,7 @@ + - + @@ -99,8 +99,8 @@ - - + + @@ -111,32 +111,32 @@ - + - + - + - - + + - + - + @@ -145,7 +145,7 @@ - + @@ -177,11 +177,11 @@ - + - + @@ -191,7 +191,7 @@ - + @@ -209,19 +209,19 @@ - - <%/* -AZ- hacks needed for safari: style="text-decoration: none !important;" + <%/* -AZ- hacks needed for safari: style="text-decoration: none !important;" AND */%> - - @@ -229,7 +229,7 @@ - + diff --git a/app/ui/src/webapp/roster.jsp b/app/ui/src/webapp/roster.jsp index 32eea2cd..ad8001da 100644 --- a/app/ui/src/webapp/roster.jsp +++ b/app/ui/src/webapp/roster.jsp @@ -1,6 +1,3 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - @@ -87,37 +84,7 @@ <%@ include file="/inc/filterPagingRoster.jspf"%> - - - - - - - - - - - - - - - - - - - - - - - - <%/* Assignment columns will be dynamically appended, starting here. */%> - +

diff --git a/app/ui/src/webapp/spreadsheetEntireGBImport.jsp b/app/ui/src/webapp/spreadsheetEntireGBImport.jsp index 4e69f9e1..a0779701 100644 --- a/app/ui/src/webapp/spreadsheetEntireGBImport.jsp +++ b/app/ui/src/webapp/spreadsheetEntireGBImport.jsp @@ -33,13 +33,13 @@ <%-- Step 1: Download template --%>


- + - + @@ -70,7 +70,7 @@ */%> - + diff --git a/app/ui/src/webapp/spreadsheetImport.jsp b/app/ui/src/webapp/spreadsheetImport.jsp index ebd86be8..e284e7ee 100644 --- a/app/ui/src/webapp/spreadsheetImport.jsp +++ b/app/ui/src/webapp/spreadsheetImport.jsp @@ -1,4 +1,7 @@ + + +
@@ -44,7 +47,7 @@ - + @@ -92,6 +95,20 @@

diff --git a/app/ui/src/webapp/spreadsheetListing.jsp b/app/ui/src/webapp/spreadsheetListing.jsp index b0407a5d..2ba80528 100644 --- a/app/ui/src/webapp/spreadsheetListing.jsp +++ b/app/ui/src/webapp/spreadsheetListing.jsp @@ -44,7 +44,7 @@ - + diff --git a/app/ui/src/webapp/studentView.jsp b/app/ui/src/webapp/studentView.jsp index ab5a8a10..4ad5e338 100644 --- a/app/ui/src/webapp/studentView.jsp +++ b/app/ui/src/webapp/studentView.jsp @@ -126,7 +126,7 @@ - +