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.68 -r1.69
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 5 Apr 2016 10:15:23 -0000 1.68
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 7 Apr 2016 18:33:58 -0000 1.69
@@ -41,7 +41,6 @@
import java.util.SortedMap;
import java.util.TreeSet;
-import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -836,7 +835,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.19 -r1.20
--- lams_tool_scratchie/web/pages/learning/results.jsp 4 Apr 2016 19:19:17 -0000 1.19
+++ lams_tool_scratchie/web/pages/learning/results.jsp 7 Apr 2016 18:33:58 -0000 1.20
@@ -119,7 +119,7 @@
jQuery("#burningQuestions${scratchieItem.uid}").addRowData(${i.index + 1}, {
id:"${i.index + 1}",
groupName:"${burningQuestionDto.sessionName}",
- feedback:"",
+ feedback:"${burningQuestionDto.escapedBurningQuestion}",
like:'',
@@ -165,7 +165,7 @@
jQuery("#reflections").addRowData(${i.index + 1}, {
id:"${i.index + 1}",
groupName:"${reflectDTO.groupName}",
- feedback:""
+ feedback:""
});
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.19 -r1.20
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp 4 Apr 2016 19:19:17 -0000 1.19
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp 7 Apr 2016 18:33:58 -0000 1.20
@@ -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}"
});