Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml =================================================================== diff -u -r2adb14cdb105f3e0e72bd3c052e9dc254949049b -r0e47151ba97eed4c2638f8dcc4fff17d4d0d225c --- lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 2adb14cdb105f3e0e72bd3c052e9dc254949049b) +++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 0e47151ba97eed4c2638f8dcc4fff17d4d0d225c) @@ -162,6 +162,7 @@ + Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== diff -u -rfbadc809bd7685aef92f0b4e25408e35dfa1e188 -r0e47151ba97eed4c2638f8dcc4fff17d4d0d225c --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision fbadc809bd7685aef92f0b4e25408e35dfa1e188) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 0e47151ba97eed4c2638f8dcc4fff17d4d0d225c) @@ -304,10 +304,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); @@ -325,8 +334,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,