Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java
===================================================================
diff -u -r9bd48180632126e711896a486782d581e2e78750 -ra99e23fb3a32273bb906230e7314380ccd8e03f8
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision 9bd48180632126e711896a486782d581e2e78750)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearnerController.java	(.../LearnerController.java)	(revision a99e23fb3a32273bb906230e7314380ccd8e03f8)
@@ -27,7 +27,6 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.SortedMap;
 import java.util.TimeZone;
 
@@ -57,6 +56,7 @@
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SubmitFilesException;
 import org.lamsfoundation.lams.tool.sbmt.web.form.LearnerForm;
+import org.lamsfoundation.lams.tool.sbmt.web.form.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
@@ -66,7 +66,6 @@
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.filter.LocaleFilter;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -98,7 +97,7 @@
 
     @Autowired
     @Qualifier("sbmtMessageService")
-    private MessageService messageService;
+    private static MessageService messageService;
 
     @Autowired
     private WebApplicationContext applicationContext;
@@ -124,9 +123,9 @@
 	if (mode == null) {
 	    mode = ToolAccessMode.LEARNER;
 	}
-	
+
 	Long sessionID = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID));
-	
+
 	// get session from shared session.
 	HttpSession ss = SessionManager.getSession();
 
@@ -223,6 +222,7 @@
 		List<SubmitUser> groupUsers = submitFilesService.getUsersBySession(new Long(sessionID).longValue());
 		request.setAttribute(SbmtConstants.ATTR_GROUP_USERS, groupUsers);
 		request.setAttribute(SbmtConstants.ATTR_SUBMIT_FILES, submittedFilesMap);
+		request.setAttribute(SbmtConstants.PARAM_WAITING_MESSAGE_KEY, "label.waiting.for.leader");
 		return "learner/waitForLeaderTimeLimit";
 	    }
 
@@ -523,4 +523,89 @@
 	}
     }
 
+    /**
+     * Display empty reflection form.
+     */
+    @RequestMapping("/newReflection")
+    public String newReflection(@ModelAttribute ReflectionForm refForm, HttpServletRequest request,
+	    HttpServletResponse response) {
+
+//		ISubmitFilesService submitFilesService = getService();
+//		ActionErrors errors = validateBeforeFinish(request,submitFilesService);
+//		if(!errors.isEmpty()){
+//			this.addErrors(request,errors);
+//			return mapping.getInputForward();
+//		}
+
+	//get session value
+	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
+	request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+
+	refForm.setUserID(user.getUserID());
+	refForm.setSessionMapID(sessionMapID);
+
+	// get the existing reflection entry
+
+	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 "learner/notebook";
+    }
+
+    /**
+     * Submit reflection form input database.
+     */
+    @RequestMapping("/submitReflection")
+    public String submitReflection(@ModelAttribute ReflectionForm refForm, HttpServletRequest request) {
+	Integer userId = refForm.getUserID();
+
+	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
+	request.setAttribute(SbmtConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	// check for existing notebook entry
+	NotebookEntry entry = submitFilesService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		SbmtConstants.TOOL_SIGNATURE, userId);
+
+	if (entry == null) {
+	    // create new entry
+	    submitFilesService.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    SbmtConstants.TOOL_SIGNATURE, userId, refForm.getEntryText());
+	} else {
+	    // update existing entry
+	    entry.setEntry(refForm.getEntryText());
+	    entry.setLastModified(new Date());
+	    submitFilesService.updateEntry(entry);
+	}
+
+	return "learner/finish";
+    }
+
+    public static void validateBeforeFinish(HttpServletRequest request, ISubmitFilesService submitFilesService) {
+	String sessionMapID = WebUtil.readStrParam(request, SbmtConstants.ATTR_SESSION_MAP_ID);
+	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID);
+	Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+
+	HttpSession ss = SessionManager.getSession();
+	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	Integer userID = user.getUserID();
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	List list = submitFilesService.getFilesUploadedByUser(userID, sessionId, request.getLocale(), false);
+	int minUpload = (Integer) sessionMap.get(SbmtConstants.PARAM_MIN_UPLOAD);
+	if (minUpload > 0) {
+	    errorMap.add("GLOBAL", messageService.getMessage("error.learning.minimum.upload.number.less"));
+	}
+    }
+
 }
Fisheye: Tag a99e23fb3a32273bb906230e7314380ccd8e03f8 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/ReflectController.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/learner/notebook.jsp
===================================================================
diff -u -r9bd48180632126e711896a486782d581e2e78750 -ra99e23fb3a32273bb906230e7314380ccd8e03f8
--- lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
+++ lams_tool_sbmt/web/learner/notebook.jsp	(.../notebook.jsp)	(revision a99e23fb3a32273bb906230e7314380ccd8e03f8)
@@ -26,10 +26,10 @@
 		</div>
 
 		<div class="form-group">
-			<form:form action="learning/submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="refForm" id="messageForm">
+			<form:form action="submitReflection.do" method="post" onsubmit="disableFinishButton();" modelAttribute="refForm" id="refForm">
 				<form:hidden path="userID" />
 				<form:hidden path="sessionMapID" />
-				<form:textarea path="entryText" cssClass="form-control" id="focused" rows="5" />
+				<form:textarea path="entryText" cssClass="form-control" id="focused" rows="5"></form:textarea>
 
 
 				<button class="btn btn-primary voffset10 pull-right na" id="finishButton" type="submit">
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
diff -u -r9bd48180632126e711896a486782d581e2e78750 -ra99e23fb3a32273bb906230e7314380ccd8e03f8
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision 9bd48180632126e711896a486782d581e2e78750)
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	(.../sbmtlearner.jsp)	(revision a99e23fb3a32273bb906230e7314380ccd8e03f8)
@@ -52,7 +52,7 @@
 			return submitCount(finishUrl);
 		}
 		function notebook() {
-			var continueUrl = "<lams:WebAppURL />learning/newReflection.do?sessionMapID=${sessionMapID}";
+			var continueUrl = "<lams:WebAppURL />learner/newReflection.do?sessionMapID=${sessionMapID}";
 			return submitCount(continueUrl);
 		}
 		function validate() {
@@ -107,7 +107,7 @@
 				 $.ajax({
 			            data: 'detailId=' + detailId,
 			            success: function () {
-			            	document.location.href = "<lams:WebAppURL />learner/"+${sessionMap.mode}+".do?toolSessionID=+"${sessionMap.toolSessionID};
+			            	document.location.href = "<lams:WebAppURL />learner/"+${sessionMap.mode}+".do?toolSessionID="+${sessionMap.toolSessionID};
 			            },
 			            error: function(error){
 			                alert("readyState: "+xhr.readyState+"\nstatus: "+xhr.status);
@@ -116,6 +116,7 @@
 			       	});
 			}
 		}
+
 	</script>
 
 </lams:head>
@@ -358,7 +359,7 @@
 					</div>
 
 					<c:if test="${sessionMap.mode != 'teacher'}">
-					<button name="notebookButton" style="margin-top: 10px" onclick="javascript:notebook();"
+					<button id="notebookButton" name="notebookButton" style="margin-top: 10px" onclick="javascript:notebook();"
 						class="btn btn-sm btn-primary btn-disable-on-submit pull-left" >
 						<fmt:message key="label.edit" />
 					</button>
@@ -371,12 +372,12 @@
 		<c:if test="${sessionMap.mode != 'teacher'}">
 		<c:choose>
 			<c:when test="${sessionMap.reflectOn and (not sessionMap.userFinished)}">
-				<button name="notebookButton" onclick="javascript:notebook();" class="btn btn-primary btn-disable-on-submit pull-right">
+				<button id="notebookButton" onclick="javascript:notebook();" class="btn btn-primary btn-disable-on-submit pull-right">
 					<fmt:message key="label.continue" />
-				</button>
+					</button>
 			</c:when>
 			<c:otherwise>
-				<button type="submit"  onclick="javascript:finish();" class="btn btn-primary btn-disable-on-submit pull-right na" id="finishButton">
+				<button type="submit" onclick="javascript:finish();" class="btn btn-primary btn-disable-on-submit pull-right na" id="finishButton">
 					<c:choose>
 						<c:when test="${activityPosition.last}">
 							<fmt:message key="button.submit" />