Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	2 May 2008 07:26:21 -0000	1.7
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	7 May 2008 03:49:43 -0000	1.8
@@ -129,3 +129,4 @@
 
 
 #======= End labels: Exported 118 labels for en AU =====
+monitoring.marked.question=Marked?
\ No newline at end of file
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	18 Apr 2008 06:07:02 -0000	1.6
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties	7 May 2008 03:49:43 -0000	1.7
@@ -127,3 +127,4 @@
 
 
 #======= End labels: Exported 118 labels for en AU =====
+monitoring.marked.question=Marked?
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java	17 Sep 2006 06:27:54 -0000	1.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java	7 May 2008 03:49:43 -0000	1.4
@@ -54,6 +54,8 @@
 	private Long marks;	
 	private Date dateOfSubmission;
 	private Date dateMarksReleased;
+	private boolean anyFilesMarked;
+
 	
 	//submit file list
 	private List filesUploaded;
@@ -236,4 +238,10 @@
 	public void setLimitUploadLeft(int limitUploadLeft) {
 		this.limitUploadLeft = limitUploadLeft;
 	}
+	public boolean isAnyFilesMarked() {
+		return anyFilesMarked;
+	}
+	public void setAnyFilesMarked(boolean anyFilesMarked) {
+		this.anyFilesMarked = anyFilesMarked;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v
diff -u -r1.41 -r1.42
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	5 May 2008 06:44:42 -0000	1.41
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	7 May 2008 03:49:44 -0000	1.42
@@ -558,12 +558,26 @@
             sessionDto.setSessionName(sfs.getSessionName());
             
             boolean hasReflect = sfs.getContent().isReflectOnActivity();
+            Map<SubmitUser,FileDetailsDTO> userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);
+            
             //construct LearnerDTO list
             List<SubmitUser> userList = submitFilesService.getUsersBySession(sessionID);
             List<SubmitUserDTO> learnerList = new ArrayList<SubmitUserDTO>();
             for(SubmitUser user : userList){
             	SubmitUserDTO learnerDto = new SubmitUserDTO(user);
             	learnerDto.setHasRefection(hasReflect);
+            	
+				learnerDto.setAnyFilesMarked(false);
+				List<FileDetailsDTO> files = (List<FileDetailsDTO>) userFilesMap.get(user);
+				if ( files != null && files.size() > 0 ) {
+					for ( FileDetailsDTO file : files ) {
+						if ( file.getMarks() != null && file.getMarks().trim().length() > 0) {
+							learnerDto.setAnyFilesMarked(true);
+							break;
+						}
+					}
+				}
+            	
             	learnerList.add(learnerDto);
             }
             sessionUserMap.put(sessionDto, learnerList);
Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/allmarks.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	8 Jun 2007 01:40:15 -0000	1.7
+++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp	7 May 2008 03:49:44 -0000	1.8
@@ -6,12 +6,16 @@
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
 	<lams:css/>
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
 	<script type="text/javascript">
 		function updateMark(detailId,reportId,sessionId,userId){
 			var act = "<c:url value="/monitoring.do"/>";
 			location.href=act + "?method=newMark&updateMode=listAllMarks&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
 		}
+		function closeAndRefreshParentMonitoringWindow() {
+			refreshParentMonitoringWindow();
+			window.close();
+		}  				
 	</script>
 </lams:head>
 <body class="stripes">
@@ -29,7 +33,7 @@
 				</c:forEach>
 				<tr>
 					<td colspan="2">
-						<html:link href="javascript:window.close();" property="submit" styleClass="button">
+						<html:link href="javascript:closeAndRefreshParentMonitoringWindow();" property="submit" styleClass="button">
 							<fmt:message key="label.monitoring.done.button" />
 						</html:link>
 					</td>
Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/mark/mark.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/web/monitoring/mark/mark.jsp	8 Jun 2007 01:40:15 -0000	1.8
+++ lams_tool_sbmt/web/monitoring/mark/mark.jsp	7 May 2008 03:49:44 -0000	1.9
@@ -9,12 +9,16 @@
 	<c:set var="lams">
 		<lams:LAMSURL />
 	</c:set>
-	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/common.js"></script>
 	<script type="text/javascript">
 		function updateMark(detailId,reportId,sessionId,userId){
 			var act = "<c:url value="/monitoring.do"/>";
 			location.href=act + "?method=newMark&updateMode=listMark&userID="+userId+"&toolSessionID="+sessionId+"&detailID="+detailId+"&reportID="+reportId;
 		}
+		function closeAndRefreshParentMonitoringWindow() {
+			refreshParentMonitoringWindow();
+			window.close();
+		}  				
 	</script>
 </lams:head>
 <body class="stripes">
@@ -28,7 +32,7 @@
 					</c:forEach>
 					<tr>
 						<td colspan="2">
-							<html:link href="javascript:window.close();" property="submit" styleClass="button">
+							<html:link href="javascript:closeAndRefreshParentMonitoringWindow();" property="submit" styleClass="button">
 								<fmt:message key="label.monitoring.done.button" />
 							</html:link>
 						</td>
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/summary.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	5 Sep 2006 04:05:23 -0000	1.3
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	7 May 2008 03:49:44 -0000	1.4
@@ -105,6 +105,9 @@
 							<fmt:message key="monitoring.user.reflection"/>
 						</th>
 					</c:if>
+					<th>
+						<fmt:message key="monitoring.marked.question"/>
+					</th>
 					<th>&nbsp;</th>
 				</tr>
 			</c:if>		
@@ -123,6 +126,16 @@
 						</html:link>
 					</c:if>				
 				</td>
+				<td>
+					<c:choose>
+					<c:when test="${user.anyFilesMarked}">
+						<img src="<lams:LAMSURL/>/images/tick.gif" alt="tick"/>
+					</c:when>
+					<c:otherwise>
+						<img src="<lams:LAMSURL/>/images/cross.gif" alt="cross"/>
+					</c:otherwise>
+					</c:choose>
+				</td>
 				<td><html:link
 					href="javascript:viewMark(${user.userID},${sessionDto.sessionID});"
 					property="Mark" styleClass="button">