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.20.2.1 -r1.20.2.2 --- lams_tool_scratchie/conf/xdoclet/struts-actions.xml 13 Feb 2015 23:51:29 -0000 1.20.2.1 +++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml 3 Jul 2015 15:42:12 -0000 1.20.2.2 @@ -162,6 +162,7 @@ + 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.44.2.3 -r1.44.2.4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 3 Jul 2015 15:39:33 -0000 1.44.2.3 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 3 Jul 2015 15:42:12 -0000 1.44.2.4 @@ -294,10 +294,19 @@ boolean isScratchingFinished = toolSession.isScratchingFinished(); boolean isWaitingForLeaderToSubmitNotebook = isReflectOnActivity && (notebookEntry == null); - boolean isShowResults = (isScratchingFinished && !isWaitingForLeaderToSubmitNotebook) && !mode.isTeacher(); + boolean isWaitingForLeaderToSubmitBurningQuestions = scratchie.isBurningQuestionsEnabled() + && (burningQuestions == null || burningQuestions.isEmpty()); + boolean isShowResults = (isScratchingFinished && !isWaitingForLeaderToSubmitNotebook && !isWaitingForLeaderToSubmitBurningQuestions) + && !mode.isTeacher(); + + //show leader showBurningQuestions page + if (isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitBurningQuestions) { + ActionRedirect redirect = new ActionRedirect(mapping.findForwardConfig("showBurningQuestions")); + redirect.addParameter(ScratchieConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); + return redirect; //show leader notebook page - if (isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitNotebook) { + } else 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); @@ -315,8 +324,7 @@ } else { //make non leaders also wait for burning questions submit - isWaitingForLeaderToSubmitNotebook |= scratchie.isBurningQuestionsEnabled() - && (burningQuestions == null || burningQuestions.isEmpty()); + isWaitingForLeaderToSubmitNotebook |= isWaitingForLeaderToSubmitBurningQuestions; sessionMap.put(ScratchieConstants.ATTR_IS_SCRATCHING_FINISHED, (Boolean) isScratchingFinished); sessionMap.put(ScratchieConstants.ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK,