Index: lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml	(.../struts-actions.xml)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -102,6 +102,10 @@
 			parameter="summary" >
 			<forward name="success" path="/pages/monitoring/monitoring.jsp" />
 		</action>
+		<action path="/monitoring/getUsers"
+			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.MonitoringAction"
+			parameter="getUsers" >
+		</action>
 		<action path="/monitoring/doStatistic"
 			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.MonitoringAction"
 			parameter="doStatistic" >
@@ -135,13 +139,8 @@
 			validate="false" 
 			scope="request">
             <forward name="editMark" path="/pages/monitoring/parts/editmark.jsp" />
-			<forward name="success" path="/pages/monitoring/parts/summarylist.jsp" />            			
+			<forward name="success" path="/pages/monitoring/parts/updatemarkaftersave.jsp" />            			
 		</action>		
-		<action path="/monitoring/viewReflection"
-			type="org.lamsfoundation.lams.tool.spreadsheet.web.action.MonitoringAction"
-			parameter="viewReflection">
-			<forward name="success" path="/pages/monitoring/parts/notebook.jsp" />
-		</action>
 		
 		<!-- ========== BEGIN: Common ============================== -->
 		<action path="/clearsession"
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java	(.../SpreadsheetConstants.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java	(.../SpreadsheetConstants.java)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -91,4 +91,10 @@
 
 	public static final String DEFUALT_PROTOCOL_REFIX = "http://";
 	public static final String ALLOW_PROTOCOL_REFIX = new String("[http://|https://|ftp://|nntp://]");
+
+	public static final int SORT_BY_NO = 1;
+	public static final int SORT_BY_USERNAME_ASC = 2;
+	public static final int SORT_BY_USERNAME_DESC = 3;
+	public static final int SORT_BY_MARKED_ASC = 4;
+	public static final int SORT_BY_MARKED_DESC = 5;
 }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetUserDAO.java
===================================================================
diff -u -r7f9f772433a7fd55c4475241d4e3bc0765f474e8 -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetUserDAO.java	(.../SpreadsheetUserDAO.java)	(revision 7f9f772433a7fd55c4475241d4e3bc0765f474e8)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetUserDAO.java	(.../SpreadsheetUserDAO.java)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -25,6 +25,7 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
 
 public interface SpreadsheetUserDAO extends DAO {
@@ -34,4 +35,9 @@
 	SpreadsheetUser getUserByUserIDAndContentID(Long userId, Long contentId);
 
 	List<SpreadsheetUser> getBySessionID(Long sessionId);
+	
+	List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString, 
+		boolean getNotebookEntries, ICoreNotebookService coreNotebookService );
+	
+	int getCountUsersBySession(final Long sessionId, String searchString);
 }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java
===================================================================
diff -u -r48eb475d4a5aaaaae7128498c850b6cd7fb880cd -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java	(.../SpreadsheetUserDAOHibernate.java)	(revision 48eb475d4a5aaaaae7128498c850b6cd7fb880cd)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java	(.../SpreadsheetUserDAOHibernate.java)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -25,7 +25,14 @@
 
 import java.util.List;
 
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.Hibernate;
+import org.hibernate.SQLQuery;
+import org.hibernate.type.StringType;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
 import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetUserDAO;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
 import org.springframework.stereotype.Repository;
@@ -56,5 +63,92 @@
 		return (List<SpreadsheetUser>) this.doFind(FIND_BY_SESSION_ID,sessionId);
 	}
 
+	@SuppressWarnings("unchecked")
+	/** Will return List<[SpreadsheetUser, String], [SpreadsheetUser, String], ... , [SpreadsheetUser, String]>
+	 * where the String is the notebook entry. No notebook entries needed? Will return in their place.
+	 */
+	public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString, 
+		boolean getNotebookEntries, ICoreNotebookService coreNotebookService) {
+	    String sortingOrder;
+	    switch (sorting) {
+	    case SpreadsheetConstants.SORT_BY_USERNAME_ASC:
+		sortingOrder = "user.last_name ASC, user.first_name ASC";
+		break;
+	    case SpreadsheetConstants.SORT_BY_USERNAME_DESC:
+		sortingOrder = "user.last_name DESC, user.first_name DESC";
+		break;
+	    case SpreadsheetConstants.SORT_BY_MARKED_ASC:
+		sortingOrder = " mark.marks ASC";
+		break;
+	    case SpreadsheetConstants.SORT_BY_MARKED_DESC:
+		sortingOrder = " mark.marks DESC";
+		break;
+	    default:
+		sortingOrder = "user.last_name, user.first_name";
+	    }
 
+	    // If the session uses notebook, then get the sql to join across to get the entries
+	    String[] notebookEntryStrings = null;
+	    if ( getNotebookEntries ) {
+		notebookEntryStrings = coreNotebookService.getNotebookEntrySQLStrings(sessionId.toString(),SpreadsheetConstants.TOOL_SIGNATURE,"user.user_id" );
+	    }
+
+	    // Basic select for the user records
+	    StringBuilder queryText = new StringBuilder();
+	    queryText.append("SELECT user.* ");
+	    queryText.append(notebookEntryStrings != null ? notebookEntryStrings[0] : ", NULL notebookEntry");
+	    queryText.append(" FROM tl_lasprd10_user user ");
+	    queryText.append(" JOIN tl_lasprd10_session session ON user.session_uid = session.uid and session.session_id = :sessionId");
+
+	    // If sorting by mark then join to mark
+	    if (sorting == SpreadsheetConstants.SORT_BY_MARKED_ASC
+		    || sorting == SpreadsheetConstants.SORT_BY_MARKED_DESC) {
+		queryText.append(" LEFT JOIN tl_lasprd10_user_modified_spreadsheet ms on user.user_modified_spreadsheet_uid=ms.uid ");
+		queryText.append(" LEFT JOIN tl_lasprd10_spreadsheet_mark mark on ms.mark_id = mark.uid ");
+	    }
+
+	    // If using notebook, add the notebook join
+	    if ( notebookEntryStrings != null )
+		queryText.append(notebookEntryStrings[1]);
+
+	    // If filtering by name add a name based where clause
+	    buildNameSearch(searchString, queryText);
+
+	    // Now specify the sort based on the switch statement above.
+	    queryText.append(" ORDER BY " + sortingOrder);
+
+	    SQLQuery query =  getSession().createSQLQuery(queryText.toString());
+	    query.addEntity("user", SpreadsheetUser.class)
+		.addScalar("notebookEntry", StringType.INSTANCE)
+	    	.setLong("sessionId", sessionId.longValue());
+	    return query.list();
+	}
+
+	private void buildNameSearch(String searchString, StringBuilder sqlBuilder) {
+	    if (!StringUtils.isBlank(searchString)) {
+		String[] tokens = searchString.trim().split("\\s+");
+		for (String token : tokens) {
+		    String escToken = StringEscapeUtils.escapeSql(token);
+		    sqlBuilder.append(" WHERE (user.first_name LIKE '%").append(escToken)
+		    .append("%' OR user.last_name LIKE '%").append(escToken)
+		    .append("%' OR user.login_name LIKE '%").append(escToken).append("%') ");
+		}
+	    }
+	} 
+
+	@SuppressWarnings("rawtypes")
+	public int getCountUsersBySession(final Long sessionId, String searchString) {
+
+	    StringBuilder queryText = new StringBuilder("SELECT count(*) FROM tl_lasprd10_user user ");
+	    queryText.append(" JOIN tl_lasprd10_session session ON user.session_uid = session.uid and session.session_id = :sessionId");
+	    buildNameSearch(searchString, queryText);
+	    
+	    List list = getSession().createSQLQuery(queryText.toString()).setLong("sessionId", sessionId.longValue()).list();
+	    if (list == null || list.size() == 0) {
+		return 0;
+	    }
+	    return ((Number) list.get(0)).intValue();
+	}
+
+
 }
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java	(.../ISpreadsheetService.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java	(.../ISpreadsheetService.java)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -139,12 +139,25 @@
 
 	/**
 	 * Return monitoring summary list. The return value is list of spreadsheet summaries for each groups.
+	 * It does not return the users in each session as we now use paging.
 	 * @param contentId
 	 * @return
 	 */
 	List<Summary> getSummary(Long contentId);
+
+	/**
+	 * Get a paged, optionally sorted and filtered, list of users.
+	 * @return
+	 */
+	List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString, boolean getNotebookEntries);
 	
 	/**
+	 * Get the number of users that would be returned by getUsersForTablesorter() if it was not paged. Supports filtering.
+	 * @return
+	 */
+	int getCountUsersBySession(Long sessionId, String searchString);
+
+	/**
 	 * Return monitoring statistic list. The return value is list of statistics for each groups.
 	 * @param contentId
 	 * @return
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
diff -u -r0aae4208886026f429f05b458b79c14f8d7030d4 -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision 0aae4208886026f429f05b458b79c14f8d7030d4)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java	(.../SpreadsheetServiceImpl.java)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -23,10 +23,6 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.spreadsheet.service;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -39,20 +35,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.contentrepository.AccessDeniedException;
-import org.lamsfoundation.lams.contentrepository.ICredentials;
-import org.lamsfoundation.lams.contentrepository.ITicket;
-import org.lamsfoundation.lams.contentrepository.IVersionedNode;
-import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
-import org.lamsfoundation.lams.contentrepository.LoginException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException;
-import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
-import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -90,7 +73,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
  * 
@@ -293,22 +275,34 @@
     }
 
     public List<Summary> getSummary(Long contentId) {
+
 	Spreadsheet spreadsheet = spreadsheetDao.getByContentId(contentId);
 	List<SpreadsheetSession> sessionList = spreadsheetSessionDao.getByContentId(contentId);
 
 	List<Summary> summaryList = new ArrayList<Summary>();
 
 	// create the user list of all whom were started this task
 	for (SpreadsheetSession session : sessionList) {
-	    List<SpreadsheetUser> userList = spreadsheetUserDao.getBySessionID(session.getSessionId());
-
-	    Summary summary = new Summary(session, spreadsheet, userList);
+	    // LDEV-3590 Monitoring is now paged so don't get the list of users
+	    // List<SpreadsheetUser> userList = spreadsheetUserDao.getBySessionID(session.getSessionId());
+	    Summary summary = new Summary(session, spreadsheet, null);
 	    summaryList.add(summary);
 	}
 
 	return summaryList;
     }
 
+    @Override
+    public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString, boolean getNotebookEntries) {
+	return spreadsheetUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries, coreNotebookService);
+    }
+    
+    @Override
+    public int getCountUsersBySession(Long sessionId, String searchString) {
+	return spreadsheetUserDao.getCountUsersBySession(sessionId, searchString);
+    }
+
+
     public List<StatisticDTO> getStatistics(Long contentId) {
 	List<SpreadsheetSession> sessionList = spreadsheetSessionDao.getByContentId(contentId);
 
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -27,15 +27,20 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.text.DateFormat;
 import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
@@ -50,6 +55,9 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants;
@@ -60,8 +68,10 @@
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetMark;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession;
 import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser;
+import org.lamsfoundation.lams.tool.spreadsheet.model.UserModifiedSpreadsheet;
 import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService;
 import org.lamsfoundation.lams.tool.spreadsheet.web.form.MarkForm;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -73,14 +83,17 @@
 
 	@Override
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
-			throws IOException, ServletException {
+			throws IOException, ServletException, JSONException {
 		String param = mapping.getParameter();
 
 		request.setAttribute("initialTabId", WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true));
 
 		if (param.equals("summary")) {
 			return summary(mapping, form, request, response);
 		}
+		if (param.equals("getUsers")) {
+			return getUsers(mapping, form, request, response);
+		}
 		if (param.equals("doStatistic")) {
 			return doStatistic(mapping, form, request, response);
 		}
@@ -99,11 +112,6 @@
 		if (param.equals("saveMark")) {
 			return saveMark(mapping, form, request, response);
 		}
-
-		if (param.equals("viewReflection")) {
-			return viewReflection(mapping, form, request, response);
-		}
-
 		return mapping.findForward(SpreadsheetConstants.ERROR);
 	}
 
@@ -122,21 +130,74 @@
 
 		Spreadsheet spreadsheet = service.getSpreadsheetByContentId(contentId);
 
-		Map<Long, Set<ReflectDTO>> reflectList = service.getReflectList(contentId, false);
-
 		//cache into sessionMap
 		sessionMap.put(SpreadsheetConstants.ATTR_SUMMARY_LIST, summaryList);
 		sessionMap.put(SpreadsheetConstants.PAGE_EDITABLE, spreadsheet.isContentInUse());
 		sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, spreadsheet);
 		sessionMap.put(SpreadsheetConstants.ATTR_TOOL_CONTENT_ID, contentId);
-		sessionMap.put(SpreadsheetConstants.ATTR_REFLECT_LIST, reflectList);
 		sessionMap.put(AttributeNames.PARAM_CONTENT_FOLDER_ID, WebUtil.readStrParam(request,
 				AttributeNames.PARAM_CONTENT_FOLDER_ID));
 		sessionMap.put(SpreadsheetConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
 
 		return mapping.findForward(SpreadsheetConstants.SUCCESS);
 	}
 
+
+	private ActionForward getUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
+	   throws JSONException, IOException {
+
+	    	Long sessionID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID));
+		Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+
+		// paging parameters of tablesorter
+		int size = WebUtil.readIntParam(request, "size");
+		int page = WebUtil.readIntParam(request, "page");
+		Integer sortByName = WebUtil.readIntParam(request, "column[0]", true);
+		Integer sortByMarked = WebUtil.readIntParam(request, "column[1]", true);
+		String searchString = request.getParameter("fcol[0]"); 
+		
+		int sorting = SpreadsheetConstants.SORT_BY_NO;
+		if ( sortByName != null ) {
+		    sorting = sortByName.equals(0) ? SpreadsheetConstants.SORT_BY_USERNAME_ASC : SpreadsheetConstants.SORT_BY_USERNAME_DESC; 
+		} else if ( sortByMarked !=null ) {
+		    sorting = sortByMarked.equals(0) ? SpreadsheetConstants.SORT_BY_MARKED_ASC : SpreadsheetConstants.SORT_BY_MARKED_DESC; 
+		}
+
+		//return user list according to the given sessionID
+		ISpreadsheetService service = getSpreadsheetService();
+		Spreadsheet spreadsheet = service.getSpreadsheetByContentId(contentId);
+		List<Object[]> users = service.getUsersForTablesorter(sessionID, page, size, sorting, searchString, spreadsheet.isReflectOnActivity());
+		
+		JSONArray rows = new JSONArray();
+		JSONObject responsedata = new JSONObject();
+		responsedata.put("total_rows", service.getCountUsersBySession(sessionID, searchString));
+
+		for (Object[] userAndReflection : users) {
+
+		    JSONObject responseRow = new JSONObject();
+		    
+		    SpreadsheetUser user = (SpreadsheetUser) userAndReflection[0];
+		    responseRow.put(SpreadsheetConstants.ATTR_USER_UID, user.getUid());
+		    responseRow.put(SpreadsheetConstants.ATTR_USER_NAME, StringEscapeUtils.escapeHtml(user.getLastName() + " " + user.getFirstName()));
+		    if ( user.getUserModifiedSpreadsheet() != null ) {
+			responseRow.put("userModifiedSpreadsheet", "true");
+			if ( user.getUserModifiedSpreadsheet().getMark() != null ) {
+			    responseRow.put("mark", user.getUserModifiedSpreadsheet().getMark().getMarks());		    
+			}
+		    }
+		    
+		    if ( userAndReflection.length > 1 && userAndReflection[1] != null) {
+			responseRow.put("reflection", userAndReflection[1]);
+		    }
+		    
+		    rows.put(responseRow);
+		}
+		responsedata.put("rows", rows);
+		response.setContentType("application/json;charset=utf-8");
+		response.getWriter().print(new String(responsedata.toString()));
+		return null;	
+	}
+
 	/**
 	 * AJAX call to refresh statistic page.
 	 * @param mapping
@@ -367,67 +428,16 @@
 			getSpreadsheetService().saveOrUpdateUserModifiedSpreadsheet(user.getUserModifiedSpreadsheet());
 		}
 
-		//update user data in sessionMap
-		String sessionMapID = markForm.getSessionMapID();
-		SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-		List<Summary> summaryList = (List<Summary>) sessionMap.get(SpreadsheetConstants.ATTR_SUMMARY_LIST);
-		for (Summary summary : summaryList) {
-			for (SpreadsheetUser sessionUser : summary.getUsers()) {
-				if (sessionUser.getUid().equals(user.getUid())) {
-					sessionUser.setUserModifiedSpreadsheet(user.getUserModifiedSpreadsheet());
-				}
-			}
-		}
-
+		request.setAttribute("mark",markForm.getMarks());
+		request.setAttribute("userUid",userUid);
+		
 		//set session map ID so that itemlist.jsp can get sessionMAP
 		request.setAttribute(SpreadsheetConstants.ATTR_SESSION_MAP_ID, markForm.getSessionMapID());
 
 		return mapping.findForward(SpreadsheetConstants.SUCCESS);
 	}
 
-	//	private ActionForward listuser(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
-	//		Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
-	//		Long itemUid = WebUtil.readLongParam(request, SpreadsheetConstants.PARAM_RESOURCE_ITEM_UID);
-	////
-	////		//get user list by given item uid
-	//		ISpreadsheetService service = getSpreadsheetService();
-	//		//TODO
-	//		List list = null;
-	////		List list = service.getUserListBySessionItem(sessionId, itemUid);
-	//		
-	//		//set to request
-	//		request.setAttribute(SpreadsheetConstants.ATTR_USER_LIST, list);
-	//		return mapping.findForward(SpreadsheetConstants.SUCCESS);
-	//	}
 
-	private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) {
-
-		Long uid = WebUtil.readLongParam(request, SpreadsheetConstants.ATTR_USER_UID);
-
-		ISpreadsheetService service = getSpreadsheetService();
-		SpreadsheetUser user = service.getUser(uid);
-		Long sessionID = user.getSession().getSessionId();
-		NotebookEntry notebookEntry = service.getEntry(sessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-				SpreadsheetConstants.TOOL_SIGNATURE, user.getUserId().intValue());
-
-		SpreadsheetSession session = service.getSessionBySessionId(sessionID);
-
-		ReflectDTO refDTO = new ReflectDTO(user);
-		if (notebookEntry == null) {
-			refDTO.setFinishReflection(false);
-			refDTO.setReflect(null);
-		}
-		else {
-			refDTO.setFinishReflection(true);
-			refDTO.setReflect(notebookEntry.getEntry());
-		}
-		refDTO.setReflectInstructions(session.getSpreadsheet().getReflectInstructions());
-
-		request.setAttribute("userDTO", refDTO);
-		return mapping.findForward("success");
-	}
-
 	// *************************************************************************************
 	// Private method
 	// *************************************************************************************
Fisheye: Tag 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp
===================================================================
diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(.../summarylist.jsp)	(revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp	(.../summarylist.jsp)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -1,4 +1,116 @@
 <%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
+<div id="summaryList2">
+
+<link type="text/css" href="${lams}css/jquery.tablesorter.theme-blue.css" rel="stylesheet">
+<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
+
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
+
+<script type="text/javascript">
+	// use noConflict() otherwise jQuery conflicts with prototype.js
+	jQuery.noConflict();
+	jQuery(document).ready(function($){
+	    
+		$(".tablesorter").tablesorter({
+			theme: 'blue',
+		    sortInitialOrder: 'desc',
+            sortList: [[0]],
+            widgets: [ "resizable", "filter" ],
+            <c:choose>
+			<c:when test="${spreadsheet.markingEnabled}">
+            headers: { 1: { filter: false}, 2: { sorter: false, filter: false} }, 
+            </c:when>
+			<c:otherwise>
+            headers: { 1: { sorter: false, filter: false} }, 
+            </c:otherwise>
+            </c:choose>
+            widgetOptions: {
+            	resizable: true,
+            	// include column filters 
+                filter_columnFilters: true, 
+                filter_placeholder: { search : '<fmt:message key="label.search"/>' }, 
+                filter_searchDelay: 700 
+            }
+		});
+		
+		$(".tablesorter").each(function() {
+			$(this).tablesorterPager({
+				savePages: false,
+				ajaxUrl : "<c:url value='/monitoring/getUsers.do'/>?sessionMapID=${sessionMapID}&toolContentID=${param.toolContentID}&page={page}&size={size}&{sortList:column}&{filterList:fcol}&toolSessionID=" + $(this).attr('data-session-id'),
+				ajaxProcessing: function (data, table) {
+					if (data && data.hasOwnProperty('rows')) {
+			    		var rows = [],
+			            json = {};
+			    		
+						for (i = 0; i < data.rows.length; i++){
+							var userData = data.rows[i];
+
+							rows += '<tr>';
+							rows += '<td>';
+							if ( ${spreadsheet.learnerAllowedToSave} ) {
+								var reviewURL = '<c:url value="/reviewItem.do"/>?userUid='+userData["userUid"];
+								rows += '<a href="javascript:launchPopup(\'' + reviewURL + '\')" style="margin-left: 7px;" styleClass="button">' + userData["userName"] + '</a>';
+							} else {
+								rows += userData["userName"];
+							}
+							rows += '</td>';
+
+							<c:if test="${spreadsheet.markingEnabled}">
+							rows += '<td align="right"><span id="mark'+userData["userUid"]+'">'; 
+							if ( userData["userModifiedSpreadsheet"] && userData["mark"] ) {
+								rows += userData["mark"];
+							} else {
+								rows += '-';
+							}
+							rows += '</span>';
+							if ( userData["userModifiedSpreadsheet"] ) {
+								rows += '<a href="javascript:editMark(\''+userData["userUid"]+'\')" style="margin-left: 7px;"><fmt:message key="label.monitoring.summary.mark.button" /></a>';
+							}
+							rows += '</td>';
+							</c:if>
+							
+							<c:if test="${spreadsheet.reflectOnActivity}">
+							rows += '<td>';
+							if ( userData["reflection"] ) {
+								rows += userData["reflection"];
+							} else {
+								rows += '-';
+							}
+							rows += '</td>';
+							</c:if>
+							
+							rows += '</tr>';
+						}
+			            
+						json.total = data.total_rows;
+						json.rows = $(rows);
+						return json;
+			            
+			    	}
+				},					
+			    container: $(this).next(".pager"),
+			    output: '{startRow} to {endRow} ({totalRows})',
+			    // css class names of pager arrows
+			    cssNext: '.tablesorter-next', // next page arrow
+				cssPrev: '.tablesorter-prev', // previous page arrow
+				cssFirst: '.tablesorter-first', // go to first page arrow
+				cssLast: '.tablesorter-last', // go to last page arrow
+				cssGoto: '.gotoPage', // select dropdown to allow choosing a page
+				cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
+				cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
+				// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
+				cssDisabled: 'disabled' // Note there is no period "." in front of this class name
+			})
+		});
+  	})
+</script>
+
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 <c:set var="summaryList" value="${sessionMap.summaryList}"/>
 <c:set var="spreadsheet" value="${sessionMap.spreadsheet}"/>
@@ -9,8 +121,7 @@
 	</div>
 </c:if>
 
-<div id="summaryList2">
-	<c:forEach var="summary" items="${summaryList}" varStatus="firstGroup">
+	<c:forEach var="summary" items="${summaryList}">
 		<c:if test="${sessionMap.isGroupedActivity}">
 			<h1>
 				<fmt:message key="monitoring.label.group" /> ${summary.sessionName}	
@@ -19,82 +130,52 @@
 		
 		<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="60%" align="left">
-					<fmt:message key="label.monitoring.summary.learner" />
-				</th>
-				<c:if test="${spreadsheet.markingEnabled}">			
-					<th width="40px" align="center">
-						<fmt:message key="label.monitoring.summary.marked" />
-					</th>
-					<th width="20px" align="left">
-					</th>
-				</c:if>
-			</tr>
-	
-			<c:forEach var="user" items="${summary.users}" varStatus="userStatus">
+		<div class="tablesorter-holder">
+		<table class="tablesorter" data-session-id="${summary.sessionId}">
+			<thead>
 				<tr>
-					<td>
-						<c:choose>
-							<c:when test="${spreadsheet.learnerAllowedToSave}">
-								<c:set var="reviewItem">
-									<c:url value="/reviewItem.do?userUid=${user.uid}"/>
-								</c:set>
-								<html:link href="javascript:launchPopup('${reviewItem}')">
-									${user.loginName}
-								</html:link>
-							</c:when>
-							<c:otherwise>
-								${user.loginName}
-							</c:otherwise>
-						</c:choose>					
-					</td>
-					
-					<c:if test="${spreadsheet.markingEnabled}">					
-						<td align="center">
-							<c:choose>
-								<c:when test="${(user.userModifiedSpreadsheet != null) && (user.userModifiedSpreadsheet.mark != null)}">
-									<img src="<lams:LAMSURL/>/images/tick.gif" alt="tick" border="0"/>
-								</c:when>
-									
-								<c:otherwise>
-									<img src="<lams:LAMSURL/>/images/cross.gif" alt="cross" border="0"/>
-								</c:otherwise>
-							</c:choose>
-						</td>
-						
-						
-						
-						
-							<c:choose>
-								<c:when test="${user.userModifiedSpreadsheet != null}">
-									<td align="left">								
-										<html:link
-											href="javascript:editMark(${user.uid});"
-											property="Mark" styleClass="button" >
-											<fmt:message key="label.monitoring.summary.mark.button" />
-										</html:link>
-									</td>										
-								</c:when>
-									
-								<c:otherwise>
-									<td align="center">
-										<fmt:message key="label.monitoring.summary.mark.button" />
-									</td>
-								</c:otherwise>
-							</c:choose>						
-						
-						
-
-
-					</c:if>				
+					<th align="left">
+						<fmt:message key="label.monitoring.summary.learner" />
+					</th>
+					<c:if test="${spreadsheet.markingEnabled}">			
+						<th width="60px" align="center">
+							<fmt:message key="label.monitoring.summary.marked" />
+						</th>
+					</c:if>
+					<c:if test="${spreadsheet.reflectOnActivity}">			
+						<th width="50%" align="center">
+							<fmt:message key="label.monitoring.summary.reflection" />
+						</th>
+					</c:if>
 				</tr>
-			</c:forEach>
-			
+			</thead>
+			<tbody>
+			</tbody>
 		</table>
+		
+		<!-- pager -->
+		<div class="pager">
+			<form>
+				<img class="tablesorter-first"/>
+				<img class="tablesorter-prev"/>
+				<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+				<img class="tablesorter-next"/>
+				<img class="tablesorter-last"/>
+				<select class="pagesize">
+					<option selected="selected" value="10">10</option>
+					<option value="20">20</option>
+					<option value="30">30</option>
+					<option value="40">40</option>
+					<option value="50">50</option>
+					<option value="100">100</option>
+				</select>
+			</form>
+		</div>
+		</div>
+	
+		
 		<c:if test="${spreadsheet.markingEnabled}">	
-			<div style="position:relative; left:30px; ">
+			<div class="space-bottom-top" style="position:relative; left:30px; ">
 				<html:link href="javascript:viewAllMarks(${summary.sessionId});"
 					property="viewAllMarks" styleClass="button">
 					<fmt:message key="label.monitoring.summary.viewAllMarks.button" />
@@ -109,62 +190,5 @@
 				</html:link>
 			</div>
 		</c:if>
-		
-		<%-- Reflection list  --%>
-		
-		<c:if test="${sessionMap.spreadsheet.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>
-						<fmt:message key="label.monitoring.summary.reflection"/>
-					</th>
-				</tr>				
-							
-				<c:forEach var="user" items="${summary.users}">
-					<tr>
-						<td>
-							${user.loginName}
-						</td>
-						<td >
-							<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>
-</div>
-
-<%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%>
-<script type="text/javascript">
-	var win = null;
-	try {
-		if (window.parent && window.parent.hideMessage) {
-			win = window.parent;
-		} else if (window.top && window.top.hideMessage) {
-			win = window.top;
-		}
-	} catch(err) {
-		// mute cross-domain iframe access errors
-	}
-	if (win) {
-		win.hideMessage();
-		var obj = win.document.getElementById('summariesArea');
-		obj.innerHTML= document.getElementById("summaryList2").innerHTML;
-	}
-</script>
+	</c:forEach>		
+</div>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/pages/monitoring/parts/updatemarkaftersave.jsp
===================================================================
diff -u
--- lams_tool_spreadsheet/web/pages/monitoring/parts/updatemarkaftersave.jsp	(revision 0)
+++ lams_tool_spreadsheet/web/pages/monitoring/parts/updatemarkaftersave.jsp	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<%@ include file="/common/taglibs.jsp"%>
+
+<lams:html>
+	<lams:head>
+		<%@ include file="/common/header.jsp"%>	
+		<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
+	</lams:head>
+	<body>
+		<script type="text/javascript"> 
+			if (window.parent && window.parent.hideMessage) {
+				window.parent.hideMessage();
+			} else if (window.top && window.top.hideMessage) {
+				window.top.hideMessage();
+			}
+			if (window.parent && window.parent.updateMarkAfterSaving) {
+				window.parent.updateMarkAfterSaving(${userUid}, ${mark});
+			} else if (window.top && window.top.updateMarkAfterSaving) {
+				window.top.updateMarkAfterSaving(${userUid}, ${mark});
+			}
+		</script>
+		<p>Mark Updated to ${mark}</p>
+	</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rfb099c65e1987ef8ff8f8aa4a0d987fd77247750 -r0d10b0f6afaf65b7d04a5c2fa54688962f4b9379
--- lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fb099c65e1987ef8ff8f8aa4a0d987fd77247750)
+++ lams_tool_spreadsheet/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 0d10b0f6afaf65b7d04a5c2fa54688962f4b9379)
@@ -29,6 +29,14 @@
 		showMessage(url);
 	}
 	
+	function updateMarkAfterSaving(userUid, mark) {
+		var span = document.getElementById('mark'+userUid);
+		while( span.firstChild ) {
+		    span.removeChild( span.firstChild );
+		}
+		span.appendChild( document.createTextNode(mark) );
+	}
+	
 	function downloadMarks(sessionId){
 		var url = "<c:url value="/monitoring/downloadMarks.do"/>";
 	    var reqIDVar = new Date();