Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -ra9f95a26e562a58b55c99f2c18e253c151ef457a -r40f2ba218df565d53c58eb97ca60c409887faa63
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision a9f95a26e562a58b55c99f2c18e253c151ef457a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 40f2ba218df565d53c58eb97ca60c409887faa63)
@@ -1141,11 +1141,10 @@
// handle general burning question
BurningQuestionItemDTO generalBurningQuestionItemDto = new BurningQuestionItemDTO();
- ScratchieItem generalDummyItem = new ScratchieItem();
+ ScratchieItem generalDummyItem = new ScratchieItem();//generalDummyItem's uid will be set to 0 in jsp
generalDummyItem.setQbQuestion(new QbQuestion());
releaseFromCache(generalDummyItem);
releaseFromCache(generalDummyItem.getQbQuestion());
- // generalDummyItem.setUid(0L);
final String generalQuestionMessage = messageService.getMessage("label.general.burning.question");
generalDummyItem.getQbQuestion().setName(generalQuestionMessage);
generalBurningQuestionItemDto.setScratchieItem(generalDummyItem);
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r40f2ba218df565d53c58eb97ca60c409887faa63
--- lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision 40f2ba218df565d53c58eb97ca60c409887faa63)
@@ -119,8 +119,9 @@
-
- jQuery("#burningQuestions${scratchieItem.uid}").jqGrid({
+
+
+ jQuery("#burningQuestions${scratchieItemUid}").jqGrid({
datatype: "local",
rowNum: 10000,
height: 'auto',
@@ -165,8 +166,8 @@
},
{name:'count', index:'count', width:50, align:"right", title: false}
],
- caption: "${scratchieItem.qbQuestion.name}""${scratchieItem.qbQuestion.name}" + " [${fn:length(burningQuestionItemDto.burningQuestionDtos)}]",
- editurl: '?sessionId=${toolSessionID}&itemUid=${scratchieItem.uid}',
+ caption: "${scratchieItem.qbQuestion.name}""${scratchieItem.qbQuestion.name}" + " [${fn:length(burningQuestionItemDto.burningQuestionDtos)}]",
+ editurl: '?sessionId=${toolSessionID}&itemUid=${scratchieItemUid}',
beforeEditRow: function (options, rowid) {
alert("aaa");
},
@@ -187,7 +188,7 @@
$self.jqGrid("editRow", rowid, { focusField: "burningQuestion" });
//Modify event handler to save on blur
- var gridId = "#burningQuestions${scratchieItem.uid}";
+ var gridId = "#burningQuestions${scratchieItemUid}";
$("textarea[id^='"+rowid+"_burningQuestion']", gridId).bind('blur',function(){
$(gridId).saveRow(rowid);
});
@@ -200,7 +201,7 @@
});
- jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
+ jQuery("#burningQuestions${scratchieItemUid}").addRowData(${i.index + 1}, {
id:"${i.index + 1}",
isUserAuthor:"${burningQuestionDto.userAuthor}",
groupName:"${burningQuestionDto.sessionName}",
@@ -214,18 +215,18 @@
like:'"' +
- 'onclick="javascript:likeEntry(${scratchieItem.uid}, ${i.index + 1}, ${burningQuestionDto.burningQuestion.uid});" />',
+ 'onclick="javascript:likeEntry(${scratchieItemUid}, ${i.index + 1}, ${burningQuestionDto.burningQuestion.uid});" />',
like:'"' +
- 'onclick="javascript:likeEntry(${scratchieItem.uid}, ${i.index + 1}, ${burningQuestionDto.burningQuestion.uid});" />',
+ 'onclick="javascript:likeEntry(${scratchieItemUid}, ${i.index + 1}, ${burningQuestionDto.burningQuestion.uid});" />',
count:'${burningQuestionDto.likeCount}'
});
- jQuery("#burningQuestions${scratchieItem.uid}").jqGrid('sortGrid','groupName', false, 'asc');
+ jQuery("#burningQuestions${scratchieItemUid}").jqGrid('sortGrid','groupName', false, 'asc');
@@ -381,8 +382,9 @@
+
@@ -418,7 +420,6 @@
-