Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -ra670eae7ac0816cd0896cc0aec54854a33aa105f -r3e084f6495f49eeefa8e5d32502292a49014f0d4
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision a670eae7ac0816cd0896cc0aec54854a33aa105f)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 3e084f6495f49eeefa8e5d32502292a49014f0d4)
@@ -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
===================================================================
diff -u -rf8801506e4b6b221595fb585797851a9a6a09404 -r3e084f6495f49eeefa8e5d32502292a49014f0d4
--- lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision f8801506e4b6b221595fb585797851a9a6a09404)
+++ lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision 3e084f6495f49eeefa8e5d32502292a49014f0d4)
@@ -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
===================================================================
diff -u -rf8801506e4b6b221595fb585797851a9a6a09404 -r3e084f6495f49eeefa8e5d32502292a49014f0d4
--- lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision f8801506e4b6b221595fb585797851a9a6a09404)
+++ lams_tool_scratchie/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 3e084f6495f49eeefa8e5d32502292a49014f0d4)
@@ -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}"
});