Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
===================================================================
diff -u -r3085af1c7e3e6c3496af23a748d998886d7168fd -rbfd24b6d094d0f9037a76731aed7f9df9744c74c
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java (.../AssessmentEscapeUtils.java) (revision 3085af1c7e3e6c3496af23a748d998886d7168fd)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java (.../AssessmentEscapeUtils.java) (revision bfd24b6d094d0f9037a76731aed7f9df9744c74c)
@@ -134,23 +134,38 @@
String str = "";
if (optionAnswers != null) {
for (QbOption option : options) {
- str += "
";
- str += "
";
- str += option.getMatchingPair();
- str += "
";
- str += "
";
- str += " - ";
+ boolean isCorrect = false;
+ String selectedOption = null;
for (AssessmentOptionAnswer optionAnswer : optionAnswers) {
if (option.getUid().equals(optionAnswer.getOptionUid())) {
for (QbOption option2 : options) {
if (option2.getUid() == optionAnswer.getAnswerInt()) {
- str += option2.getName();
+ selectedOption = option2.getName();
+ isCorrect = option.getUid()
+ .equals(Long.valueOf(optionAnswer.getAnswerInt()));
+ break;
}
}
}
+
+ if (selectedOption != null) {
+ break;
+ }
}
+ str += "
";
+ str += option.getMatchingPair();
+ str += "
";
+ str += "
";
+ str += " - ";
+ if (selectedOption != null) {
+ str += selectedOption;
+ }
str += "
";
str += "
";
str += DELIMITER;