Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== diff -u -re4b11d5f2ee68909df09e749152768bd5006aa88 -refc1830092f72f7093a111071b0073702f3dd23c --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision e4b11d5f2ee68909df09e749152768bd5006aa88) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision efc1830092f72f7093a111071b0073702f3dd23c) @@ -194,6 +194,7 @@ /*mark the http session as a learning activity */ request.getSession().setAttribute(TARGET_MODE,TARGET_MODE_LEARNING); + QaUtils.persistTimeZone(request); /*validate learning mode parameters*/ @@ -257,7 +258,25 @@ persistError(request,"error.toolContent.notAvailable"); return (mapping.findForward(ERROR_LIST_LEARNER)); } + + + if (qaContent.getTitle() == null) + { + request.getSession().setAttribute(ACTIVITY_TITLE, "Q&A Title"); + request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, "Q&A Instructions"); + } + else if (qaContent.getTitle().equals("")) + { + request.getSession().setAttribute(ACTIVITY_TITLE, "Q&A Title"); + request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, "Q&A Instructions"); + } + else + { + request.getSession().setAttribute(ACTIVITY_TITLE, qaContent.getTitle()); + request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS, qaContent.getInstructions()); + } + request.getSession().setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, qaContent.getQaContentId()); logger.debug("using TOOL_CONTENT_ID: " + qaContent.getQaContentId()); @@ -266,12 +285,7 @@ * And the passed tool session id refers to it. */ - logger.debug("ACTIVITY_TITLE: " + qaContent.getTitle()); - request.getSession().setAttribute(ACTIVITY_TITLE,qaContent.getTitle()); - logger.debug("ACTIVITY_INSTRUCTIONS: " + qaContent.getInstructions()); - request.getSession().setAttribute(ACTIVITY_INSTRUCTIONS,qaContent.getInstructions()); - logger.debug("REPORT_TITLE_LEARNER: " + qaContent.getReportTitle()); request.getSession().setAttribute(REPORT_TITLE_LEARNER,qaContent.getReportTitle()); Index: lams_tool_laqa/web/export/exportportfolio.jsp =================================================================== diff -u -r2a5c5ae4d68939c91b7eb7a77ae5ffc60a87ebf5 -refc1830092f72f7093a111071b0073702f3dd23c --- lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 2a5c5ae4d68939c91b7eb7a77ae5ffc60a87ebf5) +++ lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision efc1830092f72f7093a111071b0073702f3dd23c) @@ -26,6 +26,7 @@ <bean:message key="label.exportPortfolio"/> +