Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java =================================================================== diff -u -rb616b4a2df3217f70583fa5f62a59a1488b33f84 -r92ea854ad899fdf2e346b0b5ce005665600af0a6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision b616b4a2df3217f70583fa5f62a59a1488b33f84) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision 92ea854ad899fdf2e346b0b5ce005665600af0a6) @@ -300,7 +300,7 @@ * whether it should include questions that don't have any burning questions * @return */ - List getBurningQuestionDtos(Scratchie scratchie, Long sessionId, boolean includeEmptyItems); + List getBurningQuestionDtos(Scratchie scratchie, Long sessionId, boolean includeEmptyItems, boolean prepareForHTML); boolean addLike(Long burningQuestionUid, Long sessionId); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -rb616b4a2df3217f70583fa5f62a59a1488b33f84 -r92ea854ad899fdf2e346b0b5ce005665600af0a6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision b616b4a2df3217f70583fa5f62a59a1488b33f84) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 92ea854ad899fdf2e346b0b5ce005665600af0a6) @@ -677,6 +677,7 @@ scratchieUserDao.saveObject(user); } + @Override public Collection getAllGroupUsers(Long toolSessionId) { return toolService.getToolSession(toolSessionId).getLearners(); } @@ -954,7 +955,7 @@ @Override public List getBurningQuestionDtos(Scratchie scratchie, Long sessionId, - boolean includeEmptyItems) { + boolean includeEmptyItems, boolean prepareForHTML) { Set items = new TreeSet<>(new ScratchieItemComparator()); items.addAll(scratchie.getScratchieItems()); @@ -1014,8 +1015,11 @@ String escapedSessionName = StringEscapeUtils.escapeJavaScript(burningQuestionDto.getSessionName()); burningQuestionDto.setSessionName(escapedSessionName); - String escapedBurningQuestion = StringEscapeUtils - .escapeJavaScript(burningQuestionDto.getBurningQuestion().getQuestion()); + String escapedBurningQuestion = burningQuestionDto.getBurningQuestion().getQuestion(); + if (prepareForHTML) { + escapedBurningQuestion = escapedBurningQuestion.replaceAll("\n", "
"); + } + escapedBurningQuestion = StringEscapeUtils.escapeJavaScript(escapedBurningQuestion); burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion); } } @@ -1610,7 +1614,7 @@ row.addCell(getMessage("label.burning.questions"), IndexedColors.BLUE); row.addCell(getMessage("label.count"), IndexedColors.BLUE); - List burningQuestionItemDtos = getBurningQuestionDtos(scratchie, null, true); + List burningQuestionItemDtos = getBurningQuestionDtos(scratchie, null, true, false); for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) { ScratchieItem item = burningQuestionItemDto.getScratchieItem(); row = burningQuestionsSheet.initRow(); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java =================================================================== diff -u -r8d76bd31dd55117e17dc31cbd49ca1f6cca90e7e -r92ea854ad899fdf2e346b0b5ce005665600af0a6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision 8d76bd31dd55117e17dc31cbd49ca1f6cca90e7e) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision 92ea854ad899fdf2e346b0b5ce005665600af0a6) @@ -480,7 +480,7 @@ // display other groups' BurningQuestions if (isBurningQuestionsEnabled) { List burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie, - toolSessionId, false); + toolSessionId, false, true); request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java =================================================================== diff -u -r2188b7417d676ef1c628a44152af4980df6097e3 -r92ea854ad899fdf2e346b0b5ce005665600af0a6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 2188b7417d676ef1c628a44152af4980df6097e3) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 92ea854ad899fdf2e346b0b5ce005665600af0a6) @@ -121,7 +121,7 @@ // Create BurningQuestionsDtos if BurningQuestions is enabled. if (scratchie.isBurningQuestionsEnabled()) { List burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie, - null, true); + null, true, true); sessionMap.put(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java =================================================================== diff -u -r8aef7f7fcf46d94ac240c2f2eb83149ec061b743 -r92ea854ad899fdf2e346b0b5ce005665600af0a6 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision 8aef7f7fcf46d94ac240c2f2eb83149ec061b743) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java (.../TblMonitorController.java) (revision 92ea854ad899fdf2e346b0b5ce005665600af0a6) @@ -184,7 +184,7 @@ //find available burningQuestionDtos, if any if (scratchie.isBurningQuestionsEnabled()) { List burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie, - null, true); + null, true, true); //unescape previously escaped session names for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) { Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp =================================================================== diff -u -r3dee98435d9284b0993e2927ba9e5afadf894782 -r92ea854ad899fdf2e346b0b5ce005665600af0a6 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 3dee98435d9284b0993e2927ba9e5afadf894782) +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 92ea854ad899fdf2e346b0b5ce005665600af0a6) @@ -138,6 +138,7 @@ height: 'auto', autowidth: true, shrinkToFit: false, + autoencode: false, guiStyle: "bootstrap", iconSet: 'fontAwesome', colNames:['#',