Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -r02ce40b60524aa33d326fbda824dcd43f566ab94 -r98fb8bd4f3c36bbdcfe9b9445757f685d972cc02 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 02ce40b60524aa33d326fbda824dcd43f566ab94) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 98fb8bd4f3c36bbdcfe9b9445757f685d972cc02) @@ -1776,8 +1776,7 @@ } } - // ======================================================= Burning questions page - // ======================================= + // ========================= Burning questions page ====================================== if (scratchie.isBurningQuestionsEnabled()) { ExcelSheet burningQuestionsSheet = new ExcelSheet(getMessage("label.burning.questions")); sheets.add(burningQuestionsSheet); @@ -1787,15 +1786,23 @@ burningQuestionsSheet.addEmptyRow(); row = burningQuestionsSheet.initRow(); + row.addCell("#", IndexedColors.BLUE); row.addCell(getMessage("label.monitoring.summary.user.name"), IndexedColors.BLUE); row.addCell(getMessage("label.burning.questions"), IndexedColors.BLUE); row.addCell(getMessage("label.count"), IndexedColors.BLUE); List burningQuestionItemDtos = getBurningQuestionDtos(scratchie, null, true); + int index = 1; for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) { ScratchieItem item = burningQuestionItemDto.getScratchieItem(); row = burningQuestionsSheet.initRow(); + if (index < burningQuestionItemDtos.size()) { + row.addCell(index++); + } else { + row.addEmptyCell(); + } + row.addCell(item.getQbQuestion().getName()); List burningQuestionDtos = burningQuestionItemDto.getBurningQuestionDtos(); Index: lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp =================================================================== diff -u -rbb0f9854016a8e3380c17cbfed58cd6d02a8f54c -r98fb8bd4f3c36bbdcfe9b9445757f685d972cc02 --- lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision bb0f9854016a8e3380c17cbfed58cd6d02a8f54c) +++ lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp (.../itemlist.jsp) (revision 98fb8bd4f3c36bbdcfe9b9445757f685d972cc02) @@ -39,6 +39,9 @@ +
+ ${status.count}) + Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp =================================================================== diff -u -r87ea6a14122fad745d95e49494d801d317fd6d61 -r98fb8bd4f3c36bbdcfe9b9445757f685d972cc02 --- lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 87ea6a14122fad745d95e49494d801d317fd6d61) +++ lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 98fb8bd4f3c36bbdcfe9b9445757f685d972cc02) @@ -1,11 +1,14 @@ <%@ include file="/common/taglibs.jsp"%> - - + +
- + ${questionNumber.count})  + + +
-
+
Index: lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp =================================================================== diff -u -r4dfbbc90e3d414eaf3f4282a3a38b4ec741384d7 -r98fb8bd4f3c36bbdcfe9b9445757f685d972cc02 --- lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp (.../statisticpart.jsp) (revision 4dfbbc90e3d414eaf3f4282a3a38b4ec741384d7) +++ lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp (.../statisticpart.jsp) (revision 98fb8bd4f3c36bbdcfe9b9445757f685d972cc02) @@ -1,123 +1,123 @@ -<%@ include file="/common/taglibs.jsp"%> - - - - - - - - - - - - - - - - -

- -
-
- - - - - - - - - - - - - - -
- : - - - - : - - -
- - - - - - - -
-
-
-
-
-
-
- -
-
-

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- # - - - - - - - - - - -
- ${i.index + 1} - - - - - ---
-
- - - +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + + + + +

+ +
+
+ + + + + + + + + + + + + + +
+ : + + + + : + + +
+ + + + + + + +
+
+
+
+
+
+
+ +
+
+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ # + + + + + + + + + + +
+ ${i.count} + + + + + ---
+
+ + + Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp =================================================================== diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r98fb8bd4f3c36bbdcfe9b9445757f685d972cc02 --- lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 394f403c289f0fd7808c228840bead5c4e7d5d32) +++ lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 98fb8bd4f3c36bbdcfe9b9445757f685d972cc02) @@ -291,8 +291,8 @@ @@ -353,7 +353,13 @@
-
${burningQuestionItemDto.scratchieItem.qbQuestion.name}
+
+ + ${i.count})  + + + +