Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/xdoclet/struts-actions.xml,v
diff -u -r1.15 -r1.16
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml	6 Dec 2013 14:49:49 -0000	1.15
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml	19 Dec 2013 08:50:10 -0000	1.16
@@ -190,6 +190,7 @@
 			parameter="start" >
 			<forward name="success" path="/pages/learning/start.jsp" />
 			<forward name="waitforleader" path="/pages/learning/waitforleader.jsp" />
+			<forward name="newReflection" path="/learning/newReflection.do" />
 			<forward name="showResults" path="/learning/showResults.do" />
 			<forward name="defineLater" path="/pages/learning/definelater.jsp" />
 			<forward name="runOffline" path="/pages/learning/runoffline.jsp" />			
@@ -199,6 +200,10 @@
 			parameter="refreshQuestionList" >
 			<forward name="success" path="/pages/learning/questionlist.jsp" />		
 		</action>
+		<action path="/learning/checkLeaderSubmittedNotebook"
+			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
+			parameter="checkLeaderSubmittedNotebook" >
+		</action>
 		<action path="/learning/isAnswerCorrect"
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.LearningAction"
 			parameter="isAnswerCorrect" >
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java,v
diff -u -r1.15 -r1.16
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	11 Dec 2013 17:56:40 -0000	1.15
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	19 Dec 2013 08:50:10 -0000	1.16
@@ -105,6 +105,8 @@
     
     public static final String ATTR_IS_SCRATCHING_FINISHED = "isScratchingFinished";
     
+    public static final String ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK = "isWaitingForLeaderToSubmitNotebook";
+    
     public static final String ATTR_LEARNERS = "learners";
     
     public static final String ATTR_VISIT_LOGS = "visitLogs";
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java,v
diff -u -r1.34 -r1.35
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	17 Dec 2013 22:26:24 -0000	1.34
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java	19 Dec 2013 08:50:10 -0000	1.35
@@ -96,6 +96,9 @@
 	if (param.equals("refreshQuestionList")) {
 	    return refreshQuestionList(mapping, form, request, response);
 	}
+	if (param.equals("checkLeaderSubmittedNotebook")) {
+	    return checkLeaderSubmittedNotebook(mapping, form, request, response);
+	}
 	if (param.equals("isAnswerCorrect")) {
 	    return isAnswerCorrect(mapping, form, request, response);
 	}
@@ -209,15 +212,12 @@
 	request.setAttribute(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 
 	// get notebook entry
-	String entryText = new String();
+	NotebookEntry notebookEntry = null;
 	if (isReflectOnActivity && (groupLeader != null)) {
-	    NotebookEntry notebookEntry = LearningAction.service.getEntry(toolSessionId,
-		    CoreNotebookConstants.NOTEBOOK_TOOL, ScratchieConstants.TOOL_SIGNATURE, groupLeader.getUserId()
-			    .intValue());
-	    if (notebookEntry != null) {
-		entryText = notebookEntry.getEntry();
-	    }
+	    notebookEntry = LearningAction.service.getEntry(toolSessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    ScratchieConstants.TOOL_SIGNATURE, groupLeader.getUserId().intValue());
 	}
+	String entryText = (notebookEntry == null) ? new String() : notebookEntry.getEntry();
 
 	// basic information
 	sessionMap.put(ScratchieConstants.ATTR_TITLE, scratchie.getTitle());
@@ -331,10 +331,19 @@
 	sessionMap.put(ScratchieConstants.ATTR_MAX_SCORE, maxScore);
 	
 	boolean isScratchingFinished = toolSession.isScratchingFinished();
-
-	// decide whether to show results page or learning one
-	boolean isShowResults = isScratchingFinished && !mode.isTeacher();
-	if (isShowResults) {
+	boolean isWaitingForLeaderToSubmitNotebook = isReflectOnActivity && (notebookEntry == null);
+	boolean isShowResults = (isScratchingFinished && !isWaitingForLeaderToSubmitNotebook) && !mode.isTeacher();
+	
+	//show leader notebook page 
+	if (isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitNotebook) {
+	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("newReflection"));
+	    redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	    redirect.addParameter(AttributeNames.ATTR_MODE, mode);
+	    return redirect;
+	    
+	// show results page
+	} else if (isShowResults) {
+	
 	    ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("showResults"));
 	    redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    redirect.addParameter(AttributeNames.ATTR_MODE, mode);
@@ -343,13 +352,17 @@
 			+ "]: leaving start()");
 	    }
 	    return redirect;
+	    
+	//show learning.jsp page
 	} else {
 	    if (LearningAction.log.isDebugEnabled()) {
 		LearningAction.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
 			+ "]: leaving start()");
 	    }
-	    
+
 	    sessionMap.put(ScratchieConstants.ATTR_IS_SCRATCHING_FINISHED, (Boolean) isScratchingFinished);
+	    sessionMap.put(ScratchieConstants.ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK,
+		    (Boolean) isWaitingForLeaderToSubmitNotebook);
 	    return mapping.findForward(ScratchieConstants.SUCCESS);
 	}
 
@@ -405,7 +418,48 @@
 	}
 	return mapping.findForward(ScratchieConstants.SUCCESS);
     }
+    
+    /**
+     * Return whether leader still needs submit notebook.
+     */
+    private ActionForward checkLeaderSubmittedNotebook(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException {
+	if (LearningAction.log.isDebugEnabled()) {
+	    LearningAction.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
+		    + "]: entered checkLeaderSubmittedNotebook()");
+	}
+	initializeScratchieService();
+	
+	// get back SessionMap
+	String sessionMapID = request.getParameter(ScratchieConstants.ATTR_SESSION_MAP_ID);
+	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(
+		sessionMapID);
+	boolean isReflectOnActivity = (Boolean) sessionMap.get(ScratchieConstants.ATTR_REFLECTION_ON);
+	Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
+	
+	ScratchieSession toolSession = service.getScratchieSessionBySessionId(toolSessionId);
+	ScratchieUser groupLeader = toolSession.getGroupLeader();
+	
+	// get notebook entry
+	NotebookEntry notebookEntry = null;
+	if (isReflectOnActivity && (groupLeader != null)) {
+	    notebookEntry = service.getEntry(toolSessionId, CoreNotebookConstants.NOTEBOOK_TOOL,
+		    ScratchieConstants.TOOL_SIGNATURE, groupLeader.getUserId().intValue());
+	}
+	boolean isWaitingForLeaderToSubmitNotebook = isReflectOnActivity && (notebookEntry == null);
 
+	JSONObject JSONObject = new JSONObject();
+	JSONObject.put(ScratchieConstants.ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK, isWaitingForLeaderToSubmitNotebook);
+	response.setContentType("application/x-json;charset=utf-8");
+	response.getWriter().print(JSONObject);
+
+	if (LearningAction.log.isDebugEnabled()) {
+	    LearningAction.log.debug("LKC:[" + Thread.currentThread().getId() + "|" + Thread.activeCount()
+		    + "]: leaving checkLeaderSubmittedNotebook()");
+	}
+	return null;
+    }
+
     /**
      * Return whether scratchie answer is correct or not
      */
Index: lams_tool_scratchie/web/pages/learning/questionlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/questionlist.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_scratchie/web/pages/learning/questionlist.jsp	17 Dec 2013 22:26:25 -0000	1.9
+++ lams_tool_scratchie/web/pages/learning/questionlist.jsp	19 Dec 2013 08:50:10 -0000	1.10
@@ -11,14 +11,48 @@
 <c:set var="scratchie" value="${sessionMap.scratchie}" />
 <c:set var="isUserLeader" value="${sessionMap.isUserLeader}" />
 <c:set var="isScratchingFinished" value="${sessionMap.isScratchingFinished}" />
+<c:set var="isWaitingForLeaderToSubmitNotebook" value="${sessionMap.isWaitingForLeaderToSubmitNotebook}" />
 
 <!-- isUserLeader=${sessionMap.isUserLeader} -->
 
 <script type="text/javascript">
+
 	//stop refreshing non-leaders in case scratching is finished
 	if (${isScratchingFinished} && (refreshIntervalId != null)) {
 		clearInterval(refreshIntervalId);
 	}
+	
+	//hide finish button if isWaitingForLeaderToSubmitNotebook
+	$(document).ready(function(){
+		if (${!isUserLeader && isWaitingForLeaderToSubmitNotebook}) {
+			$("#finishButton").hide();
+		}
+	});
+	
+	//query for leader status (only in case there is notebook at the end of activity and leader hasn't answered it yet)
+	var checkLeaderIntervalId = null;
+	if (${!isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitNotebook && mode != "teacher"}) {
+		checkLeaderIntervalId = setInterval("checkLeaderSubmittedNotebook();",20000);// ask for leader status every 20 seconds
+	}
+	
+	//check Leader Submitted Notebook and if true show finishButton
+	function checkLeaderSubmittedNotebook() {
+        $.ajax({
+            url: '<c:url value="/learning/checkLeaderSubmittedNotebook.do"/>',
+            data: 'sessionMapID=${sessionMapID}',
+            dataType: 'json',
+            type: 'post',
+            success: function (json) {
+            	if (!json.isWaitingForLeaderToSubmitNotebook) {
+            		if (checkLeaderIntervalId != null) {
+            			clearInterval(checkLeaderIntervalId);
+            		}
+					
+					$("#finishButton").show();
+            	}
+            }
+       	});
+	}
 </script>
 
 		<c:forEach var="item" items="${sessionMap.itemList}" varStatus="status">
@@ -87,20 +121,19 @@
 			</div>
 		</c:if>
 
-		<c:if test="${(mode != 'teacher') &&  (isUserLeader || isScratchingFinished)}">
-			<div class="space-bottom-top align-right">
-				<c:choose>
-					<c:when test="${sessionMap.reflectOn && isUserLeader}">
-						<html:button property="finishButton" styleId="finishButton" onclick="return continueReflect()" styleClass="button">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
-					<c:otherwise>
-						<html:button property="finishButton" styleId="finishButton" onclick="return finish()" styleClass="button">
-							<fmt:message key="label.submit" />
-						</html:button>
-					</c:otherwise>
-				</c:choose>
-			</div>
-		</c:if>
-		
\ No newline at end of file
+<c:if test="${mode != 'teacher'}">
+	<div class="space-bottom-top align-right">
+		<c:choose>
+			<c:when test="${isUserLeader && sessionMap.reflectOn}">
+				<html:button property="finishButton" styleId="finishButton" onclick="return continueReflect()" styleClass="button">
+					<fmt:message key="label.continue" />
+				</html:button>
+			</c:when>
+			<c:when test="${isUserLeader && !sessionMap.reflectOn || !isUserLeader && isScratchingFinished}">
+				<html:button property="finishButton" styleId="finishButton" onclick="return finish()" styleClass="button">
+					<fmt:message key="label.submit" />
+				</html:button>
+			</c:when>
+		</c:choose>
+	</div>
+</c:if>
\ No newline at end of file