Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java,v
diff -u -r1.11 -r1.12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	1 Aug 2005 01:27:28 -0000	1.11
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java	1 Aug 2005 05:43:26 -0000	1.12
@@ -39,12 +39,7 @@
  */
 public interface ISubmitFilesService {
 
-	public static final String SBMT_LOGIN = "SubmitFilesLogin";
 
-	public static final String SBMT_PASSWORD = "SubmitFilesPassword";
-
-	public static final String SBMT_WORKSPACE = "SubmitFilesWorkspace";
-
 	/**
 	 * This method adds a new content record to the database.
 	 * 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.15 -r1.16
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	29 Jul 2005 05:25:18 -0000	1.15
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	1 Aug 2005 05:43:26 -0000	1.16
@@ -322,13 +322,13 @@
 	 * @throws SubmitFilesException
 	 */
 	private ITicket getRepositoryLoginTicket() throws SubmitFilesException {
-		repositoryService = RepositoryProxy.getLocalRepositoryService();
+		repositoryService = RepositoryProxy.getRepositoryService();
 		ICredentials credentials = new SimpleCredentials(
-				ISubmitFilesService.SBMT_LOGIN,
-				ISubmitFilesService.SBMT_PASSWORD.toCharArray());
+				SbmtToolContentHandler.repositoryUser,
+				SbmtToolContentHandler.repositoryId);
 		try {
 			ITicket ticket = repositoryService.login(credentials,
-					ISubmitFilesService.SBMT_WORKSPACE);
+					SbmtToolContentHandler.repositoryWorkspaceName);
 			return ticket;
 		} catch (AccessDeniedException ae) {
 			throw new SubmitFilesException("Access Denied to repository."
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtToolContentHandler.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtToolContentHandler.java,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtToolContentHandler.java	28 Jul 2005 07:25:54 -0000	1.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtToolContentHandler.java	1 Aug 2005 05:43:26 -0000	1.2
@@ -24,9 +24,9 @@
 
 public class SbmtToolContentHandler extends ToolContentHandler {
 
-    private static String repositoryWorkspaceName = "SubmitFilesWorkspace";
-    private static String repositoryUser = "SubmitFilesLogin";
-    private static char[] repositoryId = {'S','u','b','m','i','t','F','i','l','e','s','P','a','s','s','w','o','r','d'}; //SubmitFilesPassword
+    public static String repositoryWorkspaceName = "SubmitFilesWorkspace";
+    public static String repositoryUser = "SubmitFilesLogin";
+    public static char[] repositoryId = {'S','u','b','m','i','t','F','i','l','e','s','P','a','s','s','w','o','r','d'}; //SubmitFilesPassword
     
 	public String getRepositoryWorkspaceName() {
 		return repositoryWorkspaceName;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	28 Jul 2005 07:25:54 -0000	1.11
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	1 Aug 2005 05:43:26 -0000	1.12
@@ -6,17 +6,13 @@
  */
 package org.lamsfoundation.lams.tool.sbmt.web;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -26,19 +22,12 @@
 import org.apache.struts.action.DynaActionForm;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.contentrepository.InvalidParameterException;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException;
-import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
-import org.lamsfoundation.lams.tool.sbmt.util.SbmtToolContentHandler;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
  * @author Manpreet Minhas
@@ -47,11 +36,11 @@
  * 			path="/learner"
  * 			parameter="method"
  * 			name="SbmtLearnerForm"
- * 			input="/sbmtLearner.jsp"
+ * 			input="/learner/sbmtLearner.jsp"
  * 			scope="request"
  * 			validate="false"
  * 
- * @struts.action-forward name="upload" path="/sbmtLearner.jsp"
+ * @struts.action-forward name="upload" path="/learner/sbmtLearner.jsp"
  */
 public class LearnerAction extends DispatchAction {
 	
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.8 -r1.9
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	22 Jul 2005 05:41:32 -0000	1.8
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	1 Aug 2005 05:43:26 -0000	1.9
@@ -22,7 +22,6 @@
  */
 package org.lamsfoundation.lams.tool.sbmt.web;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Hashtable;
@@ -39,9 +38,7 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
-import org.lamsfoundation.lams.contentrepository.FileException;
 import org.lamsfoundation.lams.contentrepository.IVersionedNode;
-import org.lamsfoundation.lams.contentrepository.ValueFormatException;
 import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
@@ -56,12 +53,12 @@
  * 				scope="request"
  * 				name="emptyForm" 				
  * 
- * @struts.action-forward name="userlist" path="/userlist.jsp"
- * @struts.action-forward name="userReport" path="/userReport.jsp"
- * @struts.action-forward name="updateMarks" path="/updateMarks.jsp"
+ * @struts.action-forward name="userlist" path="/monitoring/alluserlist.jsp"
+ * @struts.action-forward name="userReport" path="/monitoring/usermarkslist.jsp"
+ * @struts.action-forward name="updateMarks" path="/monitoring/updatemarks.jsp"
+ * @struts.action-forward name="report" path="/monitoring/viewallmarks.jsp"
  * 
  * @struts.action-forward name="status" path="/Status.jsp"
- * @struts.action-forward name="report" path="/allLearners.jsp"
  * 				
  */
 public class MonitoringAction extends DispatchAction {
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_sbmt/web/allLearners.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_tool_sbmt/web/sbmtLearner.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_sbmt/web/updateMarks.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_sbmt/web/userReport.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_sbmt/web/userlist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.11 -r1.12
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	29 Jul 2005 05:25:18 -0000	1.11
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	1 Aug 2005 05:43:26 -0000	1.12
@@ -68,14 +68,14 @@
       type="org.lamsfoundation.lams.tool.sbmt.web.LearnerAction"
       name="SbmtLearnerForm"
       scope="request"
-      input="/sbmtLearner.jsp"
+      input="/learner/sbmtLearner.jsp"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
         name="upload"
-        path="/sbmtLearner.jsp"
+        path="/learner/sbmtLearner.jsp"
         redirect="false"
       />
     </action>
@@ -90,27 +90,27 @@
     >
       <forward
         name="userlist"
-        path="/userlist.jsp"
+        path="/monitoring/alluserlist.jsp"
         redirect="false"
       />
       <forward
         name="userReport"
-        path="/userReport.jsp"
+        path="/monitoring/usermarkslist.jsp"
         redirect="false"
       />
       <forward
         name="updateMarks"
-        path="/updateMarks.jsp"
+        path="/monitoring/updatemarks.jsp"
         redirect="false"
       />
       <forward
-        name="status"
-        path="/Status.jsp"
+        name="report"
+        path="/monitoring/viewallmarks.jsp"
         redirect="false"
       />
       <forward
-        name="report"
-        path="/allLearners.jsp"
+        name="status"
+        path="/Status.jsp"
         redirect="false"
       />
     </action>
Index: lams_tool_sbmt/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/web/authoring/authoring.jsp	1 Aug 2005 01:27:28 -0000	1.4
+++ lams_tool_sbmt/web/authoring/authoring.jsp	1 Aug 2005 05:43:26 -0000	1.5
@@ -13,8 +13,8 @@
 <html:base />
 <title>Submit Files</title>
 <!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
-<link href="../includes/css/aqua.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="../includes/javascript/common.js"></script>
+<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+<script type="text/javascript" src="<html:rewrite page='/includes/javascript/common.js'/>"></script>
 </head>
 
 <body>
Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/sbmtLearner.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/learner/sbmtLearner.jsp	1 Aug 2005 05:43:26 -0000	1.1
@@ -0,0 +1,119 @@
+
+<%@ page language="java"%>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html-el" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-c" prefix="c" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+  <head>
+    <html:base />
+    
+    <title><c:out value="${content.title}"/></title>    
+	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+  	<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+
+		<html:javascript formName="SbmtLearnerForm"
+        method="validateForm"/>
+
+  </head>
+  
+  <body>
+  	<H1><c:out value="${content.title}"/></H1>
+  	<H2><c:out value="${content.instruction}" escapeXml="false"/></H2>
+  	<div id="datatablecontainer">
+  	<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
+	<logic:present name="SbmtLearnerForm" property="filesUploaded">
+		<bean:size id="size" name="SbmtLearnerForm" property="filesUploaded"/>
+			<logic:equal name="size" value="0">
+					<center><b>No files have been uploaded yet.</b><p>Only one file can be uploaded at a time - Maximum file size is 1.0 MB.</p></center>
+			</logic:equal>
+			
+			<logic:greaterThan name="size" value="0">
+				<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+				<!-- Header information
+  				  <tr>
+    				<th scope="col">A colum header </th>
+ 				   <th scope="col">The other one </th>
+ 				 </tr>
+ 				-->
+ 				
+				<logic:iterate id="filesUploaded" name="SbmtLearnerForm" property="filesUploaded">				
+				<tr>
+				<!--First Row displaying the name of the File -->
+				<td><BR><b><bean:message key="label.learner.fileName"/></b></td>
+				<td><BR><bean:write name="filesUploaded" property="filePath"/></td>
+				</tr>
+				<tr>
+				<!--Second Row displaying the description of the File -->
+				<td><b><bean:message key="label.learner.fileDescription"/></b></td>
+				<td><bean:write name="filesUploaded" property="fileDescription" filter="false"/></td>
+				</tr>
+				<tr>
+				<!--Third row displaying the date of submission of the File -->
+				<td><b><bean:message key="label.learner.time"/></b></td>
+				<td><bean:write name="filesUploaded" property="dateOfSubmission"/></td>
+				</tr>
+				<tr>
+				<!--Fourth row displaying the comments -->
+				<td><b><bean:message key="label.learner.comments"/></b></td>
+				<td><logic:notEmpty name="filesUploaded" property="comments">
+						<bean:write name="filesUploaded" property="comments" filter="false"/><br>
+				</logic:notEmpty>
+				<logic:empty  name="filesUploaded" property="comments">
+						<bean:message key="label.learner.notAvailable"/><br>
+				</logic:empty>
+				</td>
+				</tr>
+				<tr>
+				<!--Fifth row displaying the marks-->
+				<td><b><bean:message key="label.learner.marks"/></b></td>
+				<td><logic:notEmpty name="filesUploaded" property="marks">
+						<bean:write name="filesUploaded" property="marks"/><br>
+				</logic:notEmpty>
+				<logic:empty name="filesUploaded" property="marks">
+					<bean:message key="label.learner.notAvailable"/><br>
+				</logic:empty>
+				</td>
+				</tr>
+				</logic:iterate>
+			</table>
+			</logic:greaterThan>
+	</logic:present>
+	</div>
+					
+  	<div id="formtablecontainer">
+    <html:form action="/learner?method=uploadFile" method="post" enctype="multipart/form-data" focus="filePath"  onsubmit="return validateForm(this);">
+      <p><html:errors/></p>
+      <table class="forms">
+      	<!-- Hidden fields -->
+      	<html:hidden property="toolSessionID" value="${requestScope.toolSessionID}"/>
+      	<html:hidden property="userID" value ="${requestScope.userID}"/>
+      	
+      	<!--File path row -->
+        <tr>
+          <td class="formlabel"><bean:message key="label.learner.filePath"/></td>
+          <td class="formcontrol"><html:file property="filePath" /></td>
+        </tr>
+        <!--File Description row -->
+        <tr>
+          <td class="formlabel"><bean:message key="label.learner.fileDescription"/></td>
+          <td class="formcontrol">
+          <html:textarea property="fileDescription" />
+           </td>
+        </tr>
+        <tr>
+          <td class="formcontrol"><html:submit><bean:message key="label.learner.upload"/></html:submit></td>
+          <td class="formcontrol">
+          	  <html:button property="finished" onclick="window.close()">
+          	  		<bean:message key="label.learner.finished"/>
+          	  </html:button>
+          </td>
+        </tr>
+      </table>
+    </html:form>
+    </div>
+  </body>
+</html:html>
Index: lams_tool_sbmt/web/monitoring/alluserlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/alluserlist.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/monitoring/alluserlist.jsp	1 Aug 2005 05:43:25 -0000	1.1
@@ -0,0 +1,70 @@
+
+<%@ page language="java"%>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html-el" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-c" prefix="c" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+  <head>
+    <html:base />
+    
+    <title><bean:message key="page.title.mark1.userlist"/></title>    
+	<!-- depending on user / site preference this will get changed probbably use passed in variable from flash to select which one to use-->
+  	<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+
+  </head>
+  
+  <body>
+
+  	<div id="datatablecontainer">
+  		<table class="forms">
+  		<c:set var="userlist" scope="request" value="${sessionScope.USERLIST}"/>
+  		<logic:notEmpty name="userlist">
+			<logic:iterate id="element" name="userlist">
+				<tr>
+				<html:form  action="/monitoring">
+				<html:hidden property="method" value="getFilesUploadedByUser"/>
+				<html:hidden property="toolSessionID" value="${toolSessionID}"/>
+				<bean:define id="details" name="element" property="userID"/>
+
+				<html:hidden property="userID" value="${details}"/>
+				<td class="formlabel"><b><bean:write name="element" property="firstName"/> <bean:write name="element" property="lastName"/></b></td>
+				<td class="formlabel"><b><bean:write name="element" property="login"/></b></td>
+				<td class="formcontrol"><b><html:submit property="Mark" value="Mark"/></b></td>
+				</html:form>
+				</tr>		
+			</logic:iterate>
+  		</logic:notEmpty>  		
+		</table>
+  		<table class="forms">
+	  		<tr>
+		  			<td class="formcontrol">
+		  			<html:form  action="/monitoring">
+		  				<INPUT type="hidden" name="method" value="viewAllMarks">
+						<INPUT type="hidden" name="toolSessionID" value="<c:out value="${toolSessionID}" />"/>
+			  			<html:submit property="viewAllMarks" value="View all marks"/>
+	  				</html:form>
+		  			</td>
+		  			<td class="formcontrol">
+		  			<html:form  action="/monitoring">
+		  				<INPUT type="hidden" name="method" value="releaseMarks">
+						<INPUT type="hidden" name="toolSessionID" value="<c:out value="${toolSessionID}" />"/>
+			  			<html:submit property="releaseMarks" value="Release marks"/>
+	  				</html:form>
+		  			</td>
+		  			<td class="formcontrol">
+		  			<html:form  action="/monitoring">
+		  				<INPUT type="hidden" name="method" value="downloadMarks">
+						<INPUT type="hidden" name="toolSessionID" value="<c:out value="${toolSessionID}" />"/>
+			  			<html:submit property="downloadMarks" value="Download marks"/>
+	  				</html:form>
+		  			</td>
+	  		</tr>
+  		</table>
+	</div>
+					
+  </body>
+</html:html>
Index: lams_tool_sbmt/web/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/updatemarks.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/monitoring/updatemarks.jsp	1 Aug 2005 05:43:25 -0000	1.1
@@ -0,0 +1,69 @@
+
+<%@ page language="java"%>
+
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-c" prefix="c" %>
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+  <head>    
+    <title>Files Submitted</title>
+  	<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+  </head>  
+  <body>
+		  <c:set var="details" value="${sessionScope.fileDetails}"/>
+		  <c:set var="user" value="${sessionScope.user}" />
+		  <c:set var="toolSessionID" value="${sessionScope.toolSessionID}" />		  
+		  <b>Please assign a mark and a comment for the report by 
+		  		 <c:out value="${user.login}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
+		  </b></p>
+		 <table width="100%"  border="0" cellspacing="0" cellpadding="0">
+			  <span><tr>	
+					<td>File Path:</td><td><c:out value="${details.filePath}"  escapeXml="false"/></td>
+				    </tr>
+				    <tr>
+					<td>File Description:</td><td> <c:out value="${details.fileDescription}"  escapeXml="false"/></td>
+					</tr>
+				    <tr>						
+					<td>Date of Submission: </td><td><c:out value="${details.dateOfSubmission}" /></td>
+					</tr>
+		</table>
+		<table class="forms">
+					<tr><td colspan="2"><html:errors/></td></tr>
+					<form name="commentForm" action="monitoring.do?method=updateMarks"  method="post">	
+							 <input type="hidden" name="toolSessionID" value=<c:out value="${toolSessionID}"/> />						
+							 <input type="hidden" name="reportID" value=<c:out value="${details.reportID}"/> />						
+ 							 <input type="hidden" name="userID" value=<c:out value="${user.userID}"/> />
+ 					<tr>						 
+ 				            <td class="formlabel">Marks:</td>
+ 				            <td class="formcontrol">
+ 				        		<input type="text" name="marks" value=<c:out value="${details.marks}"  escapeXml="false"/>>
+ 				        	</td>
+ 				    </tr>
+ 				    <tr>
+ 				    		<td class="formlabel">Comments:</td>
+					        <td class="formcontrol">
+					            <FCK:editor id="comments" 
+					    			basePath="/lams/fckEditor/"
+					    			height="150"    
+					    			width="85%">
+	    									<c:out value="${details.comments}" escapeXml="false"/>
+								</FCK:editor>
+  				            </td>
+			        </tr>
+					<tr>
+						  <td class="formcontrol" colspan="2">
+							<input type="submit" value="Update Marks" />
+						  </td>
+					</tr>
+					</form>
+				</span>
+		</table>
+  </body>
+</html:html>
+
Index: lams_tool_sbmt/web/monitoring/usermarkslist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/usermarkslist.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/monitoring/usermarkslist.jsp	1 Aug 2005 05:43:25 -0000	1.1
@@ -0,0 +1,82 @@
+
+<%@ page language="java"%>
+
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html-el" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-c" prefix="c" %>
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+  <head>    
+    <title>Files Submitted</title>
+  	<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+
+  </head>  
+  <body>	  
+	<c:set var="filesUploaded" value ="${sessionScope.userReport}"/>
+	<c:set var="user" value="${sessionScope.user}" />
+	<b>Following files have been submitted by 
+		 <c:out value="${user.login}" /> , <c:out value="${user.firstName}" />  <c:out value="${user.lastName}" /> 	
+	</b>
+	</p>
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+	<c:forEach items="${filesUploaded}"  var ="details" >			
+		<span><p>			
+		<tr>
+			<td>
+			File Path: </td><td><c:out value="${details.filePath}" /> 
+			(<a href="monitoring.do?method=downloadFile&uuID=<c:out value="${details.uuID}" /> &versionID=<c:out value="${details.versionID}" /> ">Download</a>)
+			</td>
+		</tr>
+		<tr>
+			<td>File Description: </td><td><c:out value="${details.fileDescription}"  escapeXml="false"/></td>
+		</tr>
+		<tr>
+			<td>Date of Submission: </td><td><c:out value="${details.dateOfSubmission}" /></td>
+		</tr>
+		<tr>
+			<td>Marks:</td>
+			<td> 		<c:choose>
+								<c:when test="${empty details.marks}">
+									<c:out value="Not Available"/>
+								</c:when>
+								<c:otherwise>
+									<c:out value="${details.marks}" escapeXml="false"/>
+								</c:otherwise>
+							</c:choose>
+			</td>
+		</tr>			
+		<tr>
+			<td>Comments:</td>
+			<td>
+							<c:choose>
+								<c:when test="${empty details.comments}">
+									<c:out value="Not Available"/>								
+								</c:when>
+								<c:otherwise>
+									<c:out value="${details.comments}" escapeXml="false"/>
+								</c:otherwise>
+							</c:choose>
+			</td>
+		</tr>
+
+		<tr>
+			<td colspan="2">
+			<form action="monitoring.do?method=markFile" method="post">
+					<input type="hidden" name="detailID" value=<c:out value='${details.submissionID}' /> >
+					<input type="hidden" name="reportID" value=<c:out value='${details.reportID}' /> >
+					<input type="hidden" name="toolSessionID" value=<c:out value='${sessionScope.toolSessionID}' /> >
+					<input type="hidden" name="userID" value=<c:out value='${user.userID}' /> >
+					<input type="submit" value="Update Marks"/>
+			</form>
+			</td>
+		</tr>
+		</span>
+	</c:forEach>
+</table>						
+  </body>
+</html:html>
+
Index: lams_tool_sbmt/web/monitoring/viewallmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/viewallmarks.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp	1 Aug 2005 05:43:25 -0000	1.1
@@ -0,0 +1,92 @@
+
+<%@ page language="java"%>
+
+<%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-c" prefix="c" %>
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+  <head>    
+    <title>All Learner Submission Details</title>
+    
+  	<link href="<html:rewrite page='/includes/css/aqua.css'/>" rel="stylesheet" type="text/css">
+  	
+  </head>  
+  <body>
+
+		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+		<c:forEach items="${report}"  var ="user" >		
+			<c:set var="filesUploaded" value="${user.value}"/>
+			<c:set var="first" value="true"/>
+			<c:forEach items="${filesUploaded}"  var ="details" >			
+				<span><p>			
+					<c:if test="${first}">
+						<c:set var="first" value="false"/>
+					    <tr>
+					    	<td colspan="2">
+					    	<c:out value="${details.userDTO.firstName}"/> <c:out value="${details.userDTO.lastName}"/>,
+					    	<c:out value="${details.userDTO.login}"/>, provides following submisstion:
+					    	</td>
+					    <tr>
+				    </c:if>
+				<tr>
+					<td>
+					File Path: </td>
+					<td><c:out value="${details.filePath}" /> 
+					(<a href="monitoring.do?method=downloadFile&uuID=<c:out value="${details.uuID}" /> &versionID=<c:out value="${details.versionID}" /> ">Download</a>)
+					</td>
+				</tr>
+				<tr>
+					<td>File Description: </td><td><c:out value="${details.fileDescription}"  escapeXml="false"/></td>
+				</tr>
+				<tr>
+					<td>Date of Submission: </td><td><c:out value="${details.dateOfSubmission}" /></td>
+				</tr>
+				<tr>
+					<td>Marks:</td>
+					<td> 		<c:choose>
+										<c:when test="${empty details.marks}">
+											<c:out value="Not Available"/>
+										</c:when>
+										<c:otherwise>
+											<c:out value="${details.marks}" escapeXml="false"/>
+										</c:otherwise>
+									</c:choose>
+					</td>
+				</tr>			
+				<tr>
+					<td>Comments:</td>
+					<td>
+									<c:choose>
+										<c:when test="${empty details.comments}">
+											<c:out value="Not Available"/>								
+										</c:when>
+										<c:otherwise>
+											<c:out value="${details.comments}" escapeXml="false"/>
+										</c:otherwise>
+									</c:choose>
+					</td>
+				</tr>
+		
+				<tr>
+					<td colspan="2">
+					<form action="monitoring.do?method=markFile" method="post">
+							<input type="hidden" name="detailID" value=<c:out value='${details.submissionID}' /> >
+							<input type="hidden" name="reportID" value=<c:out value='${details.reportID}' /> >
+							<input type="hidden" name="userID" value=<c:out value='${details.userID}' /> >
+							<input type="hidden" name="toolSessionID" value=<c:out value='${sessionScope.toolSessionID}' /> >
+							<input type="submit" value="Update Marks"/>
+					</form>
+					</td>
+				</tr>
+				</span>
+			</c:forEach>
+		</c:forEach>
+		</table>						
+  </body>
+</html:html>
+