Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java =================================================================== diff -u -r631e0f53795bb352e3996c28dd830255d87b5431 -r012f2ed99cee528b71b0ba249b4edd1e45abd442 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java (.../ScratchieAnswerVisitDAOHibernate.java) (revision 631e0f53795bb352e3996c28dd830255d87b5431) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java (.../ScratchieAnswerVisitDAOHibernate.java) (revision 012f2ed99cee528b71b0ba249b4edd1e45abd442) @@ -43,7 +43,7 @@ private static final String FIND_FIRST_SCRATCHED_ANSWER_BY_SESSION_AND_ITEM = "SELECT r.scratchieAnswer from " + ScratchieAnswerVisitLog.class.getName() - + " as r where r.sessionId=? and r.scratchieAnswer.scratchieItem.uid = ? order by r.accessDate asc;"; + + " as r where r.sessionId=? and r.scratchieAnswer.scratchieItem.uid = ? order by r.accessDate asc"; private static final String FIND_BY_SESSION = "from " + ScratchieAnswerVisitLog.class.getName() + " as r where r.sessionId=? order by r.accessDate asc"; Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r708bd4d049ae0a59d70c964ef2f864d2b7a352e6 -r012f2ed99cee528b71b0ba249b4edd1e45abd442 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 708bd4d049ae0a59d70c964ef2f864d2b7a352e6) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 012f2ed99cee528b71b0ba249b4edd1e45abd442) @@ -1455,7 +1455,40 @@ ExcelCell[][] fourthPageData = rowList.toArray(new ExcelCell[][] {}); dataToExport.put(getMessage("label.spss.analysis"), fourthPageData); + + // ======================================================= Burning questions page + // ======================================= + + if (scratchie.isBurningQuestionsEnabled()) { + rowList = new LinkedList(); + row = new ExcelCell[1]; + row[0] = new ExcelCell(getMessage("label.burning.questions"), true); + rowList.add(row); + rowList.add(ScratchieServiceImpl.EMPTY_ROW); + + List burningQuestionDtos = getBurningQuestionDtos(scratchie); + for (BurningQuestionDTO burningQuestionDto : burningQuestionDtos) { + ScratchieItem item = burningQuestionDto.getItem(); + row = new ExcelCell[1]; + row[0] = new ExcelCell(item.getTitle(), false); + rowList.add(row); + + Map groupNameToBurningQuestion = burningQuestionDto.getGroupNameToBurningQuestion(); + for (String groupName : groupNameToBurningQuestion.keySet()) { + String burningQuestion = groupNameToBurningQuestion.get(groupName); + row = new ExcelCell[2]; + row[0] = new ExcelCell(groupName, false); + row[1] = new ExcelCell(burningQuestion, false); + rowList.add(row); + } + rowList.add(ScratchieServiceImpl.EMPTY_ROW); + } + + ExcelCell[][] fifthPageData = rowList.toArray(new ExcelCell[][] {}); + dataToExport.put(getMessage("label.burning.questions"), fifthPageData); + } + return dataToExport; }