Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java =================================================================== diff -u -r24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc -r163c7460795072098035147b45ece51edb87e4ef --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java (.../ExportServlet.java) (revision 24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java (.../ExportServlet.java) (revision 163c7460795072098035147b45ece51edb87e4ef) @@ -171,6 +171,13 @@ request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher"); qaMonitoringAction.prepareReflectionData(request, content, qaService, null, true, "All"); + + + request.setAttribute("currentMonitoredToolSession", "All"); + MonitoringUtil.generateGroupsSessionData(request, qaService, content, true); + + + logger.debug("ending teacher mode: "); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== diff -u -r24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc -r163c7460795072098035147b45ece51edb87e4ef --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 24cbd649c978f88f34f4e80b5d8ab8ab2faefdcc) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 163c7460795072098035147b45ece51edb87e4ef) @@ -751,14 +751,17 @@ request.setAttribute(QA_STATS_DTO, qaStatsDTO); } - public static void generateGroupsSessionData(HttpServletRequest request, IQaService qaService, QaContent qaContent) + public static void generateGroupsSessionData(HttpServletRequest request, IQaService qaService, QaContent qaContent, boolean forExport) { logger.debug("generateGroupsSessionData: " + qaContent); List listAllGroupsDTO=buildGroupBasedSessionData(request, qaContent, qaService); logger.debug("listAllGroupsDTO: " + listAllGroupsDTO); request.setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO); + + if (forExport) + request.getSession().setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -reaed8e160dd64ba3f48bcdf0bb87dadf23eea2f8 -r163c7460795072098035147b45ece51edb87e4ef --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision eaed8e160dd64ba3f48bcdf0bb87dadf23eea2f8) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 163c7460795072098035147b45ece51edb87e4ef) @@ -258,7 +258,7 @@ logger.debug("ending initStatsContent..."); MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); } @@ -399,7 +399,7 @@ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); logger.debug("ending initInstructionsContent..."); } @@ -535,7 +535,7 @@ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); /* note that we are casting monitoring form subclass into Authoring form*/ logger.debug("watch here: note that we are casting monitoring form subclass into Authoring form"); @@ -682,7 +682,7 @@ request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO); MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); logger.debug("end initSummaryContent..."); } @@ -827,7 +827,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return (mapping.findForward(LOAD_MONITORING)); } @@ -944,7 +944,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return (mapping.findForward(LOAD_MONITORING)); } @@ -1069,7 +1069,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return (mapping.findForward(LOAD_MONITORING)); } @@ -1180,7 +1180,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); request.setAttribute("currentMonitoredToolSession", "All"); return (mapping.findForward(LOAD_MONITORING)); @@ -1321,7 +1321,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return (mapping.findForward(LOAD_MONITORING)); } @@ -1439,7 +1439,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); request.setAttribute("currentMonitoredToolSession", "All"); return (mapping.findForward(LOAD_MONITORING)); @@ -1564,7 +1564,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return (mapping.findForward(LOAD_MONITORING)); } @@ -1637,7 +1637,7 @@ request.setAttribute(SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); } @@ -1820,7 +1820,7 @@ request.setAttribute(QA_GENERAL_MONITORING_DTO, generalMonitoringDTO); MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); } @@ -1909,7 +1909,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); } @@ -2022,7 +2022,7 @@ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); logger.debug("submitting session to refresh the data from the database: "); return (mapping.findForward(LOAD_MONITORING)); @@ -2134,7 +2134,7 @@ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); request.setAttribute("currentMonitoredToolSession", "All"); logger.debug("submitting session to refresh the data from the database: "); @@ -2248,7 +2248,7 @@ } MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); logger.debug("submitting session to refresh the data from the database: "); return (mapping.findForward(LOAD_MONITORING)); @@ -2355,7 +2355,7 @@ } MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); request.setAttribute("currentMonitoredToolSession", "All"); logger.debug("submitting session to refresh the data from the database: "); @@ -2466,7 +2466,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return mapping.findForward(LEARNER_NOTEBOOK); } @@ -2709,7 +2709,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return mapping.findForward(LOAD_MONITORING); } @@ -2975,7 +2975,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return mapping.findForward(LOAD_MONITORING); } @@ -3173,7 +3173,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return mapping.findForward(LOAD_MONITORING); } @@ -3299,7 +3299,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); logger.debug("fwd ing to newQuestionBox: "); return (mapping.findForward("newQuestionBox")); @@ -3467,7 +3467,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); logger.debug("fwd ing to editQuestionBox: "); return (mapping.findForward("editQuestionBox")); @@ -3663,7 +3663,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return mapping.findForward(LOAD_MONITORING); @@ -3832,7 +3832,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return mapping.findForward(LOAD_MONITORING); @@ -3999,7 +3999,7 @@ /* ... till here*/ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); return mapping.findForward(LOAD_MONITORING); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== diff -u -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 -r163c7460795072098035147b45ece51edb87e4ef --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 163c7460795072098035147b45ece51edb87e4ef) @@ -254,7 +254,7 @@ MonitoringUtil.buildQaStatsDTO(request,qaService, qaContent); request.setAttribute("currentMonitoredToolSession", "All"); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent); + MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent,false); logger.debug("fwding to : " + LOAD_MONITORING); return (mapping.findForward(LOAD_MONITORING)); Index: lams_tool_laqa/web/export/exportportfolio.jsp =================================================================== diff -u -r912841604dc9f338bb59421350f3742abf0d0310 -r163c7460795072098035147b45ece51edb87e4ef --- lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 912841604dc9f338bb59421350f3742abf0d0310) +++ lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 163c7460795072098035147b45ece51edb87e4ef) @@ -58,45 +58,116 @@ - - - + + + + + + + + + + - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    :
: + :
+ - - - - - + + + + + + - - - - - - - - + + + + + + + + + + + + + + + +
+ +