diff --git a/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java b/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java index 1414b8d55303b5a8405d6289394b8d6732f52c0d..51e10968b76c9a94e6e5d86f2b40ab97fe32fda0 100644 --- a/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java +++ b/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java @@ -1,4 +1,6 @@ /** + + * <a href="http://www.openolat.org"> * OpenOLAT - Online Learning and Training</a><br> * <p> @@ -420,6 +422,7 @@ public class QTI21ArchiveFormat { header2Row.addCell(col++, translator.translate("column.header.duration"), headerStyle); List<AbstractInfos> infos = getItemInfos(); + int itemPos = 0; for(int i=0; i<infos.size(); i++) { AbstractInfos info = infos.get(i); if(info instanceof ItemInfos) { @@ -429,8 +432,9 @@ public class QTI21ArchiveFormat { for(int j=0; j<interactions.size(); j++) { Interaction interaction = interactions.get(j); col = interactionArchiveMap.get(interaction.getQtiClassName()) - .writeHeader2(item.getAssessmentItem(), interaction, i, j, header2Row, col, workbook); + .writeHeader2(item.getAssessmentItem(), interaction, itemPos, j, header2Row, col, workbook); } + itemPos++; } if (exportConfig.isPointCol()) { header2Row.addCell(col++, translator.translate("item.score"), headerStyle); @@ -483,7 +487,7 @@ public class QTI21ArchiveFormat { for(int i=0; i<numOfSessions; i++) { AssessmentTestSession testSession = sessions.get(i); SessionResponses sessionResponses = sessionToResponses.get(testSession); - writeDataRow(i + 2, sessionResponses, exportSheet, workbook); + writeDataRow(i + 1, sessionResponses, exportSheet, workbook); } } diff --git a/src/main/java/org/olat/ims/qti21/manager/archive/interactions/DefaultInteractionArchive.java b/src/main/java/org/olat/ims/qti21/manager/archive/interactions/DefaultInteractionArchive.java index c62b38af50b431585e0664265c8f8bc0b1eae48d..0778d9c29b73c0f4df5a127e12007202f0eee7cd 100644 --- a/src/main/java/org/olat/ims/qti21/manager/archive/interactions/DefaultInteractionArchive.java +++ b/src/main/java/org/olat/ims/qti21/manager/archive/interactions/DefaultInteractionArchive.java @@ -47,7 +47,7 @@ public class DefaultInteractionArchive implements InteractionArchive { @Override public int writeHeader2(AssessmentItem item, Interaction interaction, int itemNumber, int interactionNumber, Row dataRow, int col, OpenXMLWorkbook workbook) { - String header = (itemNumber + 1) + "_U" + (interactionNumber + 1);; + String header = (itemNumber + 1) + "_U" + (interactionNumber + 1); dataRow.addCell(col++, header, workbook.getStyles().getHeaderStyle()); return col; } diff --git a/src/main/java/org/olat/ims/qti21/manager/archive/interactions/SelectPointInteractionArchive.java b/src/main/java/org/olat/ims/qti21/manager/archive/interactions/SelectPointInteractionArchive.java index 17d4b888a7de14d9c969a85911640db656bb206f..7e627bdf6ae9e5cb80fad97d3ff6c36ddf49c3d8 100644 --- a/src/main/java/org/olat/ims/qti21/manager/archive/interactions/SelectPointInteractionArchive.java +++ b/src/main/java/org/olat/ims/qti21/manager/archive/interactions/SelectPointInteractionArchive.java @@ -61,7 +61,7 @@ public class SelectPointInteractionArchive extends DefaultInteractionArchive { @Override public int writeHeader2(AssessmentItem item, Interaction interaction, int itemNumber, int interactionNumber, Row dataRow, int col, OpenXMLWorkbook workbook) { List<AreaMapEntry> areaMapEntries = getAreaMapEntries(item, interaction); - if(areaMapEntries.size() == 0) { + if(areaMapEntries.isEmpty()) { col++; } else { for(AreaMapEntry areaMapEntry:areaMapEntries) { @@ -74,7 +74,7 @@ public class SelectPointInteractionArchive extends DefaultInteractionArchive { @Override public int writeInteractionData(AssessmentItem item, AssessmentResponse response, Interaction interaction, int itemNumber, Row dataRow, int col, OpenXMLWorkbook workbook) { List<AreaMapEntry> areaMapEntries = getAreaMapEntries(item, interaction); - if(areaMapEntries.size() == 0) { + if(areaMapEntries.isEmpty()) { col++; } else { String stringuifiedResponse = response == null ? null : response.getStringuifiedResponse();