From 575f0112d5542a6856eb3b278eede106bffe0f60 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 28 Mar 2017 11:13:32 +0200
Subject: [PATCH] OO-2504: better handle headers in Excel export
---
.../java/org/olat/core/util/openxml/OpenXMLWorksheet.java | 2 +-
.../java/org/olat/course/archiver/ScoreAccountingHelper.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/core/util/openxml/OpenXMLWorksheet.java b/src/main/java/org/olat/core/util/openxml/OpenXMLWorksheet.java
index 23c46c22d85..86c512f55d7 100644
--- a/src/main/java/org/olat/core/util/openxml/OpenXMLWorksheet.java
+++ b/src/main/java/org/olat/core/util/openxml/OpenXMLWorksheet.java
@@ -194,7 +194,7 @@ public class OpenXMLWorksheet {
//header rows
if(getHeaderRows() > 0) {
writer.writeStartElement("pane");
- writer.writeAttribute("topLeftCell", "A1");
+ writer.writeAttribute("topLeftCell", "A" + (getHeaderRows() + 1));
writer.writeAttribute("xSplit", "0");
writer.writeAttribute("ySplit", Integer.toString(getHeaderRows()));
writer.writeAttribute("activePane", "bottomLeft");
diff --git a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
index 997c3e8092e..70ba2d73896 100644
--- a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
+++ b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
@@ -92,6 +92,8 @@ public class ScoreAccountingHelper {
public static void createCourseResultsOverviewXMLTable(List<Identity> identities, List<AssessableCourseNode> myNodes, ICourse course, Locale locale, OutputStream bos) {
OpenXMLWorkbook workbook = new OpenXMLWorkbook(bos, 1);
OpenXMLWorksheet sheet = workbook.nextWorksheet();
+ sheet.setHeaderRows(2);
+
int headerColCnt = 0;
Translator t = Util.createPackageTranslator(ScoreAccountingArchiveController.class, locale);
@@ -111,8 +113,6 @@ public class ScoreAccountingHelper {
String no = t.translate("column.field.no");
String submitted = t.translate("column.field.submitted");
-
-
Row headerRow1 = sheet.newRow();
headerRow1.addCell(headerColCnt++, sequentialNumber);
headerRow1.addCell(headerColCnt++, login);
@@ -176,7 +176,6 @@ public class ScoreAccountingHelper {
}
}
- sheet.setHeaderRows(2);
// preload user properties cache
CourseEnvironment courseEnvironment = course.getCourseEnvironment();
--
GitLab