Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4ae8ec393ca91db4253d2445e9ca8ca9d5a9c671 -re6921d0824d45b08f8fc3d584e1934351c4beb93
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4ae8ec393ca91db4253d2445e9ca8ca9d5a9c671)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e6921d0824d45b08f8fc3d584e1934351c4beb93)
@@ -157,6 +157,8 @@
 label.monitoring.user.summary.grade = Grade
 label.monitoring.user.summary.title = Title:
 label.monitoring.user.summary.question = Question:
+label.monitoring.user.summary.grade.required = requires grading
+label.monitoring.user.summary.grade.by = graded by {0}
 label.monitoring.question.summary.history.responses = Responses for the question
 label.monitoring.question.summary.title = Title
 label.monitoring.question.summary.question = Question
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -re9f21c562efc19cd5b5f9025f6d47165de059b39 -re6921d0824d45b08f8fc3d584e1934351c4beb93
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e9f21c562efc19cd5b5f9025f6d47165de059b39)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision e6921d0824d45b08f8fc3d584e1934351c4beb93)
@@ -628,6 +628,7 @@
 		}
 
 		userData.add(response);
+		userData.add(questionResult.getMarkedBy() == null ? "" : questionResult.getMarkedBy().getFullName());
 	    } else {
 		userData.add("");
 		userData.add("");
@@ -640,6 +641,7 @@
 		    userData.add("-");
 		}
 		userData.add("-");
+		userData.add("");
 	    }
 
 	    userData.add(userDto.getUserId());
@@ -935,7 +937,8 @@
 	if (grouping != null) {
 	    Set<Group> groups = grouping.getGroups();
 	    for (Group group : groups) {
-		if (!group.getUsers().isEmpty() && group.getGroupName().toLowerCase().contains(searchString.toLowerCase())) {
+		if (!group.getUsers().isEmpty()
+			&& group.getGroupName().toLowerCase().contains(searchString.toLowerCase())) {
 		    ObjectNode groupJSON = JsonNodeFactory.instance.objectNode();
 		    groupJSON.put("label", groupLabel + group.getGroupName() + "\"");
 		    groupJSON.put("value", "group-" + group.getGroupId());
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -rc1d637e4d2786f97672dd38f6e3278d5c4f7b79c -re6921d0824d45b08f8fc3d584e1934351c4beb93
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision c1d637e4d2786f97672dd38f6e3278d5c4f7b79c)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision e6921d0824d45b08f8fc3d584e1934351c4beb93)
@@ -33,6 +33,10 @@
 				background-color: initial;
 				border: none;
 			}
+			
+			.requires-grading {
+				background-color: rgba(255, 195, 55, .6);
+			}
  		</style>
  		
 		<script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -re6921d0824d45b08f8fc3d584e1934351c4beb93
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision e6921d0824d45b08f8fc3d584e1934351c4beb93)
@@ -25,8 +25,22 @@
  	   	   		grade:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
  	   	   	});
 
+ 	   	   	<c:set var="requiresMarking"
+ 	 	   	   	   value="${empty questionResult.markedBy and question.type eq 6 and questionResult.mark eq 0}" />
  	 	    // set maxGrade attribute to cell DOM element
- 	 	    table.setCell(${i.index + 1}, "grade", "", null, {"maxGrade" :  "${questionResult.maxMark}"});
+ 	 	    table.setCell(${i.index + 1}, "grade", "", ${requiresMarking ? "'requires-grading'" : "null"},
+ 	 	 	   {"maxGrade" :  "${questionResult.maxMark}"
+ 	 	 	    <c:choose>
+	 	 	    	<c:when test="${requiresMarking}">
+	 	 	    		,"title" : "<fmt:message key='label.monitoring.user.summary.grade.required' />"
+	 	 	    	</c:when>
+	 	 	    	<c:when test="${not empty questionResult.markedBy}">
+	 	 	  			,"title" : "<fmt:message key='label.monitoring.user.summary.grade.by'>
+		 	 	  						<fmt:param><c:out value='${questionResult.markedBy.fullName}' /></fmt:param>
+		 	 	  					</fmt:message>"
+	 	 	    	</c:when>
+	 	 	    </c:choose>
+ 	 	 	    });
 		</c:forEach>
 
 		if (typeof CodeMirror != 'undefined') {
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -rf9cae5b21c66ce71a10d3e930fe8e40e265d2536 -re6921d0824d45b08f8fc3d584e1934351c4beb93
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision f9cae5b21c66ce71a10d3e930fe8e40e265d2536)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision e6921d0824d45b08f8fc3d584e1934351c4beb93)
@@ -25,6 +25,10 @@
 			#bottom-buttons {
 				text-align: right;
 				margin: 10px 10px 10px 0;
+			}		
+				
+			.requires-grading {
+				background-color: rgba(255, 195, 55, .6);
 			}
 		</style>
 		
@@ -107,6 +111,7 @@
 		  			   			"<fmt:message key="label.answer.rating.title" />",
 		  			  		</c:if>
 		  			   		"<fmt:message key="label.monitoring.user.summary.response" />",
+	  						'markedBy',
 		  			   		'userId',
 	  						'portraitId'
 	  					],
@@ -117,14 +122,16 @@
 							{name:'userName',index:'userName', width:83, searchoptions: { clearSearch: false }, formatter : function(cellvalue, options, rowObject) {
 				    			return definePortraitPopover(rowObject[rowObject.length - 1], rowObject[rowObject.length - 2], rowObject[2]);
 							}},
-							{name:'grade', index:'grade', width:30, sorttype:"float", search:false, editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' },
+							{name:'grade', index:'grade', width:30, sorttype:"float", search:false, editable:true,
+								editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false},
 	  		  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels and questionDto.type != 8}">
 			  			   		{name:'confidence', index:'confidence', width: 80, search:false, classes: 'vertical-align', formatter: gradientNumberFormatter},
 			  			  	</c:if>
 				  			<c:if test="${questionDto.groupsAnswersDisclosed}">
 				  				{name:'rating', index:'rating', width:120, align:"center", sortable:false, search:false},
 		  			  		</c:if>
 			  			   	{name:'response', index:'response', width:400, sortable:false, search:false, formatter: responseFormatter},
+		  				   	{name:'markedBy', index:'markedBy', width:0, hidden: true},
 			  				{name:'userId', index:'userId', width:0, hidden: true},
 		  				   	{name:'portraitId', index:'portraitId', width:0, hidden: true}
 	  				   	],
@@ -170,6 +177,26 @@
 	  							CodeMirror.colorize($('.code-style'));
 	  						}
   					    },
+  					    gridComplete : function(){
+  					    	let questionType = ${questionDto.type};
+  					    	// highlight essay questions which have not been graded
+	  						if (questionType == 6) {
+	  							let table = jQuery("#session${sessionDto.sessionId}"),
+	  								rows = table.getDataIDs();
+	  							for (rowIndex = 0;rowIndex < rows.length; rowIndex++) {
+		  							 let rowData = jQuery("#session${sessionDto.sessionId}").getRowData(rows[rowIndex]),
+		  							 	 requiresMarking = rowData.markedBy == "" && rowData.grade == 0;
+	  								 table.setCell(rows[rowIndex], "grade", "", requiresMarking ? 'requires-grading' : '',
+	  		  						 requiresMarking ? {
+	  									title : "<fmt:message key='label.monitoring.user.summary.grade.required' />"
+		  		  					 } :
+			  		  			     (rowData.markedBy == "" ? null : {
+			  		  					title : "<fmt:message key='label.monitoring.user.summary.grade.by'><fmt:param> </fmt:param></fmt:message>"
+	  			         		   		   + rowData.markedBy
+			  		  				 }));
+		  						 }
+	  						}
+  	  					},
   					    subGrid: true,
   						subGridOptions: {
   							reloadOnExpand : false,
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -rf5bcf9323324eb4d5add901d9e7a23c33050533a -re6921d0824d45b08f8fc3d584e1934351c4beb93
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision e6921d0824d45b08f8fc3d584e1934351c4beb93)
@@ -26,6 +26,10 @@
 	  		pre {
 				background-color: initial;
 				border: none;
+			}	
+			
+			.requires-grading {
+				background-color: rgba(255, 195, 55, .6);
 			}
 		</style>
 		
@@ -97,7 +101,8 @@
 	  		  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels and question.type != 8}">
 			  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 			  			  	</c:if>
-	  				   		{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }		
+	  				   		{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, 
+		  				   		editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false }		
 	  				   	],
 	  				   	multiselect: false,
 	  				  	cellurl: '<c:url value="/monitoring/saveUserGrade.do?sessionMapID=${sessionMapID}"/>&<csrf:token/>',
@@ -138,6 +143,9 @@
 	  				
 	  	   	        <c:forEach var="questionResult" items="${userSummaryItem.questionResults}" varStatus="i">
 	  	   	        	<c:set var="learnerInteraction" value="${learnerInteractions[questionResult.qbToolQuestion.uid]}" />
+	  	   	       		<c:set var="requiresMarking"
+	 	 	   	   	   		value="${empty questionResult.markedBy and questionResult.questionDto.type eq 6 and questionResult.mark eq 0}" />
+		 	 	   	   	   
 	  	   	        	var responseStr = "";
 	  	   	       		<%@ include file="userresponse.jsp"%>
 	  	   	     		var table = jQuery("#user${question.uid}");
@@ -153,7 +161,19 @@
 	  	   	   	   	    });
 	  	   	     		
 	  	   	    		// set maxGrade attribute to cell DOM element
-	  	 	 	     	table.setCell(${i.index + 1}, "grade", "", null, {"maxGrade" :  "${questionResult.maxMark}"});
+	  	 	 	     	table.setCell(${i.index + 1}, "grade", "", ${requiresMarking ? "'requires-grading'" : "null"},
+	  		  	 	 		{"maxGrade" :  "${questionResult.maxMark}"
+	  		   	 	 	    <c:choose>
+				 	 	    	<c:when test="${requiresMarking}">
+				 	 	    		,"title" : "<fmt:message key='label.monitoring.user.summary.grade.required' />"
+				 	 	    	</c:when>
+				 	 	    	<c:when test="${not empty questionResult.markedBy}">
+				 	 	  			,"title" : "<fmt:message key='label.monitoring.user.summary.grade.by'>
+					 	 	  						<fmt:param><c:out value='${questionResult.markedBy.fullName}' /></fmt:param>
+					 	 	  					</fmt:message>"
+				 	 	    	</c:when>
+				 	 	    </c:choose>
+			 	 	 	    });
 	  		        </c:forEach>			
 	  				
 	  			</c:forEach>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r58faa819bf7c281e7a12660020f3b063b16ada93 -re6921d0824d45b08f8fc3d584e1934351c4beb93
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 58faa819bf7c281e7a12660020f3b063b16ada93)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision e6921d0824d45b08f8fc3d584e1934351c4beb93)
@@ -124,7 +124,8 @@
 	  			   	{name:'id', index:'id', width:20, sorttype:"int"},
 	  			   	{name:'questionResultUid', index:'questionResultUid', width:0, hidden: true},
 	  			   	{name:'title', index:'title', width: 200},
-	  			    {name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' },
+	  			    {name:'grade', index:'grade', width:80, sorttype:"float", editable:true, 
+		  			    editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false },
 	  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
 	  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 	  			  	</c:if>