Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -r3126fb6636e4164bdc6e539eab16ed2a7618fe7e
--- lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 3126fb6636e4164bdc6e539eab16ed2a7618fe7e)
@@ -45,7 +45,7 @@
[${item.uid}, [
- "${optionDto.answer}",
+ "",
]],
@@ -146,7 +146,7 @@
//determine if such answer is available in the list
var answerRowIndex = -1;
assessmentAnswers.get(itemUid).forEach(function(assessmentAnswer, index) {
- if (assessmentAnswer == answer) {
+ if (assessmentAnswer == xmlEscape(answer)) {//comparing with escaped answer as assessmentAnswers' answers are escaped
answerRowIndex = index;
}
});
@@ -219,7 +219,7 @@
'
' +
' ' +
- answer +
+ xmlEscape(answer) +
' ' +
' ' +
'' +
@@ -228,9 +228,17 @@
' | ' +
'';
$("table#scratches-" + itemUid).append(trElem);
- assessmentAnswers.get(itemUid).push(answer);
+ assessmentAnswers.get(itemUid).push(xmlEscape(answer));
}
+ function xmlEscape(value) {
+ return value.replace(/&/g, '&')
+ .replace(//g, '>')
+ .replace(/"/g, '"')
+ .replace(/'/g, ''');
+ }
+
//a direct replacement for Java's String.hashCode() method
function hashCode(str) {
return str.split('').reduce((prevHash, currVal) =>
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp
===================================================================
diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -r3126fb6636e4164bdc6e539eab16ed2a7618fe7e
--- lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
+++ lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 3126fb6636e4164bdc6e539eab16ed2a7618fe7e)
@@ -101,7 +101,7 @@
-
+
Index: lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp
===================================================================
diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -r3126fb6636e4164bdc6e539eab16ed2a7618fe7e
--- lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp (.../itemSummary.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
+++ lams_tool_scratchie/web/pages/monitoring/parts/itemSummary.jsp (.../itemSummary.jsp) (revision 3126fb6636e4164bdc6e539eab16ed2a7618fe7e)
@@ -64,7 +64,7 @@
jQuery("#session${summary.sessionId}").addRowData(${i.index + 1}, {
- option:"${optionDto.answer} ()"
+ option:" ()"
,choice${j}:"${optionDto.attempts[j]}"
Index: lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp
===================================================================
diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -r3126fb6636e4164bdc6e539eab16ed2a7618fe7e
--- lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp (.../teams.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
+++ lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp (.../teams.jsp) (revision 3126fb6636e4164bdc6e539eab16ed2a7618fe7e)
@@ -22,7 +22,7 @@
${ALPHABET[j.index]}.
|
-
+
Index: lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
===================================================================
diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -r3126fb6636e4164bdc6e539eab16ed2a7618fe7e
--- lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp (.../tra.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
+++ lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp (.../tra.jsp) (revision 3126fb6636e4164bdc6e539eab16ed2a7618fe7e)
@@ -98,7 +98,7 @@
${ALPHABET[j.index]}.
|
-
+
|
Index: lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
===================================================================
diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -r3126fb6636e4164bdc6e539eab16ed2a7618fe7e
--- lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp (.../traStudentChoices.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
+++ lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp (.../traStudentChoices.jsp) (revision 3126fb6636e4164bdc6e539eab16ed2a7618fe7e)
@@ -139,7 +139,7 @@
successful-response wrong-response">
-
+
@@ -194,7 +194,7 @@
${ALPHABET[j.index]}.
-
+
|