Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r6c1e694a25153c9327c1e6db040a3b690fe1b112 -r1ce66fc771667c2fb1ea8111008f4b03468f6771 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 6c1e694a25153c9327c1e6db040a3b690fe1b112) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 1ce66fc771667c2fb1ea8111008f4b03468f6771) @@ -606,19 +606,8 @@ Long contentId = getTaskListBySessionId(sessionId).getContentId(); TaskList taskList = taskListDao.getByContentId(contentId); - ArrayList itemList = new ArrayList(); - itemList.addAll(taskList.getTaskListItems()); + List itemList = getItemListForGroup(contentId, sessionId); - //retrieve all the sessions associated with this taskList - List sessionList = taskListSessionDao.getByContentId(contentId); - //create the list containing all taskListItems - for(TaskListSession session:sessionList) { - Set newItems = session.getTaskListItems(); - for(TaskListItem item : newItems) { - if (!itemList.contains(item)) itemList.add(item); - } - } - List> eachItemOverallSummaries = new ArrayList>(); for(TaskListItem item:itemList) { eachItemOverallSummaries.add(getItemSummary(contentId, item.getUid(), true));