Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java =================================================================== diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r52c8c1dcf1233af8cbd4e3447f318146a9975f41 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision 52c8c1dcf1233af8cbd4e3447f318146a9975f41) @@ -113,9 +113,8 @@ for (QaQueContent question : qaContent.getQaQueContents()) { Long questionUid = question.getUid(); QaUsrResp dbResponse = qaService.getResponseByUserAndQuestion(qaQueUsr.getQueUsrId(), questionUid); - if (dbResponse != null) { - mapAnswersFromDb.put(String.valueOf(question.getDisplayOrder()), dbResponse.getAnswer()); - } + String answer = (dbResponse == null) ? null : dbResponse.getAnswer(); + mapAnswersFromDb.put(String.valueOf(question.getDisplayOrder()), answer); } // maybe we have come in from the review screen, if so get the answers from db. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r52c8c1dcf1233af8cbd4e3447f318146a9975f41 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 52c8c1dcf1233af8cbd4e3447f318146a9975f41) @@ -625,7 +625,7 @@ * Smileys and math functions only put in an img tag so explicitly look for that. */ private boolean isEmpty(String answer) { - if ((answer.indexOf(" -1) || (answer.indexOf(" -1)) { + if ((answer != null) && ((answer.indexOf(" -1) || (answer.indexOf(" -1))) { return false; } else { return StringUtils.isBlank(WebUtil.removeHTMLtags(answer)); Index: lams_tool_laqa/web/learning/AnswersContent.jsp =================================================================== diff -u -r55acfa2355b842ad87bac70171e366e088daad3c -r52c8c1dcf1233af8cbd4e3447f318146a9975f41 --- lams_tool_laqa/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 55acfa2355b842ad87bac70171e366e088daad3c) +++ lams_tool_laqa/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 52c8c1dcf1233af8cbd4e3447f318146a9975f41) @@ -1,5 +1,4 @@ - + <%@ include file="/common/taglibs.jsp"%> @@ -105,8 +104,7 @@

- +

@@ -125,8 +123,7 @@ - + @@ -150,10 +147,9 @@

-

- -

+

+ +

@@ -165,7 +161,6 @@

- Index: lams_tool_laqa/web/learning/CombinedAnswersContent.jsp =================================================================== diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r52c8c1dcf1233af8cbd4e3447f318146a9975f41 --- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c) +++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp (.../CombinedAnswersContent.jsp) (revision 52c8c1dcf1233af8cbd4e3447f318146a9975f41) @@ -19,8 +19,10 @@

- : + + + : + @@ -31,27 +33,27 @@

- - - - - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + +
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp =================================================================== diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -r52c8c1dcf1233af8cbd4e3447f318146a9975f41 --- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp (.../SequentialAnswersContent.jsp) (revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba) +++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp (.../SequentialAnswersContent.jsp) (revision 52c8c1dcf1233af8cbd4e3447f318146a9975f41) @@ -15,15 +15,15 @@
- + - +

- : + + + : + @@ -49,54 +49,42 @@ -

- - +
- +
-
- +
- 1}"> - + - - - + - -