Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaExportPortfolioStarterAction.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java 13 Jul 2005 07:02:04 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaExportPortfolioStarterAction.java 13 Jul 2005 07:35:24 -0000 1.5 @@ -11,10 +11,15 @@ * /&mode=learner&toolSessionId=231&userId= */ +/** + Most of the code base for the export portfolio are re-used functionality from monitoring action and jsps. + We make use of TARGET_MODE_LEARNING and TARGET_MODE_MONITORING since these are the flags in the monitoring codebase + to differentiate between learner and teacher modes. +*/ + package org.lamsfoundation.lams.tool.qa.web; import java.io.IOException; -import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -207,11 +212,16 @@ toolSessionId=(Long)request.getSession().getAttribute(TOOL_SESSION_ID); logger.debug("toolSessionId: " + toolSessionId); + /** + whether the request is of mode learner or teacher, we construct a single listToolSessions object and + build the report based on that object. + */ List listToolSessions=null; if (mode.equalsIgnoreCase(LEARNER)) { logger.debug("generate portfolio for mode: " + mode); request.getSession().setAttribute(TARGET_MODE, TARGET_MODE_LEARNING); + /** a single toolSessionId */ listToolSessions.add(1, toolSessionId); logger.debug("listToolSessions: " + listToolSessions); } @@ -250,7 +260,9 @@ toolSessionCounter++; } + /** the flag to differentiate between request for monitoring versus request for portfolio */ request.setAttribute(PORTFOLIO_REQUEST, new Boolean(true)); + logger.debug("generate portfolio jsp for mode: " + mode); return (mapping.findForward(PORTFOLIO_REPORT)); } Index: lams_tool_laqa/web/exportPortfolioIndex.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/exportPortfolioIndex.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/exportPortfolioIndex.jsp 13 Jul 2005 03:12:28 -0000 1.1 +++ lams_tool_laqa/web/exportPortfolioIndex.jsp 13 Jul 2005 07:35:24 -0000 1.2 @@ -4,3 +4,4 @@ <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %> <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> +

can be handy at some stage for testing

\ No newline at end of file Index: lams_tool_laqa/web/groupsReport.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/groupsReport.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/groupsReport.jsp 13 Jul 2005 07:02:04 -0000 1.1 +++ lams_tool_laqa/web/groupsReport.jsp 13 Jul 2005 07:35:24 -0000 1.2 @@ -104,15 +104,13 @@ -     - +     + - - - - - - + + + @@ -123,30 +121,30 @@ +     -     - +     + - - + + - - -     - +     + - - + + - @@ -155,14 +153,16 @@     : + -     - - - + +     + + + - +     Index: lams_tool_laqa/web/portfolioReport.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/portfolioReport.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/portfolioReport.jsp 13 Jul 2005 07:02:04 -0000 1.2 +++ lams_tool_laqa/web/portfolioReport.jsp 13 Jul 2005 07:35:24 -0000 1.3 @@ -11,6 +11,7 @@ requestScope.userExceptionNumberFormat == 'true' || requestScope.userExceptionToolSessionIdRequired == 'true' || requestScope.userExceptionContentIdRequired == 'true' || + requestScope.userExceptionNoToolSessions == 'true' || requestScope.userExceptionContentDoesNotExist == 'true' }">
@@ -25,7 +26,8 @@ requestScope.userExceptionNumberFormat != 'true' && requestScope.userExceptionToolSessionIdRequired != 'true' && requestScope.userExceptionContentIdRequired != 'true' && - requestScope.userExceptionContentDoesNotExist != 'true' + requestScope.userExceptionNoToolSessions != 'true' && + requestScope.userExceptionContentDoesNotExist != 'true' }">