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.22 -r1.23
--- lams_tool_scratchie/conf/xdoclet/struts-actions.xml 12 Feb 2015 23:14:35 -0000 1.22
+++ lams_tool_scratchie/conf/xdoclet/struts-actions.xml 5 May 2015 23:39:53 -0000 1.23
@@ -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.49 -r1.50
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 5 May 2015 23:11:42 -0000 1.49
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java 5 May 2015 23:39:53 -0000 1.50
@@ -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,