Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.30 -r1.31
--- lams_tool_forum/conf/language/ApplicationResources.properties	3 Nov 2006 05:02:02 -0000	1.30
+++ lams_tool_forum/conf/language/ApplicationResources.properties	20 Nov 2006 05:29:11 -0000	1.31
@@ -169,3 +169,5 @@
 
 
 #======= End labels: Exported 160 labels for en AU =====
+
+message.no.reflection.available = No notebook available
\ No newline at end of file
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v
diff -u -r1.43 -r1.44
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	2 Nov 2006 06:15:51 -0000	1.43
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	20 Nov 2006 05:29:11 -0000	1.44
@@ -226,7 +226,7 @@
 		<action path="/learning/submitReflection"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.LearningAction"
 			name="reflectionForm" 
-			validate="true" 
+			validate="false" 
 			input="tiles:/learning/reflection"
 			parameter="submitReflection" 
 			scope="request">
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v
diff -u -r1.44 -r1.45
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	2 Nov 2006 06:15:51 -0000	1.44
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	20 Nov 2006 05:29:11 -0000	1.45
@@ -79,6 +79,8 @@
 
 	public static final String ATTR_FINISHED_LOCK = "finishedLock";
 	
+	public static final String ATTR_USER_FINISHED = "userFinished";
+	
 	// used in monitoring 
 	public static final String TITLE = "title";
 	public static final String INSTRUCTIONS = "instructions";
@@ -107,6 +109,7 @@
 	public static final String ATTR_TOPIC_ID = "topicID";
 	public static final String ATTR_REFLECTION_ON = "reflectOn";
 	public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
+	public static final String ATTR_REFLECTION_ENTRY = "reflectEntry";
 	
 	public static final String MARK_UPDATE_FROM_SESSION = "listAllMarks";
 	public static final String MARK_UPDATE_FROM_USER = "listMarks";
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.52 -r1.53
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	2 Nov 2006 01:46:35 -0000	1.52
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	20 Nov 2006 05:29:11 -0000	1.53
@@ -44,6 +44,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.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
@@ -201,16 +202,27 @@
 		Boolean allowRichEditor = new Boolean(forum.isAllowRichEditor());
 		int allowNumber = forum.getLimitedChar();
 		
+		// get notebook entry
+		String entryText = new String();
+		NotebookEntry notebookEntry = forumService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, 
+				ForumConstants.TOOL_SIGNATURE, forumUser.getUserId().intValue());
+		
+		if (notebookEntry != null) {
+			entryText = notebookEntry.getEntry();
+		}
+		
 		sessionMap.put(ForumConstants.FORUM_ID, forumId);
 		sessionMap.put(AttributeNames.ATTR_MODE, mode);
 		sessionMap.put(ForumConstants.ATTR_FINISHED_LOCK, new Boolean(lock));
+		sessionMap.put(ForumConstants.ATTR_USER_FINISHED, forumUser.isSessionFinished());
 		sessionMap.put(ForumConstants.ATTR_ALLOW_EDIT, forum.isAllowEdit());
 		sessionMap.put(ForumConstants.ATTR_ALLOW_UPLOAD,forum.isAllowUpload());
 		sessionMap.put(ForumConstants.ATTR_ALLOW_NEW_TOPICS,forum.isAllowNewTopic());
 		sessionMap.put(ForumConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
 		sessionMap.put(ForumConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber));
 		sessionMap.put(ForumConstants.ATTR_REFLECTION_ON,forum.isReflectOnActivity());
 		sessionMap.put(ForumConstants.ATTR_REFLECTION_INSTRUCTION,forum.getReflectInstructions());
+		sessionMap.put(ForumConstants.ATTR_REFLECTION_ENTRY, entryText);
 		sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
 		sessionMap.put(ForumConstants.ATTR_FORUM_TITLE,forum.getTitle());
 		sessionMap.put(ForumConstants.ATTR_FORUM_INSTRCUTION,forum.getInstructions());
@@ -342,6 +354,17 @@
 		refForm.setUserID(user.getUserID());
 		refForm.setSessionMapID(sessionMapID);
 		
+		// get the existing reflection entry
+		IForumService submitFilesService = getForumManager();
+		
+		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, ForumConstants.TOOL_SIGNATURE, user.getUserID());
+		
+		if (entry != null) {
+			refForm.setEntryText(entry.getEntry());
+		}
+		
 		return mapping.findForward("success");
 	}
 	// ==========================================================================================
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ReflectionForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ReflectionForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ReflectionForm.java	17 Sep 2006 06:22:30 -0000	1.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ReflectionForm.java	20 Nov 2006 05:29:11 -0000	1.3
@@ -46,25 +46,6 @@
 	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;
-    }
-
 	public String getEntryText() {
 		return entryText;
 	}
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewforum.jsp,v
diff -u -r1.17 -r1.18
--- lams_tool_forum/web/jsps/learning/viewforum.jsp	16 Nov 2006 07:57:13 -0000	1.17
+++ lams_tool_forum/web/jsps/learning/viewforum.jsp	20 Nov 2006 05:29:11 -0000	1.18
@@ -9,81 +9,95 @@
 
 
 	<div class="small-space-top">
-
 		<c:out value="${sessionMap.instruction}" escapeXml="false" />
-
-		</div>
+	</div>
 		
-		<%@ include file="/common/messages.jsp"%>
+	<%@ include file="/common/messages.jsp"%>
 
-		
+	<%@ include file="/jsps/learning/message/topiclist.jsp"%>
 
-			<%@ include file="/jsps/learning/message/topiclist.jsp"%>
+	<c:set var="newtopic">
+		<html:rewrite
+			page="/learning/newTopic.do?sessionMapID=${sessionMapID}" />
+	</c:set>
+	
+	<c:set var="refresh">
+		<html:rewrite
+			page="/learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
+	</c:set>
+	
+	<c:set var="continue">
+		<html:rewrite
+			page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
+	</c:set>
+	
+	<c:set var="finish">
+		<html:rewrite
+			page="/learning/finish.do?sessionMapID=${sessionMapID}" />
+	</c:set>
 
-
-			<c:set var="newtopic">
-				<html:rewrite
-					page="/learning/newTopic.do?sessionMapID=${sessionMapID}" />
-			</c:set>
-			<c:set var="refresh">
-				<html:rewrite
-					page="/learning/viewForum.do?mode=${sessionMap.mode}&toolSessionID=${sessionMap.toolSessionID}&sessionMapID=${sessionMapID}" />
-			</c:set>
-			<c:set var="continue">
-				<html:rewrite
-					page="/learning/newReflection.do?sessionMapID=${sessionMapID}" />
-			</c:set>
-			<c:set var="finish">
-				<html:rewrite
-					page="/learning/finish.do?sessionMapID=${sessionMapID}" />
-			</c:set>
-
-
-
-			<div class="right-buttons">
-				<c:if test='${sessionMap.mode != "teacher"}'>
-					<c:choose>
-						<c:when
-							test="${sessionMap.reflectOn && (not sessionMap.finishedLock)}">
-							<html:button property="continue"
-								onclick="javascript:location.href='${continue}';"
-								styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:button>
-						</c:when>
-						<c:otherwise>
-							<html:button property="finish"
-								onclick="javascript:location.href='${finish}';"
-								styleClass="button">
-								<fmt:message key="label.finish" />
-							</html:button>
-						</c:otherwise>
-					</c:choose>
-				</c:if>
-
-
-
-			</div>
-
-
-			<div class="space-bottom">
-				<c:if	test='${sessionMap.mode != "teacher" && sessionMap.allowNewTopics}'>
-					<html:button property="newtopic"
-						onclick="javascript:location.href='${newtopic}';"
-						disabled="${sessionMap.finishedLock}" styleClass="button">
-						<fmt:message key="label.newtopic" />
+	<div>
+		<c:if	test='${sessionMap.mode != "teacher" && sessionMap.allowNewTopics}'>
+			<html:button property="newtopic"
+				onclick="javascript:location.href='${newtopic}';"
+				disabled="${sessionMap.finishedLock}" styleClass="button">
+				<fmt:message key="label.newtopic" />
+			</html:button>
+		</c:if>
+		
+		<html:button property="refresh"
+			onclick="javascript:location.href='${refresh}';"
+			styleClass="button">
+			<fmt:message key="label.refresh" />
+		</html:button>
+	</div>
+	
+	<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
+		<div class="small-space-top">
+			<h2>${sessionMap.reflectInstructions}</h2>
+	
+			<c:choose>
+				<c:when test="${empty sessionMap.reflectEntry}">
+					<p>
+						<em>
+							<fmt:message key="message.no.reflection.available" />
+						</em>
+					</p>
+				</c:when>
+				<c:otherwise>
+					<p> <lams:out escapeXml="true" value="${sessionMap.reflectEntry}" />  </p>				
+				</c:otherwise>
+			</c:choose>
+			
+			<html:button property="continue"
+				onclick="javascript:location.href='${continue}';"
+				styleClass="button">
+				<fmt:message key="label.edit" />
+			</html:button>											
+		</div>
+	</c:if>
+	
+	<div align="right">
+		<c:if test='${sessionMap.mode != "teacher"}'>
+			<c:choose>
+				<c:when
+					test="${sessionMap.reflectOn && (not sessionMap.userFinished)}">
+					<html:button property="continue"
+						onclick="javascript:location.href='${continue}';"
+						styleClass="button">
+						<fmt:message key="label.continue" />
 					</html:button>
-				</c:if>
-				<html:button property="refresh"
-					onclick="javascript:location.href='${refresh}';"
-					styleClass="button">
-					<fmt:message key="label.refresh" />
-				</html:button>
-
-			</div>
-
-
-
-
-
-		</div>
\ No newline at end of file
+				</c:when>
+	
+				<c:otherwise>
+					<html:button property="finish"
+						onclick="javascript:location.href='${finish}';"
+						styleClass="button">
+						<fmt:message key="label.finish" />
+					</html:button>
+				</c:otherwise>
+	
+			</c:choose>
+		</c:if>
+	</div>
+</div>
\ No newline at end of file