Index: lams_tool_daco/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.24 -r1.24.2.1
--- lams_tool_daco/conf/language/lams/ApplicationResources.properties	26 Feb 2014 18:43:36 -0000	1.24
+++ lams_tool_daco/conf/language/lams/ApplicationResources.properties	26 Jan 2016 23:40:45 -0000	1.24.2.1
@@ -252,6 +252,8 @@
 label.export.file.answer.date  =Added on
 label.authoring.cancel.button  =Cancel
 label.learning.submit  =Finish
+label.search=Search... 
+label.monitoring.average.number.records.heading=Average Number of Records
 
 
 #======= End labels: Exported 246 labels for en AU =====
Index: lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.23 -r1.23.2.1
--- lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties	26 Feb 2014 18:43:36 -0000	1.23
+++ lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties	26 Jan 2016 23:40:45 -0000	1.23.2.1
@@ -252,6 +252,8 @@
 label.export.file.answer.date  =Added on
 label.authoring.cancel.button  =Cancel
 label.learning.submit  =Finish
+label.search=Search... 
+label.monitoring.average.number.records.heading=Average Number of Records
 
 
 #======= End labels: Exported 246 labels for en AU =====
Index: lams_tool_daco/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/conf/xdoclet/struts-actions.xml,v
diff -u -r1.8 -r1.8.2.1
--- lams_tool_daco/conf/xdoclet/struts-actions.xml	17 Jan 2014 21:42:48 -0000	1.8
+++ lams_tool_daco/conf/xdoclet/struts-actions.xml	26 Jan 2016 23:40:45 -0000	1.8.2.1
@@ -140,6 +140,15 @@
 <action path="/monitoring/changeView" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="changeView">
 	<forward name="success" path="/pages/monitoring/listRecords.jsp" />
 </action>
+<action path="/monitoring/getQuestionSummaries" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="getQuestionSummaries">
+	<forward name="success" path="/pages/monitoring/questionSummaries.jsp" />
+</action>
+<action path="/monitoring/statistic" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="statistic">
+	<forward name="success" path="/pages/monitoring/statistics.jsp" />
+</action>
+<action path="/monitoring/getUsers" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction" parameter="getUsers" >
+</action>
+
 <!--  ========= Export to spreadsheet =============== -->
 <action path="/monitoring/exportToSpreadsheet" type="org.lamsfoundation.lams.tool.daco.web.action.MonitoringAction"
 	validate="false" input="/pages/export/exportToSpreadsheet.jsp" parameter="exportToSpreadsheet" scope="request">
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java,v
diff -u -r1.17 -r1.17.2.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java	17 Jan 2014 21:42:48 -0000	1.17
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java	26 Jan 2016 23:38:15 -0000	1.17.2.1
@@ -110,7 +110,7 @@
 
     public static final String LEARNING_VIEW_VERTICAL = "vertical";
 
-    // monitoring summary query match
+    // monitoring summary query match & user data return
     public static final Long MONITORING_SUMMARY_MATCH_ALL = null;
 
     public static final Long MONITORING_SUMMARY_MATCH_NONE = -1L;
@@ -121,6 +121,10 @@
 
     public static final String USER_FULL_NAME = "userFullName";
 
+    public static final String NOTEBOOK_ENTRY = "notebookEntry";
+
+    public static final String RECORD_COUNT = "recordCount";
+
     // for parameters' name
 
     public static final String PARAM_FILE_VERSION_ID = "fileVersionId";
@@ -180,6 +184,8 @@
 
     public static final String ATTR_QUESTION_SUMMARIES = "questionSummaries";
 
+    public static final String ATTR_SESSION_SUMMARIES = "sessionSummaries";
+
     public static final String ATTR_TOTAL_RECORD_COUNT = "totalRecordCount";
     
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
@@ -300,4 +306,12 @@
     public static final String KEY_LABEL_EXPORT_FILE_TITLE = "label.export.file.title";
 
     public static final String KEY_LABEL_EXPORT_FILE_ANSWER_DATE = "label.export.file.answer.date";
+    
+    // paging and sorting
+    public static final String ATTR_SORT = "sort";
+    public static final int SORT_BY_NO = 0;
+    public static final int SORT_BY_USER_NAME_ASC = 1;
+    public static final int SORT_BY_USER_NAME_DESC = 2;
+    public static final int SORT_BY_NUM_RECORDS_ASC = 3;
+    public static final int SORT_BY_NUM_RECORDS_DESC = 4;
 }
\ No newline at end of file
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java,v
diff -u -r1.7 -r1.7.2.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java	8 Nov 2010 11:52:49 -0000	1.7
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java	26 Jan 2016 23:38:15 -0000	1.7.2.1
@@ -24,4 +24,9 @@
      * @return number of records for that user
      */
     Integer getUserRecordCount(Long userId, Long sessionId);
+    
+    /**
+     * Gets the number of records entered by users in this session.
+     */
+    Integer getSessionRecordCount(Long sessionId);
 }
\ No newline at end of file
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoSessionDAO.java,v
diff -u -r1.2 -r1.2.12.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoSessionDAO.java	8 Aug 2008 08:10:21 -0000	1.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoSessionDAO.java	26 Jan 2016 23:38:15 -0000	1.2.12.1
@@ -25,6 +25,7 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.tool.daco.dto.MonitoringSummarySessionDTO;
 import org.lamsfoundation.lams.tool.daco.model.DacoSession;
 
 public interface DacoSessionDAO extends DAO {
@@ -34,5 +35,7 @@
 	List<DacoSession> getByContentId(Long toolContentId);
 
 	void deleteBySessionId(Long toolSessionId);
+	
+	List<MonitoringSummarySessionDTO> statistics(Long toolContentUid);
 
 }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java,v
diff -u -r1.2 -r1.2.12.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java	8 Aug 2008 08:10:21 -0000	1.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java	26 Jan 2016 23:38:15 -0000	1.2.12.1
@@ -25,6 +25,7 @@
 
 import java.util.List;
 
+import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.daco.model.DacoUser;
 
 public interface DacoUserDAO extends DAO {
@@ -34,4 +35,10 @@
 	DacoUser getUserByUserIdAndContentId(Long userId, Long contentId);
 
 	List<DacoUser> getBySessionId(Long sessionId);
+	
+	List<DacoUser> getBySessionId(Long sessionId, int sorting);
+	
+	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_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java,v
diff -u -r1.8.2.2 -r1.8.2.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java	28 Nov 2014 21:26:18 -0000	1.8.2.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java	26 Jan 2016 23:38:15 -0000	1.8.2.3
@@ -49,7 +49,9 @@
     private static final String FIND_USER_RECORD_COUNT = "SELECT COUNT (DISTINCT a.recordId) FROM "
 	    + DacoAnswer.class.getName() + " AS a WHERE a.user.userId=:userId AND a.user.session.sessionId=:sessionId";
 
-    @SuppressWarnings("unchecked")
+    private static final String FIND_SESSION_RECORD_COUNT = "SELECT COUNT (DISTINCT a.recordId) FROM "
+	    + DacoAnswer.class.getName() + " AS a WHERE a.user.session.sessionId=:sessionId";
+
     public List<QuestionSummaryDTO> getQuestionSummaries(Long userUid, List<QuestionSummaryDTO> summaries) {
 
 	List<Object[]> result = (List<Object[]>) doFindByNamedParam(
@@ -166,4 +168,9 @@
 	return ((Number) doFindByNamedParam(DacoAnswerDAOHibernate.FIND_USER_RECORD_COUNT,
 		new String[] { "userId", "sessionId" }, new Object[] { userId, sessionId }).get(0)).intValue();
     }
+
+    public Integer getSessionRecordCount(Long sessionId) {
+	return ((Number) doFindByNamedParam(DacoAnswerDAOHibernate.FIND_SESSION_RECORD_COUNT,
+		new String[] { "sessionId" }, new Object[] { sessionId }).get(0)).intValue();
+    }
 }
\ No newline at end of file
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java,v
diff -u -r1.3.12.2 -r1.3.12.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java	28 Nov 2014 21:26:18 -0000	1.3.12.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java	26 Jan 2016 23:38:15 -0000	1.3.12.3
@@ -25,8 +25,16 @@
 
 import java.util.List;
 
+import org.hibernate.Hibernate;
+import org.hibernate.SQLQuery;
+import org.hibernate.transform.Transformers;
+import org.hibernate.type.IntegerType;
+import org.hibernate.type.LongType;
+import org.hibernate.type.StringType;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.daco.dao.DacoSessionDAO;
+import org.lamsfoundation.lams.tool.daco.dto.MonitoringSessionStatsDTO;
+import org.lamsfoundation.lams.tool.daco.dto.MonitoringSummarySessionDTO;
 import org.lamsfoundation.lams.tool.daco.model.DacoSession;
 import org.springframework.stereotype.Repository;
 
@@ -37,6 +45,14 @@
 	private static final String FIND_BY_CONTENT_ID = "from " + DacoSession.class.getName()
 			+ " as p where p.daco.contentId=? ORDER BY p.sessionId";
 
+	private static final String CALC_SESSION_STATS = "SELECT sessionId, sessionName, COUNT(user_uid) numberLearners, SUM(record_count) totalRecordCount FROM "
+			+ " (SELECT user.uid user_uid, sess.uid sessionId, sess.session_name sessionName, COUNT(DISTINCT(record_id)) record_count "
+			+ " FROM tl_ladaco10_users user "
+			+ " JOIN tl_ladaco10_sessions sess ON sess.uid = user.session_uid AND sess.content_uid = :contentUid "
+			+ " LEFT JOIN tl_ladaco10_answers ans ON ans.user_uid = user.uid "
+			+ " GROUP by user.uid) user_counts "
+			+ " GROUP BY sessionId";
+	
 	public DacoSession getSessionBySessionId(Long sessionId) {
 		List list = doFind(DacoSessionDAOHibernate.FIND_BY_SESSION_ID, sessionId);
 		if (list == null || list.size() == 0) {
@@ -53,4 +69,17 @@
 	public void deleteBySessionId(Long toolSessionId) {
 		this.removeObject(DacoSession.class, toolSessionId);
 	}
+	
+	public List<MonitoringSummarySessionDTO> statistics(Long toolContentUid) {
+	    SQLQuery query =  getSession().createSQLQuery(DacoSessionDAOHibernate.CALC_SESSION_STATS);
+	    query.addScalar("sessionId", LongType.INSTANCE)
+		.addScalar("sessionName", StringType.INSTANCE)
+		.addScalar("numberLearners", IntegerType.INSTANCE)
+		.addScalar("totalRecordCount", IntegerType.INSTANCE)
+		.setLong("contentUid", toolContentUid)
+	    	.setResultTransformer(Transformers.aliasToBean(MonitoringSessionStatsDTO.class));
+	    return query.list();
+		
+	}
+	
 }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java,v
diff -u -r1.3.12.2 -r1.3.12.3
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java	28 Nov 2014 21:26:18 -0000	1.3.12.2
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java	26 Jan 2016 23:38:15 -0000	1.3.12.3
@@ -25,7 +25,15 @@
 
 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.IntegerType;
+import org.hibernate.type.StringType;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
+import org.lamsfoundation.lams.tool.daco.DacoConstants;
 import org.lamsfoundation.lams.tool.daco.dao.DacoUserDAO;
 import org.lamsfoundation.lams.tool.daco.model.DacoUser;
 import org.springframework.stereotype.Repository;
@@ -62,4 +70,117 @@
 	public List<DacoUser> getBySessionId(Long sessionId) {
 		return (List<DacoUser>) doFind(DacoUserDAOHibernate.FIND_BY_SESSION_ID, sessionId);
 	}
+	
+	// support sorting by name or user id, not by record number
+	@SuppressWarnings("unchecked")
+	public List<DacoUser> getBySessionId(Long sessionId, int sorting) {
+	    	String sortingOrder;
+		switch (sorting) {
+    		case DacoConstants.SORT_BY_USER_NAME_ASC:
+    		    sortingOrder = " ORDER BY u.lastName ASC, u.firstName ASC";
+    		    break;
+    		case DacoConstants.SORT_BY_USER_NAME_DESC:
+    		    sortingOrder = " ORDER BY u.lastName DESC, u.firstName DESC";
+    		    break;
+    		case DacoConstants.SORT_BY_NO:
+    		default: 
+    		    sortingOrder = " ORDER BY u.uid";
+		}
+		return (List<DacoUser>) doFind(DacoUserDAOHibernate.FIND_BY_SESSION_ID+sortingOrder, sessionId);
+	}
+
+	@SuppressWarnings("unchecked")
+	/** Will return List<[DacoUser, Integer (record count), String (notebook entry)], [DacoUser, Integer, String], ... , [DacoUser, Integer, String]>
+	 * where the String is the notebook entry. No notebook entries needed? Will return "null" 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 DacoConstants.SORT_BY_USER_NAME_ASC:
+        		    sortingOrder = "user.last_name ASC, user.first_name ASC";
+        		    break;
+        		case DacoConstants.SORT_BY_USER_NAME_DESC:
+        		    sortingOrder = "user.last_name DESC, user.first_name DESC";
+        		    break;
+        		case DacoConstants.SORT_BY_NUM_RECORDS_ASC:
+        		    sortingOrder = "record_count ASC";
+        		    break;
+        		case DacoConstants.SORT_BY_NUM_RECORDS_DESC:
+        		    sortingOrder = "record_count DESC";
+        		    break;
+        		case DacoConstants.SORT_BY_NO:
+        		default: 
+        		    sortingOrder = "user.uid";
+		}
+
+		// 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(),
+			    DacoConstants.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(", COUNT(DISTINCT(record_id)) record_count");
+		queryText.append(" FROM tl_ladaco10_users user ");
+		queryText.append(" JOIN tl_ladaco10_sessions sess on user.session_uid = sess.uid and sess.session_id = :sessionId");
+
+		// If filtering by name add a name based where clause
+		buildNameSearch(queryText, searchString);
+
+		queryText.append(" LEFT JOIN tl_ladaco10_answers ans ON ans.user_uid = user.uid");
+
+		// If using notebook, add the notebook join
+		if ( notebookEntryStrings != null )
+		    queryText.append(notebookEntryStrings[1]);
+
+		queryText.append(" GROUP BY user.uid");
+
+		// Now specify the sort based on the switch statement above.
+		queryText.append(" ORDER BY " + sortingOrder);
+
+		SQLQuery query =  getSession().createSQLQuery(queryText.toString());
+		    query.addEntity("user", DacoUser.class)
+			.addScalar("record_count", IntegerType.INSTANCE)
+			.addScalar("notebookEntry", StringType.INSTANCE)
+		    	.setLong("sessionId", sessionId.longValue())
+		    	.setFirstResult(page * size)
+		    	.setMaxResults(size);
+		return query.list();
+		
+	}
+	
+	private void buildNameSearch(StringBuilder queryText, String searchString) {
+		if (!StringUtils.isBlank(searchString)) {
+		    String[] tokens = searchString.trim().split("\\s+");
+		    for (String token : tokens) {
+			String escToken = StringEscapeUtils.escapeSql(token);
+			queryText.append(" AND (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")
+	/** Return the number of potential users in a session for the tablesorter */
+	public int getCountUsersBySession(final Long sessionId, String searchString) {
+
+		StringBuilder queryText = new StringBuilder("SELECT count(*) FROM tl_ladaco10_users user ");
+		queryText.append(" JOIN tl_ladaco10_sessions sess on user.session_uid = sess.uid and sess.session_id = :sessionId");
+		buildNameSearch(queryText, searchString);
+		    
+		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();
+	    }
+
 }
\ No newline at end of file
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dto/MonitoringSessionStatsDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java,v
diff -u -r1.3 -r1.3.12.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java	8 Aug 2008 08:10:22 -0000	1.3
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoUser.java	26 Jan 2016 23:38:15 -0000	1.3.12.1
@@ -254,4 +254,8 @@
 	public void setAnswers(Set<DacoAnswer> answers) {
 		this.answers = answers;
 	}
+	
+	public String getFullName() {
+	   return new StringBuilder(getLastName()).append(" ").append(getFirstName()).toString();
+	}
 }
\ No newline at end of file
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java,v
diff -u -r1.21.2.4 -r1.21.2.5
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	30 Dec 2015 20:40:02 -0000	1.21.2.4
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	26 Jan 2016 23:38:15 -0000	1.21.2.5
@@ -248,8 +248,7 @@
     }
 
     @Override
-    public List<List<DacoAnswer>> getDacoAnswersByUserUid(Long userUid) {
-	DacoUser user = getUser(userUid);
+    public List<List<DacoAnswer>> getDacoAnswersByUser(DacoUser user) {
 	Set<DacoAnswer> answers = user.getAnswers();
 	List<List<DacoAnswer>> result = new LinkedList<List<DacoAnswer>>();
 	if ((answers != null) && (answers.size() > 0)) {
@@ -443,16 +442,74 @@
 	List<MonitoringSummarySessionDTO> result = new ArrayList<MonitoringSummarySessionDTO>(sessions.size());
 	Daco daco = getDacoByContentId(contentId);
 	for (DacoSession session : sessions) {
+	    // for each session a monitoring summary is created but don't include users as the paging fetches them
+	    MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(),
+		    session.getSessionName());
+	    result.add(monitoringRecordList);
+	}
+	return result;
+    }
+
+    @Override
+    public List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, 
+	    String searchString, boolean getNotebookEntries) {
+	return dacoUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, 
+		getNotebookEntries, coreNotebookService);
+    }
+
+    public int getCountUsersBySession(final Long sessionId, String searchString) { 
+	return dacoUserDao.getCountUsersBySession( sessionId, searchString);
+    }
+
+    public List<MonitoringSummarySessionDTO> getSessionStatistics(Long toolContentUid) {
+	return dacoSessionDao.statistics(toolContentUid);	
+    }
+    
+    public MonitoringSummarySessionDTO getAnswersAsRecords(final Long sessionId, final Long userId, int sorting)
+    {
+	DacoSession session = dacoSessionDao.getSessionBySessionId(sessionId);
+	MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(),  session.getSessionName());
+	
+	List<MonitoringSummaryUserDTO> monitoringUsers = new ArrayList<MonitoringSummaryUserDTO>();
+	if ( userId == null ) {
+	    List<DacoUser> users = dacoUserDao.getBySessionId(sessionId, sorting);
+	    for ( DacoUser user : users ) {
+		monitoringUsers.add(getAnswersAsRecordsForUser(user));	    
+	    }
+	} else {
+	    monitoringUsers.add(getAnswersAsRecordsForUser(getUserByUserIdAndSessionId(userId, sessionId)));
+	}
+	
+	monitoringRecordList.setUsers(monitoringUsers);
+	return monitoringRecordList;
+    }
+    
+    // called by getAnswersAsRecords
+    private MonitoringSummaryUserDTO getAnswersAsRecordsForUser(DacoUser user) {
+	MonitoringSummaryUserDTO monitoringUser = new MonitoringSummaryUserDTO(user.getUid(),
+		user.getUserId().intValue(), user.getFullName(),
+		user.getLoginName());
+	List<List<DacoAnswer>> records = getDacoAnswersByUser(user);
+	monitoringUser.setRecords(records);
+	monitoringUser.setRecordCount(records.size());
+	return monitoringUser;
+    }
+    
+    public List<MonitoringSummarySessionDTO> getExportPortfolioSummary(Long contentId, Long userUid) {
+	List<DacoSession> sessions = dacoSessionDao.getByContentId(contentId);
+	List<MonitoringSummarySessionDTO> result = new ArrayList<MonitoringSummarySessionDTO>(sessions.size());
+	Daco daco = getDacoByContentId(contentId);
+	for (DacoSession session : sessions) {
 	    // for each session a monitoring summary is created
 	    MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(),
 		    session.getSessionName());
 	    List<DacoUser> users = dacoUserDao.getBySessionId(session.getSessionId());
 	    List<MonitoringSummaryUserDTO> monitoringUsers = new ArrayList<MonitoringSummaryUserDTO>(users.size());
 	    for (DacoUser user : users) {
 		MonitoringSummaryUserDTO monitoringUser = new MonitoringSummaryUserDTO(user.getUid(),
-			user.getUserId().intValue(), user.getLastName() + " " + user.getFirstName(),
+			user.getUserId().intValue(), user.getFullName(),
 			user.getLoginName());
-		List<List<DacoAnswer>> records = getDacoAnswersByUserUid(user.getUid());
+		List<List<DacoAnswer>> records = getDacoAnswersByUser(user);
 		/*
 		 * If the user provided as "userUid" matches current user UID, the summary is filled with additional
 		 * data. NULL matches all users. UID < 0 matches no users, so only the brief description of users is
@@ -525,15 +582,13 @@
 
     @Override
     public void notifyTeachersOnLearnerEntry(Long sessionId, DacoUser dacoUser) {
-	String userName = dacoUser.getLastName() + " " + dacoUser.getFirstName();
-	String message = getLocalisedMessage("event.learnerentry.body", new Object[] { userName });
+	String message = getLocalisedMessage("event.learnerentry.body", new Object[] { dacoUser.getFullName() });
 	eventNotificationService.notifyLessonMonitors(sessionId, message, false);
     }
 
     @Override
     public void notifyTeachersOnRecordSumbit(Long sessionId, DacoUser dacoUser) {
-	String userName = dacoUser.getLastName() + " " + dacoUser.getFirstName();
-	String message = getLocalisedMessage("event.recordsubmit.body", new Object[] { userName });
+	String message = getLocalisedMessage("event.recordsubmit.body", new Object[] { dacoUser.getFullName() });
 	eventNotificationService.notifyLessonMonitors(sessionId, message, false);
     }
 
@@ -590,7 +645,7 @@
 
     @Override
     public void forceCompleteUser(Long toolSessionId, User user) {
-	//no actions required
+	// no actions required
     }
 
     @Override
@@ -790,6 +845,7 @@
 		coreNotebookService.deleteEntry(entry);
 	    }
 	}
+
 	dacoDao.removeObject(Daco.class, daco.getUid());
     }
 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java,v
diff -u -r1.12 -r1.12.2.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java	10 Mar 2014 22:39:16 -0000	1.12
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java	26 Jan 2016 23:38:15 -0000	1.12.2.1
@@ -133,13 +133,13 @@
     void deleteDacoRecord(List<DacoAnswer> record);
 
     /**
-     * Return all reource questions within the given toolSessionID.
+     * Return all answers for a given user, grouped by record.
      * 
-     * @param sessionId
+     * @param user
      * 
      * @return
      */
-    List<List<DacoAnswer>> getDacoAnswersByUserUid(Long userUid);
+    List<List<DacoAnswer>> getDacoAnswersByUser(DacoUser user);
 
     /**
      * Get daco which is relative with the special toolSession.
@@ -272,9 +272,9 @@
      * @return number of records in that group
      */
     Integer getGroupRecordCount(MonitoringSummarySessionDTO monitoringSummary);
-
+    
     /**
-     * Creates summary that is later used in the monitoring.
+     * Creates summary that is later used in the monitoring. Does not include users.
      * 
      * @param contentId
      *                ID of Daco for which the summary should be created
@@ -286,7 +286,33 @@
      */
     List<MonitoringSummarySessionDTO> getMonitoringSummary(Long contentId, Long userUid);
 
+    /** Get the detailed records for a user (userId != null) or group (userId == null). SessionId should
+     * always be set.
+     */
+    MonitoringSummarySessionDTO getAnswersAsRecords(final Long sessionId, final Long userId, int sorting);
+
     /**
+     * Creates summary that is later used in the export portfolio. 
+     * 
+     * @param contentId
+     *                ID of Daco for which the summary should be created
+     * @param userUid
+     *                ID of the user for who the summary details should be created; <code>null</code> if the summary
+     *                details should be created for all users; <code>< 0 </code> if the summary details should be
+     *                created for noone
+     * @return list of monitoring summaries, one for each session
+     */
+    List<MonitoringSummarySessionDTO> getExportPortfolioSummary(Long contentId, Long userUid);
+
+    /** Get a paged user list for monitoring */
+    List<Object[]> getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, 
+	    String searchString, boolean getNotebookEntries);
+    int getCountUsersBySession(final Long sessionId, String searchString);
+
+    /** Get the basic statistics for all sessions. Used by Monitoring */
+    List<MonitoringSummarySessionDTO> getSessionStatistics(Long toolContentUid);
+    
+  /**
      * Get how many records has the given user posted.
      * 
      * @param userID
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java,v
diff -u -r1.20 -r1.20.2.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java	10 Mar 2014 22:39:16 -0000	1.20
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java	26 Jan 2016 23:38:15 -0000	1.20.2.1
@@ -53,8 +53,6 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.events.DeliveryMethodMail;
-import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -73,7 +71,6 @@
 import org.lamsfoundation.lams.tool.daco.util.DacoQuestionComparator;
 import org.lamsfoundation.lams.tool.daco.web.form.RecordForm;
 import org.lamsfoundation.lams.tool.daco.web.form.ReflectionForm;
-import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.NumberUtil;
@@ -149,9 +146,11 @@
      * @return
      */
     protected ActionForward diplayHorizontalRecordList(ActionMapping mapping, HttpServletRequest request) {
-	request
-		.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, request
+	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, request
 			.getParameter(DacoConstants.ATTR_SESSION_MAP_ID));
+	Long userUid = WebUtil.readLongParam(request, DacoConstants.USER_UID , true);
+	if ( userUid != null )
+	    request.setAttribute(DacoConstants.USER_UID, userUid);
 	return mapping.findForward(DacoConstants.SUCCESS);
     }
 
@@ -210,7 +209,7 @@
 	sessionMap.put(DacoConstants.ATTR_DACO, daco);
 	sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, DacoConstants.LEARNING_VIEW_VERTICAL);
 
-	List<List<DacoAnswer>> records = service.getDacoAnswersByUserUid(dacoUser.getUid());
+	List<List<DacoAnswer>> records = service.getDacoAnswersByUser(dacoUser);
 	sessionMap.put(DacoConstants.ATTR_RECORD_LIST, records);
 	request.setAttribute(DacoConstants.ATTR_DISPLAYED_RECORD_NUMBER, records.size() + 1);
 
@@ -1043,13 +1042,28 @@
 	IDacoService service = getDacoService();
 	DacoUser user = getCurrentUser(service, sessionId, daco);
 
-	List<QuestionSummaryDTO> summaries = service.getQuestionSummaries(user.getUid());
-	sessionMap.put(DacoConstants.ATTR_QUESTION_SUMMARIES, summaries);
+	// get mode - monitoring vs learner
+	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
+	if (mode != null && mode.isTeacher()) {
+	    // monitoring mode - user is specified in URL
+	    // user may be null if the user was force completed.
+	    user = getSpecifiedUser(service, sessionId, WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID,
+		    false));
+	} else {
+	    user = getCurrentUser(service, sessionId, daco);
+	}
 
-	Integer totalRecordCount = service.getGroupRecordCount(user.getSession().getSessionId());
-	sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, totalRecordCount);
-	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	if ( user != null ) {
+	    List<QuestionSummaryDTO> summaries = service.getQuestionSummaries(user.getUid());
+	    sessionMap.put(DacoConstants.ATTR_QUESTION_SUMMARIES, summaries);
+	    Integer totalRecordCount = service.getGroupRecordCount(user.getSession().getSessionId());
+	    sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, totalRecordCount);
+	} else {
+	    sessionMap.put(DacoConstants.ATTR_QUESTION_SUMMARIES, new LinkedList<QuestionSummaryDTO>());
+	    sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, 0);
+	}
 
+	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(DacoConstants.SUCCESS);
     }
 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java,v
diff -u -r1.13 -r1.13.2.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java	17 Jan 2014 21:42:48 -0000	1.13
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java	26 Jan 2016 23:38:15 -0000	1.13.2.1
@@ -39,12 +39,16 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+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.daco.DacoConstants;
@@ -74,12 +78,15 @@
 
     @Override
     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException, ParseException {
+	    HttpServletResponse response) throws IOException, ServletException, ParseException, JSONException {
 	String param = mapping.getParameter();
 
 	if (param.equals("summary")) {
 	    return summary(mapping, request);
 	}
+	if (param.equals("getUsers")) {
+	    return getUsers(mapping, form, request, response);
+	}
 	if (param.equals("viewReflection")) {
 	    return viewReflection(mapping, request);
 	}
@@ -90,24 +97,54 @@
 	if (param.equals("changeView")) {
 	    return changeView(mapping, request);
 	}
+	if (param.equals("getQuestionSummaries")) {
+	    return getQuestionSummaries(mapping, request);
+	}
+	if (param.equals("statistic")) {
+	    return statistic(mapping, request);
+	}
 	if (param.equals("exportToSpreadsheet")) {
 	    return exportToSpreadsheet(request, response);
 	}
 
+	
 	return mapping.findForward(DacoConstants.ERROR);
     }
 
     protected ActionForward listRecords(ActionMapping mapping, HttpServletRequest request) {
+	return listRecords(mapping, request, false);
+    }
+    
+    protected ActionForward changeView(ActionMapping mapping, HttpServletRequest request) {
+	return listRecords(mapping, request, true);
+    }
+    
+    private ActionForward listRecords(ActionMapping mapping, HttpServletRequest request, boolean changeView) {
+	
 	String sessionMapID = request.getParameter(DacoConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	Long userUid = WebUtil.readLongParam(request, DacoConstants.USER_UID, true);
-	Daco daco = (Daco) sessionMap.get(DacoConstants.ATTR_DACO);
-	IDacoService service = getDacoService();
-	sessionMap.put(DacoConstants.ATTR_MONITORING_SUMMARY, service
-		.getMonitoringSummary(daco.getContentId(), userUid));
+	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID, true);
+	Long userId = WebUtil.readLongParam(request, DacoConstants.USER_ID, true);
+	Integer sortOrder = WebUtil.readIntParam(request, DacoConstants.ATTR_SORT, true);
+	if ( sortOrder == null )
+	    sortOrder = DacoConstants.SORT_BY_NO;
+
+	sessionMap.put(DacoConstants.ATTR_MONITORING_SUMMARY, 
+		getDacoService().getAnswersAsRecords(toolSessionId, userId, sortOrder));
 	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
+	request.setAttribute(DacoConstants.ATTR_SORT, sortOrder);
+	request.setAttribute(DacoConstants.USER_ID, userId);
 
-	request.setAttribute(DacoConstants.USER_UID, userUid);
+	if (changeView) {
+	    String currentView = (String) sessionMap.get(DacoConstants.ATTR_LEARNING_VIEW);
+	    if ( DacoConstants.LEARNING_VIEW_HORIZONTAL.equals(currentView)) {
+		sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, DacoConstants.LEARNING_VIEW_VERTICAL);
+	    } else {
+		sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, DacoConstants.LEARNING_VIEW_HORIZONTAL);
+	    }
+	}
+
 	return mapping.findForward(DacoConstants.SUCCESS);
     }
 
@@ -139,22 +176,9 @@
 	    userUid = (Long) sessionMap.get(DacoConstants.USER_UID);
 	    request.setAttribute(DacoConstants.ATTR_MONITORING_CURRENT_TAB, 1);
 	} else {
-	    request.setAttribute(DacoConstants.ATTR_MONITORING_CURRENT_TAB, 4);
+	    request.setAttribute(DacoConstants.ATTR_MONITORING_CURRENT_TAB, 3);
 	}
 
-	if (userUid == null && !monitoringSummaryList.isEmpty() && !monitoringSummaryList.get(0).getUsers().isEmpty()) {
-	    userUid = monitoringSummaryList.get(0).getUsers().get(0).getUid();
-	}
-	if (userUid != null) {
-	    List<QuestionSummaryDTO> summaries = service.getQuestionSummaries(userUid);
-	    sessionMap.put(DacoConstants.ATTR_QUESTION_SUMMARIES, summaries);
-
-	    Integer totalRecordCount = service
-		    .getGroupRecordCount(service.getUser(userUid).getSession().getSessionId());
-	    sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, totalRecordCount);
-	    monitoringSummaryList = service.getMonitoringSummary(contentId, userUid);
-	}
-
 	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	sessionMap.put(DacoConstants.USER_UID, userUid);
 	sessionMap.put(DacoConstants.PAGE_EDITABLE, !daco.isContentInUse());
@@ -174,6 +198,74 @@
 	return mapping.findForward(DacoConstants.SUCCESS);
     }
 
+    protected ActionForward getUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+
+	IDacoService service = getDacoService();
+	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID, true);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	Long sessionId = WebUtil.readLongParam(request,  AttributeNames.PARAM_TOOL_SESSION_ID);
+	
+	Long contentId = sessionMap.get(AttributeNames.PARAM_TOOL_CONTENT_ID) == null ? WebUtil.readLongParam(request,
+		AttributeNames.PARAM_TOOL_CONTENT_ID) : (Long) sessionMap.get(AttributeNames.PARAM_TOOL_CONTENT_ID);
+
+	// paging parameters of tablesorter
+	int size = WebUtil.readIntParam(request, "size");
+	int page = WebUtil.readIntParam(request, "page");
+	Integer isSort1 = WebUtil.readIntParam(request, "column[0]", true);
+	Integer isSort2 = WebUtil.readIntParam(request, "column[1]", true);
+	String searchString = request.getParameter("fcol[0]"); 
+	
+	int sorting = DacoConstants.SORT_BY_NO;
+	if ((isSort1 != null) && isSort1.equals(0)) {
+	    sorting = DacoConstants.SORT_BY_USER_NAME_ASC;
+
+	} else if ((isSort1 != null) && isSort1.equals(1)) {
+	    sorting = DacoConstants.SORT_BY_USER_NAME_DESC;
+
+	} else if ((isSort2 != null) && isSort2.equals(0)) {
+	    sorting = DacoConstants.SORT_BY_NUM_RECORDS_ASC;
+
+	} else if ((isSort2 != null) && isSort2.equals(1)) {
+	    sorting = DacoConstants.SORT_BY_NUM_RECORDS_DESC;
+	} 
+	
+	Daco daco = service.getDacoByContentId(contentId);
+
+	List<Object[]> users = service.getUsersForTablesorter(sessionId, page, size, sorting, searchString, 
+		daco.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();
+	    
+	    DacoUser user = (DacoUser) userAndReflection[0];
+
+	    responseRow.put(DacoConstants.USER_ID, user.getUserId());
+	    responseRow.put(DacoConstants.USER_FULL_NAME, StringEscapeUtils.escapeHtml(user.getFullName()));
+	    
+	    if ( userAndReflection.length > 1 && userAndReflection[1] != null) {
+		responseRow.put(DacoConstants.RECORD_COUNT, (Integer)userAndReflection[1]);
+	    } else {
+		responseRow.put(DacoConstants.RECORD_COUNT, 0);
+	    }
+
+	    if ( userAndReflection.length > 2 && userAndReflection[2] != null) {
+		responseRow.put(DacoConstants.NOTEBOOK_ENTRY, StringEscapeUtils.escapeHtml((String)userAndReflection[2]));
+	    }
+	    rows.put(responseRow);
+	}
+	responsedata.put("rows", rows);
+	res.setContentType("application/json;charset=utf-8");
+	res.getWriter().print(new String(responsedata.toString()));
+	return null;
+    }
     protected ActionForward viewReflection(ActionMapping mapping, HttpServletRequest request) {
 	String sessionMapID = request.getParameter(DacoConstants.ATTR_SESSION_MAP_ID);
 	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
@@ -185,8 +277,7 @@
 	NotebookEntry notebookEntry = service.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
 		DacoConstants.TOOL_SIGNATURE, userId);
 
-	MonitoringSummaryUserDTO userDTO = new MonitoringSummaryUserDTO(null, userId, user.getLastName() + " "
-		+ user.getFirstName(), null);
+	MonitoringSummaryUserDTO userDTO = new MonitoringSummaryUserDTO(null, userId, user.getFullName(), null);
 	userDTO.setReflectionEntry(notebookEntry.getEntry());
 	sessionMap.put(DacoConstants.ATTR_USER, userDTO);
 	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
@@ -199,22 +290,6 @@
 	return (IDacoService) wac.getBean(DacoConstants.DACO_SERVICE);
     }
 
-    protected ActionForward changeView(ActionMapping mapping, HttpServletRequest request) {
-	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID);
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
-	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
-
-	String currentView = (String) sessionMap.get(DacoConstants.ATTR_LEARNING_VIEW);
-	Long userUid = WebUtil.readLongParam(request, DacoConstants.USER_UID, true);
-	request.setAttribute(DacoConstants.USER_UID, userUid);
-	if (DacoConstants.LEARNING_VIEW_HORIZONTAL.equals(currentView)) {
-	    sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, DacoConstants.LEARNING_VIEW_VERTICAL);
-	} else {
-	    sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, DacoConstants.LEARNING_VIEW_HORIZONTAL);
-	}
-	return mapping.findForward(DacoConstants.SUCCESS);
-    }
-
     /**
      * Exports all learners' data to an Excel or CSV file.
      * 
@@ -259,7 +334,7 @@
 
 	List<Object[]> rows = new LinkedList<Object[]>();
 	// We get all sessions with all users with all their records from the given Daco content
-	List<MonitoringSummarySessionDTO> monitoringSummary = service.getMonitoringSummary(daco.getContentId(), null);
+	List<MonitoringSummarySessionDTO> monitoringSummary = service.getExportPortfolioSummary(daco.getContentId(), null);
 	// Get current user's locale to format numbers properly
 	Locale monitoringUserLocale = null;
 	HttpSession ss = SessionManager.getSession();
@@ -404,4 +479,62 @@
 	// Return the file inside response, but not any JSP page
 	return null;
     }
+    
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected ActionForward getQuestionSummaries(ActionMapping mapping, HttpServletRequest request) {
+	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	Long sessionId =  WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	IDacoService service = getDacoService();
+
+	DacoUser user;
+	Long userId = WebUtil.readLongParam(request, DacoConstants.USER_ID, true);
+	user = userId != null ? service.getUserByUserIdAndSessionId(userId, sessionId) : null;
+
+	if ( user != null ) {
+	    List<QuestionSummaryDTO> summaries = service.getQuestionSummaries(user.getUid());
+	    sessionMap.put(DacoConstants.ATTR_QUESTION_SUMMARIES, summaries);
+	    Integer totalRecordCount = service.getGroupRecordCount(sessionId);
+	    sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, totalRecordCount);
+	    Integer userRecordCount = service.getRecordNum(userId, sessionId);
+	    sessionMap.put(DacoConstants.RECORD_COUNT, userRecordCount);
+	    sessionMap.put(DacoConstants.USER_FULL_NAME, user.getFullName());
+	} else {
+	    sessionMap.put(DacoConstants.ATTR_QUESTION_SUMMARIES, new LinkedList<QuestionSummaryDTO>());
+	    sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, 0);
+	    sessionMap.put(DacoConstants.RECORD_COUNT, 0);
+	    sessionMap.put(DacoConstants.USER_FULL_NAME, "");
+	}
+
+	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return mapping.findForward(DacoConstants.SUCCESS);
+    }
+
+    /**
+     * Show statistics page.
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward statistic(ActionMapping mapping, HttpServletRequest request) {
+    
+	String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+
+	IDacoService service = getDacoService();
+
+	Long contentId = sessionMap.get(AttributeNames.PARAM_TOOL_CONTENT_ID) == null ? WebUtil.readLongParam(request,
+		AttributeNames.PARAM_TOOL_CONTENT_ID) : (Long) sessionMap.get(AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Daco daco = service.getDacoByContentId(contentId);
+	List<MonitoringSummarySessionDTO> sessList = service.getSessionStatistics(daco.getUid());
+
+	request.setAttribute(DacoConstants.ATTR_SESSION_SUMMARIES, sessList);
+	request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return mapping.findForward(DacoConstants.SUCCESS);
+    }
+
 }
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/servlet/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/servlet/ExportServlet.java,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/servlet/ExportServlet.java	17 Jan 2014 21:42:48 -0000	1.5
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/servlet/ExportServlet.java	26 Jan 2016 23:38:16 -0000	1.5.2.1
@@ -115,7 +115,7 @@
 			ExportServlet.logger.error(error);
 			throw new DacoApplicationException(error);
 		}
-		List<MonitoringSummarySessionDTO> monitoringSummary = service.getMonitoringSummary(daco.getContentId(),
+		List<MonitoringSummarySessionDTO> monitoringSummary = service.getExportPortfolioSummary(daco.getContentId(),
 				DacoConstants.MONITORING_SUMMARY_MATCH_ALL);
 		sessionMap.put(DacoConstants.ATTR_MONITORING_SUMMARY, monitoringSummary);
 		sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
@@ -160,7 +160,7 @@
 			}
 		}
 		if (anyRecordsAvailable) {
-			writeResponseToFile(basePath + "/pages/monitoring/listRecords.jsp?sessionMapID=" + sessionMap.getSessionID()
+			writeResponseToFile(basePath + "/pages/export/listRecords.jsp?sessionMapID=" + sessionMap.getSessionID()
 					+ "&includeMode=exportportfolio", learnerDirectory, "allRecords.html", cookies);
 		}
 	}
@@ -196,7 +196,7 @@
 		sessionMap.put(DacoConstants.ATTR_TOTAL_RECORD_COUNT, totalRecordCount);
 
 		sessionMap.put(DacoConstants.ATTR_DACO, daco);
-		List<List<DacoAnswer>> records = service.getDacoAnswersByUserUid(user.getUid());
+		List<List<DacoAnswer>> records = service.getDacoAnswersByUser(user);
 		new File(directory, "files").mkdir();
 
 		for (List<DacoAnswer> record : records) {
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_daco/web/common/jqueryheader.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/includes/javascript/dacoMonitoring.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/includes/javascript/dacoMonitoring.js,v
diff -u -r1.2 -r1.2.12.1
--- lams_tool_daco/web/includes/javascript/dacoMonitoring.js	8 Aug 2008 08:10:22 -0000	1.2
+++ lams_tool_daco/web/includes/javascript/dacoMonitoring.js	26 Jan 2016 23:41:06 -0000	1.2.12.1
@@ -9,15 +9,15 @@
 	function doSelectTab(tabId) {
 		selectTab(tabId);
 		currentTab = tabId;
+
+    	//for statistic page change:
+    	if(tabId == 3) {
+    		doStatistic();
+    	}
 	}
 	
-	function refreshPage (url){
-		var userDropdown=document.getElementById("userDropdown");
-		var selectedValue = userDropdown.options[userDropdown.selectedIndex].value;
-		if (selectedValue == "SHOW_ALL"){
-	 		document.location.href = url;
-	 	}
-	 	else if (selectedValue >= 0){
-	 		document.location.href = url+"&userUid="+selectedValue;
-		}
-	}
\ No newline at end of file
+	function doStatistic(){
+		var url = gStatisticsUrl+"&reqID="+(new Date()).getTime();
+		$("#statisticArea").load(url);
+	} 
+	
\ No newline at end of file
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_daco/web/pages/export/listRecords.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/pages/learning/listRecords.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/listRecords.jsp,v
diff -u -r1.11 -r1.11.2.1
--- lams_tool_daco/web/pages/learning/listRecords.jsp	27 Mar 2014 13:57:45 -0000	1.11
+++ lams_tool_daco/web/pages/learning/listRecords.jsp	26 Jan 2016 23:41:06 -0000	1.11.2.1
@@ -94,7 +94,7 @@
 						<c:url var="showRecordsUrl" value='/learning/diplayHorizontalRecordList.do'>
 							<c:param name="sessionMapID" value="${sessionMapID}" />
 							<c:if test="${includeMode=='monitoring'}">
-								<c:param name="userUid" value="${user.uid}" />
+								<c:param name="userId" value="${user.userId}" />
 							</c:if>
 							<c:param name="includeMode" value="${includeMode}" />
 						</c:url>
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp,v
diff -u -r1.9 -r1.9.2.1
--- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	27 Mar 2014 13:57:45 -0000	1.9
+++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp	26 Jan 2016 23:41:06 -0000	1.9.2.1
@@ -17,21 +17,6 @@
 	<c:set var="finishedLock" value="${sessionMap.finishedLock}" />
 	<%-- It contains users info divided into sessions. --%>
 	<c:set var="monitoringSummary" value="${sessionMap.monitoringSummary}" />
-	<c:choose>
-		<%-- Record list comes from different sources, depending on the including page. --%>
-		<c:when test="${includeMode=='learning'}">
-			<c:set var="recordList" value="${sessionMap.recordList}" />
-		</c:when>
-		<c:otherwise>
-				<c:forEach var="userGroup" items="${monitoringSummary}">
-					<c:forEach var="user" items="${userGroup.users}">
-						<c:if test="${param.userUid==user.uid}">
-							<c:set var="recordList" value="${user.records}" />
-						</c:if>
-					</c:forEach>
-				</c:forEach>
-		</c:otherwise>
-	</c:choose>
 
 	<lams:css style="tabbed" />
 	<%-- To enable the table to have maximum height.  --%>
@@ -50,6 +35,20 @@
 </lams:head>
 <body class="tabpart">
 	
+	<c:choose>
+		<%-- Record list comes from different sources, depending on the including page. --%>
+		<c:when test="${includeMode=='learning'}">
+			<c:set var="recordList" value="${sessionMap.recordList}" />
+		</c:when>
+		<c:otherwise>
+			<c:forEach var="user" items="${monitoringSummary.users}">
+				<c:if test="${param.userId==user.userId}">
+					<c:set var="recordList" value="${user.records}" />
+				</c:if>
+			</c:forEach>
+		</c:otherwise>
+	</c:choose>
+
 	<table id="horizontalListTable" class="alternative-color" cellspacing="0">
 		<%-- Each column is one record. This is pure data - header was done in the including page.  --%>
 		<tr>
Index: lams_tool_daco/web/pages/monitoring/listRecords.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/listRecords.jsp,v
diff -u -r1.5 -r1.5.2.1
--- lams_tool_daco/web/pages/monitoring/listRecords.jsp	27 Mar 2014 14:21:45 -0000	1.5
+++ lams_tool_daco/web/pages/monitoring/listRecords.jsp	26 Jan 2016 23:41:06 -0000	1.5.2.1
@@ -1,26 +1,20 @@
 <%@ include file="/common/taglibs.jsp"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
-<lams:html>
+<lams:html> 
 <lams:head>
-		<%-- This page modifies its content depending on the page it was included from. --%>
+		<%-- This page/learning/listRecords.jsp page modifies its content depending on the page it was included from. --%>
 		<c:if test="${not empty param.includeMode}">
 			<c:set var="includeMode" value="${param.includeMode}" />
 		</c:if>
 		<c:if test="${empty includeMode}">
 			<c:set var="includeMode" value="monitoring" />
 		</c:if>
-		<%-- The style sheet file is either on the server (monitoring)
-			or in the parent directory (export portfolio) --%>
-		<c:if test="${includeMode=='exportportfolio'}">
-			<lams:css localLinkPath="../../" />
-			<link rel="StyleSheet" href="../daco.css" type="text/css" />
-		</c:if>
 		<c:if test="${not empty param.sessionMapID}">
 			<c:set var="sessionMapID" value="${param.sessionMapID}" />
 		</c:if>
 		<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-		<c:set var="monitoringSummary" value="${sessionMap.monitoringSummary}" />
+		<c:set var="userGroup" value="${sessionMap.monitoringSummary}" />
 			
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/prototype.js"></script>					
 		<%@ include file="/common/header.jsp"%>
@@ -41,72 +35,29 @@
 	<div id="header-no-tabs">
 	</div>
 	<div id="content">
-		<c:if test="${includeMode=='monitoring'}">
+
 			<div style="float: right; margin-left: 10px; padding-top: 4px" class="help">
 				<%-- Switch between the horizontal and vertical views --%>
 				<c:url var="changeViewUrl" value='/monitoring/changeView.do'>
 					<c:param name="sessionMapID" value="${sessionMapID}" />
-					<c:param name="userUid" value="${userUid}" />
+					<c:param name="toolSessionID" value="${toolSessionID}" />
+					<c:param name="userId" value="${userId}" />
+					<c:param name="sort" value="${sort}" />
 				</c:url>
 				<img src="${tool}includes/images/uparrow.gif" title="<fmt:message key="label.common.view.change" />"
 				 onclick="javascript:document.location.href='${changeViewUrl}'" />
 			</div>
-			<table>
-				<tr>
-					<td class="button-cell">
-						<div style="float: left">
-							<%-- Users in the dropdown menu are divided into groups.
-								 Currently displayed user is selected.
-								 There is also an option to display all records of all users. --%>
-							<select id="userDropdown" style="margin-top: -4px;">
-								<c:forEach var="userGroup" items="${monitoringSummary}">
-									<option value="-1" disabled="disabled">--- ${userGroup.sessionName} ---</option>
-									<c:forEach var="nextUser" items="${userGroup.users}">
-										<option value="${nextUser.uid}" 
-										<c:if test="${userUid==nextUser.uid}">
-											selected="selected"
-										</c:if>
-										><c:out value="${nextUser.fullName}" escapeXml="true"/></option>
-									</c:forEach>
-								</c:forEach>
-								<option value="-1" disabled="disabled">----------</option>
-								<option value="SHOW_ALL" 
-									<c:if test="${empty userUid}">
-										selected="selected"
-									</c:if>
-								>
-									<fmt:message key="label.monitoring.viewrecords.all" />
-								</option>
-							</select>
-						</div>
-						<c:url var="showRecordsUrl" value='/monitoring/listRecords.do'>
-							<c:param name="sessionMapID" value="${sessionMapID}" />
-						</c:url>
-						<a href="#" onclick="javascript:refreshPage('${showRecordsUrl}');" class="button space-left" style="margin-top: 60px;">
-							<fmt:message key="label.monitoring.chooseuser" />
-						</a>
-					</td>
-					<td class="button-cell">
-						<a href="#" onclick="javascript:self.close()" class="button"><fmt:message key="label.monitoring.close" /></a>
-					</td>
-				</tr>
-			</table>
-		</c:if>
-		<c:forEach var="userGroup" items="${monitoringSummary}">
-			<c:forEach var="user" items="${userGroup.users}" varStatus="userStatus">
-				<c:if test="${empty userUid || userUid==user.uid}">
+
+			<c:if test="${sessionMap.isGroupedActivity}">
+			<h2  style="display: inline"><fmt:message key="label.monitoring.group" />: ${userGroup.sessionName}</h2>
+			</c:if>
+			<div class="float-right"><a href="#" onclick="javascript:self.close()" class="button"><fmt:message key="label.monitoring.close" /></a></div>
+			<c:forEach var="user" items="${userGroup.users}">
 					<table cellpadding="0" class="alternative-color">
 						<tr>
 							<th><fmt:message key="label.monitoring.fullname" /></th>
 							<th><fmt:message key="label.monitoring.recordcount" /></th>
 						</tr>
-						<c:if test="${userStatus.first || userUid==user.uid}">
-							<tr>
-								<td colspan="3" style="height: 20px; font-weight: bold; text-align: center">
-									<fmt:message key="label.monitoring.group" />: ${userGroup.sessionName}
-								</td>
-							</tr>
-						</c:if>
 						<tr>
 							<td style="height: 20px;">
 								 <c:out value="${user.fullName}" escapeXml="true"/>
@@ -116,14 +67,11 @@
 							</td>
 						</tr>
 					</table>
-					<%-- for each user his record list is displayed --%>
 					<c:if test="${not empty user.records}">
 						<c:set var="recordList" value="${user.records}" />
 						<%@ include file="/pages/learning/listRecords.jsp" %>
 					</c:if>
-				</c:if>
 			</c:forEach>
-		</c:forEach>
 	</div>
 	<div id="footer">
 	</div>
Index: lams_tool_daco/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.4 -r1.4.2.1
--- lams_tool_daco/web/pages/monitoring/monitoring.jsp	17 Jan 2014 21:42:48 -0000	1.4
+++ lams_tool_daco/web/pages/monitoring/monitoring.jsp	26 Jan 2016 23:41:06 -0000	1.4.2.1
@@ -6,7 +6,7 @@
 
 <lams:html>
 	<lams:head>
-		<%@ include file="/common/tabbedheader.jsp" %>
+		<%@ include file="/common/jqueryheader.jsp" %>
 		
 		<script>
 			var currentTab = "${monitoringCurrentTab}";
@@ -22,7 +22,7 @@
 			<fmt:message key="label.common.heading" />
 		</h1>
 	<div id="header">
-		<lams:Tabs>
+		<lams:Tabs control="true">
 			<lams:Tab id="1" key="label.common.summary" />
 			<lams:Tab id="2" key="tab.monitoring.edit.activity" />			
 			<lams:Tab id="3" key="tab.monitoring.statistics" />
@@ -38,5 +38,6 @@
 	<div id="footer"></div>
 	
 	</div>
-	</body>
-</lams:html>
\ No newline at end of file
+</div>
+</body>
+</lams:html>
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_daco/web/pages/monitoring/questionSummaries.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/statistics.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_daco/web/pages/monitoring/statistics.jsp	31 Mar 2014 20:30:44 -0000	1.6
+++ lams_tool_daco/web/pages/monitoring/statistics.jsp	26 Jan 2016 23:41:06 -0000	1.6.2.1
@@ -1,45 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<c:set var="monitoringSummary" value="${sessionMap.monitoringSummary}" />
-<c:set var="includeMode" value="monitoring" />
-<c:set var="userUid" value="${sessionMap.userUid}" />
-<c:url var="refreshStatisticsUrl" value="/monitoring/summary.do?sessionMapID=${sessionMapID}"/>
-
-	<%-- Same statistics as in the learner,
-		but with an option to choose currently displayed learner. --%>
-	<c:choose>
-		<c:when test="${empty monitoringSummary || empty monitoringSummary[0].users}">
-			<div align="center" style="font-weight: bold;">
-				<fmt:message key="message.monitoring.summary.no.session" />
-			</div>
-		</c:when>
-		<c:otherwise>
-			<table>
-				<tr>
-					<td class="button-cell">
-						<div style="float: left">
-							<select id="userDropdown" style="margin-top: -2px; height: 30px">
-								<c:forEach var="userGroup" items="${monitoringSummary}">
-									<option value="-1" disabled="disabled">--- ${userGroup.sessionName} ---</option>
-									<c:forEach var="nextUser" items="${userGroup.users}">
-										<option value="${nextUser.uid}" 
-										<c:if test="${userUid==nextUser.uid}">
-											selected="selected"
-											<c:set var="recordList" value="${nextUser.records}" />
-											<c:set var="userFullName" value="<c:out value='${nextUser.fullName}' escapeXml='true'/>" />
-										</c:if>
-										<c:out value="${userFullName}" escapeXml="false"/></option>
-									</c:forEach>
-								</c:forEach>
-							</select>
-						</div>
-					<a href="#" onclick="javascript:refreshPage('${refreshStatisticsUrl}')" class="button space-left">
-						<fmt:message key="label.monitoring.chooseuser" />
-					</a>
-					</td>
-				</tr>
-			</table>
-			</p>
-			<%@ include file="/pages/learning/questionSummaries.jsp" %>
-		</c:otherwise>
-	</c:choose>
+<div id="statisticArea">
+	<%@ include file="statisticsarea.jsp"%>
+</div>
\ No newline at end of file
Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_daco/web/pages/monitoring/statisticsarea.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_daco/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/monitoring/summary.jsp,v
diff -u -r1.13 -r1.13.2.1
--- lams_tool_daco/web/pages/monitoring/summary.jsp	8 Apr 2014 00:30:37 -0000	1.13
+++ lams_tool_daco/web/pages/monitoring/summary.jsp	26 Jan 2016 23:41:06 -0000	1.13.2.1
@@ -2,108 +2,187 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
 <c:set var="monitoringSummary" value="${sessionMap.monitoringSummary}" />
 <c:set var="anyRecordsAvailable" value="false" />
-<c:url  var="refreshSummaryUrl" value="/monitoring/summary.do?sessionMapID=${sessionMapID}"/>
+<c:url var="refreshSummaryUrl" value="/monitoring/summary.do?sessionMapID=${sessionMapID}"/>
+<c:url var="statisticsUrl" value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>
 <c:set var="daco" value="${sessionMap.daco}"/>
-
+				
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js"></script>
 <script type="text/javascript">
+	var gStatisticsUrl = "${statisticsUrl}"; // used by the tab functions
+	
 	function exportSummary(){
 		location.href = "<c:url value='/monitoring/exportToSpreadsheet.do'/>?sessionMapID=${sessionMapID}&reqID=" + (new Date()).getTime();
 	};
-</script>
+	
+  	$(document).ready(function(){
+	    
+		$(".tablesorter").tablesorter({
+			theme: 'blue',
+		    sortInitialOrder: 'desc',
+            sortList: [[0]],
+            widgets: [ "resizable", "filter" ],
+            headers: { 1: { filter: false}, 2: { filter: false, sorter: false }, 3: { filter: false, sorter: false }, 4: { filter: false, sorter: false }  }, 
+            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}&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>';
+							rows += 	userData["userFullName"];
+							rows += '</td>';
+							
+							rows += '<td align="center">';
+							rows += userData["recordCount"];
+							rows += '</td>';
+							rows += '<td align="center">';
+							if ( userData["recordCount"] > 0) {
+								var url = '<c:url value="/monitoring/listRecords.do"/>?sessionMapID=${sessionMapID}&toolSessionID='+$(table).attr('data-session-id')+'&sort=1&userId='+userData["userId"];
+								var popUpTitle = '<fmt:message key="title.monitoring.recordlist" />';
+								rows +=	'&nbsp;&nbsp;<a href="#" onclick="javascript:launchPopup(\''+url+'\',\''+popUpTitle+'\');">';
+								rows += 'View Records'
+								url = '<c:url value="/monitoring/getQuestionSummaries.do"/>?sessionMapID=${sessionMapID}&toolSessionID='+$(table).attr('data-session-id')+'&userId='+userData["userId"];
+								popUpTitle = '<fmt:message key="tab.monitoring.statistics" />';
+								rows += '</a>&nbsp;&nbsp;<a href="#" onclick="javascript:launchPopup(\''+url+'\',\''+popUpTitle+'\');">';
+								rows += 'View Summary'
+								rows += '</a>';
+							} 
+							rows += '</td>';
 
+							
+							if (${daco.reflectOnActivity}) {
+								rows += '<td style="text-align: left">';
+								rows += (userData["notebookEntry"]) ? userData["notebookEntry"] : '<fmt:message key="label.monitoring.notebook.none" />' ;
+								rows += '</td>';
+							}
+							
+							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>
 <h1>
   <c:out value="${daco.title}" escapeXml="true"/>
 </h1>
-<div class="instructions space-top">
+<div class="instructions space-bottom-top">
   <c:out value="${daco.instructions}" escapeXml="false"/>
 </div>
 
 <c:choose>
-	<c:when test="${empty monitoringSummary || empty monitoringSummary[0].users}">
+	<c:when test="${empty monitoringSummary}">
 		<div align="center" style="font-weight: bold;">
 			<fmt:message key="message.monitoring.summary.no.session" />
 		</div>
 	</c:when>
 	<c:otherwise>
+		<c:forEach var="sessionSummary" items="${monitoringSummary}">
+			<c:url var="viewRecordList" value="/monitoring/listRecords.do?sessionMapID=${sessionMapID}&toolSessionID=${sessionSummary.sessionId}&sort=1" />
+			<div id="${sessionSummary.sessionId}" class="space-bottom"/>
+			<c:if test="${sessionMap.isGroupedActivity}">
+				<h1 style="display: inline">
+					<fmt:message key="label.learning.tableheader.summary.group" />: <c:out value="${sessionSummary.sessionName}"/>
+				</h1>
+				<a href="#nogo" onclick="javascript:launchPopup('${viewRecordList}','RecordList')" class="button float-right">
+					<fmt:message key="label.monitoring.viewrecords.all" />
+				</a>					
+			</c:if>
 		
-		<table cellpadding="0" class="alternative-color">
-			<tr>
-				<th><fmt:message key="label.monitoring.fullname" /></th>
-				<th align="center"><fmt:message key="label.monitoring.recordcount" /></th>
-				<c:if test="${daco.reflectOnActivity}">
-					<th align="center"><fmt:message key="label.monitoring.notebook" /></th>
-				</c:if>
-			</tr>
-			<c:forEach var="sessionSummary" items="${monitoringSummary}">
-				<c:if test="${sessionMap.isGroupedActivity}">
+			<div class="tablesorter-holder">
+			<table class="tablesorter" data-session-id="${sessionSummary.sessionId}">
+				<thead>
 					<tr>
-						<td colspan="4" style="font-weight: bold; text-align: center">
-							<fmt:message key="label.monitoring.group" />: ${sessionSummary.sessionName}
-						</td>
+						<th><fmt:message key="label.monitoring.fullname" /></th>
+						<c:choose>
+						<c:when test="${daco.reflectOnActivity}">
+						<th align="center"  width="8%"><fmt:message key="label.monitoring.recordcount" /></th>
+						<th align="center"  width="25%"></th>
+						<th align="center"  width="35%"><fmt:message key="label.monitoring.notebook" /></th>
+						</c:when>
+						<c:otherwise>
+						<th align="center"  width="8%"><fmt:message key="label.monitoring.recordcount" /></th>
+						<th align="center"  width="25%"></th>
+						</c:otherwise>
+						</c:choose>
 					</tr>
-				</c:if>
-				<c:forEach var="user" items="${sessionSummary.users}">
-					<tr>
-						<td>
-							<c:out value="${user.fullName}" escapeXml="true"/>
-						</td>
-						<td  style="text-align: center; font-weight: bold; text-align: center;">
-							<c:choose>
-								<c:when test="${user.recordCount > 0}">
-									<c:set var="anyRecordsAvailable" value="true" />
-									<c:url var="viewRecordList"	value="/monitoring/listRecords.do">
-										<c:param name="sessionMapID" value="${sessionMapID}" />
-										<c:param name="userUid" value="${user.uid}" />
-									</c:url>
-									<a href="#" onclick="javascript:launchPopup('${viewRecordList }','RecordList')">
-										${user.recordCount}
-									</a>
-								</c:when>
-								<c:otherwise>
-									0
-								</c:otherwise>
-							</c:choose>
-						</td>
-						<c:if test="${daco.reflectOnActivity}">
-							<td style="text-align: center">
-								<c:choose>
-									<c:when test="${empty user.reflectionEntry}">
-										<fmt:message key="label.monitoring.notebook.none" />
-									</c:when>
-									<c:otherwise>
-										<c:url var="viewReflection"	value="/monitoring/viewReflection.do">
-											<c:param name="toolSessionID" value="${sessionSummary.sessionId}" />
-											<c:param name="userId" value="${user.userId}" />
-											<c:param name="sessionMapID" value="${sessionMapID}" />
-										</c:url>
-										<a href="#" onclick="javascript:launchPopup('${viewReflection }','Reflection')">
-											<fmt:message key="label.monitoring.notebook.view" />
-										</a>
-									</c:otherwise>
-								</c:choose>
-							</td>
-						</c:if>
-					</tr>
-				</c:forEach>
-			</c:forEach>
-		</table>
+				</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> <!-- end tablesorter-holder -->
+			</div>
+
+		</c:forEach>
 	</c:otherwise>
 </c:choose>
 <p>
 	<a href="#nogo"  class="button" onclick="javascript:document.location.href='${refreshSummaryUrl}';">
 		<fmt:message key="label.common.summary.refresh" />
 	</a>
-	<c:if  test="${anyRecordsAvailable}">
-		<c:url var="viewRecordList" value="/monitoring/listRecords.do?sessionMapID=${sessionMapID}" />
+	<c:if test="${! empty viewRecordList}">
+		<c:if test="${! sessionMap.isGroupedActivity }">
 		<a href="#nogo" onclick="javascript:launchPopup('${viewRecordList}','RecordList')" class="button space-left">
 			<fmt:message key="label.monitoring.viewrecords.all" />
-		</a>
-		
-		<html:link href="javascript:exportSummary();" styleClass="button space-left">
-			<fmt:message key="button.export" />
-		</html:link>
-		
+		</a>					
+		</c:if>
+	<html:link href="javascript:exportSummary();" styleClass="button space-left">
+		<fmt:message key="button.export" />
+	</html:link>
 	</c:if>
 </p>