Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.82.10.2 -r1.82.10.3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 24 Feb 2011 14:22:40 -0000 1.82.10.2 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 18 Mar 2011 18:59:27 -0000 1.82.10.3 @@ -252,6 +252,7 @@ public static final String RENDER_MONITORING_EDITACTIVITY = "renderMonitoringEditActivity"; public static final String NO_AVAILABLE_SESSIONS = "noAvailableSessions"; public static final String NO_TOOL_SESSIONS_AVAILABLE = "noToolSessionAvailable"; + public static final String ATTR_CONTENT = "content"; public static final String TIMEZONE = "timeZone"; public static final String TIMEZONE_ID = "timeZoneId"; 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.18.8.3 -r1.18.8.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java 18 Mar 2011 17:58:13 -0000 1.18.8.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java 18 Mar 2011 18:59:26 -0000 1.18.8.4 @@ -23,6 +23,8 @@ package org.lamsfoundation.lams.tool.qa.web; +import java.util.List; + import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -179,6 +181,10 @@ qaMonitoringAction.prepareReflectionData(request, content, qaService, null, true, "All"); request.setAttribute("currentMonitoredToolSession", "All"); - MonitoringUtil.generateGroupsSessionData(request, qaService, content, true); + + //generateGroupsSessionData + List listAllGroupsDTO = MonitoringUtil.buildGroupBasedSessionData(request, content, qaService); + request.setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO); + request.getSession().setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO); } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v diff -u -r1.42.8.3 -r1.42.8.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 16 Mar 2011 19:56:49 -0000 1.42.8.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java 18 Mar 2011 18:59:27 -0000 1.42.8.4 @@ -328,7 +328,7 @@ return false; } - public static void buildQaStatsDTO(HttpServletRequest request, IQaService qaService, QaContent qaContent) { + private static void buildQaStatsDTO(HttpServletRequest request, IQaService qaService, QaContent qaContent) { QaStatsDTO qaStatsDTO = new QaStatsDTO(); int countSessionComplete = 0; @@ -360,15 +360,16 @@ request.setAttribute(QA_STATS_DTO, qaStatsDTO); } - public static void generateGroupsSessionData(HttpServletRequest request, IQaService qaService, QaContent qaContent, - boolean forExport) { + public static void setUpMonitoring(HttpServletRequest request, IQaService qaService, QaContent qaContent) { + + // setting up the advanced summary for LDEV-1662 + request.setAttribute(QaAppConstants.ATTR_CONTENT, qaContent); + buildQaStatsDTO(request, qaService, qaContent); + + //generateGroupsSessionData List listAllGroupsDTO = buildGroupBasedSessionData(request, qaContent, qaService); - request.setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO); - - if (forExport) - request.getSession().setAttribute(LIST_ALL_GROUPS_DTO, listAllGroupsDTO); } public static List buildGroupBasedSessionData(HttpServletRequest request, QaContent qaContent, IQaService qaService) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v diff -u -r1.61.8.5 -r1.61.8.6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 18 Mar 2011 17:58:13 -0000 1.61.8.5 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 18 Mar 2011 18:59:26 -0000 1.61.8.6 @@ -236,8 +236,7 @@ request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO); QaMonitoringAction.logger.debug("ending initStatsContent..."); - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); } @@ -351,9 +350,7 @@ request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO); - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); } @@ -467,10 +464,8 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); - /* note that we are casting monitoring form subclass into Authoring form */ QaMonitoringAction.logger .debug("watch here: note that we are casting monitoring form subclass into Authoring form"); @@ -566,8 +561,6 @@ /* find out if there are any reflection entries, from here */ boolean notebookEntriesExist = MonitoringUtil.notebookEntriesExist(qaService, qaContent); - QaMonitoringAction.logger.debug("notebookEntriesExist : " + notebookEntriesExist); - if (notebookEntriesExist) { request.setAttribute(QaAppConstants.NOTEBOOK_ENTRIES_EXIST, new Boolean(true).toString()); } else { @@ -585,22 +578,9 @@ generalMonitoringDTO.setDeletedAttachmentList(new ArrayList()); /* ...till here */ - // setting up the advanced summary for LDEV-1662 - request.setAttribute("showOtherAnswers", qaContent.isShowOtherAnswers()); - request.setAttribute("usernameVisible", qaContent.isUsernameVisible()); - request.setAttribute("allowRateAnswers", qaContent.isAllowRateAnswers()); - request.setAttribute("questionsSequenced", qaContent.isQuestionsSequenced()); - request.setAttribute("lockWhenFinished", qaContent.isLockWhenFinished()); - request.setAttribute("reflect", qaContent.isReflect()); - request.setAttribute("reflectionSubject", qaContent.getReflectionSubject()); - - request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO); - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); - - QaMonitoringAction.logger.debug("end initSummaryContent..."); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); } public ActionForward editActivityQuestions(ActionMapping mapping, ActionForm form, HttpServletRequest request, @@ -713,8 +693,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -812,8 +791,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -918,8 +896,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -1008,8 +985,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); request.setAttribute("currentMonitoredToolSession", "All"); return mapping.findForward(QaAppConstants.LOAD_MONITORING); @@ -1126,8 +1102,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -1223,8 +1198,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); request.setAttribute("currentMonitoredToolSession", "All"); return mapping.findForward(QaAppConstants.LOAD_MONITORING); @@ -1321,8 +1295,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -1385,8 +1358,7 @@ request.setAttribute(QaAppConstants.SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); } /** @@ -1520,8 +1492,7 @@ request.setAttribute(QaAppConstants.QA_GENERAL_MONITORING_DTO, generalMonitoringDTO); - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); } /** @@ -1596,8 +1567,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); } public ActionForward showResponse(ActionMapping mapping, ActionForm form, HttpServletRequest request, @@ -1690,8 +1660,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); QaMonitoringAction.logger.debug("submitting session to refresh the data from the database: "); return mapping.findForward(QaAppConstants.LOAD_MONITORING); @@ -1779,8 +1748,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); request.setAttribute("currentMonitoredToolSession", "All"); QaMonitoringAction.logger.debug("submitting session to refresh the data from the database: "); @@ -1870,8 +1838,7 @@ request.setAttribute(QaAppConstants.NOTEBOOK_ENTRIES_EXIST, new Boolean(false).toString()); } - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); QaMonitoringAction.logger.debug("submitting session to refresh the data from the database: "); return mapping.findForward(QaAppConstants.LOAD_MONITORING); @@ -1956,8 +1923,7 @@ request.setAttribute(QaAppConstants.NOTEBOOK_ENTRIES_EXIST, new Boolean(false).toString()); } - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); request.setAttribute("currentMonitoredToolSession", "All"); QaMonitoringAction.logger.debug("submitting session to refresh the data from the database: "); @@ -2046,8 +2012,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LEARNER_NOTEBOOK); } @@ -2254,8 +2219,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -2483,8 +2447,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -2654,8 +2617,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -2766,10 +2728,8 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); - QaMonitoringAction.logger.debug("fwd ing to newQuestionBox: "); return mapping.findForward("newQuestionBox"); } @@ -2915,10 +2875,8 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); - QaMonitoringAction.logger.debug("fwd ing to editQuestionBox: "); return mapping.findForward("editQuestionBox"); } @@ -3086,8 +3044,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } @@ -3234,8 +3191,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); @@ -3383,8 +3339,7 @@ } /* ... till here */ - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); return mapping.findForward(QaAppConstants.LOAD_MONITORING); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v diff -u -r1.53.8.4 -r1.53.8.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 18 Mar 2011 17:58:13 -0000 1.53.8.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 18 Mar 2011 18:59:27 -0000 1.53.8.5 @@ -211,12 +211,9 @@ request.setAttribute(NOTEBOOK_ENTRIES_EXIST, new Boolean(false).toString()); } - MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent); - request.setAttribute("currentMonitoredToolSession", "All"); - MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false); + MonitoringUtil.setUpMonitoring(request, qaService, qaContent); - logger.debug("fwding to : " + LOAD_MONITORING); return (mapping.findForward(LOAD_MONITORING)); } Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v diff -u -r1.39.10.1 -r1.39.10.2 --- lams_tool_laqa/web/monitoring/SummaryContent.jsp 4 Mar 2011 17:45:44 -0000 1.39.10.1 +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp 18 Mar 2011 18:59:27 -0000 1.39.10.2 @@ -21,14 +21,6 @@ <%@ include file="/common/taglibs.jsp"%> - -

@@ -40,15 +32,14 @@