Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
diff -u -rc36eb8bba0958f38d26c34d6cd690e60c934a619 -rbc4150568caa15d2bb1004bc1c73797c95c0205e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision c36eb8bba0958f38d26c34d6cd690e60c934a619)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	(.../SbmtResources.properties)	(revision bc4150568caa15d2bb1004bc1c73797c95c0205e)
@@ -45,7 +45,8 @@
 label.learner.notAvailable = Not Available 
 label.learner.noUpload = No files have been uploaded yet.
 label.learner.uploadMessage = Only one file can be uploaded at a time - Maximum file size is 1.0 MB
-
+learner.finish.without.upload=No files have been uploaded yet. Files can not be uploaded once you choose OK.
+ 
 #-------------------------Monitoring Labels-----------------#
 label.monitoring.heading.instructions=Submission Instructions
 label.monitoring.heading.instructions.desc=Online and offline instructions
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/LearnerDetailsDTO.java
===================================================================
diff -u -reb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8 -rbc4150568caa15d2bb1004bc1c73797c95c0205e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/LearnerDetailsDTO.java	(.../LearnerDetailsDTO.java)	(revision eb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/LearnerDetailsDTO.java	(.../LearnerDetailsDTO.java)	(revision bc4150568caa15d2bb1004bc1c73797c95c0205e)
@@ -8,36 +8,30 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author Manpreet Minhas
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
+ * @serial 5900249986365640342L
  */
 public class LearnerDetailsDTO implements Serializable{
 	
+	private static final long serialVersionUID = 5900249986365640342L;
+	private Long userID;
+	private Long toolSessionID;
 	private String name;
 	private String fileDescription;
 	private Date dateOfSubmission;
 	private String comments;	
 	private Long marks;	
 	private Date dateMarksReleased;
 	
+	private String contentTitle;
+	private String contentInstruction;
+	private boolean contentLockOnFinished;
 	
-	
+	private List filesUploaded;
 
-	public LearnerDetailsDTO(String name,String fileDescription, 
-							Date dateOfSubmission, String comments,
-							Long marks, Date dateMarksReleased) {
-		super();
-		this.name = name;
-		this.fileDescription = fileDescription;
-		this.dateOfSubmission = dateOfSubmission;
-		this.comments = comments;
-		this.marks = marks;
-		this.dateMarksReleased = dateMarksReleased;
-	}
 	/**
 	 * @return Returns the comments.
 	 */
@@ -110,4 +104,76 @@
 	public void setMarks(Long marks) {
 		this.marks = marks;
 	}
+	/**
+	 * @return Returns the contentInstruction.
+	 */
+	public String getContentInstruction() {
+		return contentInstruction;
+	}
+	/**
+	 * @param contentInstruction The contentInstruction to set.
+	 */
+	public void setContentInstruction(String contentInstruction) {
+		this.contentInstruction = contentInstruction;
+	}
+	/**
+	 * @return Returns the contentLockOnFinished.
+	 */
+	public boolean isContentLockOnFinished() {
+		return contentLockOnFinished;
+	}
+	/**
+	 * @param contentLockOnFinished The contentLockOnFinished to set.
+	 */
+	public void setContentLockOnFinished(boolean contentLockOnFinished) {
+		this.contentLockOnFinished = contentLockOnFinished;
+	}
+	/**
+	 * @return Returns the contentTitle.
+	 */
+	public String getContentTitle() {
+		return contentTitle;
+	}
+	/**
+	 * @param contentTitle The contentTitle to set.
+	 */
+	public void setContentTitle(String contentTitle) {
+		this.contentTitle = contentTitle;
+	}
+	/**
+	 * @return Returns the toolSessionID.
+	 */
+	public Long getToolSessionID() {
+		return toolSessionID;
+	}
+	/**
+	 * @param toolSessionID The toolSessionID to set.
+	 */
+	public void setToolSessionID(Long toolSessionID) {
+		this.toolSessionID = toolSessionID;
+	}
+	/**
+	 * @return Returns the userID.
+	 */
+	public Long getUserID() {
+		return userID;
+	}
+	/**
+	 * @param userID The userID to set.
+	 */
+	public void setUserID(Long userID) {
+		this.userID = userID;
+	}
+	/**
+	 * @return Returns the filesUploaded.
+	 */
+	public List getFilesUploaded() {
+		return filesUploaded;
+	}
+	/**
+	 * @param filesUploaded The filesUploaded to set.
+	 */
+	public void setFilesUploaded(List filesUploaded) {
+		this.filesUploaded = filesUploaded;
+	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -rc9f48be7b9781402a7150cf8e6e26d42c1bb457c -rbc4150568caa15d2bb1004bc1c73797c95c0205e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision c9f48be7b9781402a7150cf8e6e26d42c1bb457c)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	(.../SubmitFilesService.java)	(revision bc4150568caa15d2bb1004bc1c73797c95c0205e)
@@ -22,7 +22,6 @@
  */
 package org.lamsfoundation.lams.tool.sbmt.service;
 
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -663,13 +662,19 @@
 	 */
 	private LearnerDetailsDTO getLearnerDetailsDTO(SubmissionDetails details, 
 												  SubmitFilesReport report){
-		File file = new File(details.getFilePath());		
-		return new LearnerDetailsDTO(file.getName(),
-									 details.getFileDescription(),
-									 details.getDateOfSubmission(),
-									 report.getComments(),
-									 report.getMarks(),
-									 report.getDateMarksReleased());
+		LearnerDetailsDTO dto = new LearnerDetailsDTO();
+		dto.setComments(report.getComments());
+//		dto.setContentInstruction()
+//		dto.setContentLockOnFinished()
+//		dto.setContentTitle()
+		dto.setDateMarksReleased(report.getDateMarksReleased());
+		dto.setDateOfSubmission(details.getDateOfSubmission());
+		dto.setFileDescription(details.getFileDescription());
+		dto.setMarks(report.getMarks());
+//		dto.setName();
+//		dto.setToolSessionID()
+//		dto.setUserID()
+		return dto;
 	}	
 	
 	public ArrayList getStatus(Long sessionID){		
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -rc9f48be7b9781402a7150cf8e6e26d42c1bb457c -rbc4150568caa15d2bb1004bc1c73797c95c0205e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision c9f48be7b9781402a7150cf8e6e26d42c1bb457c)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(.../LearnerAction.java)	(revision bc4150568caa15d2bb1004bc1c73797c95c0205e)
@@ -11,7 +11,6 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -25,6 +24,7 @@
 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.dto.LearnerDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
@@ -52,6 +52,7 @@
 									HttpServletRequest request,
 									HttpServletResponse response){
 		
+
 		DynaActionForm authForm= (DynaActionForm)form;
 		
 		Long sessionID =(Long) authForm.get("toolSessionID");
@@ -60,16 +61,12 @@
 		submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 		SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
 		SubmitFilesContent content = session.getContent();
-		
-		HttpSession httpSession = request.getSession(true);
-		httpSession.setAttribute("content",content);
 
 		List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
-		listUploadFiles(authForm, filesUploaded);
+		listUploadFiles(request, filesUploaded);
 		
+		setLearnerDTO(request, sessionID, userID, content);
 		//to avoid user without patience click "upload" button too fast
-		request.setAttribute("userID",userID);
-		request.setAttribute("toolSessionID",sessionID);
 		saveToken(request);
 		return mapping.getInputForward();
 		
@@ -87,9 +84,12 @@
 			submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
 
-			listUploadFiles(authForm, filesUploaded);
-			request.setAttribute("userID",userID);
-			request.setAttribute("toolSessionID",sessionID);
+			listUploadFiles(request, filesUploaded);
+			submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+			SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
+			SubmitFilesContent content = session.getContent();
+
+			setLearnerDTO(request, sessionID, userID, content);
 			return returnErrors(mapping,request,"submit.upload.twice","upload");
 		}
 		
@@ -104,9 +104,11 @@
 		try{
 			submitFilesService.uploadFileToSession(sessionID,uploadedFile,fileDescription,userID);
 			List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID);
-			listUploadFiles(authForm, filesUploaded);
-			request.setAttribute("userID",userID);
-			request.setAttribute("toolSessionID",sessionID);
+			listUploadFiles(request, filesUploaded);
+			submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+			SubmitFilesSession session = submitFilesService.getSessionById(sessionID);
+			SubmitFilesContent content = session.getContent();
+			setLearnerDTO(request, sessionID, userID, content);
 			return mapping.getInputForward();			
 		}catch(SubmitFilesException se){
 			logger.error("uploadFile: Submit Files Exception has occured" + se.getMessage());
@@ -141,7 +143,7 @@
 	 * @param sessionID
 	 * @param userID
 	 */
-	private void listUploadFiles(DynaActionForm authForm, List filesUploaded) {
+	private void listUploadFiles(HttpServletRequest request, List filesUploaded) {
 		//if Monitoring does not release marks, then screen this mark and comment content.
 		Iterator iter = filesUploaded.iterator();
 		while(iter.hasNext()){
@@ -151,8 +153,22 @@
 				dto.setMarks(null);
 			}
 		}
-		authForm.set("filesUploaded",filesUploaded);
+		request.setAttribute("filesUploaded",filesUploaded);
 	}
 
-
+	/**
+	 * @param request
+	 * @param sessionID
+	 * @param userID
+	 * @param content
+	 */
+	private void setLearnerDTO(HttpServletRequest request, Long sessionID, Long userID, SubmitFilesContent content) {
+		LearnerDetailsDTO dto = new LearnerDetailsDTO();
+		dto.setToolSessionID(sessionID);
+		dto.setUserID(userID);
+		dto.setContentInstruction(content.getInstruction());
+		dto.setContentLockOnFinished(content.isLockOnFinished());
+		dto.setContentTitle(content.getTitle());
+		request.setAttribute("learner",dto);
+	}
 }
Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp
===================================================================
diff -u -rc9f48be7b9781402a7150cf8e6e26d42c1bb457c -rbc4150568caa15d2bb1004bc1c73797c95c0205e
--- lams_tool_sbmt/web/learner/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision c9f48be7b9781402a7150cf8e6e26d42c1bb457c)
+++ lams_tool_sbmt/web/learner/sbmtLearner.jsp	(.../sbmtLearner.jsp)	(revision bc4150568caa15d2bb1004bc1c73797c95c0205e)
@@ -1,37 +1,46 @@
 
 <%@ 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" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html:html locale="true">
   <head>
     <html:base />
     
-    <title><c:out value="${content.title}"/></title>    
+    <title>Submission tool for Learner</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"/>
+	<script language="javascript">
+	var lockOnFinished = <c:out value="${learner.contentLockOnFinished}"/>;
+	var uploadFileNum = <c:choose><c:when test="${empty filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
+	function finish(){
+		if(lockOnFinished && uploadFileNum==0){
+			if(confirm("<fmt:message key='learner.finish.without.upload'/>"))
+				window.close();
+			else
+				return false;
+		}else
+			window.close();
+	}
+	</script>
+	<html:javascript formName="SbmtLearnerForm" method="validateForm"/>
 
   </head>
   
   <body>
-  	<H1><c:out value="${content.title}"/></H1>
-  	<H2><c:out value="${content.instruction}" escapeXml="false"/></H2>
+  	<H1><c:out value="${learner.contentTitle}"/></H1>
+  	<H2><c:out value="${learner.contentInstruction}" 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">
+	<c:choose>
+			<c:when test="${empty filesUploaded}">
 					<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">
+			</c:when>
+					
+			<c:otherwise>
 				<table width="100%"  border="0" cellspacing="0" cellpadding="0">
 				<!-- Header information
   				  <tr>
@@ -40,75 +49,81 @@
  				 </tr>
  				-->
  				
-				<logic:iterate id="filesUploaded" name="SbmtLearnerForm" property="filesUploaded">				
+				<c:forEach var="file" items="${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>
+				<td><BR><b><fmt:message key="label.learner.fileName"/></b></td>
+				<td><BR><c:out value="${file.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>
+				<td><b><fmt:message key="label.learner.fileDescription"/></b></td>
+				<td><c:out value="${file.fileDescription}" escapeXml="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>
+				<td><b><fmt:message key="label.learner.time"/></b></td>
+				<td><c:out value="${file.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><b><fmt:message key="label.learner.comments"/></b></td>
+				<td>
+				<c:choose>
+					<c:when test="${empty file.comments}">	
+						<fmt:message key="label.learner.notAvailable"/><br>
+					</c:when>
+					<c:otherwise>
+						<c:out value="${file.comments}" escapeXml="false"/><br>
+					</c:otherwise>
+				</c:choose>
 				</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><b><fmt:message key="label.learner.marks"/></b></td>
+				<td>
+				<c:choose>
+					<c:when test="${empty file.comments}">	
+						<fmt:message key="label.learner.notAvailable"/><br>
+					</c:when>
+					<c:otherwise>
+						<c:out value="{$file.marks}" escapeXml="false"/><br>
+					</c:otherwise>
+				</c:choose>
 				</td>
 				</tr>
-				</logic:iterate>
+				</c:forEach>
 			</table>
-			</logic:greaterThan>
-	</logic:present>
+			</c:otherwise>
+	</c:choose>
 	</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}"/>
+      	<html:hidden property="toolSessionID" value="${learner.toolSessionID}"/>
+      	<html:hidden property="userID" value ="${learner.userID}"/>
       	
       	<!--File path row -->
         <tr>
-          <td class="formlabel"><bean:message key="label.learner.filePath"/></td>
+          <td class="formlabel"><fmt: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="formlabel"><fmt: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:submit><fmt: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 property="finished" onclick="finish()">
+          	  		<fmt:message key="label.learner.finished"/>
           	  </html:button>
           </td>
         </tr>