Index: lams_tool_task/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -258,13 +258,10 @@
 			type="org.lamsfoundation.lams.tool.taskList.web.action.MonitoringAction"
 			parameter="getPagedUsers" >
 		</action>
-		
-		<action path="/monitoring/viewReflection"
+		<action path="/monitoring/getPagedUsersByItem"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.MonitoringAction"
-			parameter="viewReflection">
-			<forward name="success" path="/pages/monitoring/parts/notebook.jsp" />
+			parameter="getPagedUsersByItem" >
 		</action>
-		
 		<action path="/monitoring/setSubmissionDeadline"
 			type="org.lamsfoundation.lams.tool.taskList.web.action.MonitoringAction"
 			parameter="setSubmissionDeadline" >
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java	(.../TaskListConstants.java)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java	(.../TaskListConstants.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -25,7 +25,7 @@
 
 public class TaskListConstants {
 	public static final String TOOL_SIGNATURE = "latask10";
-	public static final String RESOURCE_SERVICE = "lataskTaskListService";
+	public static final String TASKLIST_SERVICE = "lataskTaskListService";
 	public static final String TOOL_CONTENT_HANDLER_NAME = "lataskTaskListToolContentHandler";
 
 	public static final int COMPLETED = 1;
@@ -37,28 +37,22 @@
 	
 	//for parameters' name
 	public static final String PARAM_TOOL_CONTENT_ID = "toolContentID";
-	public static final String PARAM_TOOL_SESSION_ID = "toolSessionID"; 
-	public static final String PARAM_FILE_VERSION_ID = "fileVersionId";
-	public static final String PARAM_FILE_UUID = "fileUuid";
+	public static final String PARAM_TOOL_SESSION_ID = "toolSessionID";
 	public static final String PARAM_ITEM_INDEX = "itemIndex";
 	public static final String PARAM_SEQUENCE_ID = "sequenceId";
-	public static final String PARAM_RESOURCE_ITEM_UID = "itemUid";
-	public static final String PARAM_CURRENT_INSTRUCTION_INDEX = "insIdx";
-	public static final String PARAM_OPEN_URL_POPUP = "popupUrl";
+	public static final String PARAM_ITEM_UID = "itemUid";
 	public static final String PARAM_TITLE = "title";
 	
 	//for request attribute name
 	public static final String ATTR_TOOL_CONTENT_ID = "toolContentID";
 	public static final String ATTR_TOOL_SESSION_ID = "toolSessionID"; 
-	public static final String ATTR_RESOURCE_ITEM_LIST = "taskListList";
+	public static final String ATTR_TASKLIST_ITEM_LIST = "taskListList";
 	public static final String ATTR_CONDITION_LIST = "conditionList";
-	public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteTaskListList";
+	public static final String ATTR_DELETED_TASKLIST_ITEM_LIST = "deleteTaskListList";
 	public static final String ATTR_DELETED_CONDITION_LIST = "deleteConditionList";
-	public static final String ATT_LEARNING_OBJECT = "cpPackage";
-	public static final String ATTR_RESOURCE_REVIEW_URL = "taskListItemReviewUrl";
 	public static final String ATTR_TASKLIST = "taskList";
 	public static final String ATTR_RUN_AUTO = "runAuto";
-	public static final String ATTR_RESOURCE_ITEM_UID = "itemUid";
+	public static final String ATTR_ITEM_UID = "itemUid";
 	public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl";
 	public static final String ATTR_MONITOR_VERIFICATION_REQUIRED = "monitorVerificationRequired";
 	public static final String ATTR_SESSION_DTOS = "sessionDtos";
@@ -67,9 +61,7 @@
 	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";
-	public static final String ATTR_RESOURCE_FORM = "taskListForm";
-	public static final String ATTR_TASKLIST_FORM = "taskListItemForm";
-	public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
+	public static final String ATTR_TASKLIST_FORM = "taskListForm";
 	public static final String ATTR_TITLE = "title";
 	public static final String ATTR_USER_FINISHED = "userFinished";
 	public static final String ATTR_USER_VERIFIED_BY_MONITOR = "userVerifiedByMonitor";
@@ -97,7 +89,6 @@
 	public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed";
 	
 	public static final String PAGE_EDITABLE = "isPageEditable";
-	public static final String MODE_AUTHOR_SESSION = "author_session";
 	public static final String ATTR_REFLECTION_ON = "reflectOn";
 	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
 	public static final String ATTR_REFLECTION_ENTRY = "reflectEntry";
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java	(.../TaskListUserDAOHibernate.java)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java	(.../TaskListUserDAOHibernate.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -23,7 +23,9 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.taskList.dao.hibernate;
 
+import java.sql.Timestamp;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -86,18 +88,13 @@
 		    
 		    " WHERE session.session_id = :sessionId " +
 		    " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) " +
-		    " ORDER BY " + 
-		    " CASE " +
-			" WHEN :sortBy='userName' THEN CONCAT(user.last_name, ' ', user.first_name) " +
-			" WHEN :sortBy='grade' THEN visitLog.complete " +
-		    " END " + sortOrder;
+		    " ORDER BY CONCAT(user.last_name, ' ', user.first_name) " + sortOrder;
 
 	SQLQuery query = getSession().createSQLQuery(LOAD_USERS);
 	query.setLong("sessionId", sessionId);
 	// support for custom search from a toolbar
 	searchString = searchString == null ? "" : searchString;
 	query.setString("searchString", searchString);
-	query.setString("sortBy", sortBy);
 	query.setFirstResult(page * size);
 	query.setMaxResults(size);
 	List<Object[]> list = query.list();
@@ -130,7 +127,7 @@
     public Collection<TaskListUserDTO> getPagedUsersBySessionAndItem(Long sessionId, Long taskListItemUid, int page, int size, String sortBy,
 	    String sortOrder, String searchString) {
 	
-	String LOAD_USERS = "SELECT user.user_id, CONCAT(user.last_name, ' ', user.first_name), visitLog.complete" +
+	String LOAD_USERS = "SELECT user.user_id, CONCAT(user.last_name, ' ', user.first_name), visitLog.complete, visitLog.access_date" +
 		    " FROM tl_latask10_user user" + 
 		    " INNER JOIN tl_latask10_session session" +
 		    " ON user.session_uid=session.uid" +
@@ -144,7 +141,8 @@
 		    " ORDER BY " + 
 		    " CASE " +
 			" WHEN :sortBy='userName' THEN CONCAT(user.last_name, ' ', user.first_name) " +
-			" WHEN :sortBy='grade' THEN question_result.mark " +
+			" WHEN :sortBy='completed' THEN visitLog.complete " +
+			" WHEN :sortBy='accessDate' THEN visitLog.access_date " +
 		    " END " + sortOrder;
 
 	SQLQuery query = getSession().createSQLQuery(LOAD_USERS);
@@ -164,12 +162,14 @@
 
 		Long userId = ((Number) element[0]).longValue();
 		String fullName = (String) element[1];
-		Integer isCompleted = element[2] == null ? 0 : ((Number) element[2]).intValue();
+		boolean isCompleted = element[2] == null ? false : new Boolean(((Byte) element[2]).intValue() == 1);
+		Date accessDate = element[3] == null ? null : new Date(((Timestamp) element[3]).getTime());
 
 		TaskListUserDTO userDto = new TaskListUserDTO();
 		userDto.setUserId(userId);
 		userDto.setFullName(fullName);
-		userDto.setCompleted(Boolean.parseBoolean(isCompleted.toString()));
+		userDto.setCompleted(isCompleted);
+		userDto.setAccessDate(accessDate);;
 
 		userDtos.add(userDto);
 	    }	    
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/SessionDTO.java
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/SessionDTO.java	(.../SessionDTO.java)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/SessionDTO.java	(.../SessionDTO.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -27,7 +27,7 @@
 import java.util.List;
 
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
-import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
+import org.lamsfoundation.lams.tool.taskList.model.TaskListSession;
 
 /**
  * List contains following element: <br>
@@ -48,7 +48,9 @@
 
     private int[] visitNumbers;
 
-    public SessionDTO() {
+    public SessionDTO(TaskListSession session) {
+	this.sessionId = session.getSessionId();
+	this.sessionName = session.getSessionName();
     }
 
     /**
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListUserDTO.java
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListUserDTO.java	(.../TaskListUserDTO.java)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListUserDTO.java	(.../TaskListUserDTO.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -1,5 +1,6 @@
 package org.lamsfoundation.lams.tool.taskList.dto;
 
+import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -10,6 +11,8 @@
     
     private Set<Long> completedTaskUids = new LinkedHashSet<Long>();
     private boolean completed;
+    // item complete date. Used in monitoring summary page
+    private Date accessDate;
 
     public Long getUserId() {
 	return userId;
@@ -45,5 +48,12 @@
     public void setCompleted(boolean completed) {
 	this.completed = completed;
     }
+    
+    public Date getAccessDate() {
+	return accessDate;
+    }
+    public void setAccessDate(Date accessDate) {
+	this.accessDate = accessDate;
+    }
 
 }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -43,7 +43,6 @@
 /**
  * Interface that defines the contract that all TaskLisk service providers must follow.
  * 
- * @author Dapeng.Ni
  * @author Andrey Balan
  */
 public interface ITaskListService {
@@ -239,21 +238,29 @@
      *            id of a session during which it occured
      */
     void setItemAccess(Long taskListItemUid, Long userId, Long sessionId);
+    
+    /**
+     * Get all available sessions for contentId.
+     * 
+     * @param contentId
+     * @return
+     */
+    List<TaskListSession> getSessionsByContentId(Long contentId);
 
     /**
      * Get taskList toolSession by toolSessionId
      * 
      * @param sessionId
      * @return
      */
-    TaskListSession getTaskListSessionBySessionId(Long sessionId);
+    TaskListSession getSessionBySessionId(Long sessionId);
 
     /**
      * Save or update taskList session.
      * 
      * @param resSession
      */
-    void saveOrUpdateTaskListSession(TaskListSession resSession);
+    void saveOrUpdateSession(TaskListSession resSession);
 
     /**
      * If success return next activity's url, otherwise return null.
@@ -359,19 +366,6 @@
      * @return
      */
     List<SessionDTO> getSummary(Long contentId);
-
-    /**
-     * Return task summary for the specified TaskListItem. Used in monitoring.
-     * 
-     * @param contentId
-     *            toolContenId
-     * @param taskListItemUid
-     *            specified TaskListItem uid
-     * @param isExportProcessing
-     *            true if this method called for export, false otherwise
-     * @return
-     */
-    ItemSummary getItemSummary(Long contentId, Long taskListItemUid, boolean isExportProcessing);
     
     NotebookEntry getEntry(Long sessionId, Integer userId);
     
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	(.../TaskListServiceImpl.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -220,14 +220,19 @@
     public TaskListItem getTaskListItemByUid(Long itemUid) {
 	return taskListItemDao.getByUid(itemUid);
     }
+    
+    @Override
+    public List<TaskListSession> getSessionsByContentId(Long contentId) {
+	return taskListSessionDao.getByContentId(contentId);
+    }
 
     @Override
-    public TaskListSession getTaskListSessionBySessionId(Long sessionId) {
+    public TaskListSession getSessionBySessionId(Long sessionId) {
 	return taskListSessionDao.getSessionBySessionId(sessionId);
     }
 
     @Override
-    public void saveOrUpdateTaskListSession(TaskListSession resSession) {
+    public void saveOrUpdateSession(TaskListSession resSession) {
 	taskListSessionDao.saveObject(resSession);
     }
 
@@ -343,21 +348,27 @@
 	return summaryList;
     }
 
-    @Override
-    public ItemSummary getItemSummary(Long contentId, Long taskListItemUid, boolean isExportProcessing) {
+    /*
+     * Return task summary for the specified TaskListItem. Used in monitoring.
+     * 
+     * @param contentId
+     *            toolContenId
+     * @param item
+     *            specified TaskListItem
+     * @return
+     */
+    private ItemSummary exportItem(Long contentId, TaskListItem item) {
 
-	TaskListItem taskListItem = taskListItemDao.getByUid(taskListItemUid);
-
 	ItemSummary itemSummary = new ItemSummary();
-	itemSummary.setTaskListItem(taskListItem);
+	itemSummary.setTaskListItem(item);
 	List<GroupSummary> groupSummaries = itemSummary.getGroupSummaries();
 
-	// create sessionList depending on if taskListItem created be author or created during learning
+	// create sessionList depending on if item created be author or created during learning
 	List<TaskListSession> sessionList = new ArrayList<TaskListSession>();
-	if (taskListItem.isCreateByAuthor()) {
+	if (item.isCreateByAuthor()) {
 	    sessionList = taskListSessionDao.getByContentId(contentId);
 	} else {
-	    TaskListSession userSession = taskListItem.getCreateBy().getSession();
+	    TaskListSession userSession = item.getCreateBy().getSession();
 	    sessionList.add(userSession);
 	}
 
@@ -373,7 +384,7 @@
 		TaskListItemVisitLogSummary taskListItemVisitLogSummary = new TaskListItemVisitLogSummary();
 		taskListItemVisitLogSummary.setUser(user);
 
-		TaskListItemVisitLog visitLog = taskListItemVisitDao.getTaskListItemLog(taskListItem.getUid(),
+		TaskListItemVisitLog visitLog = taskListItemVisitDao.getTaskListItemLog(item.getUid(),
 			user.getUserId());
 		// If TaskListItemVisitLog exists then fill up taskSummaryItem otherwise put false in a completed field
 		if (visitLog != null) {
@@ -383,14 +394,14 @@
 		    }
 
 		    // fill up with comments and attachments made by this user
-		    Set<TaskListItemComment> itemComments = taskListItem.getComments();
+		    Set<TaskListItemComment> itemComments = item.getComments();
 		    for (TaskListItemComment comment : itemComments) {
 			if (user.getUserId().equals(comment.getCreateBy().getUserId())) {
 			    taskListItemVisitLogSummary.getComments().add(comment);
 			}
 		    }
 
-		    Set<TaskListItemAttachment> itemAttachments = taskListItem.getAttachments();
+		    Set<TaskListItemAttachment> itemAttachments = item.getAttachments();
 		    for (TaskListItemAttachment attachment : itemAttachments) {
 			if (user.getUserId().equals(attachment.getCreateBy().getUserId())) {
 			    taskListItemVisitLogSummary.getAttachments().add(attachment);
@@ -400,24 +411,19 @@
 		    taskListItemVisitLogSummary.setCompleted(false);
 		}
 
-		// if we're doing export then fill up all itemSummaries with reflection information
-		if (isExportProcessing) {
-
-		    NotebookEntry notebookEntry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL,
-			    TaskListConstants.TOOL_SIGNATURE, user.getUserId().intValue());
-
-		    ReflectDTO reflectDTO = new ReflectDTO(user);
-		    if (notebookEntry == null) {
-			reflectDTO.setFinishReflection(false);
-			reflectDTO.setReflect(null);
-		    } else {
-			reflectDTO.setFinishReflection(true);
-			reflectDTO.setReflect(notebookEntry.getEntry());
-		    }
-		    reflectDTO.setReflectInstructions(session.getTaskList().getReflectInstructions());
-
-		    taskListItemVisitLogSummary.setReflectDTO(reflectDTO);
+		// fill up all itemSummaries with reflection information
+		NotebookEntry notebookEntry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL,
+			TaskListConstants.TOOL_SIGNATURE, user.getUserId().intValue());
+		ReflectDTO reflectDTO = new ReflectDTO(user);
+		if (notebookEntry == null) {
+		    reflectDTO.setFinishReflection(false);
+		    reflectDTO.setReflect(null);
+		} else {
+		    reflectDTO.setFinishReflection(true);
+		    reflectDTO.setReflect(notebookEntry.getEntry());
 		}
+		reflectDTO.setReflectInstructions(session.getTaskList().getReflectInstructions());
+		taskListItemVisitLogSummary.setReflectDTO(reflectDTO);
 
 		groupSummary.getTaskListItemVisitLogSummaries().add(taskListItemVisitLogSummary);
 	    }
@@ -485,7 +491,7 @@
 
 	List<ItemSummary> itemSummaries = new ArrayList<ItemSummary>();
 	for (TaskListItem item : itemList) {
-	    itemSummaries.add(getItemSummary(contentId, item.getUid(), true));
+	    itemSummaries.add(exportItem(contentId, item));
 	}
 
 	return itemSummaries;
@@ -500,7 +506,7 @@
 
 	List<ItemSummary> itemSummaries = new ArrayList<ItemSummary>();
 	for (TaskListItem item : itemList) {
-	    itemSummaries.add(getItemSummary(contentId, item.getUid(), true));
+	    itemSummaries.add(exportItem(contentId, item));
 	}
 
 	// get rid of information that doesn't belong to the current user
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceProxy.java
===================================================================
diff -u -rf976c3bd40613835d2b5ac91a1eee6748afbe2c7 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceProxy.java	(.../TaskListServiceProxy.java)	(revision f976c3bd40613835d2b5ac91a1eee6748afbe2c7)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceProxy.java	(.../TaskListServiceProxy.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -62,7 +62,7 @@
 
     private static Object getTaskListDomainService(ServletContext servletContext) {
         WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
-        return wac.getBean(TaskListConstants.RESOURCE_SERVICE);
+        return wac.getBean(TaskListConstants.TASKLIST_SERVICE);
     }
     
 }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -235,7 +235,7 @@
 	taskListItemList.clear();
 	taskListItemList.addAll(items);
 
-	sessionMap.put(TaskListConstants.ATTR_RESOURCE_FORM, taskListForm);
+	sessionMap.put(TaskListConstants.ATTR_TASKLIST_FORM, taskListForm);
 	request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL,
 		request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL));
 	return mapping.findForward(TaskListConstants.SUCCESS);
@@ -255,7 +255,7 @@
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	TaskListForm existForm = (TaskListForm) sessionMap.get(TaskListConstants.ATTR_RESOURCE_FORM);
+	TaskListForm existForm = (TaskListForm) sessionMap.get(TaskListConstants.ATTR_TASKLIST_FORM);
 
 	TaskListForm taskListForm = (TaskListForm) form;
 	try {
@@ -619,7 +619,7 @@
     private ITaskListService getTaskListService() {
 	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
 		.getServletContext());
-	return (ITaskListService) wac.getBean(TaskListConstants.RESOURCE_SERVICE);
+	return (ITaskListService) wac.getBean(TaskListConstants.TASKLIST_SERVICE);
     }
 
     /**
@@ -630,10 +630,10 @@
      */
     private SortedSet<TaskListItem> getTaskListItemList(SessionMap sessionMap) {
 	SortedSet<TaskListItem> list = (SortedSet<TaskListItem>) sessionMap
-		.get(TaskListConstants.ATTR_RESOURCE_ITEM_LIST);
+		.get(TaskListConstants.ATTR_TASKLIST_ITEM_LIST);
 	if (list == null) {
 	    list = new TreeSet<TaskListItem>(new TaskListItemComparator());
-	    sessionMap.put(TaskListConstants.ATTR_RESOURCE_ITEM_LIST, list);
+	    sessionMap.put(TaskListConstants.ATTR_TASKLIST_ITEM_LIST, list);
 	}
 	return list;
     }
@@ -671,7 +671,7 @@
      * @return
      */
     private List getDeletedTaskListItemList(SessionMap sessionMap) {
-	return getListFromSession(sessionMap, TaskListConstants.ATTR_DELETED_RESOURCE_ITEM_LIST);
+	return getListFromSession(sessionMap, TaskListConstants.ATTR_DELETED_TASKLIST_ITEM_LIST);
     }
 
     /**
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java
===================================================================
diff -u -rc80f5cfa126621b04cfe9254bc9fc6f1b487a288 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java	(.../AuthoringTaskListConditionAction.java)	(revision c80f5cfa126621b04cfe9254bc9fc6f1b487a288)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java	(.../AuthoringTaskListConditionAction.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -114,7 +114,7 @@
 	    HttpServletResponse response) throws ServletException {
 	String sessionMapID = WebUtil.readStrParam(request, TaskListConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	TaskListForm existForm = (TaskListForm) sessionMap.get(TaskListConstants.ATTR_RESOURCE_FORM);
+	TaskListForm existForm = (TaskListForm) sessionMap.get(TaskListConstants.ATTR_TASKLIST_FORM);
 
 	TaskListForm taskListForm = (TaskListForm) form;
 	try {
@@ -328,7 +328,7 @@
     private ITaskListService getTaskListService() {
 	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
 		.getServletContext());
-	return (ITaskListService) wac.getBean(TaskListConstants.RESOURCE_SERVICE);
+	return (ITaskListService) wac.getBean(TaskListConstants.TASKLIST_SERVICE);
     }
 
     /**
@@ -355,10 +355,10 @@
      */
     private SortedSet<TaskListItem> getTaskListItemList(SessionMap sessionMap) {
 	SortedSet<TaskListItem> list = (SortedSet<TaskListItem>) sessionMap
-		.get(TaskListConstants.ATTR_RESOURCE_ITEM_LIST);
+		.get(TaskListConstants.ATTR_TASKLIST_ITEM_LIST);
 	if (list == null) {
 	    list = new TreeSet<TaskListItem>(new TaskListItemComparator());
-	    sessionMap.put(TaskListConstants.ATTR_RESOURCE_ITEM_LIST, list);
+	    sessionMap.put(TaskListConstants.ATTR_TASKLIST_ITEM_LIST, list);
 	}
 	return list;
     }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java	(.../LearningAction.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -399,7 +399,7 @@
 
 	// auto run mode, when use finish the only one taskList item, mark it as complete then finish this activity as
 	// well.
-	String taskListItemUid = request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID);
+	String taskListItemUid = request.getParameter(TaskListConstants.PARAM_ITEM_UID);
 	if (taskListItemUid != null) {
 	    doComplete(request);
 	    // NOTE:So far this flag is useless(31/08/2006).
@@ -533,7 +533,7 @@
 	comment.setCreateDate(new Timestamp(new Date().getTime()));
 
 	// persist TaskListItem changes in DB
-	Long itemUid = new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
+	Long itemUid = new Long(request.getParameter(TaskListConstants.PARAM_ITEM_UID));
 	TaskListItem dbItem = service.getTaskListItemByUid(itemUid);
 	Set<TaskListItemComment> dbComments = dbItem.getComments();
 	dbComments.add(comment);
@@ -589,7 +589,7 @@
 	TaskListItemAttachment att = service.uploadTaskListItemFile(file, taskListUser);
 
 	// persist TaskListItem changes in DB
-	Long itemUid = new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
+	Long itemUid = new Long(request.getParameter(TaskListConstants.PARAM_ITEM_UID));
 	TaskListItem dbItem = service.getTaskListItemByUid(itemUid);
 	Set<TaskListItemAttachment> dbAttachments = dbItem.getAttachments();
 	dbAttachments.add(att);
@@ -690,7 +690,7 @@
     private ITaskListService getTaskListService() {
 	WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet()
 		.getServletContext());
-	return (ITaskListService) wac.getBean(TaskListConstants.RESOURCE_SERVICE);
+	return (ITaskListService) wac.getBean(TaskListConstants.TASKLIST_SERVICE);
     }
 
     private TaskListUser getCurrentUser(ITaskListService service, Long sessionId) {
@@ -701,7 +701,7 @@
 	TaskListUser taskListUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId);
 
 	if (taskListUser == null) {
-	    TaskListSession session = service.getTaskListSessionBySessionId(sessionId);
+	    TaskListSession session = service.getSessionBySessionId(sessionId);
 	    taskListUser = new TaskListUser(user, session);
 	    service.createUser(taskListUser);
 	}
@@ -764,7 +764,7 @@
 	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
 
-	Long taskListItemUid = new Long(request.getParameter(TaskListConstants.PARAM_RESOURCE_ITEM_UID));
+	Long taskListItemUid = new Long(request.getParameter(TaskListConstants.PARAM_ITEM_UID));
 	ITaskListService service = getTaskListService();
 	HttpSession ss = SessionManager.getSession();
 	// get back login user DTO
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -26,6 +26,9 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -47,12 +50,14 @@
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.tool.taskList.TaskListConstants;
-import org.lamsfoundation.lams.tool.taskList.dto.ItemSummary;
 import org.lamsfoundation.lams.tool.taskList.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.taskList.dto.SessionDTO;
 import org.lamsfoundation.lams.tool.taskList.dto.TaskListUserDTO;
 import org.lamsfoundation.lams.tool.taskList.model.TaskList;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListItem;
+import org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment;
+import org.lamsfoundation.lams.tool.taskList.model.TaskListItemComment;
+import org.lamsfoundation.lams.tool.taskList.model.TaskListSession;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 import org.lamsfoundation.lams.tool.taskList.service.ITaskListService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -68,6 +73,8 @@
 
 public class MonitoringAction extends Action {
     public static Logger log = Logger.getLogger(MonitoringAction.class);
+    private static String TOOL_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/"
+	    + TaskListConstants.TOOL_SIGNATURE + "/";
 
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException, JSONException {
@@ -88,7 +95,6 @@
 	if (param.equals("setVerifiedByMonitor")) {
 	    return setVerifiedByMonitor(mapping, form, request, response);
 	}
-
 	if (param.equals("setSubmissionDeadline")) {
 	    return setSubmissionDeadline(mapping, form, request, response);
 	}
@@ -121,6 +127,7 @@
 	sessionMap.put(TaskListConstants.ATTR_TOOL_CONTENT_ID, contentId);
 	sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID,
 		WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID));
+	sessionMap.put(TaskListConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
 
 	if (taskList.getSubmissionDeadline() != null) {
 	    Date submissionDeadline = taskList.getSubmissionDeadline();
@@ -144,13 +151,34 @@
     private ActionForward itemSummary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 	ITaskListService service = getTaskListService();
+	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	request.setAttribute(TaskListConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 
 	Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
-	Long taskListItemId = WebUtil.readLongParam(request, TaskListConstants.ATTR_TASK_LIST_ITEM_UID);
-	ItemSummary ItemSummary = service.getItemSummary(contentId, taskListItemId, false);
+	Long itemUid = WebUtil.readLongParam(request, TaskListConstants.PARAM_ITEM_UID);
+	
+	TaskListItem item = service.getTaskListItemByUid(itemUid);
+	
+	// create sessionList depending on whether the item was created by author or by learner
+	List<SessionDTO> sessionDtos = new ArrayList<SessionDTO>();
+	if (item.isCreateByAuthor()) {
+	    List<TaskListSession> sessionList = service.getSessionsByContentId(contentId);
+	    for (TaskListSession session : sessionList) {
+		SessionDTO sessionDto = new SessionDTO(session);
+		sessionDtos.add(sessionDto);
+	    }
+		
+	} else {
+	    TaskListSession userSession = item.getCreateBy().getSession();
+	    SessionDTO sessionDto = new SessionDTO(userSession);
+	    sessionDtos.add(sessionDto);
+	}
 
-	request.setAttribute(TaskListConstants.ATTR_ITEM_SUMMARY, ItemSummary);
-	request.setAttribute(TaskListConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
+	request.setAttribute(TaskListConstants.ATTR_SESSION_DTOS, sessionDtos);
+	request.setAttribute(TaskListConstants.ATTR_TASK_LIST_ITEM, item);
+	
 	return mapping.findForward(TaskListConstants.SUCCESS);
     }
 
@@ -160,7 +188,6 @@
     public ActionForward getPagedUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse res) throws IOException, ServletException, JSONException {
 	ITaskListService service = getTaskListService();
-	String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/" + TaskListConstants.TOOL_SIGNATURE + "/";
 	
 	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
 	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
@@ -203,23 +230,22 @@
 
 	    JSONArray userData = new JSONArray();
 	    userData.put(userDto.getUserId());
-//	    userData.put(sessionId);
 	    String fullName = StringEscapeUtils.escapeHtml(userDto.getFullName());
 	    userData.put(fullName);
 	    
 	    Set<Long> completedTaskUids = userDto.getCompletedTaskUids();
 	    for (TaskListItem item : items) {
 		String completionImage = completedTaskUids.contains(item.getUid())
-			? "<img src='" + serverUrl + "/includes/images/completeitem.gif' border='0'>"
-			: "<img src='" + serverUrl + "/includes/images/dash.gif' border='0'>";
+			? "<img src='" + TOOL_URL + "/includes/images/completeitem.gif' border='0'>"
+			: "<img src='" + TOOL_URL + "/includes/images/dash.gif' border='0'>";
 		userData.put(completionImage);
 	    }
 
 	    if (tasklist.isMonitorVerificationRequired()) {
 		String label = StringEscapeUtils.escapeHtml(service.getMessage("label.confirm"));
 
 		String verificationStatus = userDto.isVerifiedByMonitor()
-			? "<img src='" + serverUrl + "/includes/images/tick.gif' border='0'>"
+			? "<img src='" + TOOL_URL + "/includes/images/tick.gif' border='0'>"
 			: "<a id='verif-" + userDto.getUserId()
 				+ "' href='javascript:;' onclick='return setVerifiedByMonitor(this, "
 				+ userDto.getUserId() + ");'>" + label + "</a>";
@@ -251,12 +277,8 @@
 	    HttpServletResponse res) throws IOException, ServletException, JSONException {
 	ITaskListService service = getTaskListService();
 	
-	String sessionMapID = request.getParameter(TaskListConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
-	TaskList tasklist = (TaskList) sessionMap.get(TaskListConstants.ATTR_TASKLIST);
 	Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
-	Long questionUid = WebUtil.readLongParam(request, "questionUid");
+	Long itemUid = WebUtil.readLongParam(request, TaskListConstants.PARAM_ITEM_UID);
 
 	// Getting the params passed in from the jqGrid
 	int page = WebUtil.readIntParam(request, AttributeNames.PARAM_PAGE);
@@ -269,46 +291,104 @@
 	String searchString = WebUtil.readStrParam(request, "userName", true);
 
 	// Get the user list from the db
-	Collection<TaskListUserDTO> userDtos = service.getPagedUsersBySessionAndItem(sessionId, questionUid, page - 1,
+	Collection<TaskListUserDTO> userDtos = service.getPagedUsersBySessionAndItem(sessionId, itemUid, page - 1,
 		rowLimit, sortBy, sortOrder, searchString);
 	int countSessionUsers = service.getCountPagedUsersBySession(sessionId, searchString);
 
 	int totalPages = new Double(
 		Math.ceil(new Integer(countSessionUsers).doubleValue() / new Integer(rowLimit).doubleValue()))
 			.intValue();
+	
+	//date formatters
+	DateFormat dateFormatter = new SimpleDateFormat("d-MMM-yyyy h:mm a");
+	HttpSession ss = SessionManager.getSession();
+	UserDTO monitorDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	TimeZone monitorTimeZone = monitorDto.getTimeZone();
+	
+	//get all comments and attachments
+	TaskListItem item = service.getTaskListItemByUid(itemUid);
+	Set<TaskListItemComment> itemComments = item.getComments();
+	Set<TaskListItemAttachment> itemAttachments = item.getAttachments();
+	String label = StringEscapeUtils.escapeHtml(service.getMessage("label.download"));
 
+	int i = 0;
 	JSONArray rows = new JSONArray();
-	int i = 1;
-//	for (TaskListUserDTO userDto : userDtos) {
+	for (TaskListUserDTO userDto : userDtos) {
+	    
+	    JSONArray userData = new JSONArray();
+	    String fullName = StringEscapeUtils.escapeHtml(userDto.getFullName());
+	    userData.put(fullName);
+	    
+	    String completionImage = userDto.isCompleted()
+		    ? "<img src='" + TOOL_URL + "/includes/images/completeitem.gif' border='0'>"
+		    : "<img src='" + TOOL_URL + "/includes/images/dash.gif' border='0'>";
+	    userData.put(completionImage);
+	    
+	    String accessDate = (userDto.getAccessDate() == null) ? "" : dateFormatter.format(DateUtil
+		    .convertToTimeZoneFromDefault(monitorTimeZone, userDto.getAccessDate()));
+	    userData.put(accessDate);
+
+	    // fill up with comments and attachments made by this user
+	    if (item.isCommentsAllowed() || item.isFilesAllowed()) {
+		String commentsFiles = "<ul>";
+		
+		ArrayList<String> userComments = new ArrayList<String>();
+		for (TaskListItemComment comment : itemComments) {
+		    if (userDto.getUserId().equals(comment.getCreateBy().getUserId())) {
+			userComments.add(comment.getComment());
+		    }
+		}
+		if (!userComments.isEmpty()) {
+		    commentsFiles += "<li>";
+		    for (String userComment : userComments) {
+			commentsFiles += StringEscapeUtils.escapeHtml(userComment);
+		    }    
+		    commentsFiles += "</li>";
+		}
+
+		ArrayList<TaskListItemAttachment> userAttachments = new ArrayList<TaskListItemAttachment>();
+		for (TaskListItemAttachment attachment : itemAttachments) {
+		    if (userDto.getUserId().equals(attachment.getCreateBy().getUserId())) {
+			userAttachments.add(attachment);
+		    }
+		}
+		if (!userAttachments.isEmpty()) {
+		    commentsFiles += "<li>";
+		    for (TaskListItemAttachment userAttachment : userAttachments) {
+			commentsFiles += StringEscapeUtils.escapeHtml(userAttachment.getFileName()) + " ";
+			commentsFiles += "<a href='" + TOOL_URL + "/download/?uuid=" + userAttachment.getFileUuid()
+				+ "&versionID=" + userAttachment.getFileVersionId() + "&preferDownload=true'>" + label + "</a>";
+		    }
+		    commentsFiles += "</li>";
+		}		
+		
+		commentsFiles += "</ul>";
+		
+		
+//		
+//		<c:forEach var="attachment" items="${visitLogSummary.attachments}">
+//			<li>
+//				<c:out value="${attachment.fileName}" />
 //
-//	    Long questionResultUid = userDto.getQuestionResultUid();
-//	    String fullName = StringEscapeUtils.escapeHtml(userDto.getFullName());
+//				<c:set var="downloadURL">
+//					<html:rewrite page="/download/?uuid=${attachment.fileUuid}&versionID=${attachment.fileVersionId}&preferDownload=true" />
+//				</c:set>
+//				<html:link href="${downloadURL}">
+//					<fmt:message key="label.download" />
+//				</html:link>
 //
-//	    JSONArray userData = new JSONArray();
-//	    if (questionResultUid != null) {
-//		AssessmentQuestionResult questionResult = service.getAssessmentQuestionResultByUid(questionResultUid);
-//
-//		userData.put(questionResultUid);
-//		userData.put(questionResult.getMaxMark());
-//		userData.put(fullName);
-//		userData.put(AssessmentEscapeUtils.printResponsesForJqgrid(questionResult));
-//		userData.put(questionResult.getMark());
-//
-//	    } else {
-//		userData.put("");
-//		userData.put("");
-//		userData.put(fullName);
-//		userData.put("-");
-//		userData.put("-");
-//	    }
-//
-//	    JSONObject userRow = new JSONObject();
-//	    userRow.put("id", i++);
-//	    userRow.put("cell", userData);
-//
-//	    rows.put(userRow);
-//	}
+//			</li>
+//		</c:forEach>
+		userData.put(commentsFiles);
+	    }
+	    
+	    JSONObject userRow = new JSONObject();
+	    userRow.put("id", i++);
+	    userRow.put("cell", userData);
 
+	    rows.put(userRow);
+	}
+
 	JSONObject responseJSON = new JSONObject();
 	responseJSON.put("total", totalPages);
 	responseJSON.put("page", page);
@@ -384,7 +464,7 @@
     private ITaskListService getTaskListService() {
 	WebApplicationContext wac = WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServlet().getServletContext());
-	return (ITaskListService) wac.getBean(TaskListConstants.RESOURCE_SERVICE);
+	return (ITaskListService) wac.getBean(TaskListConstants.TASKLIST_SERVICE);
     }
 
 }
Fisheye: Tag b41406c4167c7209080d0690b8836b1b87210ee4 refers to a dead (removed) revision in file `lams_tool_task/web/pages/monitoring/daterestriction.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/monitoring/itemsummary.jsp
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	(.../itemsummary.jsp)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -1,162 +1,179 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="item" value="${itemSummary.taskListItem}" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="item" value="${taskListItem}" />
+<c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
+<c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
 
 <lams:html>
-	<lams:head>
-		<title><fmt:message key="label.learning.title" /></title>
-		<%@ include file="/common/header.jsp"%>
-	</lams:head>
+<lams:head>
+	<title><fmt:message key="label.learning.title" /></title>
+	<%@ include file="/common/header.jsp"%>
+		
+	<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
+	<link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
+	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
+	<style media="screen,projection" type="text/css">
+		.ui-jqgrid tr.jqgrow td {
+		    white-space: normal !important;
+		    height:auto;
+		    vertical-align:text-top;
+		    padding-top:2px;
+		}
+	</style>
+		
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function(){
+			<c:forEach var="sessionDto" items="${sessionDtos}">
+				
+				jQuery("#group${sessionDto.sessionId}").jqGrid({
+					datatype: "json",
+					url: "<c:url value='/monitoring/getPagedUsersByItem.do'/>?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}&itemUid=${item.uid}",
+					height: 'auto',
+					autowidth: true,
+					shrinkToFit: true,
+					width: 'auto',
+					pager: 'pager-${sessionDto.sessionId}',
+					rowList:[10,20,30,40,50,100],
+					rowNum:10,
+					viewrecords:true,
+				   	caption: "${sessionDto.sessionName}",
+				   	colNames:[
+							"<fmt:message key="label.monitoring.tasksummary.user" />",
+							"<fmt:message key="label.monitoring.tasksummary.completed" />",
+							"<fmt:message key="label.monitoring.tasksummary.time.and.date" />"
+							<c:if test="${item.commentsAllowed || item.filesAllowed}">
+								,'<fmt:message key="label.monitoring.tasksummary.comments.files" />'
+							</c:if>
+					],
+				   	colModel:[
+				   		{name:'userName', index:'userName', width:'20', searchoptions: { clearSearch: false }},
+				   		{name:'completed', index:'completed', width:'15', sorttype:"int", search:false, align:"center"},
+				   		{name:'accessDate', index:'accessDate', width:'20', search:false, align:"center"}
+				   		<c:if test="${item.commentsAllowed || item.filesAllowed}">
+				   			,{name:'commentsFiles',index:'commentsFiles', width:'45', sortable:false, search:false, align:"center"}
+				   		</c:if>
+				   	],
+				   	loadError: function(xhr,st,err) {
+				   		jQuery("#group${sessionDto.sessionId}").clearGridData();
+				   		info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
+				   	}
+				})
+				.jqGrid('filterToolbar', { 
+	 	 			searchOnEnter: false
+	 	 		})
+	 	 		.navGrid("#pager-${sessionDto.sessionId}", {edit:false,add:false,del:false,search:false});
+			</c:forEach>
+		
+			//jqgrid autowidth
+			$(window).bind('resize', function() {
+				var grid;
+			    if (grid = jQuery(".ui-jqgrid-btable:visible")) {
+			    	grid.each(function(index) {
+				        var gridId = $(this).attr('id');
+				        
+					    var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+					    jQuery('#' + gridId).setGridWidth(gridParentWidth, false);
+			        });
+			    }
+			});
+		});
+		
+	</script>
+</lams:head>
 	
-	<body class="stripes">
-		<div id="content">
+<body class="stripes">
+	<div id="content">
 
-			<h2>
-				<fmt:message key="label.monitoring.tasksummary.task.summary" />
-			</h2>
+		<h2>
+			<fmt:message key="label.monitoring.tasksummary.task.summary" />
+		</h2>
 				
-			<div>
-				<c:out value="${item.title}" escapeXml="true"/>
+		<div>
+			<c:out value="${item.title}" escapeXml="true"/>
 				
-				<c:if test="${item.required}">
-						(<fmt:message key="label.monitoring.tasksummary.task.required.to.finish" />)
-				</c:if>				
-			</div>
-			<br/>
+			<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 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.commentsFilesAllowed}">
+					<li>
+						<fmt:message key="label.monitoring.tasksummary.comments.files.enabled" />
+					</li>
+				</c:if>
 -->					
-					<c:if test="${item.commentsAllowed}">
+				<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.allowed" />
+							<fmt:message key="label.monitoring.tasksummary.comments.required" />
 						</li>
-					</c:if>
+					</ul>
+				</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}">
+				<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.allowed" />
+							<fmt:message key="label.monitoring.tasksummary.files.required" />
 						</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>
+					</ul>
+				</c:if>
+			</ul>
+		</c:if>
+		<br>
+		<br>
 			
-			<c:forEach var="groupSummary" items="${itemSummary.groupSummaries}">
-				<c:if test="${isGroupedActivity}">
+		<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
+		
+			<div style="padding-left: 30px; <c:if test='${! status.last}'>padding-bottom: 30px;</c:if><c:if test='${ status.last}'>padding-bottom: 15px;</c:if> ">
+				<c:if test="${sessionMap.isGroupedActivity}">
+					<div style="padding-bottom: 5px; font-size: small;">
+						<B><fmt:message key="monitoring.label.group" /></B> ${sessionDto.sessionName}
+					</div>
+				</c:if>
+				<c:if test="${sessionMap.isGroupedActivity}">
 					<h1>
 						<fmt:message key="monitoring.label.group" /> ${groupSummary.sessionName}
 					</h1>
 				</c:if>
-				
-				<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="visitLogSummary" items="${groupSummary.taskListItemVisitLogSummaries}">
 					
-						<tr>
-							<td>
-								<c:out value="${visitLogSummary.user.firstName} ${visitLogSummary.user.firstName} (${visitLogSummary.user.loginName})" escapeXml="true"/>
-							</td>
+				<table id="group${sessionDto.sessionId}"></table>
+				<div id="pager-${sessionDto.sessionId}"></div>
+			</div>
 							
-							<td align="center">
-								<c:choose>
-									<c:when test="${visitLogSummary.completed}">
-										<img src="<html:rewrite page='/includes/images/completeitem.gif'/>"	border="0">
-									</c:when>
-										
-									<c:otherwise>
-										<img src="<html:rewrite page='/includes/images/dash.gif'/>" border="0">
-									</c:otherwise>
-								</c:choose>
-							</td>
-							
-							<td>
-								<lams:Date value="${visitLogSummary.date}" />
-							</td>
-										
-							<c:if test="${item.commentsAllowed || item.filesAllowed}">
-								<td>
-								
-									<ul>
-										<c:forEach var="comment" items="${visitLogSummary.comments}">
-											<li>
-												<c:out value="${comment.comment}" escapeXml="false"/>
-											</li>
-										</c:forEach>
-										
-										<c:forEach var="attachment" items="${visitLogSummary.attachments}">
-											<li>
-												<c:out value="${attachment.fileName}" />
+		</c:forEach>
+
+	</div>
+	<!--closes content-->
 	
-												<c:set var="downloadURL">
-													<html:rewrite page="/download/?uuid=${attachment.fileUuid}&versionID=${attachment.fileVersionId}&preferDownload=true" />
-												</c:set>
-												<html:link href="${downloadURL}">
-													<fmt:message key="label.download" />
-												</html:link>
+	<div id="footer">
+	</div>
+	<!--closes footer-->
 	
-											</li>
-										</c:forEach>
-									</ul>
-								</td>
-							</c:if>
-								
-						</tr>
-					</c:forEach>
-				</table>
-			
-			</c:forEach>
-		</div>
-		<!--closes content-->
-	
-		<div id="footer">
-		</div>
-		<!--closes footer-->
-	
-	</body>
+</body>
 </lams:html>
Index: lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp
===================================================================
diff -u
--- lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp	(revision 0)
+++ lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -0,0 +1,43 @@
+<%@include file="/common/taglibs.jsp"%>
+
+<h1 style="padding-bottom: 10px;">
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="restrictUsageTreeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'), '<lams:LAMSURL/>');" />
+
+	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'<lams:LAMSURL/>');" >
+		<fmt:message key="monitor.summary.date.restriction" />
+	</a>
+</h1>
+<br />
+
+<div class="monitoring-advanced" id="restrictUsageDiv" style="display:none; ">
+
+	<div>
+		<fmt:message key="monitor.summary.when.date.restriction.is.set" />
+	</div>
+		
+	<div id="datetimeDiv" <c:if test='${not empty sessionMap.submissionDeadline}'> style="display: none;" </c:if>>
+		<span>
+			<fmt:message key="monitor.summary.after.date" />
+		</span>
+		
+		<input type="text" name="datetime" id="datetime" value=""/>
+				
+		<html:link	href="javascript:setSubmissionDeadline();" styleClass="button">
+			<fmt:message key="monitor.summary.set.restriction" />
+		</html:link>
+	</div>
+
+	<div id="dateInfoDiv" <c:if test='${empty sessionMap.submissionDeadline}'> style="display: none;" </c:if>>
+		<span>
+			<fmt:message key="monitor.summary.after.date" />
+		</span>
+		
+		<span id="dateInfo">
+		</span>
+				
+		<html:link	href="javascript:removeSubmissionDeadline();" styleClass="button">
+			<fmt:message key="monitor.summary.unset.restriction" />
+		</html:link>
+	</div>
+
+</div>
\ No newline at end of file
Fisheye: Tag b41406c4167c7209080d0690b8836b1b87210ee4 refers to a dead (removed) revision in file `lams_tool_task/web/pages/monitoring/parts/notebook.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_task/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r091abac9dddc7312350403cbd0fec84bd38380c8 -rb41406c4167c7209080d0690b8836b1b87210ee4
--- lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 091abac9dddc7312350403cbd0fec84bd38380c8)
+++ lams_tool_task/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision b41406c4167c7209080d0690b8836b1b87210ee4)
@@ -2,10 +2,10 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
 <c:set var="taskList" value="${sessionMap.taskList}"/>
-
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
-<link type="text/css" href="${lams}/css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+
+<link type="text/css" href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet">
 <link type="text/css" href="${lams}/css/jquery-ui.timepicker.css" rel="stylesheet">
 <link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet"/>
 <style media="screen,projection" type="text/css">
@@ -47,7 +47,7 @@
 				datatype: "json",
 				url: "<c:url value='/monitoring/getPagedUsers.do'/>?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}",
 				height: 'auto',
-				shrinkToFit: false,
+				shrinkToFit: ${(200 + ((sessionMap.monitorVerificationRequired? 1 : 0)*130) + fn:length(sessionDto.taskListItems)*100) < 800},
 				width: '800',
 				pager: 'pager-${sessionDto.sessionId}',
 				rowList:[10,20,30,40,50,100],
@@ -68,7 +68,7 @@
 			   		{name:'userUid',index:'userUid', width:0, hidden: true}
 			   		,{name:'userName',index:'userName', width:200, searchoptions: { clearSearch: false }}
 			   		<c:forEach var="item" items="${sessionDto.taskListItems}" varStatus="status">
-			   			,{name:'item${status.index}',index:'total${status.index}', width:100,sorttype:"int", search:false, align:"center"}
+			   			,{name:'item${status.index}',index:'item${status.index}', width:100, sortable:false, search:false, align:"center"}
 			   		</c:forEach>
 			   		<c:if test="${sessionMap.monitorVerificationRequired}">
 			   			,{name:'monitorVerificationRequired',index:'monitorVerificationRequired', width:130, sortable:false, search:false, align:"center"}
@@ -102,8 +102,8 @@
 		$(window).bind('resize', resizeFunc);
 	});
 
-	function summaryTask(taskUid){
-		var myUrl = "<c:url value="/monitoring/itemSummary.do"/>?toolContentID=${toolContentID}&taskListItemUid=" + taskUid;
+	function summaryTask(itemUid){
+		var myUrl = "<c:url value="/monitoring/itemSummary.do"/>?toolContentID=${toolContentID}&itemUid=" + itemUid;
 		launchPopup(myUrl,"LearnerView");
 	}
 	
@@ -139,7 +139,7 @@
 
 <c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
 			
-	<div id="jqgrid-parent" style="padding-left: 30px; <c:if test='${! status.last}'>padding-bottom: 30px;</c:if><c:if test='${ status.last}'>padding-bottom: 15px;</c:if> ">
+	<div style="padding-left: 30px; <c:if test='${! status.last}'>padding-bottom: 30px;</c:if><c:if test='${ status.last}'>padding-bottom: 15px;</c:if> ">
 		<c:if test="${sessionMap.isGroupedActivity}">
 			<div style="padding-bottom: 5px; font-size: small;">
 				<B><fmt:message key="monitoring.label.group" /></B> ${sessionDto.sessionName}
@@ -150,13 +150,13 @@
 		<div id="pager-${sessionDto.sessionId}"></div>
 	</div>
 				
-</c:forEach>	
+</c:forEach>
 				
 <br/>
 <c:if test="${taskList.reflectOnActivity && not empty sessionMap.reflectList}">
 	<%@ include file="parts/reflections.jsp"%>
 </c:if>
 
 <%@include file="parts/advanceoptions.jsp"%>
-<%@include file="daterestriction.jsp"%>
+<%@include file="parts/daterestriction.jsp"%>
 				
\ No newline at end of file