Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java =================================================================== diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -r66c5a92a9e7f3c9ae11bbf4d2a66bb1c186bbc3a --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision 35dd47046a83ab2f9e80f76dc22d1521412219b5) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision 66c5a92a9e7f3c9ae11bbf4d2a66bb1c186bbc3a) @@ -129,6 +129,12 @@ model.addAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId); model.addAttribute("scratchie", scratchie); + if (scratchie.isBurningQuestionsEnabled()) { + List burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie, + null, true, true); + model.addAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos); + } + return "pages/monitoring/studentChoices5"; } Index: lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp =================================================================== diff -u -r38dd8aaaf5d1c0bb5f43ed4c6b33219b8777144d -r66c5a92a9e7f3c9ae11bbf4d2a66bb1c186bbc3a --- lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp (.../studentChoices.jsp) (revision 38dd8aaaf5d1c0bb5f43ed4c6b33219b8777144d) +++ lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp (.../studentChoices.jsp) (revision 66c5a92a9e7f3c9ae11bbf4d2a66bb1c186bbc3a) @@ -54,6 +54,12 @@ span.wrong-response { background-color: #d9534f; } + + .burning-questions-badge { + margin-left: 5px; + font-size: 11px; + background-color: #aaa; + } @@ -135,6 +141,15 @@ ${i.index + 1} + + + + + + + + + Index: lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp =================================================================== diff -u -r308d315464934bbf342b5bd93a31c8c3665d7d16 -r66c5a92a9e7f3c9ae11bbf4d2a66bb1c186bbc3a --- lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp (.../studentChoices5.jsp) (revision 308d315464934bbf342b5bd93a31c8c3665d7d16) +++ lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp (.../studentChoices5.jsp) (revision 66c5a92a9e7f3c9ae11bbf4d2a66bb1c186bbc3a) @@ -128,6 +128,17 @@ ${i.index + 1} + + + + + + + + +