Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java
===================================================================
diff -u -r42cd8d7da9fa6615dbd82d376984000024b4b0fe -r223de22225bd6f7969f417b6d17ba681671af095
--- lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java	(.../IRatingDAO.java)	(revision 42cd8d7da9fa6615dbd82d376984000024b4b0fe)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java	(.../IRatingDAO.java)	(revision 223de22225bd6f7969f417b6d17ba681671af095)
@@ -30,7 +30,6 @@
 import java.util.Map;
 
 import org.lamsfoundation.lams.rating.dto.ItemRatingCriteriaDTO;
-import org.lamsfoundation.lams.rating.dto.StyledRatingDTO;
 import org.lamsfoundation.lams.rating.model.Rating;
 
 public interface IRatingDAO {
Index: lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
===================================================================
diff -u -r42cd8d7da9fa6615dbd82d376984000024b4b0fe -r223de22225bd6f7969f417b6d17ba681671af095
--- lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java	(.../RatingDAO.java)	(revision 42cd8d7da9fa6615dbd82d376984000024b4b0fe)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java	(.../RatingDAO.java)	(revision 223de22225bd6f7969f417b6d17ba681671af095)
@@ -89,7 +89,7 @@
     // Used by tools to get the ratings and comments relating to their items. To be used within SQL and supply criteriaId as :ratingCriteriaId
     // See Peer Review for example usage.
     private static final String TOOL_SELECT_LEFT_JOIN_BY_USER_COMMENT = "SELECT r.item_id, r.comment "
-	    + "     FROM lams_rating_comment r WHERE r.rating_criteria_id = :ratingCriteriaId ";
+	    + "     FROM lams_rating_comment r WHERE r.rating_criteria_id = :ratingCriteriaId AND r.user_id = :userId";
 
     // Same as TOOL_SELECT_LEFT_JOIN_BY_USER_STANDARD except that it returns the average results for a single user (:userId), as left by other users
     private static final String TOOL_SELECT_LEFT_JOIN_FOR_USER_STANDARD = "SELECT DISTINCT r.item_id, rc.comment, NULL rating, calc.average_rating, calc.count_vote "
Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
===================================================================
diff -u -r42cd8d7da9fa6615dbd82d376984000024b4b0fe -r223de22225bd6f7969f417b6d17ba681671af095
--- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(.../RatingService.java)	(revision 42cd8d7da9fa6615dbd82d376984000024b4b0fe)
+++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	(.../RatingService.java)	(revision 223de22225bd6f7969f417b6d17ba681671af095)
@@ -656,6 +656,11 @@
         		    userRow.put("userRating", row[3] == null ? "" : numberFormat.format((Float) row[3]));
         		    userRow.put("averageRating",  row[4] == null ? "" : numberFormat.format((Double) row[4]));
         		    userRow.put("numberOfVotes", row[5] == null ? "" : numberFormat.format((BigInteger) row[5]));
+		    } else {
+			// don't have missing entries in JSON or an exception can occur if you try to access them
+        		    userRow.put("userRating", "");
+        		    userRow.put("averageRating", "");
+        		    userRow.put("numberOfVotes", "");
 		    }
 
 		    rows.put(userRow);
Fisheye: Tag 223de22225bd6f7969f417b6d17ba681671af095 refers to a dead (removed) revision in file `lams_tool_preview/web/pages/monitoring/criteriaToDelete.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(revision 0)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(revision 223de22225bd6f7969f417b6d17ba681671af095)
@@ -0,0 +1,144 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:choose>
+<c:when test="${criteria.ratingStyle eq 0 }">
+	<c:set var="heading"></c:set>
+</c:when>
+<c:when test="${criteria.ratingStyle eq 1 }">
+	<c:set var="heading"><fmt:message key="label.rating" /></c:set>
+</c:when>
+<c:when test="${criteria.ratingStyle eq 2 }">
+	<c:set var="heading"><fmt:message key="label.rank" /></c:set>
+</c:when>
+<c:when test="${criteria.ratingStyle eq 3 }">
+	<c:set var="heading"><fmt:message key="label.mark" /></c:set>
+</c:when>
+</c:choose>
+
+
+	<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}'
+				],
+			   	colModel:[
+			   		{name:'itemId', index:'itemId', width:0, hidden: true},
+			   		{name:'itemDescription', index:'itemDescription', width:260},
+			   		{name:'rating', index:'rating', width:160, align:"center"}
+			   	],
+			   	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"];
+					   
+					jQuery("#"+subgrid_id).html("<table id='" + subgridTableId + "' class='scroll'></table>");
+					   
+					jQuery("#"+subgridTableId).jqGrid({
+						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,
+						height: "100%",
+						autowidth:true,
+						grouping:true,	
+						groupingView : {
+							groupField : ['criteriaId'],
+							groupColumnShow : [false]
+						},
+						loadComplete: function(){
+							//remove empty subgrids
+					        var table_value = $('#'+subgridTableId).getGridParam('records');
+					        if(table_value === 0){
+					            $('#'+subgrid_id).parent().unbind('click').html('<fmt:message key="label.no.ratings.left" />');
+					        }
+						},
+						colNames:[
+							'id',
+							'<fmt:message key="label.user.name" />',
+							'${heading}',
+							'criteriaId'
+							],
+						colModel:[
+						   {name:'id', index:'id', hidden:true},
+						   {name:'userName',index:'userName'},
+						   {name:'rating', index:'rating', width:140, align:"center"},
+						   {name:'criteriaId', hidden:true}
+						],
+						loadError: function(xhr,st,err) {
+					    	jQuery("#"+subgridTableId).clearGridData();
+					    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
+					    }
+					})
+				}
+			}).jqGrid('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>
+
+<p>
+	<c:choose>
+	<c:when test="${criteria.ratingStyle eq 2}">
+		<c:choose>
+		<c:when test="${criteria.maxRating gt 0 }">
+			<fmt:message key="label.monitoring.instructions.rank.some.learners">
+				<fmt:param>${criteria.maxRating}</fmt:param>
+			</fmt:message>
+		</c:when>
+		<c:otherwise>
+			<fmt:message key="label.monitoring.instructions.rank.all.learners"/>
+		</c:otherwise>
+		</c:choose>			
+	</c:when>
+	<c:when test="${criteria.ratingStyle eq 3 }">
+		<fmt:message key="label.monitoring.instructions.assign.some.marks">
+			<fmt:param>${criteria.maxRating}</fmt:param>
+		</fmt:message>
+	</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
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r29f431633e838d565e370751ec1b7ef4f051db38 -r223de22225bd6f7969f417b6d17ba681671af095
--- lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 29f431633e838d565e370751ec1b7ef4f051db38)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 223de22225bd6f7969f417b6d17ba681671af095)
@@ -44,109 +44,7 @@
 <script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
 <script src="${lams}includes/javascript/rating.js" type="text/javascript" ></script>
-<script type="text/javascript">
-	$(document).ready(function(){
-		
-		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
-		
-			jQuery("#group${groupSummary.sessionId}").jqGrid({
-			   	url: "<c:url value='/monitoring/getUsers.do'/>?toolContentId=${sessionMap.toolContentID}&toolSessionId=${groupSummary.sessionId}",
-				datatype: "json",
-				height: 'auto',
-				autowidth: true,
-				shrinkToFit: false,
-			   	colNames:[
-						'sessionId',
-						'userId',
-						"<fmt:message key="label.user.name" />",
-						"<fmt:message key="label.rating" />"
-				],
-			   	colModel:[
-			   		{name:'sessionId', index:'sessionId', width:0, hidden: true},
-			   		{name:'userId', index:'userId', width:0, hidden: true},
-			   		{name:'userName', index:'userName', width:260},
-			   		{name:'rating', index:'rating', width:160, align:"center", sortable:false}
-			   	],
-			   	rowNum:10,
-			   	rowList:[10,20,30,40,50,100],
-			   	pager: '#pager${groupSummary.sessionId}',
-			   	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 sessionId = jQuery("#group${groupSummary.sessionId}").getRowData(row_id)["sessionId"];
-					var userId = jQuery("#group${groupSummary.sessionId}").getRowData(row_id)["userId"];
-					   
-					jQuery("#"+subgrid_id).html("<table id='" + subgridTableId + "' class='scroll'></table>");
-					   
-					jQuery("#"+subgridTableId).jqGrid({
-						datatype: "json",
-						loadonce:true,
-						rowNum: 10000,
-						url: "<c:url value='/monitoring/getSubgridData.do'/>?sessionMapID=${sessionMapID}&userID=" + userId,
-						height: "100%",
-						autowidth:true,
-						grouping:true,	
-						groupingView : {
-							groupField : ['criteriaId'],
-							groupColumnShow : [false],
-							groupText : ['<b>{0}</b>']
-						},
-						loadComplete: function(){
-							//remove empty subgrids
-					        var table_value = $('#'+subgridTableId).getGridParam('records');
-					        if(table_value === 0){
-					            $('#'+subgrid_id).parent().unbind('click').html('<fmt:message key="label.no.ratings.left" />');
-					        }
-						},
-						colModel:[
-						   {name:'id', index:'id', hidden:true},
-						   {name:'userName',index:'userName'},
-						   {name:'rating', index:'rating', width:140, align:"center"},
-						   {name:'criteriaId', hidden:true}
-						],
-						loadError: function(xhr,st,err) {
-					    	jQuery("#"+subgridTableId).clearGridData();
-					    	info_dialog("<fmt:message key="label.error"/>", "<fmt:message key="gradebook.error.loaderror"/>", "<fmt:message key="label.ok"/>");
-					    }
-					})
-				}
-			}).jqGrid('navGrid','#pager${groupSummary.sessionId}',{add:false,del:false,edit:false,search:false});
-			//$("#group${groupSummary.sessionId}").parents('div.ui-jqgrid-bdiv').css("max-height","1000px");
-			
-		</c:forEach>
-        
-		
-        //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>
-
 <div class="panel">
 	<h4>
 	    <c:out value="${sessionMap.peerreview.title}" escapeXml="true"/>
@@ -182,10 +80,25 @@
         <div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
 	</c:if>
 	
-	<table id="group${groupSummary.sessionId}" class="scroll" cellpadding="0" cellspacing="0"></table>
-	<div id="pager${groupSummary.sessionId}"></div> 
-	<div class="voffset5">&nbsp;</div>
-	
+	<c:choose>
+		<c:when test="${not empty criterias && fn:length(criterias) eq 1}">
+			<c:forEach var="criteria" items="${criterias}">
+			<h4>${criteria.title}</h4>
+			<c:set var="toolSessionId" value="${groupSummary.sessionId}" scope="request"/>
+			<c:set var="criteria" value="${criteria}" scope="request"/>
+			<c:set var="sessionMap" value="${sessionMap}" scope="request"/>
+			<jsp:include page="criteriapart.jsp"/>
+			</c:forEach>
+		</c:when>
+		<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>
+			</c:forEach>
+			<div class="voffset5">&nbsp;</div>
+		</c:otherwise>
+	</c:choose>
+
 	<c:if test="${sessionMap.isGroupedActivity}">
 		</div> <!-- end collapse area  -->
 		</div> <!-- end collapse panel  -->