Index: lams_tool_sbmt/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.23 -r1.24
--- lams_tool_sbmt/conf/language/ApplicationResources.properties	3 Nov 2006 05:08:58 -0000	1.23
+++ lams_tool_sbmt/conf/language/ApplicationResources.properties	15 Nov 2006 06:42:35 -0000	1.24
@@ -123,3 +123,6 @@
 
 
 #======= End labels: Exported 114 labels for en AU =====
+
+label.edit= Edit
+message.no.reflection.available = No Reflection available
Index: lams_tool_sbmt/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/struts-actions.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/conf/xdoclet/struts-actions.xml	1 Sep 2006 06:45:18 -0000	1.6
+++ lams_tool_sbmt/conf/xdoclet/struts-actions.xml	15 Nov 2006 06:42:36 -0000	1.7
@@ -24,7 +24,7 @@
 		<action path="/learning/submitReflection"
 			type="org.lamsfoundation.lams.tool.sbmt.web.ReflectAction"
 			name="reflectionForm" 
-			validate="true" 
+			validate="false" 
 			input="/learner/notebook.jsp"
 			parameter="submitReflection" 
 			scope="request">
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/ReflectionForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/ReflectionForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/ReflectionForm.java	17 Sep 2006 06:27:57 -0000	1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/ReflectionForm.java	15 Nov 2006 06:42:35 -0000	1.3
@@ -46,24 +46,24 @@
 	private String sessionMapID;
 	private String entryText;
 
-    /**
-     * MessageForm validation method from STRUCT interface.
-     * 
-     */
-    public ActionErrors validate(ActionMapping mapping,
-                                 javax.servlet.http.HttpServletRequest request) {
-        ActionErrors errors = new ActionErrors(); 
-        try{
-            if (StringUtils.isBlank(entryText)) {
-               ActionMessage error = new ActionMessage("error.reflection.emtpy");
-               errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-            }
-            
-        } catch (Exception e) {
-            logger.error(e);
-        }
-        return errors;
-    }
+//    /**
+//     * MessageForm validation method from STRUCT interface.
+//     * 
+//     */
+//    public ActionErrors validate(ActionMapping mapping,
+//                                 javax.servlet.http.HttpServletRequest request) {
+//        ActionErrors errors = new ActionErrors(); 
+//        try{
+//            if (StringUtils.isBlank(entryText)) {
+//               ActionMessage error = new ActionMessage("error.reflection.emtpy");
+//               errors.add(ActionMessages.GLOBAL_MESSAGE, error);
+//            }
+//            
+//        } catch (Exception e) {
+//            logger.error(e);
+//        }
+//        return errors;
+//    }
 
 	public String getEntryText() {
 		return entryText;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v
diff -u -r1.18 -r1.19
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	17 Sep 2006 06:27:55 -0000	1.18
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	15 Nov 2006 06:42:35 -0000	1.19
@@ -54,6 +54,7 @@
 	public static final String ATTR_LIMIT_UPLOAD = "limitUpload";
 	public static final String ATTR_LIMIT_UPLOAD_NUMBER = "limitUploadNumber";
 	public static final Object ATTR_ARRIVE_LIMIT = "arriveLimit";
+	public static final String ATTR_USER_FINISHED = "userFinished";
 
 }
 
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.37 -r1.38
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	17 Sep 2006 06:27:56 -0000	1.37
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	15 Nov 2006 06:42:35 -0000	1.38
@@ -43,6 +43,8 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.upload.FormFile;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -143,7 +145,7 @@
 		sessionMap.put(SbmtConstants.ATTR_INSTRUCTION,content.getInstruction());
 		sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD,content.isLimitUpload());
 		sessionMap.put(SbmtConstants.ATTR_LIMIT_UPLOAD_NUMBER,content.getLimitUploadNumber());
-
+		sessionMap.put(SbmtConstants.ATTR_USER_FINISHED, learner.isFinished());
 		
 		setLearnerDTO(request, sessionMap, learner, filesUploaded);
 		
@@ -352,6 +354,17 @@
 			dto.setLimitUploadLeft(limitUploadLeft);
 		}
 		
+		// retreive notebook reflection entry.
+		ISubmitFilesService submitFilesService = getService();
+		
+		NotebookEntry notebookEntry = submitFilesService.getEntry((Long)sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID), 
+				CoreNotebookConstants.NOTEBOOK_TOOL, 
+				SbmtConstants.TOOL_SIGNATURE, currUser.getUserID());
+		
+		if ( notebookEntry != null) {
+			dto.setReflect(notebookEntry.getEntry());
+		}
+		
 		request.setAttribute("learner",dto);
 	}
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java	1 Sep 2006 06:45:17 -0000	1.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/ReflectAction.java	15 Nov 2006 06:42:35 -0000	1.2
@@ -13,6 +13,7 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.sbmt.form.ReflectionForm;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
@@ -73,6 +74,17 @@
 		refForm.setUserID(user.getUserID());
 		refForm.setSessionMapID(sessionMapID);
 		
+		// get the existing reflection entry
+		ISubmitFilesService submitFilesService = getService();
+		
+		SessionMap map = (SessionMap)request.getSession().getAttribute(sessionMapID);
+		Long toolSessionID = (Long)map.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+		NotebookEntry entry = submitFilesService.getEntry(toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL, SbmtConstants.TOOL_SIGNATURE, user.getUserID());
+		
+		if (entry != null) {
+			refForm.setEntryText(entry.getEntry());		
+		}
+		
 		return mapping.findForward(SbmtConstants.SUCCESS);
 	}
 	/**
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	9 Nov 2006 23:26:46 -0000	1.13
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	15 Nov 2006 06:42:34 -0000	1.14
@@ -6,15 +6,14 @@
 
 <html:html>
 <head>
-	<title><fmt:message key="tool.display.name" />
-	</title>
-	<html:base />
-	<%@ include file="/common/header.jsp"%>
+<title><fmt:message key="tool.display.name" /></title>
+<html:base />
+<%@ include file="/common/header.jsp"%>
 
-	<link href="<html:rewrite page='/includes/css/tool_custom.css'/>"
-		rel="stylesheet" type="text/css">
+<link href="<html:rewrite page='/includes/css/tool_custom.css'/>"
+	rel="stylesheet" type="text/css">
 
-	<script type="text/javascript">
+<script type="text/javascript">
 		function submitCount(tUrl){
 			var lockOnFinished = <c:out value="${sessionMap.lockOnFinish}"/>;
 			var uploadFileNum = <c:choose><c:when test="${empty learner.filesUploaded}">0</c:when><c:otherwise>1</c:otherwise></c:choose>;
@@ -51,173 +50,165 @@
 
 <body class="stripes">
 
-	<div id="content">
-		<h1>
-			<c:out value="${sessionMap.title}" escapeXml="false" />
-		</h1>
+<div id="content">
+<h1><c:out value="${sessionMap.title}" escapeXml="false" /></h1>
 
-		<p>
-			<c:out value="${sessionMap.instruction}" escapeXml="false" />
-		</p>
+<p><c:out value="${sessionMap.instruction}" escapeXml="false" /></p>
 
-		<%@include file="/common/messages.jsp"%>
-		<c:if test="${sessionMap.limitUpload}">
-			<fmt:message key="message.left.upload.limit">
-				<fmt:param value="${learner.limitUploadLeft}" />
-			</fmt:message>
-		</c:if>
+<%@include file="/common/messages.jsp"%> <c:if
+	test="${sessionMap.limitUpload}">
+	<fmt:message key="message.left.upload.limit">
+		<fmt:param value="${learner.limitUploadLeft}" />
+	</fmt:message>
+</c:if> <!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
+<c:choose>
 
-		<!--Checks if the filesUploaded property of the SbmtLearnerForm is set -->
-		<c:choose>
+	<c:when test="${empty learner.filesUploaded}">
+		<p><fmt:message key="label.learner.noUpload" /></p>
+	</c:when>
 
-			<c:when test="${empty learner.filesUploaded}">
-				<p>
-					<fmt:message key="label.learner.noUpload" />
-				</p>
-			</c:when>
+	<c:otherwise>
+		<c:forEach var="file" items="${learner.filesUploaded}">
 
-			<c:otherwise>
-				<c:forEach var="file" items="${learner.filesUploaded}">
+			<div class="shading-bg">
+			<table>
+				<tr>
+					<!--First Row displaying the name of the File -->
+					<td class="field-name"><fmt:message
+						key="label.learner.fileName" /></td>
+					<td><c:out value="${file.filePath}" /> <c:if
+						test="${file.currentLearner}">
+						<c:set var="downloadURL">
+							<c:url
+								value="/download?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
+						</c:set>
+						<a href="${downloadURL}"><fmt:message key="label.download" /></a>
+					</c:if></td>
+				</tr>
 
-					<div class="shading-bg">
-						<table>
-							<tr>
-								<!--First Row displaying the name of the File -->
-								<td class="field-name">
-									<fmt:message key="label.learner.fileName" />
-								</td>
-								<td>
-									<c:out value="${file.filePath}" />
+				<tr>
+					<!--Second Row displaying the description of the File -->
+					<td class="field-name"><fmt:message
+						key="label.learner.fileDescription" /></td>
+					<td><lams:out value="${file.fileDescription}" /></td>
+				</tr>
 
-									<c:if test="${file.currentLearner}">
-										<c:set var="downloadURL">
-											<c:url
-												value="/download?uuid=${file.uuID}&versionID=${file.versionID}&preferDownload=true" />
-										</c:set>
-										<a href="${downloadURL}"><fmt:message key="label.download" /></a>
-									</c:if>
-								</td>
-							</tr>
+				<tr>
+					<!--Third row displaying the date of submission of the File -->
+					<td class="field-name"><fmt:message key="label.learner.time" />
+					</td>
+					<td><lams:Date value="${file.dateOfSubmission}" /></td>
+				</tr>
 
-							<tr>
-								<!--Second Row displaying the description of the File -->
-								<td class="field-name">
-									<fmt:message key="label.learner.fileDescription" />
-								</td>
-								<td>
-									<lams:out value="${file.fileDescription}" />
-								</td>
-							</tr>
+				<tr>
+					<!--Fourth row displaying the comments -->
+					<td class="field-name"><fmt:message
+						key="label.learner.comments" /></td>
+					<td><c:choose>
+						<c:when test="${empty file.comments}">
+							<fmt:message key="label.learner.notAvailable" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${file.comments}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose></td>
+				</tr>
 
-							<tr>
-								<!--Third row displaying the date of submission of the File -->
-								<td class="field-name">
-									<fmt:message key="label.learner.time" />
-								</td>
-								<td>
-									<lams:Date value="${file.dateOfSubmission}" />
-								</td>
-							</tr>
+				<tr>
+					<!--Fifth row displaying the marks-->
+					<td class="field-name"><fmt:message key="label.learner.marks" />
+					</td>
+					<td><c:choose>
+						<c:when test="${empty file.comments}">
+							<fmt:message key="label.learner.notAvailable" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${file.marks}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose></td>
+				</tr>
+			</table>
+			</div>
+		</c:forEach>
 
-							<tr>
-								<!--Fourth row displaying the comments -->
-								<td class="field-name">
-									<fmt:message key="label.learner.comments" />
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${empty file.comments}">
-											<fmt:message key="label.learner.notAvailable" />
-										</c:when>
-										<c:otherwise>
-											<c:out value="${file.comments}" escapeXml="false" />
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
+	</c:otherwise>
+</c:choose>
 
-							<tr>
-								<!--Fifth row displaying the marks-->
-								<td class="field-name">
-									<fmt:message key="label.learner.marks" />
-								</td>
-								<td>
-									<c:choose>
-										<c:when test="${empty file.comments}">
-											<fmt:message key="label.learner.notAvailable" />
-										</c:when>
-										<c:otherwise>
-											<c:out value="${file.marks}" escapeXml="false" />
-										</c:otherwise>
-									</c:choose>
-								</td>
-							</tr>
-						</table>
-					</div>
-				</c:forEach>
 
-			</c:otherwise>
-		</c:choose>
 
+<div class="last-item"></div>
 
+<c:if test="${sessionMap.mode != 'teacher'}">
+	<html:form action="/learner?method=uploadFile" method="post"
+		enctype="multipart/form-data">
+		<html:hidden property="sessionMapID" />
 
-		<div class="last-item"></div>
+		<!-- Hidden fields -->
+		<html:hidden property="toolSessionID"
+			value="${sessionMap.toolSessionID}" />
 
-		<c:if test="${sessionMap.mode != 'teacher'}">
-			<html:form action="/learner?method=uploadFile" method="post"
-				enctype="multipart/form-data">
-				<html:hidden property="sessionMapID" />
+		<!--File path row -->
+		<div class="field-name"><fmt:message
+			key="label.learner.filePath" /></div>
 
-				<!-- Hidden fields -->
-				<html:hidden property="toolSessionID"
-					value="${sessionMap.toolSessionID}" />
+		<html:file property="file"
+			disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
+			size="40" tabindex="1" />
 
-				<!--File path row -->
-				<div class="field-name">
-					<fmt:message key="label.learner.filePath" />
-				</div>
+		<!--File Description row -->
+		<div class="field-name space-top"><fmt:message
+			key="label.learner.fileDescription" /></div>
+		<html:textarea rows="5" cols="40" tabindex="2" styleClass="text-area"
+			property="description"
+			disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
 
-				<html:file property="file"
-					disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
-					size="40" tabindex="1" />
+		<div class="small-space-top"><html:submit
+			disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
+			styleClass="button">
+			<fmt:message key="label.learner.upload" />
+		</html:submit></div>
 
-				<!--File Description row -->
-				<div class="field-name space-top">
-					<fmt:message key="label.learner.fileDescription" />
-				</div>
-				<html:textarea rows="5" cols="40" tabindex="2"
-					styleClass="text-area" property="description"
-					disabled="${sessionMap.finishLock || sessionMap.arriveLimit}" />
+		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+			<div class="small-space-top">
+				<h2>${sessionMap.reflectInstructions}</h2>
+				
+				<c:choose>
+					<c:when test="${empty learner.reflect}">
+						<em>
+							<fmt:message key="no.reflection.available" />
+						</em>
+					</c:when>
+					<c:otherwise>
+						<p> <c:out escapeXml="true" value="${learner.reflect}" />  </p>				
+					</c:otherwise>
+				</c:choose>
+				
+				<html:button property="notebookButton"
+					onclick="javascript:notebook();" styleClass="button">
+					<fmt:message key="label.edit" />					
+				</html:button>				
+								
+			</div>
+		</c:if>
 
-				<div class="small-space-top">
-					<html:submit
-						disabled="${sessionMap.finishLock || sessionMap.arriveLimit}"
-						styleClass="button">
-						<fmt:message key="label.learner.upload" />
-					</html:submit>
-				</div>
+		<div class="space-bottom-top" align="right"><c:choose>
+			<c:when
+				test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
+				<html:button property="notebookButton"
+					onclick="javascript:notebook();" styleClass="button">
+					<fmt:message key="label.continue" />
+				</html:button>
+			</c:when>
+			<c:otherwise>
+				<html:button property="finishButton" onclick="javascript:finish();"
+					styleClass="button">
+					<fmt:message key="button.finish" />
+				</html:button>
+			</c:otherwise>
+		</c:choose></div>
 
-				<div class="space-bottom-top" align="right">
-					<c:choose>
-						<c:when
-							test="${sessionMap.reflectOn and (not sessionMap.finishLock)}">
-							<html:button property="notebookButton"
-								onclick="javascript:notebook();" styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:button>
-						</c:when>
-						<c:otherwise>
-							<html:button property="finishButton"
-								onclick="javascript:finish();" styleClass="button">
-								<fmt:message key="button.finish" />
-							</html:button>
-						</c:otherwise>
-					</c:choose>
-				</div>
-
-			</html:form>
-		</c:if>
-	</div>
-	<div id="footer"></div>
+	</html:form>
+</c:if></div>
+<div id="footer"></div>
 </body>
 </html:html>