Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/Rating.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/web/WEB-INF/tags/Rating.tag	5 Oct 2015 16:13:12 -0000	1.3
+++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag	20 Oct 2015 04:24:59 -0000	1.4
@@ -52,16 +52,32 @@
 </c:if>
 <c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
 
+<c:if test="${isCommentsEnabled}">
+	<c:set var="userId"><lams:user property="userID" /></c:set>
+	<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+		<c:if test="${comment.userId == userId}">
+			<c:set var="commentLeftByUser" value="${comment}"/>
+		</c:if>
+	</c:forEach>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
 <div class="rating-stars-holder">
+
+	<c:set var="hasStartedRating" value="false"/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
+		<c:set var="hasStartedRating" value='${hasStartedRating || criteriaDto.userRating != ""}'/>
+	</c:forEach>
+	<c:set var="hasStartedRating" value='${hasStartedRating || not empty commentLeftByUser}'/>
+	
 	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}" varStatus="status">
 		<c:set var="objectId" value="${criteriaDto.ratingCriteria.ratingCriteriaId}-${itemRatingDto.itemId}"/>
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates) || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
@@ -133,13 +149,6 @@
 <c:if test="${isCommentsEnabled}">
 	<div id="comments-area-${itemRatingDto.itemId}">
 	
-		<c:set var="userId"><lams:user property="userID" /></c:set>
-		<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
-			<c:if test="${comment.userId == userId}">
-				<c:set var="commentLeftByUser" value="${comment}"/>
-			</c:if>
-		</c:forEach>
-		
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -155,7 +164,7 @@
 				</div>
 			</c:when>
 			
-			<c:when test='${not disabled}'>
+			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
 				<div id="add-comment-area-${itemRatingDto.itemId}">
 			
 					<!-- Rating limits info -->
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.63 -r1.64
--- lams_tool_laqa/web/learning/LearnerRep.jsp	13 Oct 2015 19:00:04 -0000	1.63
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	20 Oct 2015 04:24:59 -0000	1.64
@@ -112,12 +112,25 @@
 								
 								rows += '</td>';
 								
+								var usesRatings = false;
+								var hasStartedRating = false;
+
 								if (${generalLearnerFlowDTO.allowRateAnswers == 'true'}) {
 									rows += '<td style="width:150px;">';
 									
 									if (userData["visible"] == 'true') {
 										rows += '<div class="rating-stars-holder">';
-										
+
+										// if the user has left a comment or done a rating in a batch of ratings, we need to keep all related ratings open.
+										usesRatings = true;
+										for (j = 0; !hasStartedRating && j < userData.criteriaDtos.length; j++){
+											hasStartedRating = userData.criteriaDtos[j].userRating != "";
+											if ( hasStartedRating) {
+												idsBeingRated.push(itemId); // idsBeingRated defined in rating.js
+											}
+										}
+										hasStartedRating = hasStartedRating || ${isCommentsEnabled} && userData["commentPostedByUser"] != "";
+
 										for (j = 0; j < userData.criteriaDtos.length; j++){
 											var criteriaDto = userData.criteriaDtos[j];
 											var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId;
@@ -126,7 +139,7 @@
 											var userRating = criteriaDto.userRating;
 											var isCriteriaNotRatedByUser = userRating == "";
 											var averageRatingDisplayed = (isItemAuthoredByUser || !isCriteriaNotRatedByUser) ? averageRating : 0;
-											var ratingStarsClass = (IS_DISABLED ||isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
+											var ratingStarsClass = (IS_DISABLED || isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES)  && (!hasStartedRating) || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
 								
 											rows += '<h4>';
 											rows += 	 criteriaDto.title;
@@ -182,7 +195,7 @@
 											rows += '</div>';
 											
 										//show comments textarea and a submit button
-										} else if (!IS_DISABLED) {
+										} else if (! (IS_DISABLED || usesRatings && MAX_RATES>0 && countRatedItems >= MAX_RATES && !hasStartedRating)) {
 											rows += '<div id="add-comment-area-' + itemId + '">';											
 											rows +=		'<textarea name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;"><fmt:message key="label.comment.textarea.tip"/></textarea>';
 											
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp,v
diff -u -r1.42 -r1.43
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	13 Oct 2015 19:00:04 -0000	1.42
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	20 Oct 2015 04:24:59 -0000	1.43
@@ -115,12 +115,26 @@
 								
 								rows += '</td>';
 								
+								var usesRatings = false;
+								var hasStartedRating = false;
+
+	
 								if (${generalLearnerFlowDTO.allowRateAnswers == 'true'}) {
 									rows += '<td style="width:150px;">';
 									
 									if (userData["visible"] == 'true') {
 										rows += '<div class="rating-stars-holder">';
 										
+										// if the user has left a comment or done a rating in a batch of ratings, we need to keep all related ratings open.
+										usesRatings = true;
+										for (j = 0; !hasStartedRating && j < userData.criteriaDtos.length; j++){
+											hasStartedRating = userData.criteriaDtos[j].userRating != "";
+											if ( hasStartedRating) {
+												idsBeingRated.push(itemId); // idsBeingRated defined in rating.js
+											}
+										}
+										hasStartedRating = hasStartedRating || ${isCommentsEnabled} && userData["commentPostedByUser"] != "";
+										
 										for (j = 0; j < userData.criteriaDtos.length; j++){
 											var criteriaDto = userData.criteriaDtos[j];
 											var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId;
@@ -129,7 +143,7 @@
 											var userRating = criteriaDto.userRating;
 											var isCriteriaNotRatedByUser = userRating == "";
 											var averageRatingDisplayed = (isItemAuthoredByUser || !isCriteriaNotRatedByUser) ? averageRating : 0;
-											var ratingStarsClass = (IS_DISABLED ||isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
+											var ratingStarsClass = (IS_DISABLED ||isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) && ! hasStartedRating || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
 								
 											rows += '<h4>';
 											rows += 	 criteriaDto.title;
@@ -185,7 +199,7 @@
 											rows += '</div>';
 											
 										//show comments textarea and a submit button
-										} else if (!IS_DISABLED) {
+										} else if (! (IS_DISABLED || usesRatings && MAX_RATES>0 && countRatedItems >= MAX_RATES && !hasStartedRating)) {
 											rows += '<div id="add-comment-area-' + itemId + '">';											
 											rows +=		'<textarea name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;"><fmt:message key="label.comment.textarea.tip"/></textarea>';
 											
Index: lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/LearnerRep.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	13 Oct 2015 19:00:04 -0000	1.20
+++ lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	20 Oct 2015 04:24:59 -0000	1.21
@@ -118,12 +118,26 @@
 								
 								rows += '</td>';
 								
+								var usesRatings = false;
+								var hasStartedRating = false;
+
+	
 								if (${generalLearnerFlowDTO.allowRateAnswers == 'true'}) {
 									rows += '<td style="width:150px;">';
 									
 									if (userData["visible"] == 'true') {
 										rows += '<div class="rating-stars-holder">';
 										
+										// if the user has left a comment or done a rating in a batch of ratings, we need to keep all related ratings open.
+										usesRatings = true;
+										for (j = 0; !hasStartedRating && j < userData.criteriaDtos.length; j++){
+											hasStartedRating = userData.criteriaDtos[j].userRating != "";
+											if ( hasStartedRating) {
+												idsBeingRated.push(itemId); // idsBeingRated defined in rating.js
+											}
+										}
+										hasStartedRating = hasStartedRating || ${isCommentsEnabled} && userData["commentPostedByUser"] != "";
+										
 										for (j = 0; j < userData.criteriaDtos.length; j++){
 											var criteriaDto = userData.criteriaDtos[j];
 											var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId;
@@ -132,7 +146,7 @@
 											var userRating = criteriaDto.userRating;
 											var isCriteriaNotRatedByUser = userRating == "";
 											var averageRatingDisplayed = (isItemAuthoredByUser || !isCriteriaNotRatedByUser) ? averageRating : 0;
-											var ratingStarsClass = (IS_DISABLED ||isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
+											var ratingStarsClass = (IS_DISABLED ||isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES)  && ! hasStartedRating || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
 								
 											rows += '<h4>';
 											rows += 	 criteriaDto.title;
@@ -188,7 +202,7 @@
 											rows += '</div>';
 											
 										//show comments textarea and a submit button
-										} else if (!IS_DISABLED) {
+										} else if (! (IS_DISABLED || usesRatings && MAX_RATES>0 && countRatedItems >= MAX_RATES && !hasStartedRating)) {
 											rows += '<div id="add-comment-area-' + itemId + '">';											
 											rows +=		'<textarea name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;"><fmt:message key="label.comment.textarea.tip"/></textarea>';
 											
Index: lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	13 Oct 2015 19:00:04 -0000	1.21
+++ lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	20 Oct 2015 04:24:59 -0000	1.22
@@ -118,12 +118,26 @@
 								
 								rows += '</td>';
 								
+								var usesRatings = false;
+								var hasStartedRating = false;
+
+	
 								if (${generalLearnerFlowDTO.allowRateAnswers == 'true'}) {
 									rows += '<td style="width:150px;">';
 									
 									if (userData["visible"] == 'true') {
 										rows += '<div class="rating-stars-holder">';
 										
+										// if the user has left a comment or done a rating in a batch of ratings, we need to keep all related ratings open.
+										usesRatings = true;
+										for (j = 0; !hasStartedRating && j < userData.criteriaDtos.length; j++){
+											hasStartedRating = userData.criteriaDtos[j].userRating != "";
+											if ( hasStartedRating) {
+												idsBeingRated.push(itemId); // idsBeingRated defined in rating.js
+											}
+										}
+										hasStartedRating = hasStartedRating || ${isCommentsEnabled} && userData["commentPostedByUser"] != "";
+										
 										for (j = 0; j < userData.criteriaDtos.length; j++){
 											var criteriaDto = userData.criteriaDtos[j];
 											var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId;
@@ -132,7 +146,7 @@
 											var userRating = criteriaDto.userRating;
 											var isCriteriaNotRatedByUser = userRating == "";
 											var averageRatingDisplayed = (isItemAuthoredByUser || !isCriteriaNotRatedByUser) ? averageRating : 0;
-											var ratingStarsClass = (IS_DISABLED ||isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
+											var ratingStarsClass = (IS_DISABLED ||isItemAuthoredByUser || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) && ! hasStartedRating || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
 								
 											rows += '<h4>';
 											rows += 	 criteriaDto.title;
@@ -188,7 +202,7 @@
 											rows += '</div>';
 											
 										//show comments textarea and a submit button
-										} else if (!IS_DISABLED) {
+										} else if (! (IS_DISABLED || usesRatings && MAX_RATES>0 && countRatedItems >= MAX_RATES && !hasStartedRating)) {
 											rows += '<div id="add-comment-area-' + itemId + '">';											
 											rows +=		'<textarea name="comment" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;"><fmt:message key="label.comment.textarea.tip"/></textarea>';
 											
Index: lams_tool_preview/web/WEB-INF/tags/Rating.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Rating.tag,v
diff -u -r1.2 -r1.3
--- lams_tool_preview/web/WEB-INF/tags/Rating.tag	5 Oct 2015 16:13:13 -0000	1.2
+++ lams_tool_preview/web/WEB-INF/tags/Rating.tag	20 Oct 2015 04:22:24 -0000	1.3
@@ -52,16 +52,32 @@
 </c:if>
 <c:set var="isCommentsEnabled" value="${itemRatingDto.commentsEnabled && showComments}"/>
 
+<c:if test="${isCommentsEnabled}">
+	<c:set var="userId"><lams:user property="userID" /></c:set>
+	<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
+		<c:if test="${comment.userId == userId}">
+			<c:set var="commentLeftByUser" value="${comment}"/>
+		</c:if>
+	</c:forEach>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
 <div class="rating-stars-holder">
+
+	<c:set var="hasStartedRating" value="false"/>
+	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}">
+		<c:set var="hasStartedRating" value='${hasStartedRating || criteriaDto.userRating != ""}'/>
+	</c:forEach>
+	<c:set var="hasStartedRating" value='${hasStartedRating || not empty commentLeftByUser}'/>
+	
 	<c:forEach var="criteriaDto" items="${itemRatingDto.criteriaDtos}" varStatus="status">
 		<c:set var="objectId" value="${criteriaDto.ratingCriteria.ratingCriteriaId}-${itemRatingDto.itemId}"/>
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates) || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
@@ -133,13 +149,6 @@
 <c:if test="${isCommentsEnabled}">
 	<div id="comments-area-${itemRatingDto.itemId}">
 	
-		<c:set var="userId"><lams:user property="userID" /></c:set>
-		<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
-			<c:if test="${comment.userId == userId}">
-				<c:set var="commentLeftByUser" value="${comment}"/>
-			</c:if>
-		</c:forEach>
-		
 		<c:choose>
 			<c:when test='${isItemAuthoredByUser}'>
 				<c:forEach var="comment" items="${itemRatingDto.commentDtos}">
@@ -155,7 +164,7 @@
 				</div>
 			</c:when>
 			
-			<c:when test='${not disabled}'>
+			<c:when test='${not ( disabled || (maxRates > 0) && (countRatedItems >= maxRates) && !hasStartedRating )}'>
 				<div id="add-comment-area-${itemRatingDto.itemId}">
 			
 					<!-- Rating limits info -->
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/learning.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_preview/web/pages/learning/learning.jsp	11 Sep 2015 06:07:05 -0000	1.4
+++ lams_tool_preview/web/pages/learning/learning.jsp	20 Oct 2015 04:22:24 -0000	1.5
@@ -26,7 +26,7 @@
 	<script type="text/javascript">
 		//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/";
-		
+
 		//vars for rating.js
 		var MAX_RATES = ${peerreview.maximumRates},
 		MIN_RATES = ${peerreview.minimumRates},
@@ -75,7 +75,7 @@
 			    		var rows = [],
 			            json = {},
 						countRatedItems = data.countRatedItems;
-			    		
+
 			    		if (data.rows.length == 0) {
 			    			$(".tablesorter,.pager").hide();
 			    			$("#no-users-info").show();
@@ -103,7 +103,19 @@
 							
 							rows += '<td style="width:150px;">';
 							rows += 	'<div class="rating-stars-holder">';
-								
+
+							// if the user has left a comment or done a rating in a batch of ratings, we need to keep all related ratings open.
+							var hasStartedRating = false;
+							for (j = 0; !hasStartedRating && j < userData.criteriaDtos.length; j++){
+								hasStartedRating = userData.criteriaDtos[j].userRating != "";
+								if ( hasStartedRating) {
+									idsBeingRated.push(itemId); // idsBeingRated defined in rating.js
+								}
+							}
+							hasStartedRating = hasStartedRating || ${isCommentsEnabled} && userData["commentPostedByUser"] != "";
+							
+							var isDisabled = IS_DISABLED || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) && ! hasStartedRating || isMaximumRatesPerUserReached;
+							
 							for (j = 0; j < userData.criteriaDtos.length; j++){
 								var criteriaDto = userData.criteriaDtos[j];
 								var objectId = criteriaDto["ratingCriteriaId"] + "-" + itemId;
@@ -112,11 +124,12 @@
 								var userRating = criteriaDto.userRating;
 								var isCriteriaNotRatedByUser = userRating == "";
 								var averageRatingDisplayed = (!isCriteriaNotRatedByUser) ? averageRating : 0;
-								var isDisabled = IS_DISABLED || (MAX_RATES > 0) && (countRatedItems >= MAX_RATES) || isMaximumRatesPerUserReached;
 								var ratingStarsClass = (isDisabled || !isCriteriaNotRatedByUser) ? "rating-stars-disabled" : "rating-stars";
 							
 								rows += '<h4>';
 								rows += 	 criteriaDto.title;
+								rows += '&nbsp'; rows += itemId;
+								rows += '&nbsp'; rows += objectId;
 								rows += '</h4>';
 										
 								rows += '<div class="'+ ratingStarsClass +' rating-stars-new" data-average="'+ averageRatingDisplayed +'" data-id="'+ objectId +'">';
@@ -214,7 +227,7 @@
 			alert('<fmt:message key="error.max.ratings.per.user"/>');
 			refresh();
 		}
-		
+
     </script>
 </lams:head>
 <body class="stripes">