SAK-33420 Assignment grade report: .xlsx (sakaiproject#4856)

OTEMA · Oct 6, 2017 · 7a2c1df · 7a2c1df
1 parent dba1793
commit 7a2c1df
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/assignment/bundles/resources/assignment.properties b/assignment/bundles/resources/assignment.properties
@@ -62,7 +62,7 @@ delete_assig.delass    = Delete assignments...
 
 downall = Download All
 
-downspr = Download Spreadsheet [XLS]
+downspr = Download Spreadsheet [XLSX]
 
 draft = Drafted
 

diff --git a/assignment/bundles/resources/assignment_ja.properties b/assignment/bundles/resources/assignment_ja.properties
@@ -32,7 +32,7 @@ delet=\u524a\u9664
 delete_assig.delanass=\u8ab2\u984c\u3092\u524a\u9664...
 delete_assig.delass=\u8ab2\u984c\u3092\u524a\u9664...
 downall=\u3059\u3079\u3066\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
-downspr=\u30b9\u30d7\u30ec\u30c3\u30c9\u30b7\u30fc\u30c8[XLS]\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
+downspr=\u30b9\u30d7\u30ec\u30c3\u30c9\u30b7\u30fc\u30c8[XLSX]\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9
 draft=\u30c9\u30e9\u30d5\u30c8\u306b\u3057\u307e\u3057\u305f
 dupli=\u8907\u88fd
 gen.acesubunt=\u6700\u7d42\u53d7\u7406\u65e5\u6642

diff --git a/assignment/bundles/resources/assignment_tr_TR.properties b/assignment/bundles/resources/assignment_tr_TR.properties
@@ -31,7 +31,7 @@ delet=Sil
 delete_assig.delanass=\u00d6devi Sil...
 delete_assig.delass=\u00d6devleri Sil...
 downall=T\u00fcm\u00fcn\u00fc \u0130ndir
-downspr=[XLS] tablosunu indir
+downspr=[XLSX] tablosunu indir
 draft=Haz\u0131rlanan
 dupli=Kopyala
 gen.acesubunt=Son Kabul 

diff --git a/assignment/impl/pom.xml b/assignment/impl/pom.xml
@@ -101,6 +101,11 @@
             <artifactId>poi</artifactId>
             <version>${sakai.poi.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+             <artifactId>poi-ooxml</artifactId>
+             <version>${sakai.poi.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>

diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/AssignmentServiceImpl.java
@@ -402,8 +402,8 @@ public void handleAccess(HttpServletRequest req, HttpServletResponse res, Refere
                             log.error("Could not stream the zip of submissions for ref = {}", ref.getReference());
                         }
                     } else if (REF_TYPE_GRADES.equals(ref.getSubType())) {
-                        res.setContentType("application/vnd.ms-excel");
-                        res.setHeader("Content-Disposition", "attachment; filename = export_grades_file.xls");
+                        res.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+                        res.setHeader("Content-Disposition", "attachment; filename = export_grades_file.xlsx");
 
                         try (OutputStream out = res.getOutputStream()) {
                             gradeSheetExporter.getGradesSpreadsheet(out, ref.getReference());

diff --git a/assignment/impl/src/java/org/sakaiproject/assignment/impl/GradeSheetExporter.java b/assignment/impl/src/java/org/sakaiproject/assignment/impl/GradeSheetExporter.java
@@ -29,14 +29,14 @@
 import java.util.TreeMap;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.WorkbookUtil;
-import org.sakaiproject.assignment.api.AssignmentEntity;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.sakaiproject.assignment.api.AssignmentService;
 import org.sakaiproject.assignment.api.AssignmentServiceConstants;
 import org.sakaiproject.assignment.api.model.Assignment;
@@ -119,12 +119,12 @@ public boolean getGradesSpreadsheet(final OutputStream out, final String ref) th
         } else {
             int rowNum = 0;
 
-            HSSFWorkbook wb = new HSSFWorkbook();
+            Workbook wb = new SXSSFWorkbook();
 
-            HSSFSheet sheet = wb.createSheet(WorkbookUtil.createSafeSheetName(sheetName));
+            Sheet sheet = wb.createSheet(WorkbookUtil.createSafeSheetName(sheetName));
 
             // Create a row and put some cells in it. Rows are 0 based.
-            HSSFRow row = sheet.createRow(rowNum++);
+            Row row = sheet.createRow(rowNum++);
 
             row.createCell(0).setCellValue(rb.getString("download.spreadsheet.title"));
 
@@ -144,8 +144,8 @@ public boolean getGradesSpreadsheet(final OutputStream out, final String ref) th
             row = sheet.createRow(rowNum++);
             row.createCell(0).setCellValue("");
 
-            HSSFCellStyle style = wb.createCellStyle();
-            HSSFCell cell;
+            CellStyle style = wb.createCellStyle();
+            Cell cell;
 
             // this is the header row number
             int headerRowNumber = rowNum;
@@ -353,7 +353,7 @@ public boolean getGradesSpreadsheet(final OutputStream out, final String ref) th
                 // The map is already sorted and so we just iterate over it and output rows.
                 for (Iterator<Map.Entry<Submitter, List<Object>>> resultsIt = results.entrySet().iterator(); resultsIt.hasNext(); ) {
                     Map.Entry<Submitter, List<Object>> entry = resultsIt.next();
-                    HSSFRow sheetRow = sheet.createRow(rowNum++);
+                    Row sheetRow = sheet.createRow(rowNum++);
                     Submitter submitter = entry.getKey();
                     List<Object> rowValues = entry.getValue();
                     int column = 0;

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm
@@ -1,4 +1,4 @@
-<!-- start: chef_assignments_instructory_report_submissions.vm  -->
+<!-- start: chef_assignments_instructor_report_submissions.vm  -->
 <div class="portletBody">
 	#navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )