Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r46e0b05aa6ff4798e51f86f140dbea83b22b798e -rabeade6acdabd37cde6e3710ab30073ce26532e2 --- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 46e0b05aa6ff4798e51f86f140dbea83b22b798e) +++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision abeade6acdabd37cde6e3710ab30073ce26532e2) @@ -156,7 +156,7 @@ label.monitoring.summary.total =Total label.monitoring.summary.learner.summary =Learner summary label.monitoring.user.summary.history.responses =History of responses -label.monitoring.user.summary.user.name =Username +label.monitoring.user.summary.full.name =Full name label.monitoring.user.summary.number.attempts =Number of attempts label.monitoring.user.summary.time.last.attempt =Time in the last attempt label.monitoring.user.summary.last.attempt.grade =Last attempt grade Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r3b12480474c839c58c38c6a9616ee6102713f25f -rabeade6acdabd37cde6e3710ab30073ce26532e2 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 3b12480474c839c58c38c6a9616ee6102713f25f) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision abeade6acdabd37cde6e3710ab30073ce26532e2) @@ -1641,7 +1641,7 @@ @Override public List exportSummary(Assessment assessment, List sessionDtos) { - List sheets = new LinkedList(); + List sheets = new LinkedList<>(); // -------------- First tab: Summary ---------------------------------------------------- ExcelSheet summarySheet = new ExcelSheet(getMessage("label.export.summary")); @@ -2031,13 +2031,16 @@ Set assessmentUsers = assessmentSession.getAssessmentUsers(); if (assessmentUsers != null) { for (AssessmentUser assessmentUser : assessmentUsers) { - ExcelRow userTitleRow = userSummarySheet.initRow(); - userTitleRow.addCell(getMessage("label.export.user.id"), true); - userTitleRow.addCell(getMessage("label.monitoring.user.summary.user.name"), true); - userTitleRow.addCell(getMessage("label.export.date.attempted"), true); - userTitleRow.addCell(getMessage("label.monitoring.question.summary.question"), true); - userTitleRow.addCell(getMessage("label.authoring.basic.option.answer"), true); - userTitleRow.addCell(getMessage("label.export.mark"), true); + ExcelRow userTitleRow = userSummarySheet.initRow(); + userTitleRow.addCell(getMessage("label.export.user.id"), true); + userTitleRow.addCell(getMessage("label.monitoring.user.summary.full.name"), true); + userTitleRow.addCell(getMessage("label.export.date.attempted"), true); + userTitleRow.addCell(getMessage("label.monitoring.question.summary.question"), true); + userTitleRow.addCell(getMessage("label.authoring.basic.option.answer"), true); + if (assessment.isEnableConfidenceLevels()) { + userTitleRow.addCell(getMessage("label.confidence"), true); + } + userTitleRow.addCell(getMessage("label.export.mark"), true); AssessmentResult assessmentResult = userUidToResultMap.get(assessmentUser.getUid()); if (assessmentResult != null) { @@ -2051,12 +2054,34 @@ userResultRow.addCell(questionResult.getQbQuestion().getName()); userResultRow.addCell( AssessmentEscapeUtils.printResponsesForExcelExport(questionResult)); + if (assessment.isEnableConfidenceLevels()) { + String confidenceLevel = null; + + switch (assessment.getConfidenceLevelsType()) { + case 2: + confidenceLevel = new String[] { getMessage("label.not.confident"), + getMessage("label.confident"), + getMessage("label.very.confident") }[questionResult + .getConfidenceLevel() / 5]; + break; + case 3: + confidenceLevel = new String[] { getMessage("label.not.sure"), + getMessage("label.sure"), + getMessage("label.very.sure") }[questionResult + .getConfidenceLevel() / 5]; + break; + default: + confidenceLevel = questionResult.getConfidenceLevel() * 10 + "%"; + } + + userResultRow.addCell(confidenceLevel); + } userResultRow.addCell(questionResult.getMark()); } } ExcelRow userTotalRow = userSummarySheet.initRow(); - userTotalRow.addEmptyCells(4); + userTotalRow.addEmptyCells(assessment.isEnableConfidenceLevels() ? 5 : 4); userTotalRow.addCell(getMessage("label.monitoring.summary.total"), true); userTotalRow.addCell(assessmentResult.getGrade()); userSummarySheet.addEmptyRow();