Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v diff -u -r1.73 -r1.74 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 19 Mar 2006 11:00:55 -0000 1.73 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 23 Mar 2006 11:48:27 -0000 1.74 @@ -237,6 +237,7 @@ public static final String MONITORING_ERROR ="monitoringError"; public static final String MAP_MONITORING_QUESTIONS ="mapMonitoringQuestions"; public static final String SUMMARY_TOOL_SESSIONS ="summaryToolSessions"; + public static final String SUMMARY_TOOL_SESSIONS_ID ="summaryToolSessionsId"; public static final String MONITORED_CONTENT_ID ="monitoredContentId"; public static final String EDITACTIVITY_EDITMODE ="editActivityEditMode"; public static final String FORM_INDEX ="formIndex"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v diff -u -r1.34 -r1.35 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 17 Mar 2006 10:34:47 -0000 1.34 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 23 Mar 2006 11:48:27 -0000 1.35 @@ -728,6 +728,7 @@ request.getSession().removeAttribute(MAP_CORRECT_FEEDBACK_LEARNER); request.getSession().removeAttribute(ACTIVITY_TITLE); request.getSession().removeAttribute(ACTIVITY_INSTRUCTIONS); + request.getSession().removeAttribute(SUMMARY_TOOL_SESSIONS_ID); cleanUpUserExceptions(request); logger.debug("completely cleaned the session."); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java,v diff -u -r1.7 -r1.8 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java 7 Jan 2006 14:10:33 -0000 1.7 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java 23 Mar 2006 11:48:27 -0000 1.8 @@ -115,6 +115,7 @@ */ public List getSessionsFromContent(McContent mcContent); + public List getSessionNamesFromContent(McContent mcContent); public int countSessionComplete(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java,v diff -u -r1.10 -r1.11 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java 28 Jan 2006 18:28:18 -0000 1.10 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java 23 Mar 2006 11:48:28 -0000 1.11 @@ -53,6 +53,8 @@ private static final String COUNT_SESSION_INCOMPLETE = "from mcSession in class McSession where mcSession.sessionStatus='INCOMPLETE'"; + private static final String GET_SESSIONNAMES_FROM_CONTENT = "select mcs.session_name from McSession mcs where mcs.mcContent=:mcContent order by mcs.mcSessionId"; + public McSession getMcSessionByUID(Long uid) { return (McSession) this.getHibernateTemplate() @@ -187,4 +189,12 @@ "mcContent", mcContent)); } + + public List getSessionNamesFromContent(McContent mcContent) + { + return (getHibernateTemplate().findByNamedParam(GET_SESSIONNAMES_FROM_CONTENT, + "mcContent", + mcContent)); + } + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java,v diff -u -r1.45 -r1.46 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java 16 Mar 2006 23:40:52 -0000 1.45 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java 23 Mar 2006 11:48:27 -0000 1.46 @@ -127,8 +127,10 @@ public void deleteMcById(Long mcId) throws McApplicationException; - public void deleteMcSession(McSession mcSession) throws McApplicationException; + public void deleteMcSession(McSession mcSession) throws McApplicationException; + public List getSessionNamesFromContent(McContent mcContent) throws McApplicationException; + public void removeAttempt (McUsrAttempt attempt) throws McApplicationException; public void deleteMcQueUsr(McQueUsr mcQueUsr) throws McApplicationException; @@ -213,9 +215,7 @@ public List retrieveMcUploadedFiles(Long mcContentId, boolean fileOnline) throws McApplicationException; - //public List retrieveMcUploadedOfflineFilesUuidPlusFilename(Long mcContentId) throws McApplicationException; - - public void cleanUploadedFilesMetaData() throws McApplicationException; + public void cleanUploadedFilesMetaData() throws McApplicationException; public void persistFile(String uuid, boolean isOnlineFile, String fileName, McContent mcContent) throws McApplicationException; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.55 -r1.56 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 16 Mar 2006 23:40:52 -0000 1.55 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 23 Mar 2006 11:48:27 -0000 1.56 @@ -566,7 +566,7 @@ } } - + public List refreshQuestionContent(final Long mcContentId) throws McApplicationException { try @@ -700,6 +700,21 @@ e); } } + + public List getSessionNamesFromContent(McContent mcContent) throws McApplicationException + { + try + { + return mcSessionDAO.getSessionNamesFromContent(mcContent); + } + catch (DataAccessException e) + { + throw new McApplicationException("Exception occured when lams is getting session names from content: " + + e.getMessage(), + e); + } + } + public void updateMc(McContent mc) throws McApplicationException Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v diff -u -r1.20 -r1.21 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java 19 Mar 2006 11:00:55 -0000 1.20 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java 23 Mar 2006 11:48:26 -0000 1.21 @@ -170,14 +170,17 @@ return false; } - Map summaryToolSessions=MonitoringUtil.populateToolSessions(request, mcContent); + Map summaryToolSessions=MonitoringUtil.populateToolSessions(request, mcContent, mcService); logger.debug("summaryToolSessions: " + summaryToolSessions); if (summaryToolSessions.isEmpty()) { /* inform in the Summary tab that the tool has no active sessions */ request.setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true)); } + Map summaryToolSessionsId=MonitoringUtil.populateToolSessionsId(request, mcContent, mcService); + logger.debug("summaryToolSessionsId: " + summaryToolSessionsId); + request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId); /* this section is related to summary tab. Starts here. */ request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS, summaryToolSessions); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java,v diff -u -r1.9 -r1.10 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 25 Feb 2006 19:27:26 -0000 1.9 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 23 Mar 2006 11:48:26 -0000 1.10 @@ -59,15 +59,12 @@ * @param mcContent * @return Map */ - public static Map populateToolSessions(HttpServletRequest request, McContent mcContent) + public static Map populateToolSessions(HttpServletRequest request, McContent mcContent, IMcService mcService) { - logger.debug("populating tool sessions for content:..." + mcContent); - IMcService mcService =McUtils.getToolService(request); - - List sessionsList=mcService.getSessionsFromContent(mcContent); + List sessionsList=mcService.getSessionNamesFromContent(mcContent); logger.debug("sessionsList size is:..." + sessionsList.size()); - Map sessionsMap=McUtils.convertToStringMap(sessionsList, "Long"); + Map sessionsMap=McUtils.convertToStringMap(sessionsList, "String"); logger.debug("generated sessionsMap:..." + sessionsMap); logger.debug("sessionsMap size:..." + sessionsMap.size()); @@ -83,10 +80,14 @@ } logger.debug("final sessionsMap:" + sessionsMap); - return sessionsMap; + return sessionsMap; + + } + + /** * ends up populating the attempt history for all the users of all the tool sessions for a content * buildGroupsQuestionData(HttpServletRequest request, McContent mcContent) @@ -147,7 +148,7 @@ Map mapMonitoredAttemptsContainerDTO= new TreeMap(new McStringComparator()); List listMonitoredAttemptsContainerDTO= new LinkedList(); - Map summaryToolSessions=populateToolSessions(request, mcContent); + Map summaryToolSessions=populateToolSessionsId(request, mcContent, mcService); logger.debug("summaryToolSessions: " + summaryToolSessions); Iterator itMap = summaryToolSessions.entrySet().iterator(); @@ -254,7 +255,32 @@ return mapMonitoredUserContainerDTO; } + public static Map populateToolSessionsId(HttpServletRequest request, McContent mcContent, IMcService mcService) + { + List sessionsList=mcService.getSessionsFromContent(mcContent); + logger.debug("sessionsList size is:..." + sessionsList.size()); + + Map sessionsMap=McUtils.convertToStringMap(sessionsList, "Long"); + logger.debug("generated sessionsMap:..." + sessionsMap); + logger.debug("sessionsMap size:..." + sessionsMap.size()); + + if (sessionsMap.isEmpty()) + { + logger.debug("sessionsMap size is 0:"); + sessionsMap.put(new Long(1).toString() , "None"); + } + else + { + logger.debug("sessionsMap has some entries: " + sessionsMap.size()); + sessionsMap.put(new Long(sessionsMap.size()+ 1).toString() , "All"); + } + + logger.debug("final sessionsMap:" + sessionsMap); + return sessionsMap; + } + + public static Map convertToMap(List list) { logger.debug("using convertToMap: " + list); Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v diff -u -r1.11 -r1.12 --- lams_tool_lamc/web/monitoring/SummaryContent.jsp 24 Feb 2006 20:25:28 -0000 1.11 +++ lams_tool_lamc/web/monitoring/SummaryContent.jsp 23 Mar 2006 11:48:28 -0000 1.12 @@ -47,32 +47,39 @@ - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + +
-
+ - -