Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r3249d7b78707257b5e80aaeb699972abdd1bccdd -re6cb70fdabcaeb4c35ef551f7d694167f46ca5bc --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 3249d7b78707257b5e80aaeb699972abdd1bccdd) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision e6cb70fdabcaeb4c35ef551f7d694167f46ca5bc) @@ -40,6 +40,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeSet; +import java.util.function.Function; import java.util.stream.Collectors; import org.apache.commons.lang.StringEscapeUtils; @@ -1669,12 +1670,20 @@ //prepare data for displaying user answers table int groupsSize = countSessionsByContentId(scratchie.getContentId()); ArrayList sessionDtos = new ArrayList<>(); + Map sessionsByName = scratchieSessionDao.getByContentId(scratchie.getContentId()) + .stream().filter(s -> s.getGroupLeader() != null) + .collect(Collectors.toMap(ScratchieSession::getSessionName, Function.identity())); for (int groupCount = 0; groupCount < groupsSize; groupCount++) { ExcelRow groupRow = secondPageData.getRows().get(6 + groupCount); GroupSummary groupSummary = new GroupSummary(); String sessionName = groupRow.getCell(0).toString(); groupSummary.setSessionName(sessionName); + ScratchieSession session = sessionsByName.get(sessionName); + if (session != null) { + groupSummary.setLeaderUid(session.getGroupLeader().getUserId()); + groupSummary.setSessionId(session.getSessionId()); + } Collection itemDtos = new ArrayList<>(); for (int i = 1; i <= items.size(); i++) { Index: lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp =================================================================== diff -u -r8aef7f7fcf46d94ac240c2f2eb83149ec061b743 -re6cb70fdabcaeb4c35ef551f7d694167f46ca5bc --- lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp (.../studentChoices.jsp) (revision 8aef7f7fcf46d94ac240c2f2eb83149ec061b743) +++ lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp (.../studentChoices.jsp) (revision e6cb70fdabcaeb4c35ef551f7d694167f46ca5bc) @@ -1,4 +1,7 @@ <%@ include file="/common/taglibs.jsp"%> + + +