Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java	17 Jan 2014 22:18:14 -0000	1.4
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java	9 Feb 2016 18:41:24 -0000	1.4.2.1
@@ -35,32 +35,37 @@
  */
 public interface TaskListItemVisitDAO extends DAO {
 
-	/**
-	 * Returns TaskListItemVisitLog which corresponds to specified taskListItemUid and userId.
-	 * 
-	 * @param itemUid specified taskListItemUid
-	 * @param userId specified userId
-	 * @return TaskListItemVisitLog wich corresponds to specified taskListItemUid and userId
-	 */
-	public TaskListItemVisitLog getTaskListItemLog(Long itemUid,Long userId);
-	
-	/**
-	 * Return list of taskListItemVisitLogs which corresponds to specified sessionId and itemUid
-	 * 
-	 * @param sessionId specified sessionId
-	 * @param itemUid specified itemUid
-	 * @return list of taskListItemVisitLogs which corresponds to specified sessionId and itemUid
-	 */
-	public List<TaskListItemVisitLog> getTaskListItemLogBySession(Long sessionId,Long itemUid);
-	
+    /**
+     * Returns TaskListItemVisitLog which corresponds to specified taskListItemUid and userId.
+     * 
+     * @param itemUid
+     *            specified taskListItemUid
+     * @param userId
+     *            specified userId
+     * @return TaskListItemVisitLog wich corresponds to specified taskListItemUid and userId
+     */
+    TaskListItemVisitLog getTaskListItemLog(Long itemUid, Long userId);
 
-	/**
-	 * 
-	 * 
-	 * @param toolSessionId
-	 * @param userUid
-	 * @return
-	 */
-	public int getTasksCompletedCountByUser(Long toolSessionId ,Long userUid); 
+    /**
+     * Return list of taskListItemVisitLogs which corresponds to specified sessionId and itemUid
+     * 
+     * @param sessionId
+     *            specified sessionId
+     * @param itemUid
+     *            specified itemUid
+     * @return list of taskListItemVisitLogs which corresponds to specified sessionId and itemUid
+     */
+    List<TaskListItemVisitLog> getTaskListItemLogBySession(Long sessionId, Long itemUid);
 
+    /**
+     * 
+     * 
+     * @param toolSessionId
+     * @param userId
+     * @return
+     */
+    int getCountCompletedTasksByUser(Long toolSessionId, Long userId);
+    
+    int getCountCompletedTasksBySessionAndItem(Long toolSessionId, Long itemUid);
+
 }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java,v
diff -u -r1.2 -r1.2.12.1
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java	2 Apr 2008 05:07:56 -0000	1.2
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java	9 Feb 2016 18:41:24 -0000	1.2.12.1
@@ -23,8 +23,10 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.taskList.dao;
 
+import java.util.Collection;
 import java.util.List;
 
+import org.lamsfoundation.lams.tool.taskList.dto.TaskListUserDTO;
 import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 
 /**
@@ -35,29 +37,72 @@
  */
 public interface TaskListUserDAO extends DAO {
 
-	/**
-	 * Returns user with the specified userID and sessionId.
-	 * 
-	 * @param userID specified userID
-	 * @param sessionId specified sessionId
-	 * @return user with the specified userID and sessionId
-	 */
-	TaskListUser getUserByUserIDAndSessionID(Long userID, Long sessionId);
+    /**
+     * Returns user with the specified userID and sessionId.
+     * 
+     * @param userID
+     *            specified userID
+     * @param sessionId
+     *            specified sessionId
+     * @return user with the specified userID and sessionId
+     */
+    TaskListUser getUserByUserIDAndSessionID(Long userID, Long sessionId);
 
-	/**
-	 * Returns user with the specified userID and contentId.
-	 * 
-	 * @param userId specified userID
-	 * @param contentId specified contentId
-	 * @return user with the specified userID and contentId
-	 */
-	TaskListUser getUserByUserIDAndContentID(Long userId, Long contentId);
+    /**
+     * Returns user with the specified userID and contentId.
+     * 
+     * @param userId
+     *            specified userID
+     * @param contentId
+     *            specified contentId
+     * @return user with the specified userID and contentId
+     */
+    TaskListUser getUserByUserIDAndContentID(Long userId, Long contentId);
 
-	/**
-	 * Returns list of users corresponds to specified sessionId.
-	 * 
-	 * @param sessionId specified sessionId
-	 * @return list of users corresponds to specified sessionId
-	 */
-	List<TaskListUser> getBySessionID(Long sessionId);
+    /**
+     * Returns list of users corresponds to specified sessionId.
+     * 
+     * @param sessionId
+     *            specified sessionId
+     * @return list of users corresponds to specified sessionId
+     */
+    List<TaskListUser> getBySessionID(Long sessionId);
+
+    /**
+     * Returns paged users for jqGrid based on sessionId.
+     * 
+     * @param sessionId
+     * @param page
+     * @param size
+     * @param sortBy
+     * @param sortOrder
+     * @param searchString
+     * @return
+     */
+    Collection<TaskListUserDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy,
+	    String sortOrder, String searchString);
+    
+    /**
+     * Returns paged users for jqGrid based on sessionId and taskListItemUid.
+     * 
+     * @param sessionId
+     * @param taskListItemUid
+     * @param page
+     * @param size
+     * @param sortBy
+     * @param sortOrder
+     * @param searchString
+     * @return
+     */
+    Collection<TaskListUserDTO> getPagedUsersBySessionAndItem(Long sessionId, Long taskListItemUid, int page, int size, String sortBy,
+	    String sortOrder, String searchString);
+
+    /**
+     * Returns total number of users in a specified session.
+     * 
+     * @param sessionId
+     * @param searchString
+     * @return
+     */
+    int getCountPagedUsersBySession(Long sessionId, String searchString);
 }
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ReflectDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ReflectDTO.java,v
diff -u -r1.3 -r1.3.12.1
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ReflectDTO.java	30 May 2008 09:13:33 -0000	1.3
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ReflectDTO.java	9 Feb 2016 18:41:24 -0000	1.3.12.1
@@ -1,5 +1,7 @@
 package org.lamsfoundation.lams.tool.taskList.dto;
 
+import java.util.Date;
+
 import org.lamsfoundation.lams.tool.taskList.model.TaskListUser;
 
 /**
@@ -8,60 +10,82 @@
  * @author Dapeng Ni
  */
 public class ReflectDTO {
-	private Long userUid;
-	private String fullName;
-	private String loginName;
-	private boolean hasRefection;
-	private String reflectInstrctions;
-	private boolean finishReflection;
-	private String reflect;
-	
-	public ReflectDTO(TaskListUser user) {
-		this.setLoginName(user.getLoginName());
-		this.setFullName(user.getFirstName()+" "+user.getLastName());
-		this.setUserUid(user.getUid());
-	}
-	
-	public boolean isFinishReflection() {
-		return finishReflection;
-	}
-	public void setFinishReflection(boolean finishReflection) {
-		this.finishReflection = finishReflection;
-	}
-	public String getFullName() {
-		return fullName;
-	}
-	public void setFullName(String fullName) {
-		this.fullName = fullName;
-	}
-	public boolean isHasRefection() {
-		return hasRefection;
-	}
-	public void setHasRefection(boolean hasRefection) {
-		this.hasRefection = hasRefection;
-	}
-	public String getLoginName() {
-		return loginName;
-	}
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-	public String getReflect() {
-		return reflect;
-	}
-	public void setReflect(String reflect) {
-		this.reflect = reflect;
-	}
-	public String getReflectInstrctions() {
-		return reflectInstrctions;
-	}
-	public void setReflectInstructions(String reflectInstrctions) {
-		this.reflectInstrctions = reflectInstrctions;
-	}
-	public Long getUserUid() {
-		return userUid;
-	}
-	public void setUserUid(Long userUid) {
-		this.userUid = userUid;
-	}
+    private Long userUid;
+    private String fullName;
+    private String loginName;
+    private boolean hasRefection;
+    private String reflectInstrctions;
+    private boolean finishReflection;
+    private String reflect;
+    private Date date;
+
+    public ReflectDTO(TaskListUser user) {
+	this.setLoginName(user.getLoginName());
+	this.setFullName(user.getFirstName() + " " + user.getLastName());
+	this.setUserUid(user.getUid());
+    }
+
+    public boolean isFinishReflection() {
+	return finishReflection;
+    }
+
+    public void setFinishReflection(boolean finishReflection) {
+	this.finishReflection = finishReflection;
+    }
+
+    public String getFullName() {
+	return fullName;
+    }
+
+    public void setFullName(String fullName) {
+	this.fullName = fullName;
+    }
+
+    public boolean isHasRefection() {
+	return hasRefection;
+    }
+
+    public void setHasRefection(boolean hasRefection) {
+	this.hasRefection = hasRefection;
+    }
+
+    public String getLoginName() {
+	return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+	this.loginName = loginName;
+    }
+
+    public String getReflect() {
+	return reflect;
+    }
+
+    public void setReflect(String reflect) {
+	this.reflect = reflect;
+    }
+
+    public String getReflectInstrctions() {
+	return reflectInstrctions;
+    }
+
+    public void setReflectInstructions(String reflectInstrctions) {
+	this.reflectInstrctions = reflectInstrctions;
+    }
+
+    public Long getUserUid() {
+	return userUid;
+    }
+
+    public void setUserUid(Long userUid) {
+	this.userUid = userUid;
+    }
+
+    public Date getDate() {
+	return date;
+    }
+
+    public void setDate(Date date) {
+	this.date = date;
+    }
 }
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/SessionDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.8.12.1 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListUserDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2.2.1 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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/itemsummary.jsp,v
diff -u -r1.7 -r1.7.2.1
--- lams_tool_task/web/pages/monitoring/itemsummary.jsp	3 Apr 2014 19:12:01 -0000	1.7
+++ lams_tool_task/web/pages/monitoring/itemsummary.jsp	9 Feb 2016 18:41:24 -0000	1.7.2.1
@@ -1,169 +1,179 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
+<!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="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"%>
-		<c:set var="item" value="${itemSummary.taskListItem}" />
-	</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>
-			
-			
-			<c:forEach var="groupSummary" items="${itemSummary.groupSummaries}">
-				<c:if test="${isGroupedActivity}">
-					<h1><fmt:message key="monitoring.label.group" /> ${groupSummary.sessionName}	</h1>
+					</ul>
 				</c:if>
-				
-				<table cellpadding="0" class="alternative-color" >
+			</ul>
+		</c:if>
+		<br>
+		<br>
 			
-					<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}">
+		<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>
 					
-						<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/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/statistic.jsp,v
diff -u -r1.7 -r1.7.2.1
--- lams_tool_task/web/pages/monitoring/statistic.jsp	3 Apr 2014 19:12:01 -0000	1.7
+++ lams_tool_task/web/pages/monitoring/statistic.jsp	9 Feb 2016 18:41:24 -0000	1.7.2.1
@@ -1,17 +1,17 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="summaryList" value="${sessionMap.summaryList}"/>
+<c:set var="sessionDtos" value="${sessionMap.sessionDtos}"/>
 
-<c:if test="${empty summaryList}">
+<c:if test="${empty sessionDtos}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
 	</div>
 </c:if>
 
 <c:out value="${sessionMap.isGroupedActivity}"/>
-<c:forEach var="summary" items="${summaryList}">
+<c:forEach var="sessionDto" items="${sessionDtos}">
 	<%-- display group name on first row--%>
-	<h1><fmt:message key="monitoring.label.group" /> ${summary.sessionName}	</h1>	
+	<h1><fmt:message key="monitoring.label.group" /> ${sessionDto.sessionName}	</h1>	
 		
 	<table cellspacing="3" class="alternative-color small-space-top">
 		<tr>
@@ -26,7 +26,7 @@
 			</th>
 		</tr>
 		
-		<c:forEach var="item" items="${summary.taskListItems}" varStatus="status">
+		<c:forEach var="item" items="${sessionDto.taskListItems}" varStatus="status">
 	
 			<c:if test="${item.uid == -1}">
 				<tr>
@@ -46,14 +46,11 @@
 						<c:out value="${item.createBy.loginName}" escapeXml="true"/>
 					</td>
 					<td align="center">
-						${summary.visitNumbers[status.index]}
+						${sessionDto.visitNumbers[status.index]}
 					</td>
 				</tr>
 			</c:if>
 		</c:forEach>
 	
 	</table>	
 </c:forEach>
-	
-	
-
Index: lams_tool_task/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/monitoring/summary.jsp,v
diff -u -r1.20.2.2 -r1.20.2.3
--- lams_tool_task/web/pages/monitoring/summary.jsp	4 May 2015 17:01:18 -0000	1.20.2.2
+++ lams_tool_task/web/pages/monitoring/summary.jsp	9 Feb 2016 18:41:24 -0000	1.20.2.3
@@ -1,12 +1,24 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="summaryList" value="${sessionMap.summaryList}"/>
+<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">
+	.ui-jqgrid tr.jqgrow td {
+	    white-space: normal !important;
+	    height:auto;
+	    vertical-align:text-top;
+	    padding-top:2px;
+	}
+	.ui-jqgrid .ui-jqgrid-bdiv {
+		overflow: auto;
+	}
+</style>
 
 <script type="text/javascript">
 	//pass settings to monitorToolSummaryAdvanced.js
@@ -23,22 +35,92 @@
 <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-ui.timepicker.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>  
+<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
 <script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.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">
-<!--
-	function summaryTask(taskUid){
-		var myUrl = "<c:url value="/monitoring/itemSummary.do"/>?toolContentID=${toolContentID}&taskListItemUid=" + taskUid;
+	$(document).ready(function(){
+		<c:forEach var="sessionDto" items="${sessionDtos}">
+		
+			jQuery("#group${sessionDto.sessionId}").jqGrid({
+				datatype: "json",
+				url: "<c:url value='/monitoring/getPagedUsers.do'/>?sessionMapID=${sessionMapID}&toolSessionID=${sessionDto.sessionId}",
+				height: 'auto',
+				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],
+				rowNum:10,
+				viewrecords:true,
+			   	caption: "${sessionDto.sessionName}",
+			   	colNames:[
+						'userUid'
+						,"<fmt:message key="label.monitoring.summary.user" />"
+						<c:forEach var="item" items="${sessionDto.taskListItems}">
+							,'<a href="javascript:;" onclick="return summaryTask(${item.uid})"><c:out value="${item.title}" escapeXml="true"/></a>'
+						</c:forEach>
+						<c:if test="${sessionMap.monitorVerificationRequired}">
+							,'<fmt:message key="label.monitoring.summary.confirm.completion" />'
+						</c:if>
+						],
+			   	colModel:[
+			   		{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:'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"}
+			   		</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
+		function resizeFunc(){
+			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);
+		        });
+		    }
+		}
+		resizeFunc();
+		$(window).bind('resize', resizeFunc);
+	});
+
+	function summaryTask(itemUid){
+		var myUrl = "<c:url value="/monitoring/itemSummary.do"/>?sessionMapID=${sessionMapID}&toolContentID=${toolContentID}&itemUid=" + itemUid;
 		launchPopup(myUrl,"LearnerView");
 	}
 	
-	function setVerifiedByMonitor(userUid){
-		document.location.href = "<c:url value="/monitoring/setVerifiedByMonitor.do"/>?toolContentID=${toolContentID}&contentFolderID=${sessionMap.contentFolderID}&userUid=" + userUid;
+	function setVerifiedByMonitor(link, userUid) {
+
+		$.ajax({
+			type: "POST",
+			url: '<c:url value="/monitoring/setVerifiedByMonitor.do"/>',
+			data: { userUid: userUid },
+			success: function(response) {
+				$("#verif-"+response).html('<img src="<html:rewrite page='/includes/images/tick.gif'/>" >');
+			}
+		});
+		
 		return false;
 	}
 
--->	
 </script>
 
 <h1>
@@ -47,233 +129,34 @@
 <div class="instructions space-top space-bottom">
 	<c:out value="${taskList.instructions}" escapeXml="false"/>
 </div>
-<%-- Summary list  --%>
 
-<c:if test="${empty summaryList}">
+<%-- Summary list  --%>
+<c:if test="${empty sessionDtos}">
 	<div align="center">
 		<b> <fmt:message key="message.monitoring.summary.no.session" /> </b>
 	</div>
 </c:if>
 
-<c:forEach var="summary" items="${summaryList}">
-
-	<h1><fmt:message key="monitoring.label.group" /> ${summary.sessionName}	</h1>
-	<h2 style="color:black; margin-left: 20px;"><fmt:message key="label.monitoring.summary.overall.summary" />	</h2>
-	<table cellpadding="0" class="alternative-color" >
-		
-		<tr>
-			<th width="30%" style="background-repeat: repeat">
-				<fmt:message key="label.monitoring.summary.user" />
-			</th>
-			<c:forEach var="item" items="${summary.taskListItems}">
-				<th width="30px"  align="center" style="background-repeat: repeat">
-					<a href="javascript:;" onclick="return summaryTask(${item.uid})"> 
-						<c:out value="${item.title}" escapeXml="true"/> 
-					</a>
-				</th>
-			</c:forEach>					
+<c:forEach var="sessionDto" items="${sessionDtos}" varStatus="status">
 			
-			<c:if test="${summary.monitorVerificationRequired}">
-				<th width="60px" align="center" style="background-repeat: repeat">
-					<fmt:message key="label.monitoring.summary.confirm.completion" />
-				</th>
-			</c:if>			
-		</tr>
-	
-	
-		<c:forEach var="user" items="${summary.userNames}" varStatus="userStatus">
+	<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>
 		
-			<tr>
-				<td>
-					<c:out value="${user.firstName} ${user.lastName} (${user.loginName})" escapeXml="true"/>
-				</td>
+		<table id="group${sessionDto.sessionId}"></table>
+		<div id="pager-${sessionDto.sessionId}"></div>
+	</div>
 				
-				<c:forEach var="item" items="${summary.taskListItems}" varStatus="itemStatus">
-					<td align="center">
-						<c:choose>
-							<c:when test="${summary.completeMap[userStatus.index][itemStatus.index]}">
-								<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>
-				</c:forEach>					
-							
-				<c:if test="${summary.monitorVerificationRequired}">
-					<td align="center">
-						<c:choose>
-							<c:when test="${user.verifiedByMonitor}">
-								<img src="<html:rewrite page='/includes/images/tick.gif'/>"	border="0">
-							</c:when>
-							
-							<c:otherwise>
-								<a href="javascript:;"
-									onclick="return setVerifiedByMonitor(${user.uid})"> [<fmt:message key="label.completed" /> for ${user.loginName}] 
-								</a>
-							</c:otherwise>
-						</c:choose>
-					</td>
-				</c:if>
-					
-			</tr>
-			
-		</c:forEach>
-	</table>
-	
-	<%-- Reflection list  --%>
-	
-	<c:if test="${sessionMap.taskList.reflectOnActivity}">
-	
-		<h2 style="color:black; margin-left: 20px; " ><fmt:message key="label.monitoring.summary.title.reflection"/>	</h2>
-		<table cellpadding="0"  class="alternative-color"  >
-
-			<tr>
-				<th>
-					<fmt:message key="label.monitoring.summary.user"/>
-				</th>
-				<th align="center">
-					<fmt:message key="label.monitoring.summary.reflection"/>
-				</th>
-			</tr>				
-						
-			<c:forEach var="user" items="${summary.userNames}" varStatus="userStatus">
-		
-				<tr>
-					<td>
-						<c:out value="${user.firstName} ${user.lastName} (${user.loginName})" escapeXml="true"/>
-					</td>
-					<td align="center">
-						<c:set var="viewReflection">
-							<c:url value="/monitoring/viewReflection.do?userUid=${user.uid}"/>
-						</c:set>
-						<html:link href="javascript:launchPopup('${viewReflection}')">
-							<fmt:message key="label.view" />
-						</html:link>
-					</td>
-				</tr>
-			</c:forEach>
-						
-		</table>
-	</c:if>
-	<br>
-	
-</c:forEach>				
+</c:forEach>
 				
-				
-<br/>				
-<%-- Overall TaskList information  --%>
-<h1 style="padding-bottom: 10px;">
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+<br/>
+<c:if test="${taskList.reflectOnActivity && not empty sessionMap.reflectList}">
+	<%@ include file="parts/reflections.jsp"%>
+</c:if>
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
-</h1>
-<br />
-
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
-
-	<tr>
-		<td>
-			<fmt:message key="label.monitoring.summary.lock.when.finished" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.lockWhenFinished}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.monitoring.summary.sequential.order" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.sequentialOrder}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.monitoring.summary.min.number.tasks" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.minimumNumberTasks > 0}">
-					${taskList.minimumNumberTasks}
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.monitoring.summary.allowed.contribute.tasks" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.allowContributeTasks}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.monitoring.summary.monitor.verification" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.monitorVerificationRequired}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="label.monitoring.summary.notebook.reflection" ><fmt:param> </fmt:param></fmt:message>
-		</td>
-		<td>
-			<c:choose>
-				<c:when test="${taskList.reflectOnActivity}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-</table>
-</div>
-
-<%@include file="daterestriction.jsp"%>
+<%@include file="parts/advanceoptions.jsp"%>
+<%@include file="parts/daterestriction.jsp"%>
 				
\ No newline at end of file
Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_tool_task/web/pages/monitoring/userlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_task/web/pages/monitoring/parts/advanceoptions.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.1 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?
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_task/web/pages/monitoring/parts/reflections.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?