Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Attic/Summary.java,v diff -u -r1.6 -r1.7 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java 9 May 2008 03:45:56 -0000 1.6 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java 13 May 2008 09:25:34 -0000 1.7 @@ -43,6 +43,9 @@ */ public class Summary { + private Long sessionId; + private String sessionName; + private boolean isMonitorVerificationRequired; private List userNames; @@ -56,14 +59,33 @@ /** * Contruction method for monitoring summary function. */ - public Summary(List taskListItems, List userNames, boolean[][] completeMap, int[] visitNumbers, boolean isMonitorVerificationRequired){ + public Summary(Long sessionId, String sessionName, + List taskListItems, List userNames, + boolean[][] completeMap, int[] visitNumbers, + boolean isMonitorVerificationRequired) { + this.sessionId = sessionId; + this.sessionName = sessionName; this.userNames = userNames; this.taskListItems = taskListItems; this.completeMap = completeMap; this.visitNumbers = visitNumbers; this.isMonitorVerificationRequired = isMonitorVerificationRequired; } + public Long getSessionId() { + return sessionId; + } + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSessionName() { + return sessionName; + } + public void setSessionName(String sessionName) { + this.sessionName = sessionName; + } + public List getUserNames() { return userNames; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java,v diff -u -r1.12 -r1.13 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java 9 May 2008 03:45:55 -0000 1.12 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java 13 May 2008 09:25:34 -0000 1.13 @@ -334,12 +334,12 @@ public List exportForTeacher(Long contentUid); /** - * Return summary for the specified TaskList. Used in monitoring. + * Return summary list for the specified TaskList. Used in monitoring. * * @param contentId specified TaskList uid * @return */ - Summary getSummary(Long contentId); + List getSummary(Long contentId); /** * Return task summary for the specified TaskListItem. Used in monitoring. Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java,v diff -u -r1.13 -r1.14 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 9 May 2008 03:45:55 -0000 1.13 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 13 May 2008 09:25:34 -0000 1.14 @@ -431,54 +431,57 @@ /** * {@inheritDoc} */ - public Summary getSummary(Long contentId) { + public List getSummary(Long contentId) { - TaskList taskList = taskListDao.getByContentId(contentId); - ArrayList itemList = new ArrayList(); - itemList.addAll(taskList.getTaskListItems()); + List summaryList = new ArrayList(); - ArrayList userList = new ArrayList(); - //retrieve all the sessions associated with this taskList List sessionList = taskListSessionDao.getByContentId(contentId); + + TaskList taskList = taskListDao.getByContentId(contentId); + ArrayList itemList = new ArrayList(); + itemList.addAll(taskList.getTaskListItems()); //create the list containing all taskListItems - //create the user list of all whom were started this task for(TaskListSession session:sessionList) { Set newItems = session.getTaskListItems(); for(TaskListItem item : newItems) { if (!itemList.contains(item)) itemList.add(item); } - - List newUsers = taskListUserDao.getBySessionID(session.getSessionId()); - for(TaskListUser user : newUsers) { - if (!userList.contains(user)) userList.add(user); - } } - //Fill up the copmletion table - boolean[][] complete = new boolean[userList.size()][itemList.size()]; - //Fill up the array of visitNumbers - int[] visitNumbers = new int[itemList.size()]; - for (int i = 0; i < userList.size(); i++) { - TaskListUser user = userList.get(i); + + //create the user list of all whom were started this task + for(TaskListSession session:sessionList) { - for (int j = 0; j < itemList.size(); j++) { - TaskListItem item = itemList.get(j); + List userList = taskListUserDao.getBySessionID(session.getSessionId()); + + //Fill up the copmletion table + boolean[][] complete = new boolean[userList.size()][itemList.size()]; + //Fill up the array of visitNumbers + int[] visitNumbers = new int[itemList.size()]; + for (int i = 0; i < userList.size(); i++) { + TaskListUser user = userList.get(i); - //retreiving TaskListItemVisitLog for current taskList and user - TaskListItemVisitLog visitLog = taskListItemVisitDao.getTaskListItemLog(item.getUid(), user.getUserId()); - if (visitLog !=null) { - complete[i][j] = visitLog.isComplete(); - if (visitLog.isComplete()) visitNumbers[j]++; - } else { - complete[i][j] = false; + for (int j = 0; j < itemList.size(); j++) { + TaskListItem item = itemList.get(j); + + //retreiving TaskListItemVisitLog for current taskList and user + TaskListItemVisitLog visitLog = taskListItemVisitDao.getTaskListItemLog(item.getUid(), user.getUserId()); + if (visitLog !=null) { + complete[i][j] = visitLog.isComplete(); + if (visitLog.isComplete()) visitNumbers[j]++; + } else { + complete[i][j] = false; + } } } + + Summary summary = new Summary(session.getSessionId(), session.getSessionName(), itemList, userList, complete, visitNumbers, taskList.isMonitorVerificationRequired()); + summaryList.add(summary); } - - Summary summary = new Summary(itemList, userList, complete, visitNumbers, taskList.isMonitorVerificationRequired()); - return summary; + + return summaryList; } /** @@ -640,7 +643,7 @@ taskSummary.setTaskSummaryItems(newTaskSummaryItems); //get rid of TaskListItemComments and TaskListItemAttachments belong to another users - if (taskSummary.getTaskListItem().isCommentsAllowed() && !taskSummary.getTaskListItem().getShowCommentsToAll()) { + if (taskSummary.getTaskListItem().isCommentsFilesAllowed() && !taskSummary.getTaskListItem().getShowCommentsToAll()) { TaskSummaryItem taskSummaryItem = taskSummary.getTaskSummaryItems().get(0); List newComments = new ArrayList(); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java,v diff -u -r1.5 -r1.6 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java 9 May 2008 03:45:56 -0000 1.5 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java 13 May 2008 09:25:34 -0000 1.6 @@ -103,10 +103,10 @@ TaskList taskList = service.getTaskListByContentId(contentId); taskList.toDTO(); - Summary summary = service.getSummary(contentId); + List summaryList = service.getSummary(contentId); //cache into sessionMap - sessionMap.put(TaskListConstants.ATTR_SUMMARY, summary); + sessionMap.put(TaskListConstants.ATTR_TASK_SUMMARY_LIST, summaryList); sessionMap.put(TaskListConstants.PAGE_EDITABLE, taskList.isContentInUse()); sessionMap.put(TaskListConstants.ATTR_RESOURCE, taskList); sessionMap.put(TaskListConstants.ATTR_TOOL_CONTENT_ID, contentId); Index: lams_tool_task/web/pages/export/summaryTask.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/export/Attic/summaryTask.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_task/web/pages/export/summaryTask.jsp 28 Apr 2008 08:11:16 -0000 1.3 +++ lams_tool_task/web/pages/export/summaryTask.jsp 13 May 2008 09:25:34 -0000 1.4 @@ -11,15 +11,15 @@
- +
  • (: ${item.parentTaskName})
    • - +
    • @@ -40,7 +40,7 @@ - + @@ -71,7 +71,7 @@ - +
      Index: lams_tool_task/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/summary.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_task/web/pages/monitoring/summary.jsp 9 May 2008 03:45:56 -0000 1.4 +++ lams_tool_task/web/pages/monitoring/summary.jsp 13 May 2008 09:25:34 -0000 1.5 @@ -1,6 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> - + - - - - - - - - - - - - - - + +
      + +
      +       - - - - - - - - - - - - - - - - -
      -

      -
      - - - - ${item.title} - - - -
      - ${user.loginName} - - - - - - - - - - - - - - - - - - [ for ${user.loginName}] - - - -
      + +

      ${summary.sessionName}

      +
      -<%-- Reflection list --%> - - +

      - + - - - - - - - - + + + + + + + + + + + - - + + + + + + + + + + -
      -

      -
      - + + - -
      + + ${item.title} + + + +
      + ${user.loginName} - - - - - - - + + + + + + + + + + + + + + + + + [ for ${user.loginName}] + + + +
      -       + + <%-- Reflection list --%> + + + +

      + + + + + + + + + + + + + + + +
      + + + +
      + ${user.loginName} + + + + + + + +
      +       +
      + +       + + Index: lams_tool_task/web/pages/monitoring/summaryTask.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/Attic/summaryTask.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_task/web/pages/monitoring/summaryTask.jsp 28 Mar 2008 02:21:27 -0000 1.1 +++ lams_tool_task/web/pages/monitoring/summaryTask.jsp 13 May 2008 09:25:34 -0000 1.2 @@ -28,15 +28,15 @@
      - +
      • (: ${item.parentTaskName})
        • - +
        • @@ -57,7 +57,7 @@ - + @@ -88,7 +88,7 @@ - +