Index: lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java,v
diff -u -r1.1.2.11 -r1.1.2.12
--- lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	28 Nov 2016 02:51:11 -0000	1.1.2.11
+++ lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java	8 Dec 2016 00:15:30 -0000	1.1.2.12
@@ -367,12 +367,16 @@
     @Override
     public void saveRatingCriterias(HttpServletRequest request, Collection<RatingCriteria> oldCriterias,
 	    Long toolContentId) {
+	
+	// different handling for comments - simple tag sets the isCommentsEnabled flag,
+	// the complex tag sends explicit comment type entry.
+	boolean explicitCommentTypeFound = false;
+	
 	// create orderId to RatingCriteria map
 	Map<Integer, RatingCriteria> mapOrderIdToRatingCriteria = new HashMap<Integer, RatingCriteria>();
 	for (RatingCriteria ratingCriteriaIter : oldCriterias) {
 	    mapOrderIdToRatingCriteria.put(ratingCriteriaIter.getOrderId(), ratingCriteriaIter);
 	}
-
 	
 	for ( Map.Entry entry : request.getParameterMap().entrySet()) {
 	    log.debug("entry: "+entry.getKey()+" "+entry.getValue());
@@ -398,18 +402,24 @@
 			maxRating = RatingCriteria.RATING_STYLE_RANKING_DEFAULT_MAX;
 			break;
 		    case RatingCriteria.RATING_STYLE_HEDGING:
+		    case RatingCriteria.RATING_STYLE_COMMENT:
 			maxRating = 0;
 			break;
 		}
 	    }
 
 	    Integer minRatings = 0;
 	    Integer maxRatings = 0;
-	    if ( ratingStyle == RatingCriteria.RATING_STYLE_STAR ) {
+	    if ( ratingStyle == RatingCriteria.RATING_STYLE_STAR || ratingStyle == RatingCriteria.RATING_STYLE_COMMENT ) {
 		minRatings = WebUtil.readIntParam(request, "minimumRates" + i, true);
 		maxRatings = WebUtil.readIntParam(request, "maximumRates" + i, true);
+	    } 
+	    
+	    if ( ratingStyle == RatingCriteria.RATING_STYLE_COMMENT ) {
+		explicitCommentTypeFound = true;
 	    }
-	    boolean commentsEnabled = ( ratingStyle != RatingCriteria.RATING_STYLE_COMMENT ? WebUtil.readBooleanParam(request,  "enableComments" + i, false) : false );
+
+	    boolean commentsEnabled = ( ratingStyle != RatingCriteria.RATING_STYLE_COMMENT ? WebUtil.readBooleanParam(request,  "enableComments" + i, false) : true );
 	    
 	    RatingCriteria ratingCriteria = mapOrderIdToRatingCriteria.get(i);
 	    if (StringUtils.isNotBlank(criteriaTitle)) {
@@ -437,7 +447,7 @@
 		ratingCriteria.setMinimumRates( minRatings );
 		ratingCriteria.setMaximumRates( maxRatings );
 		
-		ratingCriteriaDAO.saveOrUpdate(ratingCriteria);
+    		ratingCriteriaDAO.saveOrUpdate(ratingCriteria);
 		// !!updatedCriterias.add(ratingCriteria);
 
 		// delete
@@ -447,37 +457,39 @@
 
 	}
 
-	// ==== handle comments criteria ====
+	// ==== handle comments criteria - simple tag support ====
+	if ( ! explicitCommentTypeFound ) {
+	    boolean isCommentsEnabled = WebUtil.readBooleanParam(request, "isCommentsEnabled", false);
 
-	boolean isCommentsEnabled = WebUtil.readBooleanParam(request, "isCommentsEnabled", false);
-	// find comments' responsible RatingCriteria
-	RatingCriteria commentsResponsibleCriteria = null;
-	for (RatingCriteria ratingCriteriaIter : oldCriterias) {
-	    if (ratingCriteriaIter.isCommentRating()) {
-		commentsResponsibleCriteria = ratingCriteriaIter;
-		break;
+	    // find comments' responsible RatingCriteria
+	    RatingCriteria commentsResponsibleCriteria = null;
+	    for (RatingCriteria ratingCriteriaIter : oldCriterias) {
+		if (ratingCriteriaIter.isCommentRating()) {
+		    commentsResponsibleCriteria = ratingCriteriaIter;
+		    break;
+		}
 	    }
-	}
-	// create commentsRatingCriteria if it's required
-	if (isCommentsEnabled) {
-	    if (commentsResponsibleCriteria == null) {
-		commentsResponsibleCriteria = new LearnerItemRatingCriteria();
-		commentsResponsibleCriteria.setRatingCriteriaTypeId(RatingCriteria.LEARNER_ITEM_CRITERIA_TYPE);
-		((LearnerItemRatingCriteria) commentsResponsibleCriteria).setToolContentId(toolContentId);
-		commentsResponsibleCriteria.setOrderId(0);
-		commentsResponsibleCriteria.setCommentsEnabled(true);
-		commentsResponsibleCriteria.setRatingStyle(RatingCriteria.RATING_STYLE_COMMENT);
-	    }
+	    // create commentsRatingCriteria if it's required
+	    if (isCommentsEnabled) {
+		if (commentsResponsibleCriteria == null) {
+		    commentsResponsibleCriteria = new LearnerItemRatingCriteria();
+		    commentsResponsibleCriteria.setRatingCriteriaTypeId(RatingCriteria.LEARNER_ITEM_CRITERIA_TYPE);
+		    ((LearnerItemRatingCriteria) commentsResponsibleCriteria).setToolContentId(toolContentId);
+		    commentsResponsibleCriteria.setOrderId(0);
+		    commentsResponsibleCriteria.setCommentsEnabled(true);
+		    commentsResponsibleCriteria.setRatingStyle(RatingCriteria.RATING_STYLE_COMMENT);
+		}
 
-	    int commentsMinWordsLimit = WebUtil.readIntParam(request, "commentsMinWordsLimit");
-	    commentsResponsibleCriteria.setCommentsMinWordsLimit(commentsMinWordsLimit);
+		int commentsMinWordsLimit = WebUtil.readIntParam(request, "commentsMinWordsLimit");
+		commentsResponsibleCriteria.setCommentsMinWordsLimit(commentsMinWordsLimit);
 
-	    ratingCriteriaDAO.saveOrUpdate(commentsResponsibleCriteria);
+		ratingCriteriaDAO.saveOrUpdate(commentsResponsibleCriteria);
 
-	    // delete commentsRatingCriteria if it's not required
-	} else {
-	    if (commentsResponsibleCriteria != null) {
-		ratingCriteriaDAO.deleteRatingCriteria(commentsResponsibleCriteria.getRatingCriteriaId());
+		// delete commentsRatingCriteria if it's not required
+	    } else {
+		if (commentsResponsibleCriteria != null) {
+		    ratingCriteriaDAO.deleteRatingCriteria(commentsResponsibleCriteria.getRatingCriteriaId());
+		}
 	    }
 	}
     }
Index: lams_tool_preview/web/pages/learning/comment.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/Attic/comment.jsp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_tool_preview/web/pages/learning/comment.jsp	16 Nov 2016 04:46:16 -0000	1.1.2.2
+++ lams_tool_preview/web/pages/learning/comment.jsp	8 Dec 2016 00:24:49 -0000	1.1.2.3
@@ -6,6 +6,9 @@
 		#no-users-info {display: none;}
 	</style>
 
+	<c:set var="maxRates" value="${rateAllUsers > 0 ? rateAllUsers : criteriaRatings.ratingCriteria.maximumRates}"/>
+	<c:set var="minRates" value="${rateAllUsers > 0 ? rateAllUsers : criteriaRatings.ratingCriteria.minimumRates}"/>
+
 	<script type="text/javascript">
 		//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/";
@@ -20,6 +23,12 @@
 		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="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>";
+		
+		var	commentsSaved = true,
+			commentsLocked = false;
+			commentsOnOtherPages = ${countRatedItems};
+			numCommentsOnPage = 0;
+
 	</script>
 	
 	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
@@ -29,9 +38,9 @@
 	<script src="${lams}includes/javascript/rating.js" type="text/javascript" ></script> 	
 	
 	<script type="text/javascript">
-	
+
 	$(document).ready(function(){
-		
+
 		$(".tablesorter").tablesorter({
 			theme: 'bootstrap',
 		    widthFixed: true,
@@ -56,21 +65,38 @@
 				cssPageDisplay: '.pagedisplay',
 				cssPageSize: '.pagesize',
 				cssDisabled: 'disabled',
+				customAjaxUrl: function(table, url) {
+					if ( commentsSaved ) {
+						return url;
+					} else { 
+						<!-- Save comments first - this will retrigger the page call. Have to wait for submitEntrys ajax call to complete or end up not showing the comments when the pagesize is changed -->
+						submitEntry();
+						return "";
+					}
+				}, 
 				ajaxUrl : "<c:url value='/learning/getUsers.do'/>?page={page}&size={size}&{sortList:column}&sessionMapID=${sessionMapID}&toolContentId=${peerreview.contentId}&toolSessionId=${toolSessionId}&criteriaId=${criteriaRatings.ratingCriteria.ratingCriteriaId}&userId=<lams:user property='userID' />",
 				ajaxProcessing: function (data) {
 			    	if (data && data.hasOwnProperty('rows')) {
 			    		var rows = [],
 			            json = {};
-
+			    		
 			    		if (data.rows.length == 0) {
 			    			$(".tablesorter,.pager").hide();
 			    			$("#no-users-info").show();
 			    		}
-			    		
+
+			    		commentsOnOtherPages = data.countRatedItems;
+						var isDisabled = "${finishedLock}";
+						var maxReached = false;
+						<c:if test='${maxRates ne 0}'>
+						if ( ! isDisabled ) {
+							maxReached = ( ${maxRates} > 0 && commentsOnOtherPages >= ${maxRates} );
+						}
+						</c:if>
+
 						for (i = 0; i < data.rows.length; i++){
 							var userData = data.rows[i];
 							var itemId = userData["itemId"];
-							var isDisabled = "${finishedLock}";
 							
 							rows += '<tr>';
 
@@ -83,24 +109,34 @@
 							rows += '<td class="comment" id="comments-area-' + itemId + '" width="80%">';
 								
 							var commentPostedByUser = userData["comment"];
-									
-							if (commentPostedByUser != "") {
+							
+							if ( isDisabled ) {
 								rows += '<div class="rating-comment">';
 								rows += 	commentPostedByUser;
 								rows += '</div>';
 										
-							} else if (!isDisabled) {
+							} else {
 								rows += '<div id="add-comment-area-' + itemId + '">';	
 								rows += '<div class="no-gutter">';
 								rows += '';
 								rows += '<div class="col-xs-12 col-sm-11 ">';										
-								rows +=		'<textarea name="comment-textarea-'+itemId+'" rows="4" id="comment-textarea-'+ itemId +'" onfocus="if(this.value==this.defaultValue)this.value=\'\';" onblur="if(this.value==\'\')this.value=this.defaultValue;" class="form-control"><fmt:message key="label.comment.textarea.tip"/></textarea>';
+								rows +=		'<textarea name="comment-textarea-'+itemId+'" rows="4" id="comment-textarea-'+ itemId + '" class="form-control"';
+								<c:if test="${minRates ne 0 || maxRates ne 0}">
+									rows += ' onblur="return updatedComment(this);"';
+									if ( maxReached && commentPostedByUser == '' ) {
+										rows += ' style="display:none"';
+									}
+								</c:if>
+									rows += '>';
+								if ( commentPostedByUser != '' ) {
+									commentPostedByUser = commentPostedByUser.replace(/<BR>/gi, '\n');
+									rows += commentPostedByUser;
+									commentsOnOtherPages--;
+									numCommentsOnPage++;
+								} 
+								rows += '</textarea>';
 								rows += '</div>';
-								rows += 	'<div class="button add-comment add-comment-new col-xs-12 col-sm-1" data-item-id="'+ itemId +'" data-comment-criteria-id="${criteriaRatings.ratingCriteria.ratingCriteriaId}">';
-								rows += 	'</div>';
-									
 								rows += '';
-								rows += '';
 								rows += '</div>';											
 							}
 								
@@ -117,33 +153,190 @@
 			
 			// bind to pager events
 			.bind('pagerInitialized pagerComplete', function(event, options){
+				commentsSaved = false;
 				initializeJRating();
+				checkButtons();
 			});
 
 		});
 	 });
 	
+	function checkButtons() {
+		debugger;
+		<c:choose>
+		<c:when test="${minRates ne 0 || maxRates ne 0}">
+			if ( numCommentsOnPage + commentsOnOtherPages < ${minRates} ) {
+				hideButtons();
+			} else {
+				showButtons();
+			}
+		</c:when>
+		<c:otherwise>
+			showButtons();
+		</c:otherwise>
+		</c:choose>
+	}
 
-	function submitEntry(next){
-		// ratings already saved, just save any unsaved comments.
-		hideButtons();
-		$("#next").val(next);
+	function updateCommentCount() {
+		var newNumCommentsOnPage = 0;
+		// save the modified values
 		$('textarea').each(function() {
-			if (this.value==this.defaultValue)
-				this.value="";
+			if ( this.value != '' )
+				newNumCommentsOnPage++;
 		});
-		$("#editForm").submit();
+		numCommentsOnPage = newNumCommentsOnPage;
 	}
+	
+	<c:if test="${minRates ne 0 || maxRates ne 0}">
+	function updatedComment(comment) {		
+		// if the data has been saved to the database, don't clear it!
+		if ( comment.value == '' && comment.defaultValue != '' ) {
+			alert('<fmt:message key="error.edit.not.remove"/>');
+			comment.value = comment.defaultValue;
+			return;
+		}
+		
+		updateCommentCount();
+		if ( ${maxRates} > 0 ) {
+			if ( (numCommentsOnPage + commentsOnOtherPages) >= ${maxRates} ) {
+				commentsLocked = true;
+				$('textarea').each(function() {
+					if ( this.value == '' ) {
+						this.style.display = 'none';
+					}
+				});
+			} else if ( commentsLocked ){
+				commentsLocked = false;
+				$('textarea').each(function() {
+					this.style.display='block';
+				});
+			}
+		}
+		$('#countRatedItemsSpan').html('<fmt:message key="label.rate.limits.topic.reminder"/>'.replace('{0}', numCommentsOnPage + commentsOnOtherPages));
+		checkButtons();
+		return true;
+	}
+	</c:if>
 
+	
+	function submitEntry(next, url){	
+
+		hideButtons();
+
+		if ( numCommentsOnPage + commentsOnOtherPages < ${minRates} ) {
+			alert('<fmt:message key="label.rate.limits.reminder.min"/>'.replace('{0}',${minRates}) );
+			return false;
+		}
+			
+		var validationFailed = false, 
+			commentsToSave = 0,
+			data = {
+				sessionMapID: '${sessionMapID}', 
+				toolContentId: '${peerreview.contentId}',
+				criteriaId: '${criteriaRatings.ratingCriteria.ratingCriteriaId}'
+			};
+		
+		// save the modified values
+		$('textarea').each(function() {
+			var comment = validComment(this.id, true, true);
+			if ( ! ( typeof comment === "undefined" )  ) {
+				if (comment!=this.defaultValue) {
+					data[this.id] = comment;
+					commentsToSave++;
+				}
+			} else  {
+				validationFailed = true;
+				return false; // validation failed! abort!
+			}
+		});
+		if ( validationFailed ) {
+			checkButtons();
+			return false;
+		}
+
+		if ( commentsToSave > 0 ) {
+			$.ajax({ 
+				data: data, 
+		        type: 'POST', 
+	 	        url: '<c:url value="/learning/submitCommentsAjax.do?"/>', 
+		        success: function (response) {
+	    			var countCommentsSaved = response.countCommentsSaved;
+					if ( ! ( countCommentsSaved > 0 ) ) {
+	       				alert('<fmt:message key="error.unable.save.comments"/>');
+	       				showButtons();
+	       				return false;
+					} else {
+						return moveOn(next);
+					}
+				}
+			});
+		} else {
+			return moveOn(next);
+		}
+		
+		return false;
+	}
+	
+	function moveOn(next) {
+		commentsSaved = true;
+		if ( ! ( typeof next === "undefined" ) ) {
+			return nextprev(next);
+		} else {
+			$(".tablesorter").trigger('pagerUpdate');
+			showButtons();
+			return true;
+		}
+	}
     </script>
 
+		<!-- Rating limits info -->
+		<c:if test="${minRates ne 0 || maxRates ne 0}">
+		
+			<lams:Alert type="info" id="rate-limits-reminder" close="false">
+				<c:choose>
+					<c:when test="${rateAllUsers > 0}">
+						<fmt:message key="label.rate.all.users"></fmt:message>
+					</c:when>
+					<c:otherwise>
+						<c:choose>
+							<c:when test="${criteriaRatings.ratingCriteria.minimumRates ne 0 and criteriaRatings.ratingCriteria.maximumRates ne 0}">
+								<fmt:message key="label.rate.limits.reminder">
+									<fmt:param value="${criteriaRatings.ratingCriteria.minimumRates}"/>
+									<fmt:param value="${criteriaRatings.ratingCriteria.maximumRates}"/>
+								</fmt:message>
+							</c:when>
+							<c:when test="${criteriaRatings.ratingCriteria.minimumRates ne 0 and criteriaRatings.ratingCriteria.maximumRates eq 0}">
+								<fmt:message key="label.rate.limits.reminder.min">
+									<fmt:param value="${criteriaRatings.ratingCriteria.minimumRates}"/>
+								</fmt:message>
+							</c:when>
+							<c:when test="${criteriaRatings.ratingCriteria.minimumRates eq 0 and criteriaRatings.ratingCriteria.maximumRates ne 0}">
+								<fmt:message key="label.rate.limits.reminder.max">
+									<fmt:param value="${criteriaRatings.ratingCriteria.maximumRates}"/>
+								</fmt:message>
+							</c:when>
+						</c:choose>
+					</c:otherwise>
+				</c:choose>
+
+				<BR/>
+				<span id="countRatedItemsSpan">
+					<fmt:message key="label.rate.limits.topic.reminder">
+						<fmt:param value="<span id='count-rated-items'>${countRatedItems}</span>"/>
+					</fmt:message>
+				</span>
+			</lams:Alert>
+				
+			
+		</c:if>
+		
 	<form action="<c:url value="/learning/submitComments.do?"/>" method="get" id="editForm">
 		<input type="hidden" name="sessionMapID" value="${sessionMapID}"/>
-		<input type="hidden" name="toolContentId" value="${toolContentId}"/>
+		<input type="hidden" name="toolContentId" value="${peerreview.contentId}"/>
 		<input type="hidden" name="criteriaId" value="${criteriaRatings.ratingCriteria.ratingCriteriaId}"/>
 		<input type="hidden" name="next" id="next" value=""/>		
 
-		<lams:TSTable numColumns="2">
+		<lams:TSTable numColumns="2" test="1">
 			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>" > 
 				<fmt:message key="label.user.name" />
 			</th>