Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties =================================================================== diff -u -rcae190bef6a3e4f857bdfaff17eb3a0ae680cb72 -r9d15b7d0b741f4f9a2f3f3a0f04c0d14c6f92795 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision cae190bef6a3e4f857bdfaff17eb3a0ae680cb72) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 9d15b7d0b741f4f9a2f3f3a0f04c0d14c6f92795) @@ -82,6 +82,7 @@ error.sessionId.numberFormatException =Tool Activity Error! Can't continue. The toolSession id passed to the Tool Activity must be numerical. error.content.doesNotExist =Tool Activity Error! Can't continue. The content id passed to the Tool Activity does not refer to an existing content. error.toolSessions.doesNotExist =Tool Activity Error! Can't continue. One of the toolsession ids passed to the Tool Activity does not refer to an existing tool session. +error.toolSession.doesNotExist =Tool Activity Error! Can't continue. The toolsession id passed to the Tool Activity does not refer to an existing tool session. error.content.onlyContentAndNoSessions =A report can not be generated since no tool sessions has been passed to the Tool Activity. error.content.noToolSessions =A report can not be generated since there has not been any student activity on this content. error.tab.contentId.required =Sorry, the screen is not available. The Tool Activity requires a content id. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java =================================================================== diff -u -r4253bb20fe05c0f8dd22c9e5055279b75a7d5d79 -r9d15b7d0b741f4f9a2f3f3a0f04c0d14c6f92795 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java (.../QaExportPortfolioStarterAction.java) (revision 4253bb20fe05c0f8dd22c9e5055279b75a7d5d79) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java (.../QaExportPortfolioStarterAction.java) (revision 9d15b7d0b741f4f9a2f3f3a0f04c0d14c6f92795) @@ -41,6 +41,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaApplicationException; import org.lamsfoundation.lams.tool.qa.QaContent; +import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaStringComparator; import org.lamsfoundation.lams.tool.qa.QaUtils; import org.lamsfoundation.lams.tool.qa.service.IQaService; @@ -157,9 +158,19 @@ logger.debug("forwarding to: " + PORTFOLIO_REPORT); return (mapping.findForward(PORTFOLIO_REPORT)); } - logger.debug("final toolSessionId :" + toolSessionId); + logger.debug("final toolSessionId before exists test :" + toolSessionId); } + QaSession qaSession=qaService.retrieveQaSessionOrNullById(toolSessionId.longValue()); + if (qaSession == null) + { + persistError(request,"error.toolSession.doesNotExist"); + request.setAttribute(USER_EXCEPTION_TOOLSESSION_DOESNOTEXIST, new Boolean(true)); + logger.debug("forwarding to: " + PORTFOLIO_REPORT); + return (mapping.findForward(PORTFOLIO_REPORT)); + } + logger.debug("final toolSessionId :" + toolSessionId); + String strToolContentId=""; Long toolContentId=null; Index: lams_tool_laqa/web/portfolioReport.jsp =================================================================== diff -u -r4253bb20fe05c0f8dd22c9e5055279b75a7d5d79 -r9d15b7d0b741f4f9a2f3f3a0f04c0d14c6f92795 --- lams_tool_laqa/web/portfolioReport.jsp (.../portfolioReport.jsp) (revision 4253bb20fe05c0f8dd22c9e5055279b75a7d5d79) +++ lams_tool_laqa/web/portfolioReport.jsp (.../portfolioReport.jsp) (revision 9d15b7d0b741f4f9a2f3f3a0f04c0d14c6f92795) @@ -12,6 +12,7 @@ requestScope.userExceptionToolSessionIdRequired == 'true' || requestScope.userExceptionContentIdRequired == 'true' || requestScope.userExceptionNoToolSessions == 'true' || + requestScope.userExceptionToolSessionDoesNotExist == 'true' || requestScope.userExceptionContentDoesNotExist == 'true' }">
@@ -20,14 +21,15 @@
-