Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v diff -u -r1.50 -r1.51 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 3 Jun 2014 16:22:22 -0000 1.50 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 4 Jun 2014 12:55:45 -0000 1.51 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v diff -u -r1.52 -r1.53 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 3 Jun 2014 16:22:21 -0000 1.52 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 4 Jun 2014 12:55:45 -0000 1.53 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v diff -u -r1.38 -r1.39 --- lams_tool_laqa/web/learning/AnswersContent.jsp 29 Mar 2014 20:02:54 -0000 1.38 +++ lams_tool_laqa/web/learning/AnswersContent.jsp 4 Jun 2014 12:55:45 -0000 1.39 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/CombinedAnswersContent.jsp,v diff -u -r1.31 -r1.32 --- lams_tool_laqa/web/learning/CombinedAnswersContent.jsp 8 Jan 2014 17:50:56 -0000 1.31 +++ lams_tool_laqa/web/learning/CombinedAnswersContent.jsp 4 Jun 2014 12:55:45 -0000 1.32 @@ -19,8 +19,10 @@

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

- - - - - - - - - - - - - + + - - - - - - + + + + + + + + + + + + + + + + +
Index: lams_tool_laqa/web/learning/SequentialAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/SequentialAnswersContent.jsp,v diff -u -r1.27 -r1.28 --- lams_tool_laqa/web/learning/SequentialAnswersContent.jsp 12 Jul 2013 14:17:32 -0000 1.27 +++ lams_tool_laqa/web/learning/SequentialAnswersContent.jsp 4 Jun 2014 12:55:45 -0000 1.28 @@ -15,15 +15,15 @@
- + - +

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

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