Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java =================================================================== diff -u -r2e99c1104aacb7715e4a8731bab1d90b02e89ba9 -r3b18838d7e4786ef34e83e7c9fc3740553279510 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 2e99c1104aacb7715e4a8731bab1d90b02e89ba9) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java (.../LearningAction.java) (revision 3b18838d7e4786ef34e83e7c9fc3740553279510) @@ -305,7 +305,7 @@ boolean isScratchingFinished = toolSession.isScratchingFinished(); boolean isWaitingForLeaderToSubmitNotebook = isReflectOnActivity && (notebookEntry == null); boolean isWaitingForLeaderToSubmitBurningQuestions = scratchie.isBurningQuestionsEnabled() - && (burningQuestions == null || burningQuestions.isEmpty()); + && (burningQuestions == null || burningQuestions.isEmpty()) && !toolSession.isSessionFinished(); boolean isShowResults = (isScratchingFinished && !isWaitingForLeaderToSubmitNotebook && !isWaitingForLeaderToSubmitBurningQuestions) && !mode.isTeacher(); @@ -406,7 +406,7 @@ burningQuestions = LearningAction.service.getBurningQuestionsBySession(toolSessionId); } isWaitingForLeaderToSubmitNotebook |= isBurningQuestionsEnabled - && (burningQuestions == null || burningQuestions.isEmpty()); + && (burningQuestions == null || burningQuestions.isEmpty()) && !toolSession.isSessionFinished(); JSONObject JSONObject = new JSONObject(); JSONObject.put(ScratchieConstants.ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK, isWaitingForLeaderToSubmitNotebook); @@ -689,11 +689,6 @@ private void saveBurningQuestions(final Long sessionId, final Long itemUid, final String question, String oldQuestion) throws ScratchieApplicationException { - // if burning question is blank or is the same as before - skip saving it - if (StringUtils.isBlank(question) || question.equals(oldQuestion)) { - return; - } - // update new entry tryExecute(new Callable() { @Override