Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r3b619df5e7e11dab1dc49859d23399a4b179c16f -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3b619df5e7e11dab1dc49859d23399a4b179c16f)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -128,4 +128,8 @@
 label.learning.your.marks.shown.in.brackets=(Your marks shown in brackets after name)
 label.learning.average.rankings=Average Rankings:
 label.learning.average.marks=Average Marks:
-label.learning.your.justification=Your justification:
\ No newline at end of file
+label.learning.your.justification=Your justification:
+label.monitoring.number.learners=Number of learners
+label.monitoring.number.learners.finished=Number of learners finished
+label.monitoring.view=View {0}
+label.close=Close
\ No newline at end of file
Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r3b619df5e7e11dab1dc49859d23399a4b179c16f -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 3b619df5e7e11dab1dc49859d23399a4b179c16f)
+++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -129,4 +129,8 @@
 label.learning.your.marks.shown.in.brackets=(Your marks shown in brackets after name)
 label.learning.average.rankings=Average Rankings:
 label.learning.average.marks=Average Marks:
-label.learning.your.justification=Your justification:
\ No newline at end of file
+label.learning.your.justification=Your justification:
+label.monitoring.number.learners=Number of learners
+label.monitoring.number.learners.finished=Number of learners finished
+label.monitoring.view=View {0}
+label.close=Close
\ No newline at end of file
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java	(.../PeerreviewDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java	(.../PeerreviewDAO.java)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -23,6 +23,9 @@
 
 package org.lamsfoundation.lams.tool.peerreview.dao;
 
+import java.util.List;
+
+import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
 
 public interface PeerreviewDAO extends DAO {
@@ -33,4 +36,5 @@
 
     void delete(Peerreview peerreview);
 
+    List<PeerreviewStatisticsDTO> getStatistics(Long toolContentId);
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java	(.../PeerreviewDAOHibernate.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java	(.../PeerreviewDAOHibernate.java)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -25,8 +25,10 @@
 
 import java.util.List;
 
+import org.hibernate.transform.Transformers;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewDAO;
+import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
 
 /**
@@ -38,6 +40,13 @@
 public class PeerreviewDAOHibernate extends LAMSBaseDAO implements PeerreviewDAO {
     private static final String GET_RESOURCE_BY_CONTENTID = "from " + Peerreview.class.getName()
 	    + " as r where r.contentId=?";
+    
+    private static final String GET_STATS = "SELECT s.session_id as \"sessionId\", s.session_name as \"sessionName\", "
+	    + " count(u.uid) as \"numLearnersInSession\", sum(u.session_finished) as \"numLearnersComplete\" "
+	    + " FROM tl_laprev11_session s "
+	    + " JOIN tl_laprev11_peerreview p ON p.content_id = :toolContentId AND s.peerreview_uid = p.uid "
+	    + " LEFT JOIN tl_laprev11_user u ON u.session_uid = s.uid "
+	    + " GROUP BY session_id";
 
     @Override
     public Peerreview getByContentId(Long contentId) {
@@ -59,4 +68,13 @@
 	delete(peerreview);
     }
 
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<PeerreviewStatisticsDTO> getStatistics(Long toolContentId) {
+	return getSession().createSQLQuery(GET_STATS)
+		.setLong("toolContentId", toolContentId)
+		.setResultTransformer( Transformers.aliasToBean( PeerreviewStatisticsDTO.class ) )
+		.list();
+	
+    }
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/PeerreviewStatisticsDTO.java
===================================================================
diff -u
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/PeerreviewStatisticsDTO.java	(revision 0)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/PeerreviewStatisticsDTO.java	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -0,0 +1,47 @@
+package org.lamsfoundation.lams.tool.peerreview.dto;
+
+
+public class PeerreviewStatisticsDTO {
+    
+    // use Number to be more flexible with what Hibernate will return, as it will build this DTO for us.
+    private Number sessionId;
+    private String sessionName;
+    private Number numLearnersInSession;
+    private Number numLearnersComplete;
+
+//    PeerreviewStatisticsDTO(Number sessionId, String sessionName, Number numLearnersInSession, Number numLearnersComplete) {
+//	this.sessionId = sessionId;
+//	this.sessionName = sessionName;
+//	this.numLearnersInSession = numLearnersInSession;
+//	this.numLearnersComplete = numLearnersComplete;
+//    }
+    
+    public Number getSessionId() {
+        return sessionId;
+    }
+    public void setSessionId(Number sessionId) {
+        this.sessionId = sessionId;
+    }
+    public String getSessionName() {
+        return sessionName;
+    }
+    public void setSessionName(String sessionName) {
+        this.sessionName = sessionName;
+    }
+    public Number getNumLearnersInSession() {
+        return numLearnersInSession;
+    }
+    public void setNumLearnersInSession(Number numLearnersInSession) {
+        this.numLearnersInSession = numLearnersInSession;
+    }
+    public Number getNumLearnersComplete() {
+        return numLearnersComplete;
+    }
+    public void setNumLearnersComplete(Number numLearnersComplete) {
+        this.numLearnersComplete = numLearnersComplete;
+    }
+
+    public String toString() {
+	return sessionName;
+    }
+}
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
===================================================================
diff -u -r3b619df5e7e11dab1dc49859d23399a4b179c16f -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	(.../IPeerreviewService.java)	(revision 3b619df5e7e11dab1dc49859d23399a4b179c16f)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java	(.../IPeerreviewService.java)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -35,6 +35,7 @@
 import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO;
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary;
+import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO;
 import org.lamsfoundation.lams.tool.peerreview.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession;
@@ -47,12 +48,6 @@
  */
 public interface IPeerreviewService extends ToolRatingManager {
 
-    // TODO remove!
-    int rateItems(RatingCriteria ratingCriteria, Integer userId, Map<Long, Float> newRatings);
-    void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment);
-    RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId);
-
-    
     /**
      * Get <code>Peerreview</code> by toolContentID.
      *
@@ -194,7 +189,7 @@
      * @param contentId
      * @return
      */
-    List<ReflectDTO> getReflectList(Long contentId);
+    List<ReflectDTO> getReflectList(Long contentId, Long sessionId);
 
     /**
      * Get user by UID
@@ -230,15 +225,15 @@
 
     List<RatingCriteria> getCriteriasByToolContentId(Long toolContentId);
     
-    /**
-     * Returns item DTO with all corresponding ratings and comments. Doesn't contain average and total amount of rates.
-     *
-     * @param contentId
-     * @param itemId
-     * @return
-     */
-    ItemRatingDTO getRatingCriteriaDtoWithActualRatings(Long contentId, Long itemId);
+    /** Save the ratings for ranking and hedging. */
+    int rateItems(RatingCriteria ratingCriteria, Integer userId, Map<Long, Float> newRatings);
 
+    /** Save a comment made on a comment only page.  */
+    void commentItem(RatingCriteria ratingCriteria, Integer userId, Long itemId, String comment);
+
+    /** Get the details for a single criteria */
+    RatingCriteria getCriteriaByCriteriaId(Long ratingCriteriaId);
+    
     /**
      * It's a modification of org.lamsfoundation.lams.rating.ToolRatingManager.getRatingCriteriaDtos(Long contentId,
      * Collection<Long> itemIds, boolean isCommentsByOtherUsersRequired, Long userId) method, added additional parameter
@@ -278,4 +273,7 @@
 	    Integer page, Integer size, int sorting);
     
     String getLocalisedMessage(String key, Object[] args);
+    
+    /** Get the monitoring statistics */
+    List<PeerreviewStatisticsDTO> getStatistics(Long toolContentId);
 }
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -rd560da20e7cb2fe1dae9201d0b4df9890fdbd71e -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision d560da20e7cb2fe1dae9201d0b4df9890fdbd71e)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -71,6 +71,7 @@
 import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewSessionDAO;
 import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewUserDAO;
 import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary;
+import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO;
 import org.lamsfoundation.lams.tool.peerreview.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession;
@@ -240,27 +241,22 @@
     }
 
     @Override
-    public List<ReflectDTO> getReflectList(Long contentId) {
+    public List<ReflectDTO> getReflectList(Long contentId, Long sessionId) {
+
 	List<ReflectDTO> reflections = new LinkedList<ReflectDTO>();
 
-	List<PeerreviewSession> sessionList = peerreviewSessionDao.getByContentId(contentId);
-	for (PeerreviewSession session : sessionList) {
-	    Long sessionId = session.getSessionId();
-	    // get all users in this session
-	    List<PeerreviewUser> users = peerreviewUserDao.getBySessionID(sessionId);
-	    for (PeerreviewUser user : users) {
+	List<PeerreviewUser> users = peerreviewUserDao.getBySessionID(sessionId);
+	for (PeerreviewUser user : users) {
 
-		NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
-			PeerreviewConstants.TOOL_SIGNATURE, user.getUserId().intValue());
-		if (entry != null) {
-		    ReflectDTO ref = new ReflectDTO(user);
-		    ref.setReflect(entry.getEntry());
-		    Date postedDate = (entry.getLastModified() != null) ? entry.getLastModified()
-			    : entry.getCreateDate();
-		    ref.setDate(postedDate);
-		    reflections.add(ref);
-		}
-
+	    NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    PeerreviewConstants.TOOL_SIGNATURE, user.getUserId().intValue());
+	    if (entry != null) {
+		ReflectDTO ref = new ReflectDTO(user);
+		ref.setReflect(entry.getEntry());
+		Date postedDate = (entry.getLastModified() != null) ? entry.getLastModified()
+			: entry.getCreateDate();
+		ref.setDate(postedDate);
+		reflections.add(ref);
 	    }
 
 	}
@@ -439,6 +435,20 @@
 	return rawData;
     }
 
+    @Override
+    public boolean isGroupedActivity(long toolContentID) {
+	return toolService.isGroupedActivity(toolContentID);
+    }
+
+    @Override
+    public String getLocalisedMessage(String key, Object[] args) {
+	return messageService.getMessage(key, args);
+    }
+
+    @Override
+    public List<PeerreviewStatisticsDTO> getStatistics(Long toolContentId) {
+	return peerreviewDao.getStatistics(toolContentId);
+    }
     
     // *****************************************************************************
     // private methods
@@ -467,16 +477,6 @@
 	return contentId;
     }
 
-    @Override
-    public boolean isGroupedActivity(long toolContentID) {
-	return toolService.isGroupedActivity(toolContentID);
-    }
-
-    @Override
-    public String getLocalisedMessage(String key, Object[] args) {
-	return messageService.getMessage(key, args);
-    }
-
     // *******************************************************************************
     // ToolContentManager, ToolSessionManager methods
     // *******************************************************************************
@@ -743,11 +743,6 @@
     }
 
     @Override
-    public ItemRatingDTO getRatingCriteriaDtoWithActualRatings(Long contentId, Long itemId) {
-	return ratingService.getRatingCriteriaDtoWithActualRatings(contentId, itemId);
-    }
-
-    @Override
     public List<ItemRatingDTO> getRatingCriteriaDtos(Long contentId, Collection<Long> itemIds,
 	    boolean isCommentsByOtherUsersRequired, Long userId, boolean isCountUsersRatedEachItem) {
 	List<ItemRatingDTO> itemRatingDTOs = getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired,
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
===================================================================
diff -u -r3b619df5e7e11dab1dc49859d23399a4b179c16f -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 3b619df5e7e11dab1dc49859d23399a4b179c16f)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -51,6 +51,7 @@
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants;
 import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary;
+import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO;
 import org.lamsfoundation.lams.tool.peerreview.dto.ReflectDTO;
 import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
 import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser;
@@ -83,6 +84,13 @@
 	if (param.equals("getSubgridData")) {
 	    return getSubgridData(mapping, form, request, response);
 	}
+	// refresh statistic page by Ajax call.
+	if (param.equals("statistic")) {
+	    return statistic(mapping, form, request, response);
+	}
+	if (param.equals("reflections")) {
+	    return reflections(mapping, form, request, response);
+	}
 
 	return mapping.findForward(PeerreviewConstants.ERROR);
     }
@@ -103,12 +111,6 @@
 
 	Peerreview peerreview = service.getPeerreviewByContentId(contentId);
 
-	// Create reflectList if reflection is enabled.
-	if (peerreview.isReflectOnActivity()) {
-	    List<ReflectDTO> relectList = service.getReflectList(contentId);
-	    sessionMap.put(PeerreviewConstants.ATTR_REFLECT_LIST, relectList);
-	}
-
 	// user name map
 	List<PeerreviewUser> sessionUsers = service.getUsersByContent(contentId);
 	HashMap<Long, String> userNameMap = new HashMap<Long, String>();
@@ -129,15 +131,6 @@
 	return mapping.findForward(PeerreviewConstants.SUCCESS);
     }
 
-//    private void setupRankHedgeData(HttpServletRequest request, Long contentId, IPeerreviewService service, RatingCriteria criteria) {
-//	int sorting = criteria.isHedgeStyleRating() ? PeerreviewConstants.SORT_BY_AVERAGE_RESULT_DESC : (criteria
-//		.isRankingStyleRating() ? PeerreviewConstants.SORT_BY_AVERAGE_RESULT_ASC
-//		: PeerreviewConstants.SORT_BY_USERNAME_ASC);
-//	StyledCriteriaRatingDTO dto = service.getUsersRatingsCommentsByCriteriaIdDTO(contentId, criteria, -1L,
-//		false, sorting, true, true);
-//	request.setAttribute("criteriaRatings", dto);
-//    }
-
     private ActionForward criteria(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) {
 
@@ -343,6 +336,39 @@
 	return null;
     }
 
+    private ActionForward statistic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {	
+	IPeerreviewService service = getPeerreviewService();
+	String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+	Long toolContentId = WebUtil.readLongParam(request, PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+	request.setAttribute("summaryList", service.getStatistics(toolContentId));
+	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+	return mapping.findForward(PeerreviewConstants.SUCCESS);
+    }
+    
+    private ActionForward reflections(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+	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());
+
+	Long contentId = (Long) sessionMap.get(PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+	Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+
+	IPeerreviewService service = getPeerreviewService();
+	
+	Peerreview peerreview = service.getPeerreviewByContentId(contentId);
+	List<ReflectDTO> relectList = service.getReflectList(contentId, toolSessionId);
+	request.setAttribute(PeerreviewConstants.ATTR_REFLECT_LIST, relectList);
+	request.setAttribute("toolSessionId", toolSessionId);
+	
+	return mapping.findForward(PeerreviewConstants.SUCCESS);
+    }
+
+
+    
     // *************************************************************************************
     // Private method
     // *************************************************************************************
Index: lams_tool_preview/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r3b619df5e7e11dab1dc49859d23399a4b179c16f -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 3b619df5e7e11dab1dc49859d23399a4b179c16f)
+++ lams_tool_preview/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -179,6 +179,16 @@
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
 			parameter="getSubgridData" >
 		</action>
+		<action path="/monitoring/statistic"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
+			parameter="statistic" >
+			<forward name="success" path="/pages/monitoring/statisticpart.jsp" />
+		</action>
+		<action path="/monitoring/reflections"
+			type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction"
+			parameter="reflections" >
+			<forward name="success" path="/pages/monitoring/reflections.jsp" />
+		</action>
 		<!-- ========== BEGIN: Common ============================== -->
 		<action path="/clearsession"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.ClearSessionAction">
Index: lams_tool_preview/web/pages/monitoring/criteria.jsp
===================================================================
diff -u -r3b619df5e7e11dab1dc49859d23399a4b179c16f -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision 3b619df5e7e11dab1dc49859d23399a4b179c16f)
+++ lams_tool_preview/web/pages/monitoring/criteria.jsp	(.../criteria.jsp)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -61,7 +61,7 @@
 
 	<lams:Page type="monitor" title="${criteria.title}">
 		<%@ include file="criteriapart.jsp" %>
- 		<span onclick="window.close()" class="btn btn-default voffset5 pull-right">Close</span>
+ 		<span onclick="window.close()" class="btn btn-default voffset5 pull-right"><fmt:message key="label.close"/></span>
 	</lams:Page>
 	<!--closes content-->
 
Index: lams_tool_preview/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r2504d197b72acb9a431160463483359209b94e9b -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 2504d197b72acb9a431160463483359209b94e9b)
+++ lams_tool_preview/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
         
-
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants"%>
 
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/tabbedheader.jsp" %>
@@ -20,14 +21,28 @@
 		    }     
 		        
 		    function doSelectTab(tabId) {
-			   // end optional tab controller stuff
+			   if ( tabId == 3) {
+				   doStatistic();
+			   }
 			   selectTab(tabId);
 		    } 
 		        
-			function viewItem(itemUid){
-				var myUrl = "<c:url value="/reviewItem.do"/>?mode=teacher&itemUid=" + itemUid + "&sessionMapID=${sessionMapID}";
-				launchPopup(myUrl,"MonitoringReview");
-			}
+			function doStatistic(){
+				var url = "<c:url value="/monitoring/statistic.do?sessionMapID=${sessionMapID}"/>";
+				$("#statisticArea_Busy").show();
+				$.ajaxSetup({ cache: true });
+				$("#statisticArea").load(
+					url,
+					{
+						toolContentID: ${sessionMap.toolContentID}, 
+						reqID: (new Date()).getTime()
+					},
+					function() {
+						$("#statisticArea_Busy").hide();
+					}
+				);
+				
+			}       
 		</script>		 
 	</lams:head>
 	<body class="stripes" onLoad="init()">
@@ -37,15 +52,15 @@
         	<lams:Tabs control="true" title="${title}" helpToolSignature="<%= PeerreviewConstants.TOOL_SIGNATURE %>" helpModule="monitoring">		
 				<lams:Tab id="1" key="monitoring.tab.summary" />
 				<lams:Tab id="2" key="monitoring.tab.edit.activity" />			
-				<%-- <lams:Tab id="3" key="monitoring.tab.statistics" /> --%>
+				<lams:Tab id="3" key="monitoring.tab.statistics" />
 			</lams:Tabs>
 			
 			<lams:TabBodyArea>
 			
 			<lams:TabBodys>
 				<lams:TabBody id="1" titleKey="monitoring.tab.summary" page="summary.jsp" />
 				<lams:TabBody id="2" titleKey="monitoring.tab.edit.activity" page="editactivity.jsp" />			
-				<%-- <lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" /> --%>
+				<lams:TabBody id="3" titleKey="monitoring.tab.statistics" page="statistic.jsp" />
 			</lams:TabBodys>
 
 			</lams:TabBodyArea>
Index: lams_tool_preview/web/pages/monitoring/reflections.jsp
===================================================================
diff -u -r2504d197b72acb9a431160463483359209b94e9b -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision 2504d197b72acb9a431160463483359209b94e9b)
+++ lams_tool_preview/web/pages/monitoring/reflections.jsp	(.../reflections.jsp)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -1,29 +1,55 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="panel panel-default" >
-   <div class="panel-heading" id="headingReflections">
-   	<span class="panel-title collapsable-icon-left">
-	   	<a class="collapsed" role="button" data-toggle="collapse" href="#collapseReflections" 
-			aria-expanded="false" aria-controls="collapseReflections" >
-		<fmt:message key="title.reflection"/></a>
-	</span>
-    </div>
-     
-	<div id="collapseReflections" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingReflections">
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+<c:set var="summaryList" value="${sessionMap.summaryList}"/>
 
-	<table class="table table-condensed table-striped">
+<lams:html>
+<lams:head>
+	<title><fmt:message key="label.learning.title" />
+	</title>
+	<%@ include file="/common/header.jsp"%>
+
+</lams:head>
+<body class="stripes">
+
+	<c:set var="title"><fmt:message key="title.reflection"/></c:set>
+
+	<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
+		<c:if test="${groupSummary.sessionId eq toolSessionId}" >
+			<c:set var="title">${groupSummary.sessionName}</c:set>
+		</c:if>
+	</c:forEach>
+
+	<lams:Page type="monitor" title="${title}">
+
+		<c:if test="${empty reflectList}">
+			<fmt:message key="message.no.reflection.available"></fmt:message>
+		</c:if>
+		
+		<table class="table table-condensed table-striped">
 	
-		<c:forEach var="reflectDTO" items="${sessionMap.reflectList}">
-			<tr>
-				<td>
-					<strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.date}"/>
-					<br>
-					<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
-				</td>
-			</tr>
-		</c:forEach>
+			<c:forEach var="reflectDTO" items="${reflectList}">
+				<tr>
+					<td>
+						<strong><c:out value="${reflectDTO.fullName}" escapeXml="true"/></strong> - <lams:Date value="${reflectDTO.date}"/>
+						<br>
+						<lams:out value="${reflectDTO.reflect}" escapeHtml="true" />
+					</td>
+				</tr>
+			</c:forEach>
+		
+		</table>
 	
-	</table>
+		<span onclick="window.close()" class="btn btn-default voffset5 pull-right"><fmt:message key="label.close"/></span>
 	
+	</lams:Page>
+	<!--closes content-->
+
+	<div id="footer">
 	</div>
-</div>
+	<!--closes footer-->
+
+</body>
+
+</lams:html>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/statistic.jsp
===================================================================
diff -u -r2504d197b72acb9a431160463483359209b94e9b -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision 2504d197b72acb9a431160463483359209b94e9b)
+++ lams_tool_preview/web/pages/monitoring/statistic.jsp	(.../statistic.jsp)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -1,54 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="summaryList" value="${sessionMap.summaryList}"/>
-
-	<c:choose>
-	<c:when test="${empty summaryList}">
-		<lams:Alert type="info" id="no-session-summary" close="false">
-			<fmt:message key="message.monitoring.summary.no.session" />
-		</lams:Alert>
-	</c:when>
-	<c:otherwise>
-		<lams:Alert type="info" id="session-summary-note" close="false">
-			<fmt:message key="monitoring.summary.note" />
-		</lams:Alert>
-	</c:otherwise>
-	</c:choose>
-	
-	<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="headingStats${groupSummary.sessionId}">
-				<span class="panel-title">
-					<fmt:message key="monitoring.label.group" />: <c:out value="${groupSummary.sessionName}" />
-				</span>
-	        </div>
-	
-	        <div class="panel-body">
-		</c:if>
-	
-		<table class="table table-condensed table-no-border">
-			<tr>
-				<td class="field-name" width="30%">
-					Session Id
-				</td>
-				<td>
-					${groupSummary.sessionId}
-				</td>
-			</tr>
-		</table>
-
-		<c:if test="${sessionMap.isGroupedActivity}">	
-			</div>
-			</div>
-		</c:if>
-	</c:forEach>
-
-	<c:if test="${sessionMap.isGroupedActivity}">
-	</div>
-	</c:if>
-	
\ No newline at end of file
+<div id="statisticArea">
+	<%@ include file="statisticpart.jsp"%>
+</div>
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/statisticpart.jsp
===================================================================
diff -u
--- lams_tool_preview/web/pages/monitoring/statisticpart.jsp	(revision 0)
+++ lams_tool_preview/web/pages/monitoring/statisticpart.jsp	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -0,0 +1,54 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
+
+	<c:if test="${empty summaryList}">
+		<lams:Alert type="info" id="no-session-summary" close="false">
+			<fmt:message key="message.monitoring.summary.no.session" />
+		</lams:Alert>	
+	</c:if>
+	
+	<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="headingStats${groupSummary.sessionId}">
+				<span class="panel-title">
+					<fmt:message key="monitoring.label.group" />: <c:out value="${groupSummary.sessionName}" />
+				</span>
+	        </div>
+	
+	        <div class="panel-body">
+		</c:if>
+	
+		<table class="table table-condensed table-no-border">
+			<tr>
+				<td class="field-name" width="30%">
+					<fmt:message key="label.monitoring.number.learners"/>
+				</td>
+				<td>
+					${groupSummary.numLearnersInSession}
+				</td>
+			</tr>
+			<tr>
+				<td class="field-name" width="30%">
+					<fmt:message key="label.monitoring.number.learners.finished"/>
+				</td>
+				<td>
+					${groupSummary.numLearnersComplete}
+				</td>
+			</tr>
+		</table>
+
+		<c:if test="${sessionMap.isGroupedActivity}">	
+			</div>
+			</div>
+		</c:if>
+	</c:forEach>
+
+	<c:if test="${sessionMap.isGroupedActivity}">
+	</div>
+	</c:if>
+	
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r223de22225bd6f7969f417b6d17ba681671af095 -rf059acd48464d2785b1ab003d64cc21747bba49d
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 223de22225bd6f7969f417b6d17ba681671af095)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision f059acd48464d2785b1ab003d64cc21747bba49d)
@@ -81,7 +81,7 @@
 	</c:if>
 	
 	<c:choose>
-		<c:when test="${not empty criterias && fn:length(criterias) eq 1}">
+		<c:when test="${not empty criterias && fn:length(criterias) eq 1 && not sessionMap.peerreview.reflectOnActivity}">
 			<c:forEach var="criteria" items="${criterias}">
 			<h4>${criteria.title}</h4>
 			<c:set var="toolSessionId" value="${groupSummary.sessionId}" scope="request"/>
@@ -93,8 +93,13 @@
 		<c:otherwise>
 			<c:forEach var="criteria" items="${criterias}">
 				<c:set var='url'>criteria.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&criteriaId=${criteria.ratingCriteriaId}</c:set>
-				<a href="javascript:launchPopup('${url}')" class="btn btn-default voffset5 loffset5">View ${criteria.title}</a>
+				<a href="javascript:launchPopup('${url}')" class="btn btn-default voffset5 loffset5">
+					<fmt:message key="label.monitoring.view"><fmt:param>${criteria.title}</fmt:param></fmt:message></a>
 			</c:forEach>
+			<c:if test="${sessionMap.peerreview.reflectOnActivity}">
+				<c:set var='url'>reflections.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}</c:set>
+				<a href="javascript:launchPopup('${url}')" class="btn btn-default voffset5 loffset5"><fmt:message key="title.reflection"/></a>
+			</c:if>
 			<div class="voffset5">&nbsp;</div>
 		</c:otherwise>
 	</c:choose>
@@ -103,14 +108,10 @@
 		</div> <!-- end collapse area  -->
 		</div> <!-- end collapse panel  -->
 	</c:if>
-	${ !sessionMap.isGroupedActivity || ! status.last || sessionMap.peerreview.reflectOnActivity ? '<div class="voffset5">&nbsp;</div>' :  ''}
+	${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
 
 </c:forEach>
 
-<c:if test="${sessionMap.peerreview.reflectOnActivity}">
-	<%@ include file="reflections.jsp"%>
-</c:if>
-
 <c:if test="${sessionMap.isGroupedActivity}">
 	</div> <!--  end panel group -->
 </c:if>