Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -rf7ff5b86cc44db37f600384016cd0bf4f69db00e -r9e11e9cec20735adb7ec1e13a2f78a086c7e63e3 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision f7ff5b86cc44db37f600384016cd0bf4f69db00e) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 9e11e9cec20735adb7ec1e13a2f78a086c7e63e3) @@ -2018,6 +2018,9 @@ questionTitlesRow.addCell(title, true, ExcelCell.BORDER_STYLE_LEFT_THIN); int columnShift = 1; + if (QbQuestion.TYPE_ESSAY == question.getType()) { + columnShift += 2; + } // currently only MCQ and True/False questions have learner interaction logged // for other question types, do not include the column boolean addAnsweredDateColumn = QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType() @@ -2046,8 +2049,12 @@ for (QuestionReference questionReference : questionReferences) { userSummaryUserHeadersRow.addCell(getMessage("label.export.mark"), ExcelCell.BORDER_STYLE_LEFT_THIN); userSummaryUserHeadersRow.addCell(getMessage("label.authoring.basic.option.answer")); - AssessmentQuestion question = questionReference.getQuestion(); + if (QbQuestion.TYPE_ESSAY == question.getType()) { + userSummaryUserHeadersRow.addCell(getMessage("label.monitoring.user.summary.marker")); + userSummaryUserHeadersRow.addCell(getMessage("label.monitoring.user.summary.marker.comment")); + } + boolean addAnsweredDateColumn = QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType() || QbQuestion.TYPE_TRUE_FALSE == question.getType(); if (addAnsweredDateColumn) { @@ -2056,6 +2063,7 @@ if (assessment.isEnableConfidenceLevels() && QbQuestion.TYPE_MARK_HEDGING != question.getType()) { userSummaryUserHeadersRow.addCell(getMessage("label.confidence")); } + } // a single column at the end of previous headers @@ -2110,6 +2118,12 @@ // learner interaction QbQuestion question = questionResult.getQbQuestion(); + if (QbQuestion.TYPE_ESSAY == question.getType()) { + userResultRow.addCell(questionResult.getMarkedBy() == null ? "" + : questionResult.getMarkedBy().getFullName()); + userResultRow.addCell(questionResult.getMarkerComment()); + } + boolean addAnsweredDateColumn = QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType() || QbQuestion.TYPE_TRUE_FALSE == question.getType(); if (addAnsweredDateColumn) {