Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java =================================================================== diff -u -r6f0f844e82f555e8dc0df6916226fac35a2a7c36 -r434f8c5a2d415879cc5c52b495baed5d6c987edf --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java (.../ICommonScratchieService.java) (revision 6f0f844e82f555e8dc0df6916226fac35a2a7c36) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java (.../ICommonScratchieService.java) (revision 434f8c5a2d415879cc5c52b495baed5d6c987edf) @@ -16,4 +16,9 @@ * Returns VS answers which require allocation for the given activity */ Map> getUnallocatedVSAnswers(long toolContentId); + + /** + * Tells whether burning questions are enabled in the given activity + */ + boolean isBurningQuestionsEnabled(long toolContentId); } \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -r07b3fbd22469b98039c011d1a67f19e77af0a646 -r434f8c5a2d415879cc5c52b495baed5d6c987edf --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 07b3fbd22469b98039c011d1a67f19e77af0a646) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 434f8c5a2d415879cc5c52b495baed5d6c987edf) @@ -84,6 +84,7 @@ import org.lamsfoundation.lams.monitoring.service.IMonitoringService; import org.lamsfoundation.lams.security.ISecurityService; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; +import org.lamsfoundation.lams.tool.service.ICommonScratchieService; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; @@ -156,6 +157,9 @@ private MessageService messageService; @Autowired private IAuthoringService authoringService; + @Autowired + @Qualifier("scratchieService") + private ICommonScratchieService commonScratchieService; public MonitoringController() { // bind sinks so a learner finishing an activity also triggers an update in lesson progress @@ -1018,6 +1022,14 @@ if (isTBLSequence && useNewUI) { List lessonActivities = getLessonActivities(lessonService.getLesson(lessonId)); TblMonitoringController.setupAvailableActivityTypes(request, lessonActivities); + + boolean burningQuestionsEnabled = false; + Long traToolActivityId = (Long) request.getAttribute("traToolActivityId"); + if (traToolActivityId != null) { + long traToolContentId = activityDAO.find(ToolActivity.class, traToolActivityId).getToolContentId(); + burningQuestionsEnabled = commonScratchieService.isBurningQuestionsEnabled(traToolContentId); + } + request.setAttribute("burningQuestionsEnabled", burningQuestionsEnabled); } return "monitor" + (useNewUI ? "5" : ""); Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r5b9c9b21910ead6832eb47f7a19fa206a0f4d21b -r434f8c5a2d415879cc5c52b495baed5d6c987edf --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 5b9c9b21910ead6832eb47f7a19fa206a0f4d21b) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 434f8c5a2d415879cc5c52b495baed5d6c987edf) @@ -321,15 +321,17 @@ - + + + Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -ra06e6557d861c8f9961ae746fccc0ae65d3d5e0c -r434f8c5a2d415879cc5c52b495baed5d6c987edf --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision a06e6557d861c8f9961ae746fccc0ae65d3d5e0c) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 434f8c5a2d415879cc5c52b495baed5d6c987edf) @@ -657,6 +657,15 @@ } /** + * Tells whether burning questions are enabled in the given activity + */ + @Override + public boolean isBurningQuestionsEnabled(long toolContentId) { + Scratchie scratchie = getScratchieByContentId(toolContentId); + return scratchie != null && scratchie.isBurningQuestionsEnabled(); + } + + /** * Counts how many questions were answered correctly on first attempt by the given user, regardless of mark given. */ @Override