Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java	(.../TaskListConstants.java)	(revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java	(.../TaskListConstants.java)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -65,7 +65,8 @@
 	public static final String ATTR_RESOURCE_ITEM_UID = "itemUid";
 	public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";
 	public static final String ATTR_SUMMARY_LIST = "summaryList";
-	public static final String ATTR_ITEM_SUMMARY_LIST_LIST = "itemSummaryListList";
+	public static final String ATTR_GROUP_SUMMARY_LIST = "groupSummaryList";
+	public static final String ATTR_ITEM_SUMMARY_LIST = "itemSummaryList";
 	public static final String ATTR_USER_LIST = "userList";
 	public static final String ATTR_FINISH_LOCK = "finishedLock";
 	public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/GroupSummary.java
===================================================================
diff -u
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/GroupSummary.java	(revision 0)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/GroupSummary.java	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -0,0 +1,72 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.taskList.dto;  
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
+
+/**
+ * DTO object which is used in a monitoring. Contains information describing current group.
+ * 
+ * @author Andrey Balan
+ */
+public class GroupSummary {
+	
+	//Group information.
+	private String sessionName;
+	
+	private List<ItemSummary> itemSummaries;
+	
+	//only for export
+	private TaskListItem taskListItem;
+	
+	public GroupSummary() {
+		itemSummaries = new ArrayList<ItemSummary>();
+	}
+	
+	public String getSessionName() {
+		return sessionName;
+	}
+	public void setSessionName(String sessionName) {
+		this.sessionName = sessionName;
+	}
+	
+	public List<ItemSummary> getItemSummaries() {
+		return itemSummaries;
+	}
+	public void setItemSummaries(List<ItemSummary> itemSummaries) {
+		this.itemSummaries = itemSummaries;
+	}
+	
+	public TaskListItem getTaskListItem() {
+		return taskListItem;
+	}
+	public void setTaskListItem(TaskListItem taskListItem) {
+		this.taskListItem = taskListItem;
+	}
+
+}
+ 
\ No newline at end of file
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java	(.../ItemSummary.java)	(revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java	(.../ItemSummary.java)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -40,10 +40,6 @@
  */
 public class ItemSummary {
 	
-	//Group information.
-	private Long sessionId; 
-	private String sessionName;
-	
 	private TaskListUser user;
 	private boolean completed;
 	private Date date;
@@ -60,20 +56,6 @@
   	//		Get/Set methods
 	//  **********************************************************
 	
-	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;
-	}
-	
 	/**
 	 * Returns user whom created this TaskListItem.
 	 * 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java
===================================================================
diff -u -r9c5284945798a4bfc0048ad1bbbd7f6c104fc179 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java	(.../Summary.java)	(revision 9c5284945798a4bfc0048ad1bbbd7f6c104fc179)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java	(.../Summary.java)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -43,7 +43,6 @@
  */
 public class Summary {
 
-	private Long sessionId; 
 	private String sessionName;
 	
 	private boolean isMonitorVerificationRequired;
@@ -59,11 +58,9 @@
 	/**
 	 * Contruction method for monitoring summary function. 
 	 */
-	public Summary(Long sessionId, String sessionName,
-			List<TaskListItem> taskListItems, List<TaskListUser> userNames,
-			boolean[][] completeMap, int[] visitNumbers,
-			boolean isMonitorVerificationRequired) {
-		this.sessionId = sessionId;
+	public Summary(String sessionName, List<TaskListItem> taskListItems,
+			List<TaskListUser> userNames, boolean[][] completeMap,
+			int[] visitNumbers, boolean isMonitorVerificationRequired) {
 		this.sessionName = sessionName;
 		this.userNames = userNames;
 		this.taskListItems = taskListItems;
@@ -72,13 +69,6 @@
 		this.isMonitorVerificationRequired = isMonitorVerificationRequired;
 	}
 	
-	public Long getSessionId() {
-		return sessionId;
-	}
-	public void setSessionId(Long sessionId) {
-		this.sessionId = sessionId;
-	}
-	
 	public String getSessionName() {
 		return sessionName;
 	}
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -34,6 +34,7 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
 import org.lamsfoundation.lams.tool.exception.ToolException;
+import org.lamsfoundation.lams.tool.taskList.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.taskList.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.Summary;
@@ -324,23 +325,23 @@
 	 *
 	 * @return
 	 */
-	List<ItemSummary> exportForLearner(Long contentUid, TaskListUser learner);
+	List<List<GroupSummary>> exportForLearner(Long contentUid, TaskListUser learner);
 	
 	/**
 	 * Make an export for the whole TaskList.
 	 * 
 	 * @param contentUid
 	 * @return
 	 */
-	List<ItemSummary> exportForTeacher(Long contentUid);
+	List<List<GroupSummary>> exportForTeacher(Long contentUid);
 	
 	/**
 	 * Return summary list for the specified TaskList. Used in monitoring.
 	 * 
 	 * @param contentId specified TaskList uid
 	 * @return
 	 */
-	List<Summary> getTaskListSummary(Long contentId);
+	List<Summary> getSummary(Long contentId);
 	
 	/**
 	 * Return task summary for the specified TaskListItem. Used in monitoring.
@@ -349,7 +350,7 @@
 	 * @param taskListItemUid specified TaskListItem uid
 	 * @return
 	 */
-	List<List<ItemSummary>> getTaskListItemSummary(Long contentId, Long taskListItemUid);
+	List<GroupSummary> getItemSummary(Long contentId, Long taskListItemUid);
 	
 }
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -82,6 +82,7 @@
 import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemVisitDAO;
 import org.lamsfoundation.lams.tool.taskList.dao.TaskListSessionDAO;
 import org.lamsfoundation.lams.tool.taskList.dao.TaskListUserDAO;
+import org.lamsfoundation.lams.tool.taskList.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.taskList.dto.Summary;
 import org.lamsfoundation.lams.tool.taskList.dto.ItemSummary;
@@ -422,7 +423,7 @@
 	/** 
 	 * {@inheritDoc}
 	 */
-	public List<Summary> getTaskListSummary(Long contentId) {
+	public List<Summary> getSummary(Long contentId) {
 		
 		List<Summary> summaryList = new ArrayList<Summary>();
 		
@@ -468,7 +469,7 @@
 				}
 			}
 			
-			Summary summary = new Summary(session.getSessionId(), session.getSessionName(), itemList, userList, complete, visitNumbers, taskList.isMonitorVerificationRequired());
+			Summary summary = new Summary(session.getSessionName(), itemList, userList, complete, visitNumbers, taskList.isMonitorVerificationRequired());
 			summaryList.add(summary);
 		}
 
@@ -524,24 +525,25 @@
 	/** 
 	 * {@inheritDoc}
 	 */
-	public List<List<ItemSummary>> getTaskListItemSummary(Long contentId, Long taskListItemUid) {
+	public List<GroupSummary> getItemSummary(Long contentId, Long taskListItemUid) {
 		
 		TaskListItem taskListItem = taskListItemDao.getByUid(taskListItemUid);
 		
-		List<List<ItemSummary>> resultSummaryList = new ArrayList<List<ItemSummary>>();
+		List<GroupSummary> groupSummaries = new ArrayList<GroupSummary>();
 		
 		//create the user list of all whom were started this task
 		List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);
 		for(TaskListSession session:sessionList) {
-			List<ItemSummary> groupSummary = new ArrayList<ItemSummary>();
 			
-			List<TaskListUser> grouppedUsers = taskListUserDao.getBySessionID(session.getSessionId());
-			for(TaskListUser user : grouppedUsers) {
+			GroupSummary groupSummary = new GroupSummary();
+			groupSummary.setSessionName(session.getSessionName());
+			groupSummary.setTaskListItem(taskListItem);
+			
+			List<TaskListUser> usersBelongToGroup = taskListUserDao.getBySessionID(session.getSessionId());
+			for(TaskListUser user : usersBelongToGroup) {
 				
 				ItemSummary userItemSummary = new ItemSummary();
 				userItemSummary.setUser(user);
-				userItemSummary.setSessionId(session.getSessionId());
-				userItemSummary.setSessionName(session.getSessionName());
 				
 				TaskListItemVisitLog visitLog = taskListItemVisitDao.getTaskListItemLog(taskListItem.getUid(), user.getUserId());
 				//If TaskListItemVisitLog exists then fill up taskSummaryItem otherwise put false in a completed field
@@ -559,101 +561,91 @@
 					for(TaskListItemAttachment attachment : itemAttachments) {
 						if (user.getUserId().equals(attachment.getCreateBy().getUserId())) userItemSummary.getAttachments().add(attachment);
 					}
-
 				} else {
 					userItemSummary.setCompleted(false);
 				}
-				groupSummary.add(userItemSummary);
+				
+				groupSummary.getItemSummaries().add(userItemSummary);
 			}
-			resultSummaryList.add(groupSummary);
+			groupSummaries.add(groupSummary);
 		}
 		
 		
-		return resultSummaryList;
+		return groupSummaries;
 	}
 	
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<ItemSummary> exportForTeacher(Long contentId) {
-//		TaskList taskList = taskListDao.getByContentId(contentId);
-//		ArrayList<TaskListItem> itemList = new ArrayList<TaskListItem>();
-//		itemList.addAll(taskList.getTaskListItems());
-//		
-//		//retrieve all the sessions associated with this taskList
-//		List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);
-//		//create the list containing all taskListItems  
-//		for(TaskListSession session:sessionList) {
-//			Set<TaskListItem> newItems = session.getTaskListItems();
-//			for(TaskListItem item : newItems) {
-//				if (!itemList.contains(item)) itemList.add(item);
-//			}
-//		}
-//		
-//		List<TaskSummary> taskSummaries = new ArrayList<TaskSummary>();
-//		for(TaskListItem item:itemList) {
-//			taskSummaries.add(getTaskSummary(contentId, item.getUid()));
-//		}
-//		
-//		return taskSummaries;
-		return null;
+	public List<List<GroupSummary>> exportForTeacher(Long contentId) {
+		TaskList taskList = taskListDao.getByContentId(contentId);
+		ArrayList<TaskListItem> itemList = new ArrayList<TaskListItem>();
+		itemList.addAll(taskList.getTaskListItems());
+		
+		//retrieve all the sessions associated with this taskList
+		List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);
+		//create the list containing all taskListItems  
+		for(TaskListSession session:sessionList) {
+			Set<TaskListItem> newItems = session.getTaskListItems();
+			for(TaskListItem item : newItems) {
+				if (!itemList.contains(item)) itemList.add(item);
+			}
+		}
+		
+		List<List<GroupSummary>> taskSummaries = new ArrayList<List<GroupSummary>>();
+		for(TaskListItem item:itemList) {
+			taskSummaries.add(getItemSummary(contentId, item.getUid()));
+		}
+		
+		return taskSummaries;
 	}
 	
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<ItemSummary> exportForLearner(Long sessionId, TaskListUser learner) {
-//		Long contentId = getTaskListBySessionId(sessionId).getContentId();
-//		
-//		TaskList taskList = taskListDao.getByContentId(contentId);
-//		ArrayList<TaskListItem> itemList = new ArrayList<TaskListItem>();
-//		itemList.addAll(taskList.getTaskListItems());
-//		
-//		//retrieve all the sessions associated with this taskList
-//		List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);
-//		//create the list containing all taskListItems  
-//		for(TaskListSession session:sessionList) {
-//			Set<TaskListItem> newItems = session.getTaskListItems();
-//			for(TaskListItem item : newItems) {
-//				if (!itemList.contains(item)) itemList.add(item);
-//			}
-//		}
-//		
-//		List<TaskSummary> taskSummaries = new ArrayList<TaskSummary>();
-//		for(TaskListItem item:itemList) {
-//			taskSummaries.add(getTaskSummary(contentId, item.getUid()));
-//		}
-//		
-//		//get rid of information that is not allowed to be shown to the current user
-//		for(TaskSummary taskSummary:taskSummaries) {
-//			
-//			//get rid of taskSummaryItems belong to another users
-//			List<TaskListItemSummary> newTaskSummaryItems = new  ArrayList<TaskListItemSummary>();
-//			for(TaskListItemSummary taskSummaryItem:taskSummary.getTaskSummaryItems()) {
-//				if (learner.equals(taskSummaryItem.getUser())) newTaskSummaryItems.add(taskSummaryItem);
-//			}
-//			taskSummary.setTaskSummaryItems(newTaskSummaryItems);
-//
-//			//get rid of TaskListItemComments and TaskListItemAttachments belong to another users
-//			if (taskSummary.getTaskListItem().isCommentsFilesAllowed() && !taskSummary.getTaskListItem().getShowCommentsToAll()) {
-//				TaskListItemSummary taskSummaryItem = taskSummary.getTaskSummaryItems().get(0);
-//				
-//				List<TaskListItemComment> newComments = new  ArrayList<TaskListItemComment>();
-//				for(TaskListItemComment comment:taskSummaryItem.getComments()) {
-//					if (learner.equals(comment.getCreateBy())) newComments.add(comment);
-//				}
-//				taskSummaryItem.setComments(newComments);
-//
-//				List<TaskListItemAttachment> newAttachments = new  ArrayList<TaskListItemAttachment>();
-//				for(TaskListItemAttachment attachment:taskSummaryItem.getAttachments()) {
-//					if (learner.equals(attachment.getCreateBy())) newAttachments.add(attachment);
-//				}
-//				taskSummaryItem.setAttachments(newAttachments);
-//			}
-//		}
-//		
-//		return taskSummaries;
-		return null;
+	public List<List<GroupSummary>> exportForLearner(Long sessionId, TaskListUser learner) {
+		Long contentId = getTaskListBySessionId(sessionId).getContentId();
+		
+		TaskList taskList = taskListDao.getByContentId(contentId);
+		ArrayList<TaskListItem> itemList = new ArrayList<TaskListItem>();
+		itemList.addAll(taskList.getTaskListItems());
+		
+		//retrieve all the sessions associated with this taskList
+		List<TaskListSession> sessionList = taskListSessionDao.getByContentId(contentId);
+		//create the list containing all taskListItems  
+		for(TaskListSession session:sessionList) {
+			Set<TaskListItem> newItems = session.getTaskListItems();
+			for(TaskListItem item : newItems) {
+				if (!itemList.contains(item)) itemList.add(item);
+			}
+		}
+		
+		List<List<GroupSummary>> eachItemOverallSummaries = new ArrayList<List<GroupSummary>>();
+		for(TaskListItem item:itemList) {
+			eachItemOverallSummaries.add(getItemSummary(contentId, item.getUid()));
+		}
+		
+		//get rid of information that doesn't belong to the current user
+		for(List<GroupSummary> itemOverallSummary:eachItemOverallSummaries) {
+			
+			//get rid of groups that user doesn't belong to	
+			GroupSummary newGroupSummary = new GroupSummary();
+			for(GroupSummary groupSummary:itemOverallSummary) {
+			
+				for(ItemSummary itemSummary:groupSummary.getItemSummaries()) {
+					if (learner.equals(itemSummary.getUser()))  {
+						newGroupSummary.setSessionName(groupSummary.getSessionName());
+						newGroupSummary.setTaskListItem(groupSummary.getTaskListItem());
+						newGroupSummary.getItemSummaries().add(itemSummary);
+					}
+				}
+			}
+			itemOverallSummary.clear();
+			itemOverallSummary.add(newGroupSummary);
+			
+		}
+		
+		return eachItemOverallSummaries;
 	}
 
 	/** 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -40,6 +40,7 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
+import org.lamsfoundation.lams.tool.taskList.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.taskList.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.Summary;
@@ -96,7 +97,7 @@
 		TaskList taskList = service.getTaskListByContentId(contentId);
 		taskList.toDTO();
 		
-		List<Summary> summaryList = service.getTaskListSummary(contentId);
+		List<Summary> summaryList = service.getSummary(contentId);
 		
 		//cache into sessionMap
 		sessionMap.put(TaskListConstants.ATTR_SUMMARY_LIST, summaryList);
@@ -114,8 +115,8 @@
 		Long taskListItemId = WebUtil.readLongParam(request, TaskListConstants.ATTR_TASK_LIST_ITEM_UID);
 		request.setAttribute(TaskListConstants.ATTR_TASK_LIST_ITEM, service.getTaskListItemByUid(taskListItemId));
 		
-		List<List<ItemSummary>> itemSummaryList = service.getTaskListItemSummary(contentId, taskListItemId);
-		request.setAttribute(TaskListConstants.ATTR_ITEM_SUMMARY_LIST_LIST, itemSummaryList);
+		List<GroupSummary> groupSummaryList = service.getItemSummary(contentId, taskListItemId);
+		request.setAttribute(TaskListConstants.ATTR_GROUP_SUMMARY_LIST, groupSummaryList);
 						
 		return mapping.findForward(TaskListConstants.SUCCESS);
 	}
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java	(.../ExportServlet.java)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -42,6 +42,7 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
+import org.lamsfoundation.lams.tool.taskList.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.Summary;
 import org.lamsfoundation.lams.tool.taskList.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
@@ -164,12 +165,12 @@
 			throw new TaskListException(error);
 		}
 		
-		List<ItemSummary> taskSummaries = service.exportForLearner(toolSessionID, learner);
+		List<List<GroupSummary>> itemSummaries = service.exportForLearner(toolSessionID, learner);
 		
-		saveFileToLocal(taskSummaries, directoryName);
+		saveFileToLocal(itemSummaries, directoryName);
 		
 		sessionMap.put(TaskListConstants.ATTR_TITLE, content.getTitle());
-//		sessionMap.put(TaskListConstants.ATTR_TASK_SUMMARY_LIST, taskSummaries);
+		sessionMap.put(TaskListConstants.ATTR_ITEM_SUMMARY_LIST, itemSummaries);
 	}
 
 	/**
@@ -201,13 +202,13 @@
 			throw new TaskListException(error);
 		}
 		
-		List<ItemSummary> taskSummaries = service.exportForTeacher(toolContentID);
+		List<List<GroupSummary>> itemSummaries = service.exportForTeacher(toolContentID);
 		
-		saveFileToLocal(taskSummaries, directoryName);
+		saveFileToLocal(itemSummaries, directoryName);
 		
 		// put it into HTTPSession
 		sessionMap.put(TaskListConstants.ATTR_TITLE, content.getTitle());
-//		sessionMap.put(TaskListConstants.ATTR_TASK_SUMMARY_LIST, taskSummaries);
+		sessionMap.put(TaskListConstants.ATTR_ITEM_SUMMARY_LIST, itemSummaries);
 	}
 
     /**
@@ -217,33 +218,37 @@
      * @param directoryName
      * @throws IOException 
      */
-    private void saveFileToLocal(List<ItemSummary> taskSummaries, String directoryName) {
+    private void saveFileToLocal(List<List<GroupSummary>> eachItemOverallSummaries, String directoryName) {
     	handler = getToolContentHandler();
     	
     	//save all the attachments
-		for (ItemSummary taskSummary : taskSummaries) {
-//			for (ItemSummary taskSummaryItem : taskSummary.getTaskSummaryItems()) {
-//				for (TaskListItemAttachment attachment : taskSummaryItem.getAttachments()) {
-//					try{
-//						int idx= 1;
-//						String userName = attachment.getCreateBy().getLoginName();
-//						String localDir;
-//						while(true){
-//							localDir = FileUtil.getFullPath(directoryName,userName + "/" + idx);
-//							File local = new File(localDir);
-//							if(!local.exists()){
-//								local.mkdirs();
-//								break;
-//							}
-//							idx++;
-//						}
-//						attachment.setAttachmentLocalUrl(userName + "/" + idx + "/" + attachment.getFileUuid() + '.' + FileUtil.getFileExtension(attachment.getFileName()));
-//						handler.saveFile(attachment.getFileUuid(), FileUtil.getFullPath(directoryName, attachment.getAttachmentLocalUrl()));
-//					} catch (Exception e) {
-//						logger.error("Export forum topic attachment failed: " + e.toString());
-//					}
-//				}
-//			}
+		for (List<GroupSummary> itemOverallSummary : eachItemOverallSummaries) {
+			for (GroupSummary groupSummary : itemOverallSummary) {
+				for (ItemSummary itemSummary : groupSummary.getItemSummaries()) {
+					
+					for (TaskListItemAttachment attachment : itemSummary.getAttachments()) {
+						try{
+							int idx= 1;
+							String userName = attachment.getCreateBy().getLoginName();
+							String localDir;
+							while(true){
+								localDir = FileUtil.getFullPath(directoryName,userName + "/" + idx);
+								File local = new File(localDir);
+								if(!local.exists()){
+									local.mkdirs();
+									break;
+								}
+								idx++;
+							}
+							attachment.setAttachmentLocalUrl(userName + "/" + idx + "/" + attachment.getFileUuid() + '.' + FileUtil.getFileExtension(attachment.getFileName()));
+							handler.saveFile(attachment.getFileUuid(), FileUtil.getFullPath(directoryName, attachment.getAttachmentLocalUrl()));
+						} catch (Exception e) {
+							logger.error("Export forum topic attachment failed: " + e.toString());
+						}
+					}
+					
+				}
+			}
 		}
 	}
     
Index: lams_tool_task/web/pages/export/exportportfolio.jsp
===================================================================
diff -u -rf976c3bd40613835d2b5ac91a1eee6748afbe2c7 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision f976c3bd40613835d2b5ac91a1eee6748afbe2c7)
+++ lams_tool_task/web/pages/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -3,7 +3,7 @@
 	"http://www.w3.org/TR/html4/loose.dtd">
 <c:set var="sessionMapID" value="${param.sessionMapID}"/>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="taskSummaryList" value="${sessionMap.taskSummaryList}"/>
+<c:set var="itemSummaryList" value="${sessionMap.itemSummaryList}"/>
 <c:set var="mode" value="${sessionMap.mode}"/>
 <c:set var="title" value="${sessionMap.title}"/>
 
@@ -33,10 +33,10 @@
 	<h1>${title} </h1>
 
 		<table border="0" cellspacing="3" width="98%">
-			<c:forEach var="taskSummary" items="${taskSummaryList}">
+			<c:forEach var="itemSummary" items="${itemSummaryList}">
 				<tr>
 					<td>
-						<%@ include file="summaryTask.jsp"%>
+						<%@ include file="itemsummary.jsp"%>
 					</td>
 				</tr>
 			</c:forEach>
Index: lams_tool_task/web/pages/export/itemsummary.jsp
===================================================================
diff -u
--- lams_tool_task/web/pages/export/itemsummary.jsp	(revision 0)
+++ lams_tool_task/web/pages/export/itemsummary.jsp	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -0,0 +1,143 @@
+			<c:set var="item" value="${itemSummary[0].taskListItem}"/>
+
+			<div>
+				<h2>
+					<c:out value="${item.title}"></c:out>
+				</h2>
+									
+				<c:if test="${item.required}">
+					(<fmt:message key="label.monitoring.tasksummary.task.required.to.finish" />)
+				</c:if>
+			</div>
+			<br/>
+				
+			<c:if test="${item.childTask || item.commentsFilesAllowed || item.commentsAllowed || item.filesAllowed}">
+				<ul>
+					<c:if test="${item.childTask}">
+						<li>
+							(<fmt:message key="label.monitoring.tasksummary.parent.activity" />: ${item.parentTaskName})
+						</li>
+					</c:if>
+<!-- 						
+					<c:if test="${item.commentsFilesAllowed}">
+						<li>
+							<fmt:message key="label.monitoring.tasksummary.comments.files.enabled" />
+						</li>
+					</c:if>
+-->					
+					<c:if test="${item.commentsAllowed}">
+						<li>
+							<fmt:message key="label.monitoring.tasksummary.comments.allowed" />
+						</li>
+					</c:if>
+					
+					<c:if test="${item.commentsRequired}">
+					    <ul>
+							<li>
+								<fmt:message key="label.monitoring.tasksummary.comments.required" />
+							</li>
+						</ul>
+					</c:if>
+					
+					<c:if test="${item.filesAllowed}">
+						<li>
+							<fmt:message key="label.monitoring.tasksummary.files.allowed" />
+						</li>
+					</c:if>
+
+					<c:if test="${item.filesRequired}">
+						<ul>
+							<li>
+								<fmt:message key="label.monitoring.tasksummary.files.required" />
+							</li>
+						</ul>
+					</c:if>
+				</ul>
+			</c:if>
+			<br>
+			<br>			
+			
+			<c:forEach var="groupSummary" items="${itemSummary}">
+				<h1><fmt:message key="monitoring.label.group" /> ${groupSummary.sessionName}	</h1>
+	
+				<table cellpadding="0" class="alternative-color" >
+				
+					<tr>
+						<th width="20%">
+							<fmt:message key="label.monitoring.tasksummary.user" />
+						</th>
+						<th width="15%">
+							<fmt:message key="label.monitoring.tasksummary.completed" />?
+						</th>
+						<th width="20%">
+							<fmt:message key="label.monitoring.tasksummary.time.and.date" />
+						</th>
+						
+						<c:if test="${item.commentsAllowed || item.filesAllowed}">
+							<th width="45%" align="center">
+								<fmt:message key="label.monitoring.tasksummary.comments.files" />
+							</th>
+						</c:if>			
+					</tr>
+				
+				
+					<c:forEach var="itemSummary" items="${groupSummary.itemSummaries}">
+					
+						<tr>
+							<td>
+								${itemSummary.user.loginName}
+							</td>
+							
+							<td align="center">
+								<c:choose>
+									<c:when test="${itemSummary.completed}">
+										<img src="../images/tick.gif"	border="0">
+									</c:when>
+										
+									<c:otherwise>
+										<img src="../images/cross.gif" border="0">
+									</c:otherwise>
+								</c:choose>
+							</td>
+							
+							<td>
+								<lams:Date value="${itemSummary.date}" />
+							</td>
+										
+							<c:if test="${item.commentsAllowed  || item.filesAllowed}">
+								<td>
+								
+									<ul>
+										<c:forEach var="comment" items="${itemSummary.comments}">
+											<li>
+												<c:out value="${comment.comment}" escapeXml="false"></c:out>
+											</li>
+										</c:forEach>
+										
+										<c:forEach var="attachment" items="${itemSummary.attachments}">
+											<li>
+												<c:out value="${attachment.fileName}" />
+	
+												<html:link href="${attachment.attachmentLocalUrl}">
+													<fmt:message key="label.download" />
+												</html:link>
+	
+											</li>
+										</c:forEach>
+										
+									</ul>
+								
+								
+								
+								
+								</td>
+							</c:if>
+								
+						</tr>
+						
+							
+					</c:forEach>
+				</table>
+			<br/><br/>
+		</c:forEach>
+
Fisheye: Tag eb556ddb82142fad802b26f79504f90d507f4fb3 refers to a dead (removed) revision in file `lams_tool_task/web/pages/export/summaryTask.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp
===================================================================
diff -u -r51dd63725c1359785962a1c8a08382540d9e2343 -reb556ddb82142fad802b26f79504f90d507f4fb3
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 51dd63725c1359785962a1c8a08382540d9e2343)
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision eb556ddb82142fad802b26f79504f90d507f4fb3)
@@ -74,8 +74,8 @@
 			<br>
 			
 			
-			<c:forEach var="itemSummaryList" items="${itemSummaryListList}">
-				<h1><fmt:message key="monitoring.label.group" /> ${itemSummaryList[0].sessionName}	</h1>
+			<c:forEach var="groupSummary" items="${groupSummaryList}">
+				<h1><fmt:message key="monitoring.label.group" /> ${groupSummary.sessionName}	</h1>
 				
 				<table cellpadding="0" class="alternative-color" >
 			
@@ -98,7 +98,7 @@
 					</tr>
 				
 				
-					<c:forEach var="itemSummary" items="${itemSummaryList}">
+					<c:forEach var="itemSummary" items="${groupSummary.itemSummaries}">
 					
 						<tr>
 							<td>