Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27 -r57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7521e0cd5b5f4b01d188ca0ddad1e5f59d3bde27)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5)
@@ -434,6 +434,7 @@
 label.authoring.preview.skip.validation = As a learner you should answer all required questions. In preview mode you are allowed to press this button again to continue.
 label.monitoring.student.choices.none = No learners have answered questions yet
 label.monitoring.user.summary.grade.required = requires grading
+label.monitoring.user.summary.grade.auto = auto-graded
 label.monitoring.user.summary.grade.by = graded by {0}
 label.learning.page.next = Next page
 label.learning.page.previous = Previous page
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -r8a4525c7b493856da2b60a94cad2ecb7c1643c40 -r57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 8a4525c7b493856da2b60a94cad2ecb7c1643c40)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5)
@@ -655,10 +655,19 @@
 		//LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor
 		userData.add(questionResult.getQbQuestion().getType().equals(QbQuestion.TYPE_ESSAY)
 			&& questionResult.getMarkedBy() == null ? "-" : questionResult.getMark().toString());
-		userData.add(questionResult.getMarkedBy() == null
-			? (questionResult.getQbQuestion().getType().equals(QbQuestion.TYPE_ESSAY) ? service.getMessage(
-			"label.monitoring.user.summary.grade.required") : "")
-			: questionResult.getMarkedBy().getFullName());
+
+		String marker = "";
+		if (questionResult.getMarkedBy() == null) {
+		    if (questionResult.getQbQuestion().getType().equals(QbQuestion.TYPE_ESSAY)) {
+			marker = "<b>(" + service.getMessage("label.monitoring.user.summary.grade.required") + ")</b>";
+		    } else {
+			marker = "(" + service.getMessage("label.monitoring.user.summary.grade.auto") + ")";
+		    }
+		} else {
+		    marker = questionResult.getMarkedBy().getFullName();
+		}
+		userData.add(marker);
+
 		String markerCommentEscaped = "";
 		if (StringUtils.isNotBlank(questionResult.getMarkerComment())) {
 		    markerCommentEscaped = questionResult.getMarkerComment().replace("\n", "<br>");
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
diff -u -rcfd463431d2171b40403dcff2508408e72685c0e -r57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision cfd463431d2171b40403dcff2508408e72685c0e)
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	(.../masterDetailLoadUp.jsp)	(revision 57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5)
@@ -2,60 +2,59 @@
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
 
 <script type="text/javascript">
-	function masterDetailLoadUp(){
-		jQuery("#userSummary${param.tableName}").clearGridData().setGridParam({scrollOffset: 18});
+    function masterDetailLoadUp(){
+        jQuery("#userSummary${param.tableName}").clearGridData().setGridParam({scrollOffset: 18});
 
- 	    <c:forEach var="questionResult" items="${assessmentResult.questionResults}" varStatus="i">
-	       	<c:set var="question" value="${questionResult.questionDto}"/>
-	       	<c:set var="title">
-	       		<c:out value="${questionResult.questionDto.titleEscaped}" escapeXml="true"/>
-	       	</c:set>	
- 	        var responseStr = "";
- 	       	<%@ include file="userresponse.jsp"%>
- 	       		
- 	       	var table = jQuery("#userSummary${param.tableName}");
- 	   	   	<c:set var="requiresMarking"
-	 	   	   	   value="${empty questionResult.markedBy and question.type eq 6 and questionResult.mark eq 0}" />
- 	     	table.addRowData(${i.index + 1}, {
- 	   	    	id:"${i.index + 1}",
- 	   	   		questionResultUid:"${questionResult.uid}",
- 	   	   		title:"${fn:escapeXml(title)}",
- 	   	   		response:responseStr,
- 	   	   		<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
- 	   	   			confidence:"${question.type == 8 ? -1 : questionResult.confidenceLevel}",
- 	   	   		</c:if>
- 	   	   		grade:
-	 	 	 	 <c:choose>
-	 	 	    	<c:when test="${requiresMarking}">
-	 	 	    		"-"
-	 	 	    	</c:when>
-	 	 	    	<c:otherwise>
-	 	 	    		"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
-	 	 	    	</c:otherwise>
-	 	 	    </c:choose>,
-	 	 	    marker : 
-		 	 	 <c:choose>
-	 	 	    	<c:when test="${requiresMarking}">
-		 	    		("<b><spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.user.summary.grade.required' /></spring:escapeBody></b>")
-		 	    	</c:when>
-		 	    	<c:when test="${not empty questionResult.markedBy}">
-		 	  			"<c:out value='${questionResult.markedBy.fullName}' />"
-		 	    	</c:when>
-		 	    	<c:otherwise>
-		 	    		""
-		 	    	</c:otherwise>
-		 	     </c:choose>,
-		 	     markerComment: "<c:out value='${questionResult.markerComment}' />"
- 	   	   	});
+        <c:forEach var="questionResult" items="${assessmentResult.questionResults}" varStatus="i">
+        <c:set var="question" value="${questionResult.questionDto}"/>
+        <c:set var="title">
+        <c:out value="${questionResult.questionDto.titleEscaped}" escapeXml="true"/>
+        </c:set>
+        var responseStr = "";
+        <%@ include file="userresponse.jsp"%>
 
- 	 	    // set maxGrade attribute to cell DOM element
- 	 	    table.setCell(${i.index + 1}, "grade", "", null, {"maxGrade" :  "${questionResult.maxMark}"});
-		</c:forEach>
-		
-		if (typeof CodeMirror != 'undefined') {
-			CodeMirror.colorize($('.code-style'));
-		}
-	};
-	masterDetailLoadUp();
-</script>
-   	  
+        var table = jQuery("#userSummary${param.tableName}");
+        <c:set var="requiresMarking"
+               value="${empty questionResult.markedBy and question.type eq 6 and questionResult.mark eq 0}" />
+        table.addRowData(${i.index + 1}, {
+            id:"${i.index + 1}",
+            questionResultUid:"${questionResult.uid}",
+            title:"${fn:escapeXml(title)}",
+            response:responseStr,
+            <c:if test="${sessionMap.assessment.enableConfidenceLevels}">
+            confidence:"${question.type == 8 ? -1 : questionResult.confidenceLevel}",
+            </c:if>
+            grade:
+                <c:choose>
+                <c:when test="${requiresMarking}">
+                "-"
+            </c:when>
+            <c:otherwise>
+            "<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
+            </c:otherwise>
+            </c:choose>,
+            marker :
+                <c:choose>
+                <c:when test="${requiresMarking}">
+                "<b>(<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.user.summary.grade.required' /></spring:escapeBody>)</b>"
+            </c:when>
+            <c:when test="${not empty questionResult.markedBy}">
+            "<c:out value='${questionResult.markedBy.fullName}' />"
+            </c:when>
+            <c:otherwise>
+            "(<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.user.summary.grade.auto' /></spring:escapeBody>)"
+            </c:otherwise>
+            </c:choose>,
+            markerComment: "${questionResult.markerCommentEscaped}"
+        });
+
+        // set maxGrade attribute to cell DOM element
+        table.setCell(${i.index + 1}, "grade", "", null, {"maxGrade" :  "${questionResult.maxMark}"});
+        </c:forEach>
+
+        if (typeof CodeMirror != 'undefined') {
+            CodeMirror.colorize($('.code-style'));
+        }
+    };
+    masterDetailLoadUp();
+</script>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r00e68ec2b347f409ce1a616f14f2b8ce975829e8 -r57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 00e68ec2b347f409ce1a616f14f2b8ce975829e8)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5)
@@ -132,7 +132,7 @@
 						</c:if>
 						{name:'grade', index:'grade', width:30, sorttype:"float", search:false, editable:true,
 							editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false},
-						{name:'marker', index:'marker', width: 80, search:false, title: false},
+						{name:'marker', index:'marker', width: 110, search:false, title: false},
 						{name:'markerComment', index:'markerComment', width:300, editable:true, edittype: 'textarea',
 							sortable: false, editoptions: {maxlength: 3000, rows: 6}, title : false,
 							formatter:function(cellvalue, options, rowObject, event) {
@@ -157,7 +157,7 @@
 							return value;
 						}
 						if (value == "-") {
-							value = "0";
+							value = "";
 						}
 						return value;
 					},
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r00e68ec2b347f409ce1a616f14f2b8ce975829e8 -r57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 00e68ec2b347f409ce1a616f14f2b8ce975829e8)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5)
@@ -105,7 +105,7 @@
 						</c:if>
 						{name:'grade', index:'grade', width:80, sorttype:"float", editable:true,
 							editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false },
-						{name:'marker', index:'marker', width: 80, title: false},
+						{name:'marker', index:'marker', width: 110, title: false},
 						{name:'markerComment', index:'markerComment', width:300, editable:true, edittype: 'textarea',
 							sortable: false, editoptions: {maxlength: 3000, rows: 6}, title : false,
 							formatter:function(cellvalue, options, rowObject, event) {
@@ -127,7 +127,7 @@
 							return value;
 						}
 						if (value == "-") {
-							value = "0";
+							value = "";
 						}
 						return value;
 					},
@@ -210,15 +210,15 @@
 					</c:otherwise>
 					</c:choose>,
 					marker :
-							<c:choose>
-							<c:when test="${requiresMarking}">
-							("<b><fmt:message key='label.monitoring.user.summary.grade.required' /></b>")
+					<c:choose>
+					<c:when test="${requiresMarking}">
+							"<b>(<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.user.summary.grade.required' /></spring:escapeBody>)</b>"
 					</c:when>
 					<c:when test="${not empty questionResult.markedBy}">
 					"<c:out value='${questionResult.markedBy.fullName}' />"
 					</c:when>
 					<c:otherwise>
-					""
+					"(<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.user.summary.grade.auto' /></spring:escapeBody>)"
 					</c:otherwise>
 					</c:choose>,
 					markerComment: "${questionResult.markerCommentEscaped}"
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r00e68ec2b347f409ce1a616f14f2b8ce975829e8 -r57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 00e68ec2b347f409ce1a616f14f2b8ce975829e8)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 57a3aa14acf1aecf9450ab6a8cc473ae470fc6c5)
@@ -193,7 +193,7 @@
 				</c:if>
 				{name:'grade', index:'grade', width:80, sorttype:"float", editable:true,
 					editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align', title : false },
-				{name:'marker', index:'marker', width: 80, title: false},
+				{name:'marker', index:'marker', width: 110, title: false},
 				{name:'markerComment', index:'markerComment', width:300, editable:true, edittype: 'textarea',
 					sortable: false, editoptions: {maxlength: 3000, rows: 6}, title : false,
 					formatter:function(cellvalue, options, rowObject, event) {