Index: lams_tool_scratchie/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r48254dfc21feff77f6873023998798430649b7a5 -rfcd37060ecca18e6c4a2cac2fa0d888aa968a6ff
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 48254dfc21feff77f6873023998798430649b7a5)
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision fcd37060ecca18e6c4a2cac2fa0d888aa968a6ff)
@@ -162,6 +162,7 @@
+
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
===================================================================
diff -u -rf1a2f2da6585328f8e5ad794cfcc0cb7865367f1 -rfcd37060ecca18e6c4a2cac2fa0d888aa968a6ff
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision f1a2f2da6585328f8e5ad794cfcc0cb7865367f1)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision fcd37060ecca18e6c4a2cac2fa0d888aa968a6ff)
@@ -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,