Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -raabab3912296d793cd204eff1cc42dd072888759 -reff233243475ad0693dd5bf2c3b441712bd0d4db --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision aabab3912296d793cd204eff1cc42dd072888759) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision eff233243475ad0693dd5bf2c3b441712bd0d4db) @@ -2079,6 +2079,7 @@ .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) { @@ -2127,11 +2128,18 @@ } model.put("sessionDtos", groupSummaries); + boolean vsaPresent = false; for (ScratchieItem item : itemList) { item.setCorrectOnFirstAttemptPercent(groupSummaries.isEmpty() ? 0 : (double) item.getCorrectOnFirstAttemptCount() * 100 / groupSummaries.size()); + + if (!vsaPresent && item.getQbQuestion().getType().equals(QbQuestion.TYPE_VERY_SHORT_ANSWERS)) { + vsaPresent = true; + } } + model.put("vsaPresent", vsaPresent); + return model; } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java =================================================================== diff -u -r6f0f844e82f555e8dc0df6916226fac35a2a7c36 -reff233243475ad0693dd5bf2c3b441712bd0d4db --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 6f0f844e82f555e8dc0df6916226fac35a2a7c36) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java (.../MonitoringController.java) (revision eff233243475ad0693dd5bf2c3b441712bd0d4db) @@ -49,7 +49,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.qb.dto.QbStatsActivityDTO; -import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.qb.service.IQbService; import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants; import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO; @@ -157,13 +156,6 @@ sessionMap.put(ScratchieConstants.ATTR_REFLECTIONS, reflections); } - for (ScratchieItem item : scratchie.getScratchieItems()) { - if (item.getQbQuestion().getType().equals(QbQuestion.TYPE_VERY_SHORT_ANSWERS)) { - request.setAttribute("vsaPresent", true); - break; - } - } - Map modelAttributes = scratchieService.prepareStudentChoicesData(scratchie); model.addAllAttributes(modelAttributes); Index: lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp =================================================================== diff -u -r1cacada3b99a289e0a7fa6e887fd62285be99a81 -reff233243475ad0693dd5bf2c3b441712bd0d4db --- lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp (.../studentChoices.jsp) (revision 1cacada3b99a289e0a7fa6e887fd62285be99a81) +++ lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp (.../studentChoices.jsp) (revision eff233243475ad0693dd5bf2c3b441712bd0d4db) @@ -77,10 +77,10 @@