Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java,v diff -u -r1.11.2.3 -r1.11.2.4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java 29 Nov 2014 21:42:16 -0000 1.11.2.3 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java 10 Feb 2016 08:48:54 -0000 1.11.2.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v diff -u -r1.51.2.14 -r1.51.2.15 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 30 Dec 2015 20:39:55 -0000 1.51.2.14 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 10 Feb 2016 08:48:54 -0000 1.51.2.15 @@ -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; }