Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java =================================================================== diff -u -rc43839b5fdd3e80db9792b154b3496802aae6553 -r5bc5ec74a1a58a332b029c020e006c8aa03f3e62 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java (.../LearningAction.java) (revision c43839b5fdd3e80db9792b154b3496802aae6553) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java (.../LearningAction.java) (revision 5bc5ec74a1a58a332b029c020e006c8aa03f3e62) @@ -297,6 +297,8 @@ ISurveyService service = getSurveyService(); service.updateAnswerList(answerList); + + request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID); return mapping.findForward(SurveyConstants.SUCCESS); } @@ -431,9 +433,10 @@ //for mandatory questions, answer can not be null. if(!question.isOptional() && answer == null){ errors.add(SurveyConstants.ERROR_MSG_KEY + question.getUid(),new ActionMessage(SurveyConstants.ERROR_MSG_MANDATORY_QUESTION)); - addErrors(request, errors); } } + if(!errors.isEmpty()) + addErrors(request, errors); return errors; } Index: lams_tool_survey/web/pages/learning/question.jsp =================================================================== diff -u -rc43839b5fdd3e80db9792b154b3496802aae6553 -r5bc5ec74a1a58a332b029c020e006c8aa03f3e62 --- lams_tool_survey/web/pages/learning/question.jsp (.../question.jsp) (revision c43839b5fdd3e80db9792b154b3496802aae6553) +++ lams_tool_survey/web/pages/learning/question.jsp (.../question.jsp) (revision 5bc5ec74a1a58a332b029c020e006c8aa03f3e62) @@ -42,10 +42,10 @@ -

+

-

+

\ No newline at end of file Index: lams_tool_survey/web/pages/learning/result.jsp =================================================================== diff -u -ra2c091a27056e7b41531ca140012603bf027d5b8 -r5bc5ec74a1a58a332b029c020e006c8aa03f3e62 --- lams_tool_survey/web/pages/learning/result.jsp (.../result.jsp) (revision a2c091a27056e7b41531ca140012603bf027d5b8) +++ lams_tool_survey/web/pages/learning/result.jsp (.../result.jsp) (revision 5bc5ec74a1a58a332b029c020e006c8aa03f3e62) @@ -1,3 +1,14 @@ + + +<%@ include file="/common/taglibs.jsp"%> + + + + <fmt:message key="label.learning.title" /> + + <%@ include file="/common/header.jsp"%> + - -
- - - - - - - - - - - - -
-
+ + +
+

+ ${sessionMap.title} +

+
+
+ + +
+

+ ${sessionMap.instructions} +

+
+
+ + + + + + + + + + + + + +
+ + * + + +
+ + + + + + + + + + + + + + + ${option.description}

+
+
+ + + + +

+
+
+ +
+ + + + + + + + + + + + +
+
+ +
+ + + + + +
+ + +
+ +