Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java =================================================================== diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r09dba58a4754f4962e8cfa1be27f702d47d4e3fa --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision eccd6838790a4369b6788e48fb5ae5851622fe35) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision 09dba58a4754f4962e8cfa1be27f702d47d4e3fa) @@ -199,6 +199,18 @@ sessionMap.put(AttributeNames.ATTR_IS_LAST_ACTIVITY, scratchieService.isLastActivity(toolSessionID)); + Collection items = storeItemsToSessionMap(toolSessionID, scratchie, sessionMap, + mode.isTeacher()); + + sessionMap.put(ScratchieConstants.ATTR_SCRATCHIE, scratchie); + // calculate max score + double maxScore = scratchieService.getMaxPossibleScore(scratchie); + sessionMap.put(ScratchieConstants.ATTR_MAX_SCORE, maxScore); + + boolean isScratchingFinished = toolSession.isScratchingFinished(); + boolean isWaitingForLeaderToSubmitNotebook = isReflectOnActivity && (notebookEntry == null); + boolean isShowResults = (isScratchingFinished && !isWaitingForLeaderToSubmitNotebook) && !mode.isTeacher(); + // check if there is submission deadline Date submissionDeadline = scratchie.getSubmissionDeadline(); if (submissionDeadline != null) { @@ -217,18 +229,6 @@ } } - Collection items = storeItemsToSessionMap(toolSessionID, scratchie, sessionMap, - mode.isTeacher()); - - sessionMap.put(ScratchieConstants.ATTR_SCRATCHIE, scratchie); - // calculate max score - double maxScore = scratchieService.getMaxPossibleScore(scratchie); - sessionMap.put(ScratchieConstants.ATTR_MAX_SCORE, maxScore); - - boolean isScratchingFinished = toolSession.isScratchingFinished(); - boolean isWaitingForLeaderToSubmitNotebook = isReflectOnActivity && (notebookEntry == null); - boolean isShowResults = (isScratchingFinished && !isWaitingForLeaderToSubmitNotebook) && !mode.isTeacher(); - // show notebook page to the leader if (isUserLeader && isScratchingFinished && isWaitingForLeaderToSubmitNotebook) {