Index: lams_tool_preview/web/pages/learning/results.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/results.jsp,v
diff -u -r1.3.2.4 -r1.3.2.5
--- lams_tool_preview/web/pages/learning/results.jsp	9 Mar 2016 03:01:20 -0000	1.3.2.4
+++ lams_tool_preview/web/pages/learning/results.jsp	10 Oct 2016 00:31:04 -0000	1.3.2.5
@@ -29,15 +29,16 @@
 		var pathToImageFolder = "${lams}images/css/";
 		
 		//vars for rating.js
-		var MAX_RATES = ${peerreview.maximumRates},
-		MIN_RATES = ${peerreview.minimumRates},
-		COMMENTS_MIN_WORDS_LIMIT = ${sessionMap.commentsMinWordsLimit},
-		MAX_RATINGS_FOR_ITEM = ${peerreview.maximumRatesPerUser},
+		var MAX_RATES = 0,
+		MIN_RATES = 0,
+		COMMENTS_MIN_WORDS_LIMIT = 0,
+		MAX_RATINGS_FOR_ITEM = 0,
+		LIMIT_BY_CRITERIA = "true";
 		LAMS_URL = '${lams}',
-		COUNT_RATED_ITEMS = ${sessionMap.countRatedItems},
+		COUNT_RATED_ITEMS = 0,
 		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
 		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="warning.comment.blank"/>',
-		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${sessionMap.commentsMinWordsLimit}"/></fmt:message>";
+		WARN_MIN_NUMBER_WORDS_LABEL = "<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>";
 	</script>
 	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
@@ -49,7 +50,6 @@
 	<script type="text/javascript">
 	
 		$(document).ready(function(){
-			
 			$(".tablesorter").tablesorter({
 				theme: 'bootstrap',
 			    widthFixed: true,
@@ -65,7 +65,7 @@
 		            } 
 		        } 
 			});
-			
+			initializeJRating();
 		 });
 	
 		function finishSession(){
@@ -87,89 +87,75 @@
 
 	<lams:Page type="learner" title="${peerreview.title}">
 
-		<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
-			<lams:Alert type="danger" id="warn-lock" close="false">
-				<c:choose>
-					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked"/>
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" ><fmt:param><fmt:message key="label.finished" /></fmt:param></fmt:message>
-					</c:otherwise>
-				</c:choose>
-			</lams:Alert>
-		</c:if>
+	<c:if test="${sessionMap.lockOnFinish and mode != 'teacher'}">
+		<lams:Alert type="danger" id="warn-lock" close="false">
+			<c:choose>
+				<c:when test="${sessionMap.userFinished}">
+					<fmt:message key="message.activityLocked"/>
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="message.warnLockOnFinish" ><fmt:param><fmt:message key="label.finished" /></fmt:param></fmt:message>
+				</c:otherwise>
+			</c:choose>
+		</lams:Alert>
+	</c:if>
 
-		<c:if test="${not empty itemRatingDtos}">
+	<c:if test="${peerreview.showRatingsLeftForUser}">
 
-		<!-- Ratings UI -->
-		<table class="tablesorter">
-			<thead>
-				<tr>
-					<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
-						<fmt:message key="label.user.name" />
-					</th>
-					<th class="comment">
-						<fmt:message key="label.rating" />
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				<c:forEach var="itemRatingDto" items="${itemRatingDtos}">
-					<tr>
-						<td>
-							<c:out value="${userNameMap[itemRatingDto.itemId]}" escapeXml="true"/>
-						</td>
-						
-						<td>
-							<lams:Rating itemRatingDto="${itemRatingDto}" disabled="true" isItemAuthoredByUser="false"/>
-						</td>
-					</tr>
-				</c:forEach>
-			</tbody>
-		</table>
-		
+		<c:if test="${not empty allCriteriaRatings}">
+		<c:forEach var="criteriaRatings" items="${allCriteriaRatings}" varStatus="status">
+			<div class="panel panel-default">
+			<div class="panel-heading panel-title">
+				${criteriaRatings.ratingCriteria.title}
+			</div>
+			<div class="panel-body">
+			<lams:StyledRating criteriaRatings="${criteriaRatings}" showJustification="true" alwaysShowAverage="false" currentUserDisplay="false"/>
+			</div>
+			</div>
+		</c:forEach>
 		</c:if>
-		
-		<c:if test="${peerreview.showRatingsLeftForUser}">
+
 		<div class="panel panel-default">
 		<div class="panel-heading panel-title">
 			<fmt:message key="label.ratings.by.others" />
 		</div>
 		<div class="panel-body">
-			<lams:Rating itemRatingDto="${itemRatingDto}" disabled="true" isItemAuthoredByUser="true"/>
+			<c:forEach var="criteriaRatings" items="${userRatings}" varStatus="status">
+				<h4>${criteriaRatings.ratingCriteria.title}</h4>
+		 		<lams:StyledRating criteriaRatings="${criteriaRatings}" showJustification="false" alwaysShowAverage="true" currentUserDisplay="true"/>
+		</c:forEach>
 		</div>
 		</div>
-		</c:if>
+	</c:if>
+				
+	<!-- Reflection -->
+	<c:if test="${sessionMap.isSessionCompleted and sessionMap.reflectOn}">
+		<%@ include file="notebookdisplay.jsp"%>
+	</c:if>
+	<!-- End Reflection -->
 
-		<!-- Reflection -->
-		<c:if test="${sessionMap.isSessionCompleted and sessionMap.reflectOn}">
-			<%@ include file="notebookdisplay.jsp"%>
-		</c:if>
-		<!-- End Reflection -->
+	<c:if test="${!peerreview.lockWhenFinished}">
+		<html:button property="redoRatings" styleClass="btn btn-default voffset5 pull-left" onclick="redoRatings();">
+			<fmt:message key="label.redo" />
+		</html:button>
+	</c:if>	
 
-		<c:if test="${!peerreview.lockWhenFinished}">
-			<html:button property="redoRatings" styleClass="btn btn-default voffset5 pull-left" onclick="redoRatings();">
-				<fmt:message key="label.redo" />
-			</html:button>
-		</c:if>	
+	<c:if test="${mode != 'teacher'}">
+			<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">
+						<fmt:message key="label.continue" />
+					</html:button>
+				</c:when>
+				<c:otherwise>
+					<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>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
 
-		<c:if test="${mode != 'teacher'}">
-				<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">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
-					<c:otherwise>
-						<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>
-					</c:otherwise>
-				</c:choose>
-			</div>
-		</c:if>
-
 	</lams:Page>
 	<!--closes content-->