Index: lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.hbm.xml
===================================================================
diff -u -r9ab6da017a5180a0ee0e766740571644972ce628 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.hbm.xml	(.../PeerreviewUser.hbm.xml)	(revision 9ab6da017a5180a0ee0e766740571644972ce628)
+++ lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.hbm.xml	(.../PeerreviewUser.hbm.xml)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -87,6 +87,14 @@
             insert="true"
             column="session_finished"
         />
+        
+        <property
+            name="hidden"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="hidden"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r129ea5b185183a7213e3dedaff8724c146b7fc9e -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 129ea5b185183a7213e3dedaff8724c146b7fc9e)
+++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -160,3 +160,10 @@
 label.show.ratings.left.by.user  =After completion, show feedback left for other students
 label.ratings.by.others  =Ratings left for you
 label.no.ratings.out.of.possible.ratings={0} rating(s) out of {1} possible ratings.
+
+label.export.team.results  =Export to spreadsheet
+label.manage.users  =Manage users
+label.manage.users.description  =Uncheck all learners that should not be rated by others
+label.removed.user.warning  =The teacher has limited your ability to rate and be rated in this activity.
+label.user.hidden  =Remove user from rating
+
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java
===================================================================
diff -u -re755d63f41781aa02a1fb97ae349019d01a58782 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java	(.../PeerreviewConstants.java)	(revision e755d63f41781aa02a1fb97ae349019d01a58782)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java	(.../PeerreviewConstants.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -66,6 +66,7 @@
     public static final String PARAM_SEARCH_FIELD = "searchField";
     public static final String PARAM_SEARCH_OPERATION = "searchOper";
     public static final String PARAM_SEARCH_STRING = "searchString";
+    public static final String PARAM_SORT_USER_NAME = "userName";
     public static final String PARAM_SORT_NAME = "itemDescription";
     public static final String PARAM_SORT_RATING = "rating";
     public static final String PARAM_SORT_NOTEBOOK = "notebook";
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java
===================================================================
diff -u -r4d3e6f238197f6f125591b3a2d6e6c8916b59ee0 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java	(.../PeerreviewUserDAO.java)	(revision 4d3e6f238197f6f125591b3a2d6e6c8916b59ee0)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java	(.../PeerreviewUserDAO.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -34,15 +34,21 @@
 public interface PeerreviewUserDAO extends DAO {
 
     PeerreviewUser getUserByUserIDAndSessionID(Long userID, Long sessionId);
+    
+    PeerreviewUser getUserByUid(Long userUid);
 
     PeerreviewUser getUserByUserIDAndContentID(Long userId, Long contentId);
 
     List<PeerreviewUser> getBySessionID(Long sessionId);
 
-    List<Long> getUserIdsBySessionID(Long sessionId);
-
-    List<PeerreviewUser> getByContentId(Long toolContentId);
-
+    /**
+     * Counts number of users in a session excluding specified user. Besides, it also *excludes all hidden users*.
+     * 
+     * @param toolSessionId
+     * @param excludeUserId
+     * @param includeHiddenUsers whether hidden users should be counted as well or not
+     * @return
+     */
     int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId);
 
     List<Object[]> getRatingsComments(Long toolContentId, Long toolSessionId, RatingCriteria criteria, Long userId, Integer page,
@@ -53,10 +59,28 @@
 	
     List<Object[]> getDetailedRatingsComments(Long toolContentId, Long toolSessionId, Long criteriaId, Long itemId );
     
+    /**
+     * Counts number of users in a specified session. It counts it regardless whether a user is hidden or not.
+     * 
+     * @param toolSessionId
+     * @return
+     */
     int getCountUsersBySession(Long toolSessionId);
 
     int createUsersForSession(PeerreviewSession session);
     
     List<Object[]> getUserNotebookEntriesForTablesorter(final Long toolSessionId, int page, int size, int sorting, String searchString, 
 	    ICoreNotebookService coreNotebookService);
+    
+    /**
+     * Returns list of <userUid, userName> pairs. Used by monitor's manageUsers functionality.
+     * 
+     * @param toolSessionId
+     * @param page
+     * @param size
+     * @param sorting
+     * @param searchString
+     * @return
+     */
+    List<Object[]> getPagedUsers(Long toolSessionId, Integer page, Integer size, int sorting, String searchString);
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
===================================================================
diff -u -rc1f2aa0761a3d79b04018fb752e069f366ccd15b -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(.../PeerreviewUserDAOHibernate.java)	(revision c1f2aa0761a3d79b04018fb752e069f366ccd15b)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java	(.../PeerreviewUserDAOHibernate.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -46,21 +46,18 @@
 
     private static final String FIND_BY_USER_ID_CONTENT_ID = "FROM " + PeerreviewUser.class.getName()
 	    + " AS u WHERE u.userId =? AND u.peerreview.contentId=?";
+    
     private static final String FIND_BY_USER_ID_SESSION_ID = "FROM " + PeerreviewUser.class.getName()
 	    + " AS u WHERE u.userId =? AND u.session.sessionId=?";
+    
     private static final String FIND_BY_SESSION_ID = "FROM " + PeerreviewUser.class.getName()
 	    + " AS u WHERE u.session.sessionId=?";
-    private static final String GET_USERIDS_BY_SESSION_ID = "SELECT userId FROM " + PeerreviewUser.class.getName()
-	    + " AS u WHERE u.session.sessionId=?";
 
-    private static final String FIND_BY_CONTENT_ID = "FROM " + PeerreviewUser.class.getName()
-	    + " AS u WHERE u.session.peerreview.contentId=?";
-
     private static final String GET_COUNT_USERS_FOR_SESSION_EXCLUDE_USER = "SELECT COUNT(*) FROM "
-	    + PeerreviewUser.class.getName() + " AS r WHERE r.session.sessionId=? AND r.userId!=?";
+	    + PeerreviewUser.class.getName() + " AS u WHERE u.session.sessionId=? AND u.userId!=? AND u.hidden=0";
 
     private static final String GET_COUNT_USERS_FOR_SESSION = "SELECT COUNT(*) FROM " + PeerreviewUser.class.getName()
-	    + " AS r WHERE r.session.sessionId=?";
+	    + " AS u WHERE u.session.sessionId=?";
 
     @Override
     public PeerreviewUser getUserByUserIDAndSessionID(Long userID, Long sessionId) {
@@ -70,6 +67,11 @@
 	}
 	return (PeerreviewUser) list.get(0);
     }
+    
+    @Override
+    public PeerreviewUser getUserByUid(Long userUid) {
+	return (PeerreviewUser) this.find(PeerreviewUser.class, userUid);
+    }
 
     @Override
     public PeerreviewUser getUserByUserIDAndContentID(Long userId, Long contentId) {
@@ -86,16 +88,6 @@
     }
 
     @Override
-    public List<Long> getUserIdsBySessionID(Long sessionId) {
-	return find(GET_USERIDS_BY_SESSION_ID, sessionId);
-    }
-
-    @Override
-    public List<PeerreviewUser> getByContentId(Long toolContentId) {
-	return find(FIND_BY_CONTENT_ID, toolContentId);
-    }
-
-    @Override
     public int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId) {
 
 	List list = find(GET_COUNT_USERS_FOR_SESSION_EXCLUDE_USER, new Object[] { toolSessionId, excludeUserId });
@@ -115,9 +107,6 @@
 	return ((Number) list.get(0)).intValue();
     }
 
-    private static final String LOAD_USERS_FOR_SESSION_LIMIT = "FROM user in class PeerreviewUser "
-	    + "WHERE user.session.sessionId=:toolSessionId AND user.userId!=:excludeUserId order by ";
-
     private static final String CREATE_USERS = "INSERT into tl_laprev11_user (user_id, login_name, first_name, last_name, session_finished, session_uid) "
 	    + " SELECT user.user_id, user.login, user.first_name, user.last_name, 0, :session_uid "
 	    + " FROM lams_user user " + " JOIN lams_user_group ug ON ug.user_id = user.user_id "
@@ -141,7 +130,7 @@
     private static final String FIND_USER_RATINGS_COMMENTS1 = "SELECT user.user_id, rating.*, user.first_name, user.last_name "
 	    + " FROM tl_laprev11_peerreview p "
 	    + " JOIN tl_laprev11_session sess ON p.content_id = :toolContentId AND p.uid = sess.peerreview_uid AND sess.session_id = :toolSessionId  "
-	    + " JOIN tl_laprev11_user user ON user.session_uid = sess.uid "
+	    + " JOIN tl_laprev11_user user ON user.session_uid = sess.uid AND user.hidden = 0 "
 	    + " LEFT JOIN ( ";
     private static final String FIND_USER_RATINGS_COMMENTS2 = " ) rating ON user.user_id = rating.item_id ";
     
@@ -220,12 +209,13 @@
     private static final String SELECT_ALL_RATINGS_COMMENTS_LEFT_FOR_ITEM = "SELECT user.user_id, rc.comment, r.rating, user.first_name, user.last_name "
 	    + " FROM tl_laprev11_peerreview p "
 	    + " JOIN tl_laprev11_session sess ON p.content_id = :toolContentId AND p.uid = sess.peerreview_uid AND sess.session_id = :toolSessionId "
-	    + " JOIN tl_laprev11_user user ON user.session_uid = sess.uid "
+	    + " JOIN tl_laprev11_user user ON user.session_uid = sess.uid AND user.hidden = 0 "
 	    + " LEFT JOIN ( SELECT rating, user_id FROM lams_rating "
 	    + "    WHERE rating_criteria_id = :ratingCriteriaId AND item_id = :itemId) r ON r.user_id = user.user_id "
 	    + " LEFT JOIN ( SELECT item_id, comment, user_id FROM lams_rating_comment "
 	    + "    WHERE rating_criteria_id = :ratingCriteriaId AND (item_id = :itemId || item_id = rating_criteria_id) ) rc ON rc.user_id = user.user_id " 
 	    + " WHERE r.rating IS NOT NULL OR rc.comment IS NOT NULL";
+    @Override
     public List<Object[]> getDetailedRatingsComments(Long toolContentId, Long toolSessionId, Long criteriaId, Long itemId ) {
 	Query query = getSession().createSQLQuery(SELECT_ALL_RATINGS_COMMENTS_LEFT_FOR_ITEM)
 		.setLong("toolContentId", toolContentId)
@@ -238,12 +228,13 @@
     private static final String COUNT_COMMENTS_FOR_SESSION = "SELECT user.user_id, rating.comment_count, user.first_name, user.last_name  "
     	    + " FROM tl_laprev11_peerreview p "
 	    + " JOIN tl_laprev11_session sess ON p.content_id = :toolContentId AND p.uid = sess.peerreview_uid AND sess.session_id = :toolSessionId  "
-	    + " JOIN tl_laprev11_user user ON user.session_uid = sess.uid "
+	    + " JOIN tl_laprev11_user user ON user.session_uid = sess.uid AND user.hidden = 0 "
 	    + " LEFT JOIN ( "
 	    + " 	SELECT r.item_id, count(r.comment)  comment_count "
 	    + " 	FROM lams_rating_comment r "
 	    + "		WHERE r.rating_criteria_id = :ratingCriteriaId "
 	    + " 	GROUP BY r.item_id ) rating ON user.user_id = rating.item_id ";
+    @Override
     public List<Object[]> getCommentsCounts(Long toolContentId, Long toolSessionId, RatingCriteria criteria,
 	    Integer page, Integer size, int sorting, String searchString) {
 	String sortingOrder = "";
@@ -335,4 +326,45 @@
 	return query.list();
 
     }
+    
+    @Override
+    public List<Object[]> getPagedUsers(Long toolSessionId, Integer page, Integer size, int sorting,
+	    String searchString) {
+
+	String GET_USERS_FOR_SESSION = "SELECT user.uid, user.hidden, CONCAT(user.firstName, ' ', user.lastName) FROM "
+		+ PeerreviewUser.class.getName() + " user WHERE user.session.sessionId = :toolSessionId ";
+	
+	String sortingOrder = "";
+	switch (sorting) {
+	    case PeerreviewConstants.SORT_BY_NO:
+		sortingOrder = " ORDER BY user.uid";
+		break;
+	    case PeerreviewConstants.SORT_BY_USERNAME_ASC:
+		sortingOrder = " ORDER BY user.firstName ASC";
+		break;
+	    case PeerreviewConstants.SORT_BY_USERNAME_DESC:
+		sortingOrder = " ORDER BY user.firstName DESC";
+		break;
+	}
+
+    	StringBuilder bldr =  new StringBuilder(GET_USERS_FOR_SESSION);
+	if (!StringUtils.isBlank(searchString)) {
+	    String[] tokens = searchString.trim().split("\\s+");
+	    for (String token : tokens) {
+		String escToken = StringEscapeUtils.escapeSql(token);
+		bldr.append(" AND ( ").append("user.firstName LIKE '%").append(escToken)
+			.append("%' OR user.lastName LIKE '%").append(escToken).append("%' OR user.loginName LIKE '%")
+			.append(escToken).append("%') ");
+	    }
+	}
+    	bldr.append(sortingOrder);
+    	
+	String queryString = bldr.toString();
+	Query query = getSession().createQuery(queryString)
+		.setLong("toolSessionId", toolSessionId);
+	if ( page != null && size != null ) {
+	    query.setFirstResult(page * size).setMaxResults(size);
+	}
+	return (List<Object[]>) query.list();
+    }
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170215.sql
===================================================================
diff -u
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170215.sql	(revision 0)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20170215.sql	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4233: Ability to remove users from Peer Review tool
+ALTER TABLE tl_laprev11_user ADD COLUMN hidden TINYINT(1) DEFAULT '0';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java	(.../PeerreviewUser.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java	(.../PeerreviewUser.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -33,9 +33,6 @@
  * Peerreview User
  *
  * @author Dapeng Ni
- *
- *
- *
  */
 public class PeerreviewUser implements Cloneable {
     private static final long serialVersionUID = -7043502180037866257L;
@@ -47,6 +44,8 @@
     private String lastName;
     private String loginName;
     private boolean sessionFinished;
+    //status set by monitor to indicate users that shouldn't be rated
+    private boolean hidden;
 
     private PeerreviewSession session;
     private Peerreview peerreview;
@@ -62,6 +61,7 @@
 	this.session = session;
 	this.peerreview = null;
 	this.sessionFinished = false;
+	this.hidden = false;
     }
 
     public PeerreviewUser(UserDTO user, Peerreview content) {
@@ -72,6 +72,7 @@
 	this.session = null;
 	this.peerreview = content;
 	this.sessionFinished = false;
+	this.hidden = false;
     }
 
     /**
@@ -199,7 +200,18 @@
     public void setSessionFinished(boolean sessionFinished) {
 	this.sessionFinished = sessionFinished;
     }
+    
+    /**
+    * @return status set by monitor to indicate users that shouldn't be rated
+    */
+   public boolean isHidden() {
+	return hidden;
+   }
 
+   public void setHidden(boolean hidden) {
+	this.hidden = hidden;
+   }
+
     @Override
     public boolean equals(Object obj) {
 	if (this == obj) {
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml
===================================================================
diff -u -rc1f2aa0761a3d79b04018fb752e069f366ccd15b -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml	(.../peerreviewApplicationContext.xml)	(revision c1f2aa0761a3d79b04018fb752e069f366ccd15b)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml	(.../peerreviewApplicationContext.xml)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -87,6 +87,7 @@
                 <prop key="delete*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="remove*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="save*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
+                <prop key="set*">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="exportTeamReportSpreadsheet">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="markUserFinished">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
                 <prop key="createUsersFromLesson">PROPAGATION_REQUIRED,-java.lang.Exception</prop>
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
===================================================================
diff -u -rc1f2aa0761a3d79b04018fb752e069f366ccd15b -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	(.../IPeerreviewService.java)	(revision c1f2aa0761a3d79b04018fb752e069f366ccd15b)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	(.../IPeerreviewService.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -73,12 +73,6 @@
      */
     void createUser(PeerreviewUser peerreviewUser);
 
-    List<PeerreviewUser> getUsersBySession(Long toolSessionId);
-
-    List<PeerreviewUser> getUsersByContent(Long toolContentId);
-    
-    List<Long> getUserIdsBySessionID(Long sessionId);
-
     /**
      * Get user by given userID and toolContentID.
      *
@@ -151,7 +145,23 @@
      */
     List<GroupSummary> getGroupSummaries(Long contentId);
 
+    /**
+     * Counts number of users in a session excluding specified user. Besides, it also *excludes all hidden users*.
+     * 
+     * @param qaSessionId
+     * @param excludeUserId
+     * @param includeHiddenUsers whether hidden users should be counted as well or not
+     * @return
+     */
     int getCountUsersBySession(final Long qaSessionId, final Long excludeUserId);
+    
+    /**
+     * Counts number of users in a specified session. It counts it regardless whether a user is hidden or not.
+     * 
+     * @param toolSessionId
+     * @return
+     */
+    int getCountUsersBySession(Long toolSessionId);
 
     /**
      * Create refection entry into notebook tool.
@@ -202,6 +212,15 @@
      * @throws Throwable
      */
     boolean createUsersFromLesson(Long toolSessionId) throws Throwable;
+    
+    /**
+     * Store user hidden status in a DB. If user is marked as hidden - it will automatically remove all rating left by
+     * him to prevent statistics mess up.
+     * 
+     * @param userUid
+     * @param isHidden
+     */
+    void setUserHidden(Long toolContentId, Long userUid, boolean isHidden);
 
     /**
      * Returns whether activity is grouped and therefore it is expected more than one tool session.
@@ -271,6 +290,18 @@
      * 	Will return List<[user.user_id, user.first_name, user.first_name + user.last_name, notebook entry, notebook date]>
      */
     List<Object[]> getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting, String searchString);
+    
+    /**
+     * Returns list of <userUid, userName> pairs. Used by monitor's manageUsers functionality.
+     * 
+     * @param toolSessionId
+     * @param page
+     * @param size
+     * @param sorting
+     * @param searchString
+     * @return
+     */
+    List<Object[]> getPagedUsers(Long toolSessionId, Integer page, Integer size, int sorting, String searchString);
 
     /** Send an email with the user's results to each user in the session */
     int emailReportToSessionUsers(Long toolContentId, Long sessionId);
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision d1d97d8c7da9ec5a96332afba14fa04970882bf9)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -120,7 +120,7 @@
     private ICoreNotebookService coreNotebookService;
 
     private IRatingService ratingService;
-    
+
     private IEventNotificationService eventNotificationService;
 
     private SortedSet<Long> creatingUsersForSessionIds;
@@ -137,7 +137,7 @@
     public Peerreview getPeerreviewByContentId(Long contentId) {
 	Peerreview rs = peerreviewDao.getByContentId(contentId);
 	if (rs == null) {
-	    PeerreviewServiceImpl.log.debug("Could not find the content by given ID:" + contentId);
+	    log.debug("Could not find the content by given ID:" + contentId);
 	}
 	return rs;
     }
@@ -146,7 +146,7 @@
     public Peerreview getDefaultContent(Long contentId) throws PeerreviewApplicationException {
 	if (contentId == null) {
 	    String error = messageService.getMessage("error.msg.default.content.not.find");
-	    PeerreviewServiceImpl.log.error(error);
+	    log.error(error);
 	    throw new PeerreviewApplicationException(error);
 	}
 
@@ -173,11 +173,6 @@
     }
 
     @Override
-    public List<Long> getUserIdsBySessionID(Long sessionId) {
-	return peerreviewUserDao.getUserIdsBySessionID(sessionId);
-    }
-
-    @Override
     public void saveOrUpdatePeerreview(Peerreview peerreview) {
 	peerreviewDao.saveObject(peerreview);
     }
@@ -251,6 +246,11 @@
     public int getCountUsersBySession(final Long toolSessionId, final Long excludeUserId) {
 	return peerreviewUserDao.getCountUsersBySession(toolSessionId, excludeUserId);
     }
+    
+    @Override
+    public int getCountUsersBySession(final Long toolSessionId) {
+	return peerreviewUserDao.getCountUsersBySession(toolSessionId);
+    }
 
     @Override
     public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId,
@@ -280,16 +280,6 @@
     }
 
     @Override
-    public List<PeerreviewUser> getUsersBySession(Long toolSessionId) {
-	return peerreviewUserDao.getBySessionID(toolSessionId);
-    }
-
-    @Override
-    public List<PeerreviewUser> getUsersByContent(Long toolContentId) {
-	return peerreviewUserDao.getByContentId(toolContentId);
-    }
-
-    @Override
     public boolean createUsersFromLesson(Long toolSessionId) throws Throwable {
 
 	User currentUser = null;
@@ -299,7 +289,7 @@
 		return false;
 	    }
 
-//	    long start = System.currentTimeMillis();
+	    // long start = System.currentTimeMillis();
 
 	    PeerreviewSession session = getPeerreviewSessionBySessionId(toolSessionId);
 	    int numberPotentialLearners = toolService.getCountUsersForActivity(toolSessionId);
@@ -309,30 +299,45 @@
 		numUsersCreated = peerreviewUserDao.createUsersForSession(session);
 	    }
 
-//	    log.debug("Peer Review UserCreateThread " + toolSessionId + ": numUsersCreated "+numUsersCreated+" took: "
-//	    	    + (System.currentTimeMillis() - start) + "ms.");
+	    // log.debug("Peer Review UserCreateThread " + toolSessionId + ": numUsersCreated "+numUsersCreated+" took:
+	    // "
+	    // + (System.currentTimeMillis() - start) + "ms.");
 
 	    creatingUsersForSessionIds.remove(toolSessionId);
 	    return true;
 	} catch (Throwable e) {
 	    creatingUsersForSessionIds.remove(toolSessionId);
 	    String message = e.getMessage() != null ? e.getMessage() : e.getClass().getName();
-	    PeerreviewServiceImpl.log
-		    .error("Exception thrown creating Peer Review users for session " + toolSessionId + " user id: "
-			    + (currentUser != null ? currentUser.getUserId().toString() : "null") + "; " + message, e);
+	    log.error("Exception thrown creating Peer Review users for session " + toolSessionId + " user id: "
+		    + (currentUser != null ? currentUser.getUserId().toString() : "null") + "; " + message, e);
 	    e.printStackTrace();
 	    throw (e);
 	}
     }
 
     @Override
+    public void setUserHidden(Long toolContentId, Long userUid, boolean isHidden) {
+	PeerreviewUser user = peerreviewUserDao.getUserByUid(userUid);
+	if (user == null) {
+	    return;
+	}
+	
+	//If user is marked as hidden - it will automatically remove all rating left by him to prevent statistics mess up.
+	if (isHidden) {
+	    ratingService.removeUserCommitsByContent(toolContentId, user.getUserId().intValue());
+	}
+	
+	user.setHidden(isHidden);
+	peerreviewUserDao.saveObject(user);
+    }
+
+    @Override
     public int rateItems(RatingCriteria ratingCriteria, Integer userId, Map<Long, Float> newRatings) {
 	return ratingService.rateItems(ratingCriteria, userId, newRatings);
     }
 
     @Override
-    public void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment)
-    {
+    public void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment) {
 	ratingService.commentItem(ratingCriteria, userId, itemId, comment);
     }
 
@@ -342,73 +347,80 @@
     }
 
     @Override
-    public StyledCriteriaRatingDTO getUsersRatingsCommentsByCriteriaIdDTO(Long toolContentId, Long toolSessionId, RatingCriteria criteria, 
-	    Long currentUserId, boolean skipRatings, int sorting,  String searchString, boolean getAllUsers, boolean getByUser) {
-	
-	if ( skipRatings ) {
+    public StyledCriteriaRatingDTO getUsersRatingsCommentsByCriteriaIdDTO(Long toolContentId, Long toolSessionId,
+	    RatingCriteria criteria, Long currentUserId, boolean skipRatings, int sorting, String searchString,
+	    boolean getAllUsers, boolean getByUser) {
+
+	if (skipRatings) {
 	    return ratingService.convertToStyledDTO(criteria, currentUserId, getAllUsers, null);
 	}
-	
-	List<Object[]> rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria, 
+
+	List<Object[]> rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria,
 		currentUserId, null, null, sorting, searchString, getByUser, ratingService);
 
-	for ( Object[] raw : rawData ) {
+	for (Object[] raw : rawData) {
 	    int len = raw.length;
-	    StringBuilder description = new StringBuilder((String)raw[len-2] ).append(" ").append((String)raw[len-1]);	    
-	    raw[len-1] = (Object) StringEscapeUtils.escapeCsv(description.toString());
+	    StringBuilder description = new StringBuilder((String) raw[len - 2]).append(" ")
+		    .append((String) raw[len - 1]);
+	    raw[len - 1] = (Object) StringEscapeUtils.escapeCsv(description.toString());
 	}
-	// if !getByUser -> is get current user's ratings from other users -> 
+	// if !getByUser -> is get current user's ratings from other users ->
 	// convertToStyledJSON.getAllUsers needs to be true otherwise current user (the only one in the set!) is dropped
 	return ratingService.convertToStyledDTO(criteria, currentUserId, !getByUser || getAllUsers, rawData);
     }
 
     @Override
-    public JSONArray getUsersRatingsCommentsByCriteriaIdJSON(Long toolContentId, Long toolSessionId, RatingCriteria criteria, Long currentUserId, 
-	    Integer page, Integer size, int sorting, String searchString, boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException {
+    public JSONArray getUsersRatingsCommentsByCriteriaIdJSON(Long toolContentId, Long toolSessionId,
+	    RatingCriteria criteria, Long currentUserId, Integer page, Integer size, int sorting, String searchString,
+	    boolean getAllUsers, boolean getByUser, boolean needRatesPerUser) throws JSONException {
 
-	List<Object[]> rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria, 
+	List<Object[]> rawData = peerreviewUserDao.getRatingsComments(toolContentId, toolSessionId, criteria,
 		currentUserId, page, size, sorting, searchString, getByUser, ratingService);
-	
-	for ( Object[] raw : rawData ) {
+
+	for (Object[] raw : rawData) {
 	    int len = raw.length;
-	    StringBuilder description = new StringBuilder((String)raw[len-2] ).append(" ").append((String)raw[len-1]);	    
-	    raw[len-1] = (Object) StringEscapeUtils.escapeCsv(description.toString());
+	    StringBuilder description = new StringBuilder((String) raw[len - 2]).append(" ")
+		    .append((String) raw[len - 1]);
+	    raw[len - 1] = (Object) StringEscapeUtils.escapeCsv(description.toString());
 	}
-	// if !getByUser -> is get current user's ratings from other users -> 
+	// if !getByUser -> is get current user's ratings from other users ->
 	// convertToStyledJSON.getAllUsers needs to be true otherwise current user (the only one in the set!) is dropped
-	return ratingService.convertToStyledJSON(criteria, currentUserId, !getByUser || getAllUsers, rawData, needRatesPerUser);
+	return ratingService.convertToStyledJSON(criteria, currentUserId, !getByUser || getAllUsers, rawData,
+		needRatesPerUser);
     }
 
     @Override
-    public List<Object[]> getDetailedRatingsComments(Long toolContentId, Long toolSessionId, Long criteriaId, Long itemId ) {
+    public List<Object[]> getDetailedRatingsComments(Long toolContentId, Long toolSessionId, Long criteriaId,
+	    Long itemId) {
 	NumberFormat numberFormat = NumberFormat.getInstance(Locale.US);
 	numberFormat.setMaximumFractionDigits(1);
-	    
-	// raw data: user_id, comment, rating, first_name, last_name 
-	List<Object[]> rawData = peerreviewUserDao.getDetailedRatingsComments( toolContentId,  toolSessionId,  criteriaId,  itemId );
-	for ( Object[] raw : rawData ) {
-	    raw[2] = ( raw[2] == null ? null : numberFormat.format((Float) raw[2])); // format rating
+
+	// raw data: user_id, comment, rating, first_name, last_name
+	List<Object[]> rawData = peerreviewUserDao.getDetailedRatingsComments(toolContentId, toolSessionId, criteriaId,
+		itemId);
+	for (Object[] raw : rawData) {
+	    raw[2] = (raw[2] == null ? null : numberFormat.format((Float) raw[2])); // format rating
 	    // format name
-	    StringBuilder description = new StringBuilder((String)raw[3] ).append(" ").append((String)raw[4]);	    
+	    StringBuilder description = new StringBuilder((String) raw[3]).append(" ").append((String) raw[4]);
 	    raw[4] = (Object) StringEscapeUtils.escapeCsv(description.toString());
-	    
+
 	}
 	return rawData;
     }
-    
+
     @Override
     public List<Object[]> getCommentsCounts(Long toolContentId, Long toolSessionId, RatingCriteria criteria,
 	    Integer page, Integer size, int sorting, String searchString) {
-	
-	List<Object[]> rawData = peerreviewUserDao.getCommentsCounts(toolContentId, toolSessionId, criteria, 
-		page, size, sorting, searchString);
-	
-	// raw data: user_id, comment_count, first_name, last_name 
-	for ( Object[] raw : rawData ) {
-	    StringBuilder description = new StringBuilder((String)raw[2] ).append(" ").append((String)raw[3]);	    
+
+	List<Object[]> rawData = peerreviewUserDao.getCommentsCounts(toolContentId, toolSessionId, criteria, page, size,
+		sorting, searchString);
+
+	// raw data: user_id, comment_count, first_name, last_name
+	for (Object[] raw : rawData) {
+	    StringBuilder description = new StringBuilder((String) raw[2]).append(" ").append((String) raw[3]);
 	    raw[3] = (Object) StringEscapeUtils.escapeCsv(description.toString());
 	}
-	
+
 	return rawData;
     }
 
@@ -426,20 +438,28 @@
     public List<PeerreviewStatisticsDTO> getStatistics(Long toolContentId) {
 	return peerreviewDao.getStatistics(toolContentId);
     }
-    
-    public List<Object[]> getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting, String searchString) {
-	List<Object[]> rawData = peerreviewUserDao.getUserNotebookEntriesForTablesorter(toolSessionId, 
-		page, size, sorting, searchString, coreNotebookService);
-	
-	for ( Object[] raw : rawData ) {
-	    StringBuilder description = new StringBuilder((String)raw[1] ).append(" ").append((String)raw[2]);	    
+
+    @Override
+    public List<Object[]> getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting,
+	    String searchString) {
+	List<Object[]> rawData = peerreviewUserDao.getUserNotebookEntriesForTablesorter(toolSessionId, page, size,
+		sorting, searchString, coreNotebookService);
+
+	for (Object[] raw : rawData) {
+	    StringBuilder description = new StringBuilder((String) raw[1]).append(" ").append((String) raw[2]);
 	    raw[2] = (Object) StringEscapeUtils.escapeCsv(description.toString());
 	}
-	
+
 	return rawData;
     }
 
     @Override
+    public List<Object[]> getPagedUsers(Long toolSessionId, Integer page, Integer size, int sorting,
+	    String searchString) {
+	return peerreviewUserDao.getPagedUsers(toolSessionId, page, size, sorting, searchString);
+    }
+
+    @Override
     public int emailReportToSessionUsers(Long toolContentId, Long sessionId) {
 	List<PeerreviewUser> users = peerreviewUserDao.getBySessionID(sessionId);
 	Peerreview peerreview = getPeerreviewByContentId(toolContentId);
@@ -470,31 +490,28 @@
 	return getLocalisedMessage("event.sent.results.subject", new Object[] { peerreview.getTitle() });
     }
 
-    private int emailReport(Long toolContentId, Long sessionId, PeerreviewUser user, Peerreview peerreview, List<RatingCriteria> ratingCriterias, String subject) {
+    private int emailReport(Long toolContentId, Long sessionId, PeerreviewUser user, Peerreview peerreview,
+	    List<RatingCriteria> ratingCriterias, String subject) {
 
 	int userId = user.getUserId().intValue();
-	String name = StringEscapeUtils.escapeCsv(user.getFirstName()+" "+user.getLastName());
-	
-	    StringBuilder notificationMessage = new StringBuilder();
+	String name = StringEscapeUtils.escapeCsv(user.getFirstName() + " " + user.getLastName());
 
-	    for (RatingCriteria criteria : ratingCriterias) {
-		int sorting = (criteria.isStarStyleRating() || criteria.isHedgeStyleRating()) 
-			    ? PeerreviewConstants.SORT_BY_AVERAGE_RESULT_DESC
-			    : PeerreviewConstants.SORT_BY_AVERAGE_RESULT_ASC;
-		StyledCriteriaRatingDTO dto = getUsersRatingsCommentsByCriteriaIdDTO(toolContentId, sessionId, criteria,
-			user.getUserId(), false, sorting, null, true, false);
-		generateRatingEntryForEmail(notificationMessage, criteria, dto);
-	    }
+	StringBuilder notificationMessage = new StringBuilder();
 
-	    eventNotificationService.sendMessage(null, 
-		    userId, 
-		    IEventNotificationService.DELIVERY_METHOD_MAIL,
-		    subject, 
-		    getLocalisedMessage("event.sent.results.body", new Object[]{name, notificationMessage.toString()}), 
-		    true);
+	for (RatingCriteria criteria : ratingCriterias) {
+	    int sorting = (criteria.isStarStyleRating() || criteria.isHedgeStyleRating())
+		    ? PeerreviewConstants.SORT_BY_AVERAGE_RESULT_DESC : PeerreviewConstants.SORT_BY_AVERAGE_RESULT_ASC;
+	    StyledCriteriaRatingDTO dto = getUsersRatingsCommentsByCriteriaIdDTO(toolContentId, sessionId, criteria,
+		    user.getUserId(), false, sorting, null, true, false);
+	    generateRatingEntryForEmail(notificationMessage, criteria, dto);
+	}
 
-	    return 1;
+	eventNotificationService.sendMessage(null, userId, IEventNotificationService.DELIVERY_METHOD_MAIL, subject,
+		getLocalisedMessage("event.sent.results.body", new Object[] { name, notificationMessage.toString() }),
+		true);
 
+	return 1;
+
     }
 
     private void generateRatingEntryForEmail(StringBuilder notificationMessage, RatingCriteria criteria,
@@ -508,12 +525,12 @@
 			String escaped = StringEscapeUtils.escapeHtml(ratingDto.getComment());
 			comments.append("<li>").append(escaped).append("</li>");
 		    }
-		};
-		notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.comment", 
+		}
+		notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.comment",
 			new Object[] { escapedTitle, StringUtils.replace(comments.toString(), "&lt;BR&gt;", "<BR>") }));
 	    } else {
-		String avgRating = dto.getRatingDtos().get(0).getAverageRating().length() > 0 ? dto.getRatingDtos()
-			.get(0).getAverageRating() : "0";
+		String avgRating = dto.getRatingDtos().get(0).getAverageRating().length() > 0
+			? dto.getRatingDtos().get(0).getAverageRating() : "0";
 		StringBuilder comments = null;
 		if (criteria.isStarStyleRating()) {
 		    if (criteria.isCommentsEnabled()) {
@@ -525,45 +542,42 @@
 			    }
 			}
 		    }
-		    notificationMessage.append(getLocalisedMessage(
-			    "event.sent.results.criteria.star",
-			    new Object[] { escapedTitle, avgRating,
-				    comments != null ? comments.toString() : "" }));
+		    notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.star",
+			    new Object[] { escapedTitle, avgRating, comments != null ? comments.toString() : "" }));
 		} else if (criteria.isRankingStyleRating()) {
 		    if (criteria.getMaxRating() > 0) {
-			notificationMessage
-				.append(getLocalisedMessage("event.sent.results.criteria.rank", new Object[] {
-					escapedTitle, avgRating, criteria.getMaxRating() }));
+			notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.rank",
+				new Object[] { escapedTitle, avgRating, criteria.getMaxRating() }));
 		    } else {
 			notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.rankAll",
 				new Object[] { escapedTitle, avgRating }));
 		    }
 		} else { // hedge style rating
-		    notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.hedge", new Object[] {
-			    escapedTitle, avgRating, criteria.getMaxRating() }));
+		    notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.hedge",
+			    new Object[] { escapedTitle, avgRating, criteria.getMaxRating() }));
 		}
 	    }
 	} else {
-	    notificationMessage.append(escapedTitle).append(
-		    getLocalisedMessage("event.sent.results.no.results", null));
+	    notificationMessage.append(escapedTitle).append(getLocalisedMessage("event.sent.results.no.results", null));
 	}
 	notificationMessage.append("\n");
     }
-    
+
     @Override
     @SuppressWarnings("unchecked")
     public LinkedHashMap<String, ExcelCell[][]> exportTeamReportSpreadsheet(Long toolContentId) {
 
 	Peerreview peerreview = peerreviewDao.getByContentId(toolContentId);
 	if (peerreview == null) {
-	    PeerreviewServiceImpl.log.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    log.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
 	    return null;
 	}
 
-	return new SpreadsheetBuilder(peerreview, ratingService, peerreviewSessionDao, peerreviewUserDao, this).generateTeamReport();
-	
+	return new SpreadsheetBuilder(peerreview, ratingService, peerreviewSessionDao, peerreviewUserDao, this)
+		.generateTeamReport();
+
     }
-	
+
     @Override
     public int[] getNumberPossibleRatings(Long toolContentId, Long toolSessionId, Long userId) {
 	int[] retValue = new int[2];
@@ -573,8 +587,8 @@
 	Map<Long, Long> numRatingsForUserMap = ratingService.countUsersRatedEachItem(toolContentId, itemIds, -1);
 	Long numRatingsForUser = numRatingsForUserMap.get(userId);
 	retValue[0] = numRatingsForUser != null ? numRatingsForUser.intValue() : 0;
-	
-	int numUsersInSession = peerreviewUserDao.getCountUsersBySession(toolSessionId);
+
+	int numUsersInSession = peerreviewUserDao.getCountUsersBySession(toolSessionId, -1L);
 	Peerreview peerreview = peerreviewDao.getByContentId(toolContentId);
 	retValue[1] = peerreview.isSelfReview() ? numUsersInSession : numUsersInSession - 1;
 	return retValue;
@@ -589,7 +603,7 @@
 	Peerreview defaultPeerreview = getPeerreviewByContentId(defaultPeerreviewId);
 	if (defaultPeerreview == null) {
 	    String error = messageService.getMessage("error.msg.default.content.not.find");
-	    PeerreviewServiceImpl.log.error(error);
+	    log.error(error);
 	    throw new PeerreviewApplicationException(error);
 	}
 
@@ -601,7 +615,7 @@
 	contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature));
 	if (contentId == null) {
 	    String error = messageService.getMessage("error.msg.default.content.not.find");
-	    PeerreviewServiceImpl.log.error(error);
+	    log.error(error);
 	    throw new PeerreviewApplicationException(error);
 	}
 	return contentId;
@@ -627,7 +641,7 @@
 
 	// need to clone the Peer Review details, otherwise clearing the fields may update the database!
 	toolContentObj = Peerreview.newInstance(toolContentObj, toolContentId);
-	
+
 	// don't export following fields
 	for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) {
 	    criteria.setToolContentId(null);
@@ -741,27 +755,25 @@
 	Iterator<PeerreviewSession> iter = list.iterator();
 	while (iter.hasNext()) {
 	    PeerreviewSession session = iter.next();
-	    if (peerreviewUserDao.getCountUsersBySession(session.getSessionId(), -1L) == 0) {
-		PeerreviewServiceImpl.log
-			.debug("Peer Review isReadOnly called. Returning true. Count of users for session id "
-				+ session.getSessionId() + " is "
-				+ peerreviewUserDao.getCountUsersBySession(session.getSessionId(), -1L));
+	    int sessionUsersNumber = peerreviewUserDao.getCountUsersBySession(session.getSessionId());
+	    if (sessionUsersNumber == 0) {
+		log.debug("Peer Review isReadOnly called. Returning true. Count of users for session id "
+			+ session.getSessionId() + " is " + sessionUsersNumber);
 		return true;
 	    } else {
-		PeerreviewServiceImpl.log.debug("Peer Review isReadOnly called. Count of users for session id "
-			+ session.getSessionId() + " is 0");
+		log.debug("Peer Review isReadOnly called. Count of users for session id " + session.getSessionId()
+			+ " is 0");
 	    }
 	}
-	PeerreviewServiceImpl.log.debug("Peer Review isReadOnly called. Returning false.");
+	log.debug("Peer Review isReadOnly called. Returning false.");
 	return false;
     }
 
     @Override
     public void removeToolContent(Long toolContentId) throws ToolException {
 	Peerreview peerreview = peerreviewDao.getByContentId(toolContentId);
 	if (peerreview == null) {
-	    PeerreviewServiceImpl.log
-		    .warn("Can not remove the tool content as it does not exist, ID: " + toolContentId);
+	    log.warn("Can not remove the tool content as it does not exist, ID: " + toolContentId);
 	    return;
 	}
 
@@ -779,15 +791,13 @@
     @Override
     @SuppressWarnings("unchecked")
     public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException {
-	if (PeerreviewServiceImpl.log.isDebugEnabled()) {
-	    PeerreviewServiceImpl.log
-		    .debug("Removing Peerreview content for user ID " + userId + " and toolContentId " + toolContentId);
+	if (log.isDebugEnabled()) {
+	    log.debug("Removing Peerreview content for user ID " + userId + " and toolContentId " + toolContentId);
 	}
 
 	Peerreview peerreview = peerreviewDao.getByContentId(toolContentId);
 	if (peerreview == null) {
-	    PeerreviewServiceImpl.log
-		    .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
+	    log.warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content");
 	    return;
 	}
 
@@ -819,11 +829,11 @@
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
 	if (toolSessionId == null) {
-	    PeerreviewServiceImpl.log.error("Fail to leave tool Session based on null tool session id.");
+	    log.error("Fail to leave tool Session based on null tool session id.");
 	    throw new ToolException("Fail to remove tool Session based on null tool session id.");
 	}
 	if (learnerId == null) {
-	    PeerreviewServiceImpl.log.error("Fail to leave tool Session based on null learner.");
+	    log.error("Fail to leave tool Session based on null learner.");
 	    throw new ToolException("Fail to remove tool Session based on null learner.");
 	}
 
@@ -832,8 +842,8 @@
 	    session.setStatus(PeerreviewConstants.COMPLETED);
 	    peerreviewSessionDao.saveObject(session);
 	} else {
-	    PeerreviewServiceImpl.log.error("Fail to leave tool Session.Could not find peerreview "
-		    + "session by given session id: " + toolSessionId);
+	    log.error("Fail to leave tool Session.Could not find peerreview " + "session by given session id: "
+		    + toolSessionId);
 	    throw new DataMissingException("Fail to leave tool Session."
 		    + "Could not find peerreview session by given session id: " + toolSessionId);
 	}
@@ -865,7 +875,7 @@
     public List<RatingCriteria> getCriteriasByToolContentId(Long toolContentId) {
 	return ratingService.getCriteriasByToolContentId(toolContentId);
     }
-    
+
     @Override
     public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId) {
@@ -901,7 +911,7 @@
     public int getCountItemsRatedByUserByCriteria(final Long criteriaId, final Integer userId) {
 	return ratingService.getCountItemsRatedByUserByCriteria(criteriaId, userId);
     }
-    
+
     @Override
     public ToolSessionExportOutputData exportToolSession(Long toolSessionId)
 	    throws DataMissingException, ToolException {
@@ -928,7 +938,7 @@
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return null;
     }
-    
+
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return new ArrayList<ToolOutput>();
@@ -1003,11 +1013,11 @@
 	return new ToolCompletionStatus(learner.isSessionFinished() ? ToolCompletionStatus.ACTIVITY_COMPLETED
 		: ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null);
     }
-    
+
     // ****************** REST methods *************************
 
     public void setEventNotificationService(IEventNotificationService eventNotificationService) {
-        this.eventNotificationService = eventNotificationService;
+	this.eventNotificationService = eventNotificationService;
     }
 
     /**
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
===================================================================
diff -u -rc1f2aa0761a3d79b04018fb752e069f366ccd15b -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	(.../LearningAction.java)	(revision c1f2aa0761a3d79b04018fb752e069f366ccd15b)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	(.../LearningAction.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -159,6 +159,7 @@
 	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	request.setAttribute(AttributeNames.ATTR_MODE, mode);
 	request.setAttribute(PeerreviewConstants.PARAM_TOOL_SESSION_ID, sessionId);
+	sessionMap.put(PeerreviewConstants.PARAM_TOOL_SESSION_ID, sessionId);
 
 	// If user already exists go straight to the normal screen, otherwise go to a refresh screen
 	// until the user is created. The user will be created by the UserCreateThread(), which should
@@ -181,14 +182,18 @@
 	} catch (Throwable e) {
 	    throw new IOException(e);
 	}
-
+	
+	// goto refresh screen TODO create a specialised page
 	if (user == null) {
-	    // goto refresh screen TODO create a specialised page
 	    request.setAttribute(PeerreviewConstants.ATTR_CREATING_USERS, "true");
 	    return mapping.findForward("defineLater");
+	    
+	//in case user is hidden by the monitor - show him learningHiddenUser.jsp page 
+	} else if (user.isHidden()) {
+	    return mapping.findForward("learningHiddenUser");
+	    
+	// goto standard screen
 	} else {
-	    // goto standard screen
-	    sessionMap.put(PeerreviewConstants.PARAM_TOOL_SESSION_ID, sessionId);
 	    sessionMap.put(AttributeNames.ATTR_MODE, mode);
 	    sessionMap.put(PeerreviewConstants.ATTR_USER, user);
 	    return startRating(mapping, form, request, response, service, sessionMap, sessionId, user, mode, null, null);
@@ -263,7 +268,7 @@
      *
      */
     private ActionForward startRating(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response, IPeerreviewService service, SessionMap sessionMap, Long sessionId,
+	    HttpServletResponse response, IPeerreviewService service, SessionMap<String, Object> sessionMap, Long sessionId,
 	    PeerreviewUser user, ToolAccessMode mode, RatingCriteria currentCriteria, Boolean next) throws IOException, ServletException {
 
 	Peerreview peerreview = service.getPeerreviewBySessionId(sessionId);
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
===================================================================
diff -u -r24b187a7aa86f8975f9d4fabab3e7c2d03e33229 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 24b187a7aa86f8975f9d4fabab3e7c2d03e33229)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -28,7 +28,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.TimeZone;
@@ -52,7 +51,6 @@
 import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants;
 import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
-import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
 import org.lamsfoundation.lams.tool.peerreview.service.IPeerreviewService;
 import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.ExcelCell;
@@ -103,9 +101,18 @@
 	if (param.equals("sendResultsToSessionUsers")) {
 	    return sendResultsToSessionUsers(mapping, form, request, response);
 	}
-	if ( param.equals("exportTeamReport")) {
+	if (param.equals("exportTeamReport")) {
 	    return exportTeamReport(mapping, form, request, response);
 	}
+	if (param.equals("manageUsers")) {
+	    return manageUsers(mapping, form, request, response);
+	}
+	if (param.equals("getManageUsers")) {
+	    return getManageUsers(mapping, form, request, response);
+	}
+	if (param.equals("setUserHidden")) {
+	    return setUserHidden(mapping, form, request, response);
+	}
 	return mapping.findForward(PeerreviewConstants.ERROR);
     }
 
@@ -125,14 +132,6 @@
 
 	Peerreview peerreview = service.getPeerreviewByContentId(contentId);
 
-	// user name map
-	List<PeerreviewUser> sessionUsers = service.getUsersByContent(contentId);
-	HashMap<Long, String> userNameMap = new HashMap<Long, String>();
-	for (PeerreviewUser userIter : sessionUsers) {
-	    userNameMap.put(userIter.getUserId(), userIter.getFirstName() + " " + userIter.getLastName());
-	}
-	sessionMap.put("userNameMap", userNameMap);
-
 	// cache into sessionMap
 	sessionMap.put(PeerreviewConstants.ATTR_SUMMARY_LIST, groupList);
 	sessionMap.put(PeerreviewConstants.PAGE_EDITABLE, peerreview.isContentInUse());
@@ -211,7 +210,6 @@
 	Long dummyUserId = -1L;
 	
 	JSONObject responcedata = new JSONObject();
-
 	int numUsersInSession = service.getCountUsersBySession(toolSessionId, dummyUserId);
 	responcedata.put("page", page + 1);
 	responcedata.put("total", Math.ceil((float) numUsersInSession / size));
@@ -239,7 +237,6 @@
 		} else {
 		    cell.put("rating", "");
 		    cell.put("email", "");
-
 		}
 
 		JSONObject row = new JSONObject();
@@ -304,7 +301,6 @@
     private ActionForward getSubgridData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws JSONException, IOException {
 	IPeerreviewService service = getPeerreviewService();
-	String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
 
 	Long itemId = WebUtil.readLongParam(request, "itemId");
 	Long toolContentId = WebUtil.readLongParam(request, "toolContentId");
@@ -434,15 +430,13 @@
 	DateFormat dateFormatterTimeAgo = new SimpleDateFormat(DateUtil.ISO8601_FORMAT); 
 	dateFormatterTimeAgo.setTimeZone(TimeZone.getTimeZone("GMT")); 
 
-	Long dummyUserId = -1L;
+	IPeerreviewService service = getPeerreviewService();
+	int sessionUserCount = service.getCountUsersBySession(toolSessionId, -1L);
 	
 	JSONObject responcedata = new JSONObject();
-
-	IPeerreviewService service = getPeerreviewService();
-
 	responcedata.put("page", page + 1);
-	responcedata.put("total", Math.ceil((float) service.getCountUsersBySession(toolSessionId, dummyUserId) / size));
-	responcedata.put("records", service.getCountUsersBySession(toolSessionId, dummyUserId));
+	responcedata.put("total", Math.ceil((float) sessionUserCount / size));
+	responcedata.put("records", sessionUserCount);
 
 	List<Object[]> nbEntryList = service.getUserNotebookEntriesForTablesorter(toolSessionId, 
 		page, size, sorting, searchString);
@@ -521,14 +515,13 @@
 	response.getWriter().write(service.getLocalisedMessage("msg.results.sent", new Object[] { numEmailsSent }));
 	return null;
     }
-
     
     /**
      * Exports Team Report into Excel spreadsheet.
      * @throws ServletException 
      * @throws IOException 
      */
-    public ActionForward exportTeamReport(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    private ActionForward exportTeamReport(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws ServletException {
 	
 	IPeerreviewService service = getPeerreviewService();
@@ -571,6 +564,85 @@
 	return null;
     }
     
+    private ActionForward manageUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws ServletException {
+	
+	IPeerreviewService service = getPeerreviewService();
+	String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		.getAttribute(sessionMapID);
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	
+	return mapping.findForward(PeerreviewConstants.SUCCESS);
+    }
+    
+    /**
+     * Gets a paged set of data for stars or comments. These are directly saved to the database, not through
+     * LearnerAction like Ranking and Hedging. 
+     */
+    private ActionForward getManageUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	
+	IPeerreviewService service = getPeerreviewService();
+	Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+	
+	// Getting the params passed in from the jqGrid
+	int page = WebUtil.readIntParam(request, PeerreviewConstants.PARAM_PAGE) - 1;
+	int size = WebUtil.readIntParam(request, PeerreviewConstants.PARAM_ROWS);
+	String sortOrder = WebUtil.readStrParam(request, PeerreviewConstants.PARAM_SORD);
+	String sortBy = WebUtil.readStrParam(request, PeerreviewConstants.PARAM_SIDX, true);
+
+	int sorting = PeerreviewConstants.SORT_BY_USERNAME_ASC;
+	if (sortBy != null && sortBy.equals(PeerreviewConstants.PARAM_SORT_USER_NAME)) {
+	    if (sortOrder != null && sortOrder.equals(PeerreviewConstants.SORT_DESC)) {
+		sorting = PeerreviewConstants.SORT_BY_USERNAME_DESC;
+	    } else {
+		sorting = PeerreviewConstants.SORT_BY_USERNAME_ASC;
+	    }
+	}
+	String searchString = WebUtil.readStrParam(request, "userName", true);
+	
+	JSONObject responcedata = new JSONObject();
+
+	int numUsersInSession = service.getCountUsersBySession(toolSessionId);
+	responcedata.put("page", page + 1);
+	responcedata.put("total", Math.ceil((float) numUsersInSession / size));
+	responcedata.put("records", numUsersInSession);
+	
+	// gets the user
+	List<Object[]> rawRows = service.getPagedUsers(toolSessionId, page, size, sorting, searchString);
+	JSONArray rows = new JSONArray();
+	for (int i = 0; i < rawRows.size(); i++) {
+	    Object[] rawRow = rawRows.get(i);
+	    JSONObject cell = new JSONObject();
+	    cell.put("hidden", !(Boolean)rawRow[1]);
+	    cell.put("userUid", rawRow[0]);
+	    cell.put("userName", (String) rawRow[2]);
+
+	    JSONObject row = new JSONObject();
+	    row.put("id", "" + rawRow[0]);
+	    row.put("cell", cell);
+	    rows.put(row);
+	}
+	responcedata.put("rows", rows);
+
+	res.setContentType("application/json;charset=utf-8");
+	res.getWriter().print(new String(responcedata.toString()));
+	return null;
+    }
+    
+    private ActionForward setUserHidden(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	IPeerreviewService service = getPeerreviewService();
+
+	Long toolContentId = WebUtil.readLongParam(request, PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+	Long userUid = WebUtil.readLongParam(request, "userUid");
+	boolean isHidden = !WebUtil.readBooleanParam(request, "hidden");
+	
+	service.setUserHidden(toolContentId, userUid, isHidden);
+	return null;
+    }
+    
     // *************************************************************************************
     // Private method
     // *************************************************************************************
Index: lams_tool_preview/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r50f1856800095f4593e45eb7c3cd9ab3b5cd9ac7 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 50f1856800095f4593e45eb7c3cd9ab3b5cd9ac7)
+++ lams_tool_preview/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -86,6 +86,7 @@
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
 			parameter="start" >
 			<forward name="success" path="/pages/learning/learning.jsp" />
+			<forward name="learningHiddenUser" path="/pages/learning/learningHiddenUser.jsp" />
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
 			<forward name="showResults" path="/learning/showResults.do" />	
 			<forward name="newReflection" path="/learning/newReflection.do" />	
@@ -216,6 +217,19 @@
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
 			parameter="exportTeamReport" >
 		</action>
+		<action path="/monitoring/manageUsers"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
+			parameter="manageUsers" >
+			<forward name="success" path="/pages/monitoring/manageUsers.jsp" />
+		</action>
+		<action path="/monitoring/getManageUsers"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
+			parameter="getManageUsers" >
+		</action>
+		<action path="/monitoring/setUserHidden"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
+			parameter="setUserHidden" >
+		</action>
 		<!-- ========== BEGIN: Common ============================== -->
 		<action path="/clearsession"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.ClearSessionAction">
Index: lams_tool_preview/web/pages/learning/comment.jsp
===================================================================
diff -u -r8d7b0ed5882ba1a3790c126452133e8d6d51ab68 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 8d7b0ed5882ba1a3790c126452133e8d6d51ab68)
+++ lams_tool_preview/web/pages/learning/comment.jsp	(.../comment.jsp)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -28,7 +28,6 @@
 			commentsLocked = false;
 			commentsOnOtherPages = ${countRatedItems};
 			numCommentsOnPage = 0;
-
 	</script>
 	
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
@@ -326,7 +325,6 @@
 				</span>
 			</lams:Alert>
 				
-			
 		</c:if>
 		
 	<form action="<c:url value="/learning/submitComments.do?"/>" method="get" id="editForm">
Index: lams_tool_preview/web/pages/learning/definelater.jsp
===================================================================
diff -u -rb91f46a77fa9a30a9c970e61ca6a7a868f8dba4d -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision b91f46a77fa9a30a9c970e61ca6a7a868f8dba4d)
+++ lams_tool_preview/web/pages/learning/definelater.jsp	(.../definelater.jsp)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -1,6 +1,4 @@
 <!DOCTYPE html>
-        
-
 <%@include file="/common/taglibs.jsp"%>
 
 <lams:html>
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
diff -u -rb93b66bd1f94719aaef4320dd280b5bb0c27648f -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision b93b66bd1f94719aaef4320dd280b5bb0c27648f)
+++ lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -24,8 +24,6 @@
 	</c:otherwise>
 </c:choose>
 
-
- 
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.learning.title" /></title>
Index: lams_tool_preview/web/pages/learning/learningHiddenUser.jsp
===================================================================
diff -u
--- lams_tool_preview/web/pages/learning/learningHiddenUser.jsp	(revision 0)
+++ lams_tool_preview/web/pages/learning/learningHiddenUser.jsp	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<%@include file="/common/taglibs.jsp"%>
+
+<lams:html>
+<lams:head>
+	<%@ include file="/common/header.jsp"%>
+	<meta http-equiv="refresh" content="60">
+	
+	<script type="text/javascript">
+
+ 		function finishSession(){
+ 			document.getElementById("finishButton").disabled = true;
+			document.location.href ='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}"/>';
+			return false;
+		}
+ 		
+     </script>
+</lams:head>
+
+<body class="stripes">
+
+	<c:set scope="request" var="title">
+		<fmt:message key="activity.title" />
+	</c:set>
+	<lams:Page type="learner" title="${title}">
+	
+		<div class="row no-gutter">
+			<div
+				class="col-xs-12 col-sm-offset-1 col-sm-10 col-lg-offset-2 col-lg-8">
+				<div class="alert alert-info">
+					<fmt:message key="label.removed.user.warning" />
+				</div>
+			</div>
+		</div>
+		
+		<div class="row no-gutter">
+			<div class="col-xs-12">
+				
+			</div>
+		</div>
+		
+		<div>
+		<a href="javascript:location.reload(true);"	class="btn btn-default voffset5">
+					<fmt:message key="button.try.again" />
+				</a>
+		
+			<html:link href="#nogo" property="FinishButton" styleId="finishButton" onclick="return finishSession()" styleClass="btn btn-primary voffset5 pull-right na">
+				<fmt:message key="label.finished" />
+			</html:link>
+		</div>
+		
+	</lams:Page>
+	
+	<div id="footer"></div>
+
+</body>
+</lams:html>
Index: lams_tool_preview/web/pages/learning/results.jsp
===================================================================
diff -u -rc1f2aa0761a3d79b04018fb752e069f366ccd15b -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision c1f2aa0761a3d79b04018fb752e069f366ccd15b)
+++ lams_tool_preview/web/pages/learning/results.jsp	(.../results.jsp)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -1,6 +1,4 @@
 <!DOCTYPE html>
-        
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:if test="${not empty param.sessionMapID}">
@@ -131,7 +129,7 @@
 			<c:forEach var="criteriaRatings" items="${userRatings}" varStatus="status">
 				<h4><c:out value="${criteriaRatings.ratingCriteria.title}" escapeXml="true"/></h4>
 		 		<lams:StyledRating criteriaRatings="${criteriaRatings}" showJustification="false" alwaysShowAverage="true" currentUserDisplay="true"/>
-		</c:forEach>
+			</c:forEach>
 		</div>
 		</div>
 	</c:if>
@@ -149,6 +147,7 @@
 	</c:if>	
 
 	<c:if test="${mode != 'teacher'}">
+		<div>
 			<c:choose>			
 				<c:when test="${(not sessionMap.isSessionCompleted) and sessionMap.reflectOn}">
 					<html:button property="FinishButton" onclick="return continueReflect()" styleClass="btn btn-default voffset5 pull-right">
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u -r129ea5b185183a7213e3dedaff8724c146b7fc9e -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision 129ea5b185183a7213e3dedaff8724c146b7fc9e)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -15,42 +15,40 @@
 </c:when>
 </c:choose>
 
-
-	<script type="text/javascript">
+<script type="text/javascript">
 	$(document).ready(function(){
 
-			jQuery("#group${toolSessionId}").jqGrid({
-			   	url: "<c:url value='/monitoring/getUsers.do'/>?toolContentId=${sessionMap.toolContentID}&toolSessionId=${toolSessionId}&criteriaId=${criteria.ratingCriteriaId}",
-				datatype: "json",
-				height: 'auto',
-				autowidth: true,
-				shrinkToFit: false,
-			   	colNames:[
-						'itemId',
-						'<fmt:message key="label.user.name" />',
-						'${heading}'
-						<c:if test="${sessionMap.peerreview.notifyUsersOfResults}">, ''</c:if>
-				],
-			   	colModel:[
-			   		{name:'itemId', index:'itemId', width:0, hidden: true},
-			   		{name:'itemDescription', index:'itemDescription', width:200, searchoptions: { clearSearch: false }},
-			   		{name:'rating', index:'rating', width:100, align:"center", search:false}
-					<c:if test="${sessionMap.peerreview.notifyUsersOfResults}">, {name:'email', index:'email', width:100, align:"center", search:false}</c:if>
-			   		
-			   	],
-			   	rowNum:10,
-			   	rowList:[10,20,30,40,50,100],
-			   	pager: '#pager${toolSessionId}',
-			   	viewrecords:true,
-				loadComplete: function(){
-					initializeJRating();
-				},
-			   	// caption: "${groupSummary.sessionName}" use Bootstrap panels as the title bar
-				subGrid: true,
-				subGridOptions: {
-					reloadOnExpand : false 
-				},
-				subGridRowExpanded: function(subgrid_id, row_id) {
+		jQuery("#group${toolSessionId}").jqGrid({
+		   	url: "<c:url value='/monitoring/getUsers.do'/>?toolContentId=${sessionMap.toolContentID}&toolSessionId=${toolSessionId}&criteriaId=${criteria.ratingCriteriaId}",
+			datatype: "json",
+			height: 'auto',
+			autowidth: true,
+			shrinkToFit: false,
+		   	colNames:[
+				'itemId',
+				'<fmt:message key="label.user.name" />',
+				'${heading}'
+				<c:if test="${sessionMap.peerreview.notifyUsersOfResults}">, ''</c:if>
+			],
+		   	colModel:[
+		   		{name:'itemId', index:'itemId', width:0, hidden: true},
+		   		{name:'itemDescription', index:'itemDescription', width:200, searchoptions: { clearSearch: false }},
+		   		{name:'rating', index:'rating', width:100, align:"center", search:false}
+				<c:if test="${sessionMap.peerreview.notifyUsersOfResults}">, {name:'email', index:'email', width:100, align:"center", search:false}</c:if>		   		
+		   	],
+		   	rowNum:10,
+		   	rowList:[10,20,30,40,50,100],
+		   	pager: '#pager${toolSessionId}',
+		   	viewrecords:true,
+			loadComplete: function(){
+				initializeJRating();
+			},
+		   	// caption: "${groupSummary.sessionName}" use Bootstrap panels as the title bar
+			subGrid: true,
+			subGridOptions: {
+				reloadOnExpand : false 
+			},
+			subGridRowExpanded: function(subgrid_id, row_id) {
 					var subgridTableId = subgrid_id+"_t";
 					var itemId = jQuery("#group${toolSessionId}").getRowData(row_id)["itemId"];
 					   
@@ -60,7 +58,7 @@
 						datatype: "json",
 						loadonce:true,
 						rowNum: 10000,
-						url: "<c:url value='/monitoring/getSubgridData.do'/>?toolContentId=${sessionMap.toolContentID}&toolSessionId=${toolSessionId}&sessionMapID=${sessionMapID}&criteriaId=${criteria.ratingCriteriaId}&itemId=" + itemId,
+						url: "<c:url value='/monitoring/getSubgridData.do'/>?toolContentId=${sessionMap.toolContentID}&toolSessionId=${toolSessionId}&criteriaId=${criteria.ratingCriteriaId}&itemId=" + itemId,
 						height: "100%",
 						autowidth:true,
 						grouping:true,	
@@ -92,11 +90,11 @@
 					    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
 					    }
 					})
-				}
-			}).jqGrid('filterToolbar', { 
-				searchOnEnter: false
-			})
-			.navGrid('#pager${toolSessionId}',{add:false,del:false,edit:false,search:false});
+			}
+		}).jqGrid('filterToolbar', { 
+			searchOnEnter: false
+		})
+		.navGrid('#pager${toolSessionId}',{add:false,del:false,edit:false,search:false});
         
         //jqgrid autowidth (http://stackoverflow.com/a/1610197)
         $(window).bind('resize', function() {
@@ -139,7 +137,6 @@
 		return false;
 	}
 
-
 </script>
 
 <!--For send results feature-->
@@ -167,8 +164,7 @@
 	</span>
 	</c:when>
 	</c:choose>
-
 </p>
 
-		<table id="group${toolSessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
-		<div id="pager${toolSessionId}"></div> 
\ No newline at end of file
+<table id="group${toolSessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
+<div id="pager${toolSessionId}"></div> 
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/manageUsers.jsp
===================================================================
diff -u
--- lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(revision 0)
+++ lams_tool_preview/web/pages/monitoring/manageUsers.jsp	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -0,0 +1,158 @@
+<!DOCTYPE html>
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="summaryList" value="${sessionMap.summaryList}"/>
+
+<lams:html>
+<lams:head>
+	<title><fmt:message key="label.monitoring.heading" /></title>
+	<%@ include file="/common/header.jsp"%>
+
+	<link type="text/css" href="${lams}css/jquery-ui-smoothness-theme.css" rel="stylesheet">
+	<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
+	<link rel="stylesheet" href="<html:rewrite page='/includes/css/learning.css'/>">
+	<style type="text/css">
+		.ui-jqgrid-labels {
+			display:none; !important;
+		}
+		.ui-search-toolbar th:nth-child(2){
+			display:none !important;
+		}	
+	</style>
+
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+	<script type="text/javascript">
+	$(document).ready(function(){
+
+		//init all available jqGrids
+		$("[id^=group]").each(function() {
+			var toolSessionId = $(this).data("session-id");
+		
+			$(this).jqGrid({
+			   	url: "<c:url value='/monitoring/getManageUsers.do'/>?toolSessionId=" + toolSessionId,
+				datatype: "json",
+				height: 'auto',
+				autowidth: true,
+				shrinkToFit: false,
+			   	colNames:[
+					'userUid',
+			   		'<fmt:message key="label.user.hidden" />',
+					'<fmt:message key="label.user.name" />'
+				],
+			   	colModel:[
+			   		{name:'userUid', index:'userUid', width:0, hidden: true},
+			   		{name: 'hidden', index: 'hidden', width:10, editable:true, edittype:'checkbox', editoptions: {value:"True:False"}, 
+							formatter: "checkbox", formatoptions: {disabled : false}, sortable:false, search: false},
+			   		{name:'userName', index:'userName', width:300, searchoptions: { clearSearch: false }}
+			   	],
+			   	sortname: "userUid",
+			   	rowNum:10,
+			   	rowList:[10,20,30,40,50,100],
+			   	pager: '#pager' + toolSessionId,
+			   	viewrecords:true,
+			   	// caption: "${groupSummary.sessionName}" use Bootstrap panels as the title bar
+			   	loadComplete: function() {
+			   		var table = this;
+			   		
+					// storing isHidden change to DB
+				    $(":checkbox").change(function(){
+				    	var userUid = $(this).parent().parent().prop('id');
+				    	//var userUid = jQuery("#user${question.uid}").getCell(rowid, 'userUid');
+			            //var iRow = $("#grid").getInd($(this).parent('td').parent('tr').attr('id'));
+			            //var iCol = $(this).parent('td').parent('tr').find('td').index($(this).parent('td'));
+				    	
+						$.ajax({ 
+							data: {
+								toolContentID: ${sessionMap.toolContentID},
+								userUid: userUid,
+								hidden: this.checked
+							}, 
+						    type: 'POST', 
+					 	    url: '<c:url value="/monitoring/setUserHidden.do"/>'
+						});
+				    });
+			   	}
+			}).jqGrid('filterToolbar', { 
+				searchOnEnter: false
+			})
+			.navGrid('#pager' + toolSessionId, {add:false,del:false,edit:false,search:false});
+		});
+		
+        //jqgrid autowidth (http://stackoverflow.com/a/1610197)
+        $(window).bind('resize', function() {
+            resizeJqgrid(jQuery(".ui-jqgrid-btable:visible"));
+        });
+
+        //resize jqGrid on openning of bootstrap collapsible
+        $('div[id^="collapse"]').on('shown.bs.collapse', function () {
+            resizeJqgrid(jQuery(".ui-jqgrid-btable:visible", this));
+        })
+
+        function resizeJqgrid(jqgrids) {
+            jqgrids.each(function(index) {
+                var gridId = $(this).attr('id');
+                var gridParentWidth = jQuery('#gbox_' + gridId).parent().width();
+                jQuery('#' + gridId).setGridWidth(gridParentWidth, true);
+            });
+        };
+        setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300);
+		
+	});
+	</script>
+	
+</lams:head>
+<body class="stripes">
+
+	<c:set var="title"><fmt:message key="label.manage.users" /></c:set>	
+	<lams:Page type="monitor" title="${title}">
+	
+		<h5>
+			<fmt:message key="label.manage.users.description" />
+		</h5>
+		
+		<c:if test="${sessionMap.isGroupedActivity}">
+			<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+		</c:if>
+		
+		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
+	
+		 	<c:if test="${sessionMap.isGroupedActivity}">
+			    <div class="panel panel-default" >
+			        <div class="panel-heading" id="heading${groupSummary.sessionId}">
+			        	<span class="panel-title collapsable-icon-left">
+				        	<a role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}" 
+									aria-expanded="true" aria-controls="collapse${groupSummary.sessionId}">
+								<fmt:message key="monitoring.label.group" />: ${groupSummary.sessionName}
+							</a>
+						</span>
+			        </div>
+			        
+			        <div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
+			</c:if>
+			
+			<table id="group${groupSummary.sessionId}" class="scroll" data-session-id="${groupSummary.sessionId}" cellpadding="0" cellspacing="0"></table>
+			<div id="pager${groupSummary.sessionId}"></div>
+			
+			<c:if test="${sessionMap.isGroupedActivity}">
+					</div> <!-- end collapse area  -->
+				</div> <!-- end collapse panel  -->
+			</c:if>
+			${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
+		
+		</c:forEach>
+		
+		<c:if test="${sessionMap.isGroupedActivity}">
+			</div> <!--  end panel group -->
+		</c:if>
+		
+ 		<span onclick="window.close()" class="btn btn-default voffset5 pull-right">
+ 			<fmt:message key="label.close"/>
+ 		</span>
+	</lams:Page>
+
+	<div id="footer"></div>
+
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r24b187a7aa86f8975f9d4fabab3e7c2d03e33229 -r88b7dcb4a13d6997f86da1f2f0650abe3d3c3644
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 24b187a7aa86f8975f9d4fabab3e7c2d03e33229)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 88b7dcb4a13d6997f86da1f2f0650abe3d3c3644)
@@ -9,9 +9,14 @@
 <link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 <link type="text/css" href="${lams}css/jquery.jRating.css" rel="stylesheet"/>
 <link rel="stylesheet" href="${webapp}includes/css/learning.css'/>">
+<style type="text/css">
+	#common-buttons-area {
+		overflow: auto;
+		margin-bottom: 10px;
+	}
+</style>
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
-
 <script type="text/javascript">
 	//var for jquery.jRating.js
 	var pathToImageFolder = "${lams}images/css/";
@@ -96,17 +101,11 @@
 	<!--For send results feature-->
 	<i class="fa fa-spinner" style="display:none" id="messageArea_Busy"></i>
 	<div class="voffset5" id="messageArea"></div>
-
-	<div id="export-link-area">
-		<a href="#nogo" id="export-team-results-button" onClick="javascript:exportResults()" class="btn btn-default">
-			<i class="fa fa-download" aria-hidden="true"></i> Export
-		</a> Team Results to Spreadsheet
-	</div>
 	
 </div>
 
 <c:if test="${sessionMap.isGroupedActivity}">
-<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
+	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
 </c:if>
 
 <c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
@@ -167,7 +166,23 @@
 
 <c:if test="${sessionMap.isGroupedActivity}">
 	</div> <!--  end panel group -->
-</c:if>		
+</c:if>
 
+<div id="common-buttons-area">
+	<a href="#nogo" onClick="javascript:exportResults()" class="btn btn-default loffset5 pull-right">
+		<i class="fa fa-download" aria-hidden="true"></i> 
+		<fmt:message key="label.export.team.results" />
+	</a>
+	
+	<c:if test="${!empty summaryList}">
+		<c:set var='url'>
+			<c:url value="/monitoring/manageUsers.do"/>?sessionMapID=${sessionMapID}
+		</c:set>
+		<a href="#nogo" onClick="javascript:launchPopup('${url}');" class="btn btn-default pull-right">
+			<i class="fa fa-remove" aria-hidden="true"></i> 
+			<fmt:message key="label.manage.users" />
+		</a>
+	</c:if>
+</div>
 
 <%@ include file="advanceoptions.jsp"%>