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.17 -r1.51.2.18
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 5 Apr 2016 17:24:33 -0000 1.51.2.17
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 8 Apr 2016 11:30:59 -0000 1.51.2.18
@@ -833,7 +833,7 @@
burningQuestionDto.setSessionName(escapedSessionName);
String escapedBurningQuestion = StringEscapeUtils
- .escapeJavaScript(burningQuestionDto.getBurningQuestion().getQuestion());
+ .escapeJavaScript(burningQuestionDto.getBurningQuestion().getQuestion().replaceAll("\\n", "
"));
burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion);
}
}
Index: lams_tool_scratchie/web/pages/learning/results.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/results.jsp,v
diff -u -r1.13.2.7 -r1.13.2.8
--- lams_tool_scratchie/web/pages/learning/results.jsp 5 Apr 2016 17:24:32 -0000 1.13.2.7
+++ lams_tool_scratchie/web/pages/learning/results.jsp 8 Apr 2016 11:30:59 -0000 1.13.2.8
@@ -110,7 +110,7 @@
colModel:[
{name:'id', index:'id', width:0, sorttype:"int", hidden: true},
{name:'groupName', index:'groupName', width:200},
- {name:'feedback', index:'feedback', width:374},
+ {name:'feedback', index:'feedback', width:401},
{name:'like', index:'like', width:60, align: "center"},
{name:'count', index:'count', width:50, align:"right"}
],
@@ -121,15 +121,15 @@
jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
id:"${i.index + 1}",
groupName:"${burningQuestionDto.sessionName}",
- feedback:"",
+ feedback:"${burningQuestionDto.escapedBurningQuestion}",
-
+
like:'',
like:'',
-
+
like:'"' +
'onclick="javascript:likeEntry(${burningQuestionDto.burningQuestion.uid});" id="like-${burningQuestionDto.burningQuestion.uid}" />',
Index: lams_tool_scratchie/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/summary.jsp,v
diff -u -r1.14.2.5 -r1.14.2.6
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp 5 Apr 2016 17:24:32 -0000 1.14.2.5
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp 8 Apr 2016 11:30:59 -0000 1.14.2.6
@@ -121,7 +121,7 @@
jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
id:"${i.index + 1}",
groupName:"${burningQuestionDto.sessionName}",
- feedback:"",
+ feedback:"${burningQuestionDto.escapedBurningQuestion}",
count:"${burningQuestionDto.likeCount}"
});