Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java =================================================================== diff -u -rae7f0d44518e7b49d09bd544cc12bf7bce242cb3 -rfaf33007f05228b597c1ee1b22f9cc474ff72b7e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision ae7f0d44518e7b49d09bd544cc12bf7bce242cb3) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision faf33007f05228b597c1ee1b22f9cc474ff72b7e) @@ -504,9 +504,7 @@ logger.debug("final mcQueUsr: " + mcQueUsr); - //String highestAttemptOrder=(String)request.getSession().getAttribute(LEARNER_LAST_ATTEMPT_ORDER); - //logger.debug("current highestAttemptOrder:" + highestAttemptOrder); - + String highestAttemptOrder="0"; McUsrAttempt mcUsrAttempt = mcService.getAttemptWithLastAttemptOrderForUserInSession(mcQueUsr.getUid(), toolSessionUid); logger.debug("mcUsrAttempt with highest attempt order: " + mcUsrAttempt); @@ -529,10 +527,6 @@ LearningUtil.createAttempt(request, mcQueUsr, mapGeneralCheckedOptionsContent, mark, passed, new Integer(highestAttemptOrder).intValue(), mapLearnerAssessmentResults); logger.debug("created user attempt in the db"); - //int intHighestAttemptOrder=new Integer(highestAttemptOrder).intValue()+ 1 ; - //logger.debug("updated highestAttemptOrder:" + intHighestAttemptOrder); - //request.getSession().setAttribute(LEARNER_LAST_ATTEMPT_ORDER, new Integer(intHighestAttemptOrder).toString()); - logger.debug("before getLearnerMarkAtLeast: passMark" + passMark); logger.debug("before getLearnerMarkAtLeast: mapQuestionWeights" + mapQuestionWeights); @@ -912,11 +906,8 @@ String previewOnly=(String)request.getSession().getAttribute(PREVIEW_ONLY); logger.debug("previewOnly: " + previewOnly); - if ((previewOnly != null) && (previewOnly.equalsIgnoreCase("true"))) - { - logger.debug("request for preview."); - return (mapping.findForward(PREVIEW)); - } + + logger.debug("fwding to LOAD_LEARNER: " + LOAD_LEARNER); return (mapping.findForward(LOAD_LEARNER)); } Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== diff -u -r8183d9b12eb400911b7c12d5086a9bbc0514c649 -rfaf33007f05228b597c1ee1b22f9cc474ff72b7e --- lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision 8183d9b12eb400911b7c12d5086a9bbc0514c649) +++ lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision faf33007f05228b597c1ee1b22f9cc474ff72b7e) @@ -177,7 +177,7 @@ - + @@ -215,7 +215,6 @@ -