Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== diff -u -r5ce575b11f3206c1e80792d2a2be752612bd26d7 -rc16f7566edb3210bc26aa0fd2b99cccdaa6125a1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 5ce575b11f3206c1e80792d2a2be752612bd26d7) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision c16f7566edb3210bc26aa0fd2b99cccdaa6125a1) @@ -409,7 +409,10 @@ } /** - * the only attributes kept are TOOL_SESSION and TOOL_CONTENT_ID + * the only attributes kept are TOOL_SESSION and TOOL_CONTENT_ID + * and + * ACTIVITY_TITLE + ACTIVITY_INSTRUCTIONS * cleanUpSessionAbsolute(HttpServletRequest request) * @param request */ @@ -515,8 +518,6 @@ request.getSession().removeAttribute(SUBMIT_SUCCESS); request.getSession().removeAttribute(DELETED_ATTACHMENT_LIST); request.getSession().removeAttribute(UUID); - request.getSession().removeAttribute(ACTIVITY_TITLE); - request.getSession().removeAttribute(ACTIVITY_INSTRUCTIONS); request.getSession().removeAttribute(IS_USERNAME_VISIBLE); request.getSession().removeAttribute(CURRENT_ANSWER); request.getSession().removeAttribute(ACTIVE_MODULE); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -re3a9298bc43dacd6add3de2f6d9e3ec061f84af6 -rc16f7566edb3210bc26aa0fd2b99cccdaa6125a1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision e3a9298bc43dacd6add3de2f6d9e3ec061f84af6) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision c16f7566edb3210bc26aa0fd2b99cccdaa6125a1) @@ -174,6 +174,13 @@ mapAnswers.put(new Long(1).toString(), qaLearningForm.getAnswer()); } + else + { + logger.debug("totalQuestionCount is > 1: " + qaLearningForm.getAnswer()); + int mapSize=mapAnswers.size(); + logger.debug("mapSize: " + mapSize); + mapAnswers.put(new Long(mapSize+1).toString() , qaLearningForm.getAnswer()); + } } logger.debug(logger + " " + this.getClass().getName() + "final mapAnswers: " + mapAnswers); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -r18ebee3fd6c583b848ef9aebba2c8204dae08c52 -rc16f7566edb3210bc26aa0fd2b99cccdaa6125a1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 18ebee3fd6c583b848ef9aebba2c8204dae08c52) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision c16f7566edb3210bc26aa0fd2b99cccdaa6125a1) @@ -294,6 +294,8 @@ logger.debug("forwarding to: " + LOAD_MONITORING); return (mapping.findForward(LOAD_MONITORING)); } + request.getSession().setAttribute(ACTIVITY_TITLE, qaContent.getTitle()); + request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, qaContent.getInstructions()); return qaStarterAction.executeDefineLater(mapping, form, request, response, qaService); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== diff -u -r18ebee3fd6c583b848ef9aebba2c8204dae08c52 -rc16f7566edb3210bc26aa0fd2b99cccdaa6125a1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 18ebee3fd6c583b848ef9aebba2c8204dae08c52) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision c16f7566edb3210bc26aa0fd2b99cccdaa6125a1) @@ -156,6 +156,9 @@ /* this section is related to instructions tab. Starts here. */ /* ends here. */ + request.getSession().setAttribute(ACTIVITY_TITLE, qaContent.getTitle()); + request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, qaContent.getInstructions()); + return true; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== diff -u -re3a9298bc43dacd6add3de2f6d9e3ec061f84af6 -rc16f7566edb3210bc26aa0fd2b99cccdaa6125a1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision e3a9298bc43dacd6add3de2f6d9e3ec061f84af6) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision c16f7566edb3210bc26aa0fd2b99cccdaa6125a1) @@ -396,16 +396,30 @@ QaUtils.populateUploadedFilesData(request, qaContent, qaService); request.getSession().setAttribute(IS_DEFINE_LATER, new Boolean(qaContent.isDefineLater())); - - qaAuthoringForm.setTitle(qaContent.getTitle()); + qaAuthoringForm.setTitle(qaContent.getTitle()); qaAuthoringForm.setInstructions(qaContent.getInstructions()); - request.getSession().setAttribute(ACTIVITY_TITLE, qaContent.getTitle()); - request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, qaContent.getInstructions()); + //request.getSession().setAttribute(ACTIVITY_TITLE, qaContent.getTitle()); + //request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, qaContent.getInstructions()); logger.debug("Title is: " + qaContent.getTitle()); logger.debug("Instructions is: " + qaContent.getInstructions()); + if ((qaAuthoringForm.getTitle() == null) || (qaAuthoringForm.getTitle().equals(""))) + { + logger.debug("resetting title"); + String activityTitle=(String)request.getSession().getAttribute(ACTIVITY_TITLE); + logger.debug("activityTitle: " + activityTitle); + qaAuthoringForm.setTitle(activityTitle); + } - + if ((qaAuthoringForm.getInstructions() == null) || (qaAuthoringForm.getInstructions().equals(""))) + { + logger.debug("resetting instructions"); + String activityInstructions=(String)request.getSession().getAttribute(ACTIVITY_INSTRUCTIONS); + logger.debug("activityInstructions: " + activityInstructions); + qaAuthoringForm.setInstructions(activityInstructions); + } + + /* * get the existing question content */ @@ -436,10 +450,12 @@ request.getSession().setAttribute(MAP_QUESTION_CONTENT, mapQuestionContent); logger.debug("starter initialized the Comparable Map: " + request.getSession().getAttribute("mapQuestionContent") ); + logger.debug("final title: " + qaAuthoringForm.getTitle()); + logger.debug("final ins: " + qaAuthoringForm.getInstructions()); + /* * load questions page */ - logger.debug("RENDER_MONITORING_EDITACTIVITY: " + request.getAttribute(RENDER_MONITORING_EDITACTIVITY)); qaAuthoringForm.resetUserAction(); } Index: lams_tool_laqa/web/authoring/BasicContent.jsp =================================================================== diff -u -r5ce575b11f3206c1e80792d2a2be752612bd26d7 -rc16f7566edb3210bc26aa0fd2b99cccdaa6125a1 --- lams_tool_laqa/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision 5ce575b11f3206c1e80792d2a2be752612bd26d7) +++ lams_tool_laqa/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision c16f7566edb3210bc26aa0fd2b99cccdaa6125a1) @@ -52,8 +52,7 @@ - - - -
: - +
: + : +
: + " style="visibility: hidden; display: none;">