Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r8bcf5f3b87aa5b9bcead80b6c2c06a5982513b41 -re056a0a5b2e79bb29440e7b57e7ec4b89735a1cb --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 8bcf5f3b87aa5b9bcead80b6c2c06a5982513b41) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision e056a0a5b2e79bb29440e7b57e7ec4b89735a1cb) @@ -1804,6 +1804,10 @@ questionTitleRow.addCell(getMessage("label.answer.justification"), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN); } + questionTitleRow.addCell(getMessage("label.monitoring.user.summary.marker"), true, + ExcelCell.BORDER_STYLE_BOTTOM_THIN); + questionTitleRow.addCell(getMessage("label.monitoring.user.summary.marker.comment"), true, + ExcelCell.BORDER_STYLE_BOTTOM_THIN); int questionNumber = 1; @@ -1928,7 +1932,9 @@ //mark //calculating markCount & markTotal if (questionResult.getMark() != null && questionResult.getFinishDate() != null) { - userResultRow.addCell(questionResult.getMark()); + userResultRow.addCell(questionResult.getMarkedBy() == null + && question.getType().equals(QbQuestion.TYPE_ESSAY) ? "-" + : questionResult.getMark().toString()); markCount++; markTotal += questionResult.getMark(); @@ -1940,6 +1946,9 @@ userResultRow.addCell(AssessmentEscapeUtils .escapeStringForExcelExport(questionResult.getJustification())); } + userResultRow.addCell( + questionResult.getMarkedBy() == null ? "" : questionResult.getMarkedBy().getFullName()); + userResultRow.addCell(questionResult.getMarkerComment()); questionSummaryTabTemp.add(userResultRow);