Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rbcc43af1123a6ca42c3caa1d366507a4dc57c93f -r3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4 --- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision bcc43af1123a6ca42c3caa1d366507a4dc57c93f) +++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4) @@ -268,5 +268,6 @@ label.button.submit =Submit label.authoring.advanced.question.etherpad = Include discussion pad for questions label.etherpad.discussion = Discussion +label.options.show = Show question options #======= End labels: Exported 260 labels for en AU ===== Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r2e61eefa786c0411376091c504812a8931395186 -r3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 2e61eefa786c0411376091c504812a8931395186) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4) @@ -42,6 +42,7 @@ import java.util.SortedMap; import java.util.TreeSet; import java.util.UUID; +import java.util.function.Function; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -694,6 +695,7 @@ scratchieUserDao.saveObject(user); } + @Override public Collection getAllGroupUsers(Long toolSessionId) { return toolService.getToolSession(toolSessionId).getLearners(); } @@ -1954,8 +1956,17 @@ List correctAnswerLetters = ScratchieServiceImpl.getCorrectAnswerLetters(items); model.put("correctAnswerLetters", correctAnswerLetters); + Map sessionsByName = scratchieSessionDao.getByContentId(scratchie.getContentId()) + .stream().filter(s -> s.getGroupLeader() != null) + .collect(Collectors.toMap(ScratchieSession::getSessionName, Function.identity())); List groupSummaries = getSummaryByTeam(scratchie, items); for (GroupSummary summary : groupSummaries) { + ScratchieSession session = sessionsByName.get(summary.getSessionName()); + if (session != null) { + // for this view, we need user ID, not UID + summary.setLeaderUid(session.getGroupLeader().getUserId()); + } + //prepare OptionDtos to display int i = 0; for (ScratchieItemDTO itemDto : summary.getItemDtos()) { Index: lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp =================================================================== diff -u -rac33d20fb7883183fe443062a74f163abc98f012 -r3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4 --- lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp (.../studentChoices.jsp) (revision ac33d20fb7883183fe443062a74f163abc98f012) +++ lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp (.../studentChoices.jsp) (revision 3c3e6d09ccfbfd0b279a5c2a0363d482d2eb77d4) @@ -1,5 +1,8 @@ <%@ include file="/common/taglibs.jsp"%> <% pageContext.setAttribute("newLineChar", "\r\n"); %> + + +