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.22 -r1.23
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	2 Dec 2005 00:48:54 -0000	1.22
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	9 Dec 2005 01:38:41 -0000	1.23
@@ -44,7 +44,6 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
-import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
@@ -96,6 +95,8 @@
             HttpServletRequest request,
             HttpServletResponse response)
     {
+    	Long contentID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+    	request.getSession().setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID,contentID);
         return userList(mapping, form, request, response);
     }
     
@@ -447,31 +448,42 @@
 			   ActionForm form,
 			   HttpServletRequest request,
 			   HttpServletResponse response){
-		
-		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+	    Long contentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
 		submitFilesService = getSubmitFilesService();
-		//return FileDetailsDTO list according to the given sessionID
-		Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);
-		Iterator iter = userFilesMap.values().iterator();
-		Iterator dtoIter; 
-		int notMarkedCount = 0;
-		int markedCount = 0;
-		while(iter.hasNext()){
-			List list = (List) iter.next();
-			dtoIter = list.iterator();
-			while(dtoIter.hasNext()){
-				FileDetailsDTO dto = (FileDetailsDTO) dtoIter.next();
-				if(dto.getMarks() == null)
-					notMarkedCount++;
-				else
-					markedCount++;
+		// List userList = submitFilesService.getUsers(sessionID);
+		List submitFilesSessionList = submitFilesService.getSubmitFilesSessionByContentID(contentID);
+		Map sessionStatisticMap = new HashMap();
+
+		// build a map with all users in the submitFilesSessionList
+		Iterator it = submitFilesSessionList.iterator();
+		while (it.hasNext()) {
+			Long sessionID = ((SubmitFilesSession) it.next()).getSessionID();
+			submitFilesService = getSubmitFilesService();
+			//return FileDetailsDTO list according to the given sessionID
+			Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);
+			Iterator iter = userFilesMap.values().iterator();
+			Iterator dtoIter; 
+			int notMarkedCount = 0;
+			int markedCount = 0;
+			while(iter.hasNext()){
+				List list = (List) iter.next();
+				dtoIter = list.iterator();
+				while(dtoIter.hasNext()){
+					FileDetailsDTO dto = (FileDetailsDTO) dtoIter.next();
+					if(dto.getMarks() == null)
+						notMarkedCount++;
+					else
+						markedCount++;
+				}
 			}
+			StatisticDTO dto = new StatisticDTO();
+			dto.setMarkedCount(markedCount);
+			dto.setNotMarkedCount(notMarkedCount);
+			dto.setTotalUploadedFiles(markedCount+notMarkedCount);
+			sessionStatisticMap.put(sessionID,dto);
 		}
-		StatisticDTO dto = new StatisticDTO();
-		dto.setMarkedCount(markedCount);
-		dto.setNotMarkedCount(notMarkedCount);
-		dto.setTotalUploadedFiles(markedCount+notMarkedCount);
-		request.setAttribute("statistic",dto);
+
+		request.setAttribute("statisticList",sessionStatisticMap);
 		return mapping.findForward("statistic");
 	}
 	/**
Index: lams_tool_sbmt/web/monitoring/alluserlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/alluserlist.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/monitoring/alluserlist.jsp	17 Nov 2005 06:34:07 -0000	1.4
+++ lams_tool_sbmt/web/monitoring/alluserlist.jsp	9 Dec 2005 01:38:41 -0000	1.5
@@ -14,6 +14,9 @@
   </head>
   
   <body>
+    <div>
+    <%@ include file="tabmenu.jsp"%>
+    </div>
 	<html:errors/>
   	<div id="datatablecontainer">
   		<c:set var="sessionUserMap" scope="request" value="${sessionUserMap}"/>
Index: lams_tool_sbmt/web/monitoring/editactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/editactivity.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/monitoring/editactivity.jsp	13 Sep 2005 04:13:20 -0000	1.4
+++ lams_tool_sbmt/web/monitoring/editactivity.jsp	9 Dec 2005 01:38:41 -0000	1.5
@@ -14,6 +14,9 @@
 </head>
 
 <body>
+    <div>
+    <%@ include file="tabmenu.jsp"%>
+    </div>
 	<html:form action="monitoring" method="post" >
 		<html:errors/>
 		<div id="basic">
Index: lams_tool_sbmt/web/monitoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/instructions.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/monitoring/instructions.jsp	23 Nov 2005 01:29:12 -0000	1.4
+++ lams_tool_sbmt/web/monitoring/instructions.jsp	9 Dec 2005 01:38:41 -0000	1.5
@@ -9,7 +9,10 @@
     <link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
 	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/common.js"></script>
   </head>
-  <body>  
+  <body>
+      <div>
+    <%@ include file="tabmenu.jsp"%>
+    </div>  
   	<h1><fmt:message key="label.monitoring.heading.instructions" /></h1>
 	<h2><fmt:message key="label.monitoring.heading.instructions.desc" /></h2>
 	<table class="forms">
Index: lams_tool_sbmt/web/monitoring/showactivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/showactivity.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/web/monitoring/showactivity.jsp	8 Aug 2005 05:30:08 -0000	1.2
+++ lams_tool_sbmt/web/monitoring/showactivity.jsp	9 Dec 2005 01:38:41 -0000	1.3
@@ -11,6 +11,9 @@
 </head>
 
 <body>
+    <div>
+    <%@ include file="tabmenu.jsp"%>
+    </div>
 	<html:form action="monitoring" method="post" >
 		<div id="basic">
 		<h1><fmt:message key="label.authoring.heading.basic" /></h1>
Index: lams_tool_sbmt/web/monitoring/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/statistic.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/web/monitoring/statistic.jsp	10 Aug 2005 01:39:37 -0000	1.1
+++ lams_tool_sbmt/web/monitoring/statistic.jsp	9 Dec 2005 01:38:41 -0000	1.2
@@ -7,26 +7,36 @@
   	<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
   </head>  
   <body>
+      <div>
+    <%@ include file="tabmenu.jsp"%>
+    </div>
 		<h1><fmt:message key="monitoring.statistic.title"/></h1>
 		<div class="datatablecontainer">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-		  <tr>
-		    <th scope="col">Title</th>
-		    <th scope="col">Count</th>
-		  </tr>
-		  <tr>
-		    <td><fmt:message key="monitoring.statistic.marked"/></td>
-		    <td><c:out value="${statistic.markedCount}"/></td>
-		  </tr>
-		  <tr>
-		    <td><fmt:message key="monitoring.statistic.not.marked"/></td>
-		    <td><c:out value="${statistic.notMarkedCount}"/></td>
-		  </tr>
-		  <tr>
-		    <td><fmt:message key="monitoring.statistic.total.uploaded.file"/></td>
-		    <td><c:out value="${statistic.totalUploadedFiles}"/></td>
-		  </tr>
-		</table>
+		<c:forEach var="element" items="${statisticList}">
+			<c:set var="sessionID" value="${element.key}"/>
+			<c:set var="statistic" value="${element.value}"/>
+			<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		    <tr>
+		        <td style="border-bottom:1px #000 solid;" colspan="2"><b>SESSION ID: <c:out value="${sessionID}" /></td>
+		    </tr>
+		    <tr>
+			    <th scope="col">Title</th>
+			    <th scope="col">Count</th>
+			  </tr>
+			  <tr>
+			    <td><fmt:message key="monitoring.statistic.marked"/></td>
+			    <td><c:out value="${statistic.markedCount}"/></td>
+			  </tr>
+			  <tr>
+			    <td><fmt:message key="monitoring.statistic.not.marked"/></td>
+			    <td><c:out value="${statistic.notMarkedCount}"/></td>
+			  </tr>
+			  <tr>
+			    <td><fmt:message key="monitoring.statistic.total.uploaded.file"/></td>
+			    <td><c:out value="${statistic.totalUploadedFiles}"/></td>
+			  </tr>
+			</table>
+		</c:forEach>
 		</div>						
   </body>
 </html:html>
Index: lams_tool_sbmt/web/monitoring/tabmenu.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/tabmenu.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/monitoring/tabmenu.jsp	9 Dec 2005 01:38:41 -0000	1.1
@@ -0,0 +1,21 @@
+<div id="datatablecontainer">
+<table class="forms">
+	<tr>
+		<c:set var="monitoringURL">
+			<html:rewrite page="/monitoring.do" />
+		</c:set>
+		<td><a
+			href="<c:out value='${monitoringURL}'/>?method=userList&toolContentID=<c:out value='${sessionScope.toolContentID}'/>">Monitoring
+		Logon</a></td>
+		<td><a
+			href="<c:out value='${monitoringURL}'/>?method=instructions&toolContentID=<c:out value='${sessionScope.toolContentID}'/>">Monitoring
+		Instructions</a></td>
+		<td><a
+			href="<c:out value='${monitoringURL}'/>?method=showActivity&toolContentID=<c:out value='${sessionScope.toolContentID}'/>">Edit
+		Activity</a></td>
+		<td><a
+			href="<c:out value='${monitoringURL}'/>?method=statistic&toolContentID=<c:out value='${sessionScope.toolContentID}'/>">Monitoring
+		Statistic</a></td>
+	</tr>
+</table>
+</div>
Index: lams_tool_sbmt/web/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/updatemarks.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/web/monitoring/updatemarks.jsp	18 Aug 2005 00:23:42 -0000	1.5
+++ lams_tool_sbmt/web/monitoring/updatemarks.jsp	9 Dec 2005 01:38:41 -0000	1.6
@@ -9,6 +9,9 @@
   	<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
   </head>  
   <body>
+      <div>
+	    <%@ include file="tabmenu.jsp"%>
+	    </div>
 		  <c:set var="details" value="${fileDetails}"/>
 		  <c:set var="user" value="${user}" />
 		  <c:set var="toolSessionID" value="${toolSessionID}" />		  
Index: lams_tool_sbmt/web/monitoring/usermarkslist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/usermarkslist.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/monitoring/usermarkslist.jsp	13 Sep 2005 04:13:20 -0000	1.4
+++ lams_tool_sbmt/web/monitoring/usermarkslist.jsp	9 Dec 2005 01:38:41 -0000	1.5
@@ -9,7 +9,10 @@
 	<script type="text/javascript" src="<%=LAMS_WEB_ROOT%>/includes/javascript/common.js"></script>
 
   </head>  
-  <body>	  
+  <body>
+      <div>
+    <%@ include file="tabmenu.jsp"%>
+    </div>
 	<c:set var="filesUploaded" value ="${userReport}"/>
 	<c:set var="user" value="${user}" />
 	<b>Following files have been submitted by 
Index: lams_tool_sbmt/web/monitoring/viewallmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/viewallmarks.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/web/monitoring/viewallmarks.jsp	8 Dec 2005 00:12:21 -0000	1.5
+++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp	9 Dec 2005 01:38:41 -0000	1.6
@@ -9,7 +9,9 @@
   	
   </head>  
   <body>
-
+    <div>
+    <%@ include file="tabmenu.jsp"%>
+    </div>
 		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
 		<c:forEach items="${report}"  var ="user" >		
 			<c:set var="filesUploaded" value="${user.value}"/>