Index: lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelUtil.java =================================================================== diff -u -r74717924f7dac5b18892bdcf36fc14d90ea2ee61 -r4f5eca990931a3d98f22aee38ccb79bb8ce9f153 --- lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelUtil.java (.../ExcelUtil.java) (revision 74717924f7dac5b18892bdcf36fc14d90ea2ee61) +++ lams_common/src/java/org/lamsfoundation/lams/util/excel/ExcelUtil.java (.../ExcelUtil.java) (revision 4f5eca990931a3d98f22aee38ccb79bb8ce9f153) @@ -341,7 +341,7 @@ CellUtil.setCellStyleProperty(cell, CellUtil.BORDER_LEFT, BorderStyle.THICK); break; case ExcelCell.BORDER_STYLE_BOTTOM_THIN: - CellUtil.setCellStyleProperty(cell, CellUtil.BORDER_RIGHT, BorderStyle.THIN); + CellUtil.setCellStyleProperty(cell, CellUtil.BORDER_BOTTOM, BorderStyle.THIN); break; case ExcelCell.BORDER_STYLE_RIGHT_THICK: CellUtil.setCellStyleProperty(cell, CellUtil.BORDER_RIGHT, BorderStyle.THICK); Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r48340d4d314a3487c1ac43f91415cf57955b555e -r4f5eca990931a3d98f22aee38ccb79bb8ce9f153 --- lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 48340d4d314a3487c1ac43f91415cf57955b555e) +++ lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4f5eca990931a3d98f22aee38ccb79bb8ce9f153) @@ -136,6 +136,8 @@ label.average = Average label.for.user = For {0} label.learner = Student +label.first.name = First name +label.last.name = Last name label.spa.factor = SPA factor label.total.group.mark = Total team mark label.individual.mark = Individual mark Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java =================================================================== diff -u -r74717924f7dac5b18892bdcf36fc14d90ea2ee61 -r4f5eca990931a3d98f22aee38ccb79bb8ce9f153 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java (.../SpreadsheetBuilder.java) (revision 74717924f7dac5b18892bdcf36fc14d90ea2ee61) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/SpreadsheetBuilder.java (.../SpreadsheetBuilder.java) (revision 4f5eca990931a3d98f22aee38ccb79bb8ce9f153) @@ -73,9 +73,19 @@ ExcelSheet sessionSheet = new ExcelSheet(session.getSessionName()); sheets.add(sessionSheet); + List users = peerreviewUserDao.getBySessionID(session.getSessionId()); + ExcelRow numberOfTeamsRow = sessionSheet.initRow(); + numberOfTeamsRow.addCell(service.getLocalisedMessage("label.number.of.team.members", null), true); + numberOfTeamsRow.addCell(users.size(), IndexedColors.YELLOW); + sessionSheet.addEmptyRow(); + //Title row ExcelRow titleRow = sessionSheet.initRow(); - titleRow.addCell(service.getLocalisedMessage("label.learner", null), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN); + titleRow.addCell(service.getLocalisedMessage("label.first.name", null), true, + ExcelCell.BORDER_STYLE_BOTTOM_THIN); + titleRow.addCell(service.getLocalisedMessage("label.last.name", null), true, + ExcelCell.BORDER_STYLE_BOTTOM_THIN); + Map criteriaIndexMap = new HashMap<>(); int countNonCommentCriteria = 0; Integer previousRatingCriteriaGroupId = null; @@ -115,18 +125,14 @@ titleRow.addCell(service.getLocalisedMessage("label.individual.mark", null), true, ExcelCell.BORDER_STYLE_BOTTOM_THIN); - List users = peerreviewUserDao.getBySessionID(session.getSessionId()); Map userNames = new TreeMap<>(); + Map userMap = new HashMap<>(); for (PeerreviewUser user : users) { + userMap.put(user.getUserId(), user); userNames.put(user.getUserId(), StringEscapeUtils.escapeCsv(user.getFirstName() + " " + user.getLastName())); } - ExcelRow numberOfTeamsRow = sessionSheet.initRow(); - numberOfTeamsRow.addCell(service.getLocalisedMessage("label.number.of.team.members", null), true); - numberOfTeamsRow.addCell(users.size(), IndexedColors.YELLOW); - sessionSheet.addEmptyRow(); - // uses same index as the user row, so allow for the name in the first column Double[] criteriaMarkSum = new Double[countNonCommentCriteria + 1]; Integer[] criteriaMarkCount = new Integer[countNonCommentCriteria + 1]; @@ -158,7 +164,10 @@ ExcelRow userRow = new ExcelRow(); Long userId = ratingDto.getItemId(); - userRow.addCell(userNames.get(userId)); + PeerreviewUser user = userMap.get(userId); + userRow.addCell(StringEscapeUtils.escapeCsv(user.getFirstName())); + userRow.addCell(StringEscapeUtils.escapeCsv(user.getLastName())); + for (double userRowDataIter : userRowData) { userRow.addCell(userRowDataIter); } @@ -170,6 +179,7 @@ // calculate the group averages ExcelRow avgRow = new ExcelRow(); avgRow.addCell(service.getLocalisedMessage("label.average", null), true); + avgRow.addEmptyCell(); double averageMarkSum = 0D; for (int i = 0; i < criteriaMarkSum.length - 1; i++) { if (criteriaMarkCount[i] > 0) {