Index: lams_central/conf/security/Owasp.CsrfGuard.properties
===================================================================
diff -u -r5b9fbd9e325d84d886a2e880982c40734c984ad3 -ra8e22ae6f537fb94e709edeaff47e3dfe42d464c
--- lams_central/conf/security/Owasp.CsrfGuard.properties	(.../Owasp.CsrfGuard.properties)	(revision 5b9fbd9e325d84d886a2e880982c40734c984ad3)
+++ lams_central/conf/security/Owasp.CsrfGuard.properties	(.../Owasp.CsrfGuard.properties)	(revision a8e22ae6f537fb94e709edeaff47e3dfe42d464c)
@@ -217,6 +217,7 @@
 org.owasp.csrfguard.protected.previewAuthoringSave=/lams/tool/laprev11/authoring/update.do
 org.owasp.csrfguard.protected.previewAuthoringDefineLater=/lams/tool/laprev11/authoring/definelater.do
 org.owasp.csrfguard.protected.previewMonitoringExportExcel=/lams/tool/laprev11/monitoring/exportTeamReport.do
+org.owasp.csrfguard.protected.previewModerateLearnerComment=/lams/tool/laprev11/monitoring/saveComment.do
 
 org.owasp.csrfguard.protected.pixirAuthoringDefineLater=/lams/tool/lapixl10/authoring/definelater.do
 org.owasp.csrfguard.protected.pixirAuthoringSave=/lams/tool/lapixl10/authoring/updateContent.do
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
===================================================================
diff -u -r99a280f84fbb60b29aae4ec331bee65af8dde781 -ra8e22ae6f537fb94e709edeaff47e3dfe42d464c
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 99a280f84fbb60b29aae4ec331bee65af8dde781)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision a8e22ae6f537fb94e709edeaff47e3dfe42d464c)
@@ -62,6 +62,7 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.util.HtmlUtils;
@@ -328,6 +329,7 @@
 		userData.add((String) ratingDetails[4]);
 		userData.add((String) ratingDetails[2]);
 		userData.add(title);
+		userData.add(ratingDetails[0].toString());
 
 		ObjectNode userRow = JsonNodeFactory.instance.objectNode();
 		userRow.put("id", i++);
@@ -352,6 +354,7 @@
 		    commentText = StringUtils.replace(commentText, "&lt;BR&gt;", "<BR/>").replace("\n", "<BR/>");
 		    userData.add(commentText);
 		    userData.add("Comments");
+		    userData.add(ratingDetails[0].toString());
 
 		    ObjectNode userRow = JsonNodeFactory.instance.objectNode();
 		    userRow.put("id", i++);
@@ -683,4 +686,12 @@
 	service.setUserHidden(toolContentId, userUid, isHidden);
 	return "";
     }
+
+    @RequestMapping("/saveComment")
+    @ResponseBody
+    public void saveComment(@RequestParam Long criteriaId, @RequestParam Long toolSessionId,
+	    @RequestParam Integer userId, @RequestParam Long itemId, @RequestParam String comment) {
+	RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
+	service.commentItem(criteria, toolSessionId, userId, itemId, comment);
+    }
 }
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp
===================================================================
diff -u -rf1d0722ace2f721a8a423f094d2101c433c15a0a -ra8e22ae6f537fb94e709edeaff47e3dfe42d464c
--- lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision f1d0722ace2f721a8a423f094d2101c433c15a0a)
+++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(.../criteriapart.jsp)	(revision a8e22ae6f537fb94e709edeaff47e3dfe42d464c)
@@ -17,6 +17,7 @@
 
 <script type="text/javascript">
 	$(document).ready(function(){
+	    let savedCellValue = "";
 
 		jQuery("#group${toolSessionId}").jqGrid({
 		   	url: "<c:url value='/monitoring/getUsers.do'/>?toolContentId=${sessionMap.toolContentID}&toolSessionId=${toolSessionId}&criteriaId=${criteria.ratingCriteriaId}",
@@ -79,13 +80,15 @@
 							'id',
 							'<fmt:message key="label.user.name" />',
 							'${heading}',
-							'criteriaId'
+							'criteriaId',
+							'userId'
 							],
 						colModel:[
 						   {name:'id', index:'id', width:0, hidden:true},
 						   {name:'userName', index:'userName', width:40 },
-						   {name:'rating', index:'rating',  title:false},
-						   {name:'criteriaId', width:0, hidden:true}
+						   {name:'rating', index:'rating',  title:false, editable: true},
+						   {name:'criteriaId', width:0, hidden:true},
+						   {name:'userId', width:0, hidden:true}
 						],
 						loadComplete: function(){
 							//remove empty subgrids
@@ -97,7 +100,22 @@
 						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"/>");
-					    }
+					    },
+					    cellurl: "<c:url value='/monitoring/saveComment.do'/>?<csrf:token/>&toolSessionId=${toolSessionId}&criteriaId=${criteria.ratingCriteriaId}&itemId=" + itemId,
+	  				  	cellEdit: true,
+		  				beforeSelectRow: function(rowId) {
+			  			  // only comments are editable
+			  			  var rowData = $(this).jqGrid ('getRowData', rowId);
+			  			  $(this).setColProp('rating',{editable: rowData.criteriaId == 'Comments'});
+		  				}, 		
+	  				  	beforeSubmitCell : function (rowId,name,val){
+		  				  	// send additional information while submitting
+				  			var rowData = $(this).jqGrid ('getRowData', rowId);
+				  			return {
+					  			userId : rowData.userId,
+					  			comment : val
+					  		};
+	  					}
 					})
 			}
 		}).jqGrid('filterToolbar', {