Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
===================================================================
diff -u -rdbc01e6417b9ebbe49741ddd0463c571cc6e3932 -rb949dad84953ebb7e06117c001d10ea568f5186e
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	(.../LearningAction.java)	(revision dbc01e6417b9ebbe49741ddd0463c571cc6e3932)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java	(.../LearningAction.java)	(revision b949dad84953ebb7e06117c001d10ea568f5186e)
@@ -603,10 +603,11 @@
      *
      * @throws IOException
      * @throws ServletException 
+     * @throws JSONException 
      *
      */
     public ActionForward submitComments(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
+	    HttpServletResponse response) throws IOException, ServletException, JSONException {
 
 	IPeerreviewService service = getPeerreviewService();
 
@@ -618,12 +619,14 @@
 	ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE);
 	PeerreviewUser user = (PeerreviewUser) sessionMap.get(PeerreviewConstants.ATTR_USER);
 	Long toolSessionId = (Long) sessionMap.get(PeerreviewConstants.PARAM_TOOL_SESSION_ID);
+	Long toolContentId = WebUtil.readLongParam(request, "toolContentId");
 
 	Peerreview peerreview = service.getPeerreviewBySessionId(toolSessionId);
 
 	Long criteriaId = WebUtil.readLongParam(request, "criteriaId");
 	RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
 
+	int countCommentsSaved = 0;
 	if ( ! ( peerreview.getLockWhenFinished() && user.isSessionFinished() ) ) {
 
 	    Integer userId = user.getUserId().intValue();
@@ -632,22 +635,22 @@
 		    String itemIdString = key.substring(17);
 		    Long itemId = new Long(itemIdString);
 		    String comment = request.getParameter(key);
-		    if ( comment != null && comment.length() > 0 ) {
+		    if ( comment != null ) {
 			// save the comment to the database.
 			service.commentItem(criteria, userId, itemId, comment);
+			countCommentsSaved++;
 		    }
 		}
 	    }
 	}
 	
-	request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
-	request.setAttribute(AttributeNames.ATTR_MODE, mode);
-	request.setAttribute(PeerreviewConstants.PARAM_TOOL_SESSION_ID, toolSessionId);
-
-	Boolean next = WebUtil.readBooleanParam(request, "next");
-
-	// goto standard screen
-	return startRating(mapping, form, request, response, service, sessionMap, toolSessionId, user, mode, criteria, next);
+	JSONObject responsedata = new JSONObject();
+	int countRatedQuestions = service.getCountItemsRatedByUser(toolContentId, user.getUserId().intValue());
+	responsedata.put(AttributeNames.ATTR_COUNT_RATED_ITEMS, countRatedQuestions);
+	responsedata.put("countCommentsSaved", countCommentsSaved);
+	response.setContentType("application/json;charset=utf-8");
+	response.getWriter().print(new String(responsedata.toString()));
+	return null;
     }
     /**
      * Submit the ranking / hedging data and go back to the main learning screen.
@@ -720,7 +723,8 @@
 
 	    if (criteria.isHedgeStyleRating() && criteria.isCommentsEnabled()) {
 		String justify = request.getParameter("justify");
-		service.commentItem(criteria, userId, criteria.getRatingCriteriaId(), justify);
+		if ( justify != null && justify.length() > 0)
+		    service.commentItem(criteria, userId, criteria.getRatingCriteriaId(), justify);
 	    }
 
 	}
Index: lams_tool_preview/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r24b187a7aa86f8975f9d4fabab3e7c2d03e33229 -rb949dad84953ebb7e06117c001d10ea568f5186e
--- lams_tool_preview/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 24b187a7aa86f8975f9d4fabab3e7c2d03e33229)
+++ lams_tool_preview/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision b949dad84953ebb7e06117c001d10ea568f5186e)
@@ -111,9 +111,6 @@
 		<action path="/learning/submitComments"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
 			parameter="submitComments" >
-			<forward name="showResults" path="/learning/showResults.do" />	
-			<forward name="newReflection" path="/learning/newReflection.do" />	
-			<forward name="success" path="/pages/learning/learning.jsp" />
 		</action>	
 		<action path="/learning/submitHedging"
 			type="org.lamsfoundation.lams.tool.peerreview.web.action.LearningAction"
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rc260f6f3f855894e54d3725095e56d39a139d893 -rb949dad84953ebb7e06117c001d10ea568f5186e
--- lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision b949dad84953ebb7e06117c001d10ea568f5186e)
@@ -192,7 +192,7 @@
 		var style = styleDropDown.options[styleDropDown.selectedIndex].value;
 		maxOrderId++;
 		$("#criteria-max-order-id").val(maxOrderId);
-		addRow(maxOrderId, style, '', '', false, 0, 0, 0);
+		addRow(maxOrderId, style, '', '', false, 1, 0, 0);
 		reactivateArrows();
 	}
 	
Index: lams_tool_preview/web/includes/css/learning.css
===================================================================
diff -u -r0a6765ac7eb73c6b99c343a021877c48236241b8 -rb949dad84953ebb7e06117c001d10ea568f5186e
--- lams_tool_preview/web/includes/css/learning.css	(.../learning.css)	(revision 0a6765ac7eb73c6b99c343a021877c48236241b8)
+++ lams_tool_preview/web/includes/css/learning.css	(.../learning.css)	(revision b949dad84953ebb7e06117c001d10ea568f5186e)
@@ -10,6 +10,12 @@
 .tablesorter tr.odd .jStar {
 	background-image: url(/lams/images/css/jquery.jRating-stars-light-blue.png)!important;
 }
+
+/* override the usual jrating greyed area */
+textarea[id^=comment-textarea-] {
+	color: inherit !important;
+}
+
 td.username {min-width: 150px;}
 td.rating {width:150px;}
 td.comment {min-width: 250px;}
Index: lams_tool_preview/web/pages/learning/hedging.jsp
===================================================================
diff -u -rc260f6f3f855894e54d3725095e56d39a139d893 -rb949dad84953ebb7e06117c001d10ea568f5186e
--- lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision c260f6f3f855894e54d3725095e56d39a139d893)
+++ lams_tool_preview/web/pages/learning/hedging.jsp	(.../hedging.jsp)	(revision b949dad84953ebb7e06117c001d10ea568f5186e)
@@ -26,14 +26,52 @@
 		function submitEntry(next){
 			hideButtons();
 			updateMark();
+
 			if (  currentMark == ${criteriaRatings.ratingCriteria.maxRating} ) {
 				$("#next").val(next);
+
+				var finishedLock = '${finishedLock}';
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && ! finishedLock}">
+				if ( validateJustification() )
+				</c:if>
+				{				
 				$("#editForm").submit();
+				}
 			} else {
 				alert('<fmt:message key="error.assign.marks"><fmt:param>${criteriaRatings.ratingCriteria.maxRating}</fmt:param></fmt:message>');
 			}
 		}
 		
+		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled && ! finishedLock}">
+		function validateJustification() {
+			
+			var justify = document.getElementById("justify");
+			
+			//replace special characters with HTML tags
+		    var tempTextarea = jQuery('<textarea/>');
+		    filterData(justify, tempTextarea);
+			var comment = tempTextarea.value;
+
+			//word count limit
+			var wordLimit = ${criteriaRatings.ratingCriteria.commentsMinWordsLimit};
+			if (wordLimit != 0) { 
+				var value =  $("#justify").val();
+				value = value.trim();
+				
+			    var wordCount = value ? (value.replace(/['";:,.?\-!]+/g, '').match(/\S+/g) || []).length : 0;
+				    
+			    if(wordCount < wordLimit){
+			    	var alertMessage = '<fmt:message key="warning.minimum.number.words"><fmt:param value="${criteriaRatings.ratingCriteria.commentsMinWordsLimit}"/></fmt:message>';
+					alert( alertMessage.replace("{1}", wordCount));
+					return false;
+				}
+			}
+			
+			justify.value = comment;
+			return true;
+		} 
+		</c:if>
+		
 		function cancel() {
 			document.location.href='<c:url value="/learning/refresh.do?sessionMapID=${sessionMapID}"/>';
 		}
@@ -89,8 +127,14 @@
 		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
 			<div class="form-group">
 			<h4><label for="justify" class="voffset10"><fmt:message key="label.justify.hedging.marks" /></label></h4>
-			<lams:STRUTS-textarea property="justify" rows="4" cols="60" value="${criteriaRatings.justificationComment}" 
-					disabled="${finishedLock}" styleClass="mark-hedging-select"	/>
+			<c:choose>
+			<c:when test="${finishedLock}">
+				<span>${criteriaRatings.justificationComment}</span>
+			</c:when>
+			<c:otherwise>
+				<textarea id="justify" name="justify" rows="4" cols="60" class="mark-hedging-select" onblur="updateMark()">${criteriaRatings.justificationComment}</textarea>
+			</c:otherwise>
+			</c:choose>
 			</div>
 		</c:if>
 	
Index: lams_tool_preview/web/pages/learning/star.jsp
===================================================================
diff -u -rdbc01e6417b9ebbe49741ddd0463c571cc6e3932 -rb949dad84953ebb7e06117c001d10ea568f5186e
--- lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision dbc01e6417b9ebbe49741ddd0463c571cc6e3932)
+++ lams_tool_preview/web/pages/learning/star.jsp	(.../star.jsp)	(revision b949dad84953ebb7e06117c001d10ea568f5186e)
@@ -32,7 +32,8 @@
 	<script type="text/javascript">
 	
 	var YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-	IS_DISABLED =  ${sessionMap.isDisabled};
+		IS_DISABLED =  ${sessionMap.isDisabled},
+		commentsSaved = true;
 	
 	
 	$(document).ready(function(){
@@ -65,7 +66,19 @@
 				cssPageDisplay: '.pagedisplay',
 				cssPageSize: '.pagesize',
 				cssDisabled: 'disabled',
+
 				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' />",
+				<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
+				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 "";
+					}
+				}, 
+				</c:if>
 				ajaxProcessing: function (data) {
 			    	if (data && data.hasOwnProperty('rows')) {
 			    		var rows = [],
@@ -99,6 +112,7 @@
 							
 							var isDisabled = IS_DISABLED || (MAX_RATES > 0) && ( COUNT_RATED_ITEMS >= MAX_RATES) || isMaximumRatesPerUserReached;
 							
+							
 							var objectId = "${criteriaRatings.ratingCriteria.ratingCriteriaId}-" + itemId;
 							var averageRating = userData["averageRating"];
 							var numberOfVotes = userData["numberOfVotes"];
@@ -129,30 +143,18 @@
 								var commentPostedByUser = userData["comment"];
 									
 								//show all comments needs to be shown
-								if (commentPostedByUser != "") {
+								if (commentPostedByUser != "" && IS_DISABLED) {
 									rows += '<div class="rating-comment">';
 									rows += 	commentPostedByUser;
 									rows += '</div>';
 										
 								//show comments textarea and a submit button
-								} else if (!isDisabled) {
+								} else if (!IS_DISABLED) {
 									rows += '<div id="add-comment-area-' + itemId;
 									if ( isCriteriaNotRatedByUser )
 										rows += '" style="visibility: hidden;';
 									rows += '">';	
-									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 += '</div>';
-									rows += 	'<div id="comment-tick-'+itemId+'" class="button add-comment add-comment-new col-xs-12 col-sm-1" ';
-									if ( isCriteriaNotRatedByUser )
-										rows += 'style="visibility: hidden;"';
-									rows += 'data-item-id="'+ itemId +'" data-comment-criteria-id="${criteriaRatings.ratingCriteria.ratingCriteriaId}">';
-									rows += 	'</div>';
-									
-									rows += '';
-									rows += '';
+									rows +=		'<textarea name="comment-textarea-'+itemId+'" rows="4" id="comment-textarea-'+ itemId +'" onblur="onRatingSuccessCallback()" class="form-control">'+commentPostedByUser+'</textarea>';
 									rows += '</div>';											
 								}
 								
@@ -171,23 +173,79 @@
 			
 			// bind to pager events
 			.bind('pagerInitialized pagerComplete', function(event, options){
+				commentsSaved = false;
 				initializeJRating();
+				onRatingSuccessCallback(); // show buttons if appropriate
 			});
 		});
 	 });
 	
 
 <c:choose>
 <c:when test="${criteriaRatings.ratingCriteria.commentsEnabled}">
-	function submitEntry(next){
-		// ratings already saved, just save any unsaved comments.
+	function submitEntry(next, url){	
+
 		hideButtons();
-		$("#next").val(next);
+
+		var validationFailed = false, 
+			commentsToSave = 0,
+			data = {
+				sessionMapID: '${sessionMapID}', 
+				toolContentId: '${peerreview.contentId}',
+				criteriaId: '${criteriaRatings.ratingCriteria.ratingCriteriaId}'
+			};
+		
+		// save the modified values
 		$('textarea').each(function() {
-			if (this.value==this.defaultValue)
-				this.value="";
+			if ( ! ( $('#'+this.id).parent().css('visibility') == 'hidden') ) {
+				var comment = validComment(this.id, true);
+				if ( ! ( typeof comment === "undefined" )  ) {
+					if (comment!=this.defaultValue) {
+						data[this.id] = comment;
+						commentsToSave++;
+					}
+				} else  {
+					validationFailed = true;
+					return false; // validation failed! abort!
+				}
+			}
 		});
-		$("#editForm").submit();
+		if ( validationFailed )
+			return false;
+		
+		if ( commentsToSave > 0 ) {
+			$.ajax({ 
+				data: data, 
+		        type: 'POST', 
+	 	        url: '<c:url value="/learning/submitComments.do?"/>', 
+		        success: function (response) {
+	    			var countCommentsSaved = response.countCommentsSaved;
+					if ( ! ( countCommentsSaved >= 0 ) ) {
+	       				alert('Unable to save comments');
+	       				return false;
+					} else {
+						commentsSaved = true;
+						if ( next ) {
+							return nextprev(next);
+						} else {
+							$(".tablesorter").trigger('pagerUpdate');
+							return true;
+						}
+					}
+				}
+			});
+			
+		} else {
+			commentsSaved = true;
+			if ( next ) {
+				return nextprev(next);
+			} else {
+				$(".tablesorter").trigger('pagerUpdate');
+				return true;
+			}
+		}
+		
+		return false;
 	}
 </c:when>
 <c:otherwise>
@@ -245,20 +303,12 @@
 			
 		</c:if>
 
-		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
-		<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="criteriaId" value="${criteriaRatings.ratingCriteria.ratingCriteriaId}"/>
-			<input type="hidden" name="next" id="next" value=""/>		
-		</c:if>
-				
 		<c:set var="numColumns" value="2"/>
 		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
 			<c:set var="numColumns" value="3"/>
 		</c:if>
 	
-		<lams:TSTable numColumns="${numColumns}">
+		<lams:TSTable numColumns="${numColumns}" test="yup">
 			<th class="username" title="<fmt:message key='label.sort.by.user.name'/>"  width="20%"> 
 				<fmt:message key="label.user.name" />
 			</th>
@@ -272,10 +322,6 @@
 			</c:if>
 		</lams:TSTable>
 
-		<c:if test="${criteriaRatings.ratingCriteria.commentsEnabled}">
-		</form>
-		</c:if>
-							
 		<div id="no-users-info">
 			<fmt:message key="label.no.users" />
 		</div>