Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -rfc9ea4d27882b0a15cfae1d3fc5983ecb0f71020 -raf12ac115bcee7eafef9a3900a6371014e760fb2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision fc9ea4d27882b0a15cfae1d3fc5983ecb0f71020) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision af12ac115bcee7eafef9a3900a6371014e760fb2) @@ -458,9 +458,10 @@ GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent); String httpSessionID = qaLearningForm.getHttpSessionID(); - qaLearningForm.setHttpSessionID(httpSessionID); generalLearnerFlowDTO.setHttpSessionID(httpSessionID); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(httpSessionID); /*recreate the users and responses*/ qaLearningForm.resetUserActions(); @@ -477,16 +478,24 @@ qaLearningForm.resetAll(); - boolean lockWhenFinished = qaContent.isLockWhenFinished(); + boolean lockWhenFinished; + boolean noReeditAllowed; + if (sessionMap.get("noRefresh") != null && (Boolean)sessionMap.get("noRefresh")) { + lockWhenFinished = true; + noReeditAllowed = true; + } else { + lockWhenFinished = qaContent.isLockWhenFinished(); + noReeditAllowed = qaContent.isNoReeditAllowed(); + } generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString()); - generalLearnerFlowDTO.setNoReeditAllowed(qaContent.isNoReeditAllowed()); + generalLearnerFlowDTO.setNoReeditAllowed(noReeditAllowed); boolean allowRichEditor = qaContent.isAllowRichEditor(); generalLearnerFlowDTO.setAllowRichEditor(new Boolean(allowRichEditor).toString()); boolean useSelectLeaderToolOuput = qaContent.isUseSelectLeaderToolOuput(); generalLearnerFlowDTO.setUseSelectLeaderToolOuput(new Boolean(useSelectLeaderToolOuput).toString()); - + generalLearnerFlowDTO.setAllowRateAnswers(new Boolean(qaContent.isAllowRateAnswers()).toString()); QaQueUsr qaQueUsr = getCurrentUser(toolSessionID); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== diff -u -rdc0a9183e92bfbc1b34d87e0256c7f896fa82d09 -raf12ac115bcee7eafef9a3900a6371014e760fb2 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision dc0a9183e92bfbc1b34d87e0256c7f896fa82d09) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision af12ac115bcee7eafef9a3900a6371014e760fb2) @@ -308,6 +308,8 @@ if (qaContent.isShowOtherAnswersAfterDeadline()) { generalLearnerFlowDTO.setLockWhenFinished(Boolean.TRUE.toString()); generalLearnerFlowDTO.setNoReeditAllowed(true); + //only for ActionForward refreshAllResults(..) method + sessionMap.put("noRefresh", true); /* * the report should have all the users' entries OR the report should have only the current * session's entries