Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java =================================================================== diff -u -rf8801506e4b6b221595fb585797851a9a6a09404 -ra670eae7ac0816cd0896cc0aec54854a33aa105f --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision f8801506e4b6b221595fb585797851a9a6a09404) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java (.../IScratchieService.java) (revision a670eae7ac0816cd0896cc0aec54854a33aa105f) @@ -225,10 +225,10 @@ List getQuestionSummary(Long contentId, Long itemUid); /** - * Get BurningQuestionDtos used for summary tab + * In order to group BurningQuestions by items, organise them as a list of BurningQuestionItemDTOs. * * @param scratchie - * @param sessionId optional parameter, if it's specified, BurningQuestionDTO will also contain whether leader liked + * @param sessionId optional parameter, if it's specified, BurningQuestionDTOs will also contain information what leader of this group has liked * @return */ List getBurningQuestionDtos(Scratchie scratchie, Long sessionId); Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -rf8801506e4b6b221595fb585797851a9a6a09404 -ra670eae7ac0816cd0896cc0aec54854a33aa105f --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision f8801506e4b6b221595fb585797851a9a6a09404) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision a670eae7ac0816cd0896cc0aec54854a33aa105f) @@ -790,6 +790,7 @@ List burningQuestionDtos = scratchieBurningQuestionDao .getBurningQuestionsByContentId(scratchie.getUid(), sessionId); + //in order to group BurningQuestions by items, organise them as a list of BurningQuestionItemDTOs List burningQuestionItemDtos = new ArrayList(); for (ScratchieItem item : items) { @@ -798,6 +799,7 @@ for (BurningQuestionDTO burningQuestionDto : burningQuestionDtos) { ScratchieBurningQuestion burningQuestion = burningQuestionDto.getBurningQuestion(); + //general burning question is handled further down if (!burningQuestion.isGeneralQuestion() && item.getUid().equals(burningQuestion.getScratchieItem().getUid())) { burningQuestionDtosOfSpecifiedItem.add(burningQuestionDto); } @@ -1479,6 +1481,12 @@ row[0] = new ExcelCell(getMessage("label.burning.questions"), true); rowList.add(row); rowList.add(ScratchieServiceImpl.EMPTY_ROW); + + row = new ExcelCell[3]; + row[0] = new ExcelCell(getMessage("label.monitoring.summary.user.name"), IndexedColors.BLUE); + row[1] = new ExcelCell(getMessage("label.burning.questions"), IndexedColors.BLUE); + row[2] = new ExcelCell(getMessage("label.count"), IndexedColors.BLUE); + rowList.add(row); List burningQuestionItemDtos = getBurningQuestionDtos(scratchie, null); for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) { @@ -1490,9 +1498,10 @@ List burningQuestionDtos = burningQuestionItemDto.getBurningQuestionDtos(); for (BurningQuestionDTO burningQuestionDto : burningQuestionDtos) { String burningQuestion = burningQuestionDto.getBurningQuestion().getQuestion(); - row = new ExcelCell[2]; + row = new ExcelCell[3]; row[0] = new ExcelCell(burningQuestionDto.getSessionName(), false); row[1] = new ExcelCell(burningQuestion, false); + row[2] = new ExcelCell(burningQuestionDto.getLikeCount(), false); rowList.add(row); } rowList.add(ScratchieServiceImpl.EMPTY_ROW);