Index: lams_tool_laqa/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.6 -r1.7 --- lams_tool_laqa/conf/language/ApplicationResources.properties 7 Jun 2006 17:33:23 -0000 1.6 +++ lams_tool_laqa/conf/language/ApplicationResources.properties 9 Jun 2006 08:36:10 -0000 1.7 @@ -171,6 +171,9 @@ label.allResponses =View All Responses label.learning.forceFinish =You are required to finish this activity now. label.learning.yourAnswer =Your Answer: +label.export.learner =Portfolio Export for Learner +label.export.teacher =Portfolio Export for Teacher +label.export =Portfolio Export #======= End labels: Exported 160 labels for en AU ===== Index: lams_tool_laqa/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/tool_insert.sql,v diff -u -r1.18 -r1.19 --- lams_tool_laqa/db/sql/tool_insert.sql 10 Apr 2006 11:10:45 -0000 1.18 +++ lams_tool_laqa/db/sql/tool_insert.sql 9 Jun 2006 08:36:10 -0000 1.19 @@ -45,8 +45,8 @@ 'tool/laqa11/authoringStarter.do', 'tool/laqa11/monitoringStarter.do', 'tool/laqa11/defineLaterStarter.do', -'tool/laqa11/export.do?mode=learner', -'tool/laqa11/export.do?mode=teacher', +'tool/laqa11/exportPortfolio?mode=learner', +'tool/laqa11/exportPortfolio?mode=teacher', 'tool/laqa11/monitoringStarter.do', 'tool/laqa11/monitoringStarter.do', 'org.lamsfoundation.lams.tool.qa.ApplicationResources', Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java 2 Jun 2006 07:55:32 -0000 1.1 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java 9 Jun 2006 08:36:10 -0000 1.2 @@ -47,7 +47,7 @@ public class ExportServlet extends AbstractExportPortfolioServlet implements QaAppConstants{ static Logger logger = Logger.getLogger(ExportServlet.class.getName()); - private static final long serialVersionUID = -4529093489007108143L; + private static final long serialVersionUID = -1529093489007108143L; private final String FILENAME = "qa_main.html"; @@ -56,6 +56,7 @@ logger.debug("dispathcing doExport"); request.getSession().setAttribute(IS_PORTFOLIO_EXPORT, new Boolean(true).toString()); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath(); + logger.debug("basePath:" + basePath); if (StringUtils.equals(mode,ToolAccessMode.LEARNER.toString())){ learner(request,response,directoryName,cookies); @@ -110,8 +111,9 @@ logger.debug("calling learning mode toolSessionID:" + toolSessionID + " userID: " + userID ); QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); - //voteMonitoringAction.refreshSummaryData(request, content, voteService, true, true, toolSessionID.toString(), userID.toString() , true); - + logger.debug("start refreshSummaryData for learner mode."); + qaMonitoringAction.refreshSummaryData(request, content, qaService, true, true, toolSessionID.toString(), userID.toString()); + logger.debug("end refreshSummaryData for learner mode."); logger.debug("ending learner mode: "); } @@ -140,9 +142,9 @@ } QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); - logger.debug("starting refreshSummaryData."); - //voteMonitoringAction.refreshSummaryData(request, content, voteService, true, false, null, null, false); - + logger.debug("start refreshSummaryData for teacher mode."); + qaMonitoringAction.refreshSummaryData(request, content, qaService, true, false, null, null); + logger.debug("end refreshSummaryData for teacher mode."); logger.debug("teacher uses content id: " + content.getQaContentId()); logger.debug("ending teacher mode: "); } Index: lams_tool_laqa/web/export/ExportContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/export/Attic/ExportContent.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_laqa/web/export/ExportContent.jsp 2 Jun 2006 07:55:32 -0000 1.1 +++ lams_tool_laqa/web/export/ExportContent.jsp 9 Jun 2006 08:36:10 -0000 1.2 @@ -32,4 +32,67 @@ -Export Content goes here \ No newline at end of file + + + + + + + + + + + + + + + + +     + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_tool_laqa/web/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/export/exportportfolio.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/export/exportportfolio.jsp 5 Jun 2006 07:58:59 -0000 1.2 +++ lams_tool_laqa/web/export/exportportfolio.jsp 9 Jun 2006 08:36:10 -0000 1.3 @@ -78,14 +78,14 @@ - + - +