diff --git a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties index 79063565e1b6..6e60ae0507ce 100644 --- a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties +++ b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties @@ -1958,6 +1958,10 @@ # DEFAULT: false # gradebookng.allowColumnResizing=true +# SAK-50770 +# DEFAULT: false +# gradebookng.export.enabelOsirisExport=true + # SAK-46075: max upload file size, defined in megabytes # DEFAULT: 2 # gradebook.import.maxSize=3 diff --git a/gradebookng/bundle/src/main/bundle/gradebookng.properties b/gradebookng/bundle/src/main/bundle/gradebookng.properties index ccbe40d53c11..78ef9c7e93cd 100644 --- a/gradebookng/bundle/src/main/bundle/gradebookng.properties +++ b/gradebookng/bundle/src/main/bundle/gradebookng.properties @@ -275,6 +275,10 @@ importExport.template.button.fullGradebook = Export Gradebook importExport.template.button.customGradebook = Download Custom Export importExport.template.button.advancedOptions = Custom Export +importExport.export.osiris.heading = Export to Osiris +importExport.export.osiris.description = Export final grades in a format compatible with the Osiris SIS platform +importExport.template.button.export.osiris = Osiris export + importExport.selection.heading = Gradebook Item Import Selection importExport.selection.description = The system has analyzed the contents of your file upload and has identified new/updated information where applicable. Please select from the desired items below. importExport.selection.note = Note: Selecting "Update" items will override existing values for that item. diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/EventHelper.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/EventHelper.java index 48ca8f821166..2b6c13608dfa 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/EventHelper.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/EventHelper.java @@ -141,10 +141,20 @@ public static void postStudentViewEvent(Gradebook gradebook, String studentUid) public static void postExportEvent(Gradebook gradebook, boolean isCustomExport) { + postExportEvent(gradebook, isCustomExport ? "custom" : "full"); + } + + + public static void postOsirisExportEvent(Gradebook gradebook) { + postExportEvent(gradebook, "osiris"); + } + + + private static void postExportEvent(Gradebook gradebook, String exportType) { String[] bits = new String[] { EVENT_REF_PREFIX, String.valueOf(gradebook.getId()), - isCustomExport ? "custom" : "full" + exportType }; postEvent(createEvent(GbEvent.EXPORT, String.join("/", bits), false)); diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BasePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BasePanel.java index d0953bbb7a92..3024bc6d100b 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BasePanel.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BasePanel.java @@ -68,6 +68,9 @@ public abstract class BasePanel extends Panel { protected static final String SAK_PROP_ALLOW_COMPARE_GRADES = "gradebookng.allowStudentsToCompareGradesWithClassmates"; protected static final Boolean SAK_PROP_ALLOW_COMPARE_GRADES_DEFAULT = Boolean.FALSE; + protected static final String SAK_PROP_ENABLE_OSIRIS_EXPORT = "gradebookng.export.enabelOsirisExport"; + protected static final Boolean SAK_PROP_ENABLE_OSIRIS_EXPORT_DEFAULT = Boolean.FALSE; + public BasePanel(final String id) { super(id); } diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html index f8a216879eaa..2662b3aea91d 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.html @@ -154,6 +154,26 @@