Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v diff -u -r1.19 -r1.20 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 15 Jun 2006 17:38:39 -0000 1.19 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 16 Jun 2006 07:42:20 -0000 1.20 @@ -402,7 +402,7 @@ mcLearningForm.setUserOverPassMark(new Boolean(false).toString()); mcLearningForm.setPassMarkApplicable(new Boolean(false).toString()); boolean passed=false; - if ((passMark != null) && (passMark.intValue() != 0)) + if ((passMark != null)) { mcLearningForm.setPassMarkApplicable(new Boolean(true).toString()); int totalUserWeight=LearningUtil.calculateWeights(mapLeanerAssessmentResults, mapQuestionWeights); @@ -646,8 +646,6 @@ } else { - //mcQueUsr=mcService.retrieveMcQueUsr(new Long(learnerProgressUserId)); - //logger.debug("mcQueUsr: " + mcQueUsr); Long toolSessionId=(Long)request.getSession().getAttribute(TOOL_SESSION_ID); logger.debug("toolSessionId: " + toolSessionId); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v diff -u -r1.45 -r1.46 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 15 Jun 2006 17:38:39 -0000 1.45 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 16 Jun 2006 07:42:20 -0000 1.46 @@ -357,8 +357,6 @@ McLearningAction mcLearningAction= new McLearningAction(); /* pay attention that this userId is the learner's userId passed by the request parameter. * It is differerent than USER_ID kept in the session of the current system user*/ - //McQueUsr mcQueUsr=mcService.retrieveMcQueUsr(new Long(userId)); - //logger.debug("mcQueUsr:" + mcQueUsr); McQueUsr mcQueUsr=mcService.getMcUserBySession(new Long(userId), mcSession.getUid()); logger.debug("mcQueUsr: " + mcQueUsr); @@ -490,7 +488,17 @@ logger.debug("the user's session id AND user id exists in the tool tables go to redo questions. " + toolSessionId + " mcQueUsr: " + mcQueUsr + " user id: " + mcQueUsr.getQueUsrId()); logger.debug("the learner has already responsed to this content, just generate a read-only report. Use redo questions for this."); - return (mapping.findForward(REDO_QUESTIONS)); + + boolean isRetries=mcContent.isRetries(); + logger.debug("isRetries: " + isRetries); + if (isRetries == true) + return (mapping.findForward(REDO_QUESTIONS)); + else + { + McLearningAction mcLearningAction= new McLearningAction(); + logger.debug("present to learner with previous attempts data"); + return mcLearningAction.viewAnswers(mapping, form, request, response); + } } } else if (learningMode.equals("teacher"))