Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Attic/McResources.properties,v diff -u -r1.31 -r1.32 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties 20 Nov 2005 18:13:50 -0000 1.31 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties 21 Nov 2005 13:30:28 -0000 1.32 @@ -25,6 +25,7 @@ label.redo.questions =Redo Questions label.view.summary =View Summary label.view.answers =View Answers +label.finished =Finished button.basic =Basic Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v diff -u -r1.60 -r1.61 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 21 Nov 2005 12:28:34 -0000 1.60 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 21 Nov 2005 13:30:27 -0000 1.61 @@ -2227,6 +2227,13 @@ mcLearningForm.resetCommands(); return (mapping.findForward(VIEW_SUMMARY)); } + else if (mcLearningForm.getLearnerFinished() != null) + { + logger.debug("requested learner finished, the learner should be directed to next activity."); + mcLearningForm.resetCommands(); + //fix this + return (mapping.findForward(VIEW_SUMMARY)); + } mcLearningForm.resetCommands(); return (mapping.findForward(LOAD_LEARNER)); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java,v diff -u -r1.7 -r1.8 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java 20 Nov 2005 12:38:17 -0000 1.7 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java 21 Nov 2005 13:30:27 -0000 1.8 @@ -22,6 +22,7 @@ protected String redoQuestions; protected String viewSummary; protected String viewAnswers; + protected String learnerFinished; protected String redoQuestionsOk; public void resetCommands() @@ -33,7 +34,7 @@ this.setViewSummary(null); this.setViewAnswers(null); this.setRedoQuestionsOk(null); - + this.setLearnerFinished(null); } public void resetParameters() @@ -191,4 +192,16 @@ public void setNextOptions(String nextOptions) { this.nextOptions = nextOptions; } + /** + * @return Returns the learnerFinished. + */ + public String getLearnerFinished() { + return learnerFinished; + } + /** + * @param learnerFinished The learnerFinished to set. + */ + public void setLearnerFinished(String learnerFinished) { + this.learnerFinished = learnerFinished; + } } 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.13 -r1.14 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 21 Nov 2005 12:28:34 -0000 1.13 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 21 Nov 2005 13:30:28 -0000 1.14 @@ -224,6 +224,16 @@ request.getSession().setAttribute(TOTAL_QUESTION_COUNT, new Long(mapQuestionsContent.size()).toString()); + + request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1"); + logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX)); + logger.debug("final Options Map for the first question: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT)); + + /*also prepare data into mapGeneralOptionsContent for combined answers view */ + Map mapGeneralOptionsContent=AuthoringUtil.generateGeneralOptionsContentMap(request, mcContent); + logger.debug("returned mapGeneralOptionsContent: " + mapGeneralOptionsContent); + request.getSession().setAttribute(MAP_GENERAL_OPTIONS_CONTENT, mapGeneralOptionsContent); + /* * Verify that userId does not already exist in the db. * If it does exist, that means, that user already responded to the content and @@ -235,23 +245,20 @@ McQueUsr mcQueUsr=mcService.retrieveMcQueUsr(new Long(userID)); logger.debug("mcQueUsr:" + mcQueUsr); + Long queUsrId=mcQueUsr.getUid(); + logger.debug("queUsrId: " + queUsrId); + + int learnerBestMark=LearningUtil.getHighestMark(request, queUsrId); + logger.debug("learnerBestMark: " + learnerBestMark); + request.getSession().setAttribute(LEARNER_BEST_MARK,new Integer(learnerBestMark).toString()); + if (mcQueUsr != null) { 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)); } - - request.getSession().setAttribute(CURRENT_QUESTION_INDEX, "1"); - logger.debug("CURRENT_QUESTION_INDEX: " + request.getSession().getAttribute(CURRENT_QUESTION_INDEX)); - logger.debug("final Options Map for the first question: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT)); - - /*also prepare data into mapGeneralOptionsContent for combined answers view */ - Map mapGeneralOptionsContent=AuthoringUtil.generateGeneralOptionsContentMap(request, mcContent); - logger.debug("returned mapGeneralOptionsContent: " + mapGeneralOptionsContent); - request.getSession().setAttribute(MAP_GENERAL_OPTIONS_CONTENT, mapGeneralOptionsContent); - - return (mapping.findForward(LOAD_LEARNER)); + return (mapping.findForward(LOAD_LEARNER)); } Index: lams_tool_lamc/web/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/IndividualLearnerResults.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_lamc/web/IndividualLearnerResults.jsp 20 Nov 2005 18:13:50 -0000 1.7 +++ lams_tool_lamc/web/IndividualLearnerResults.jsp 21 Nov 2005 13:30:28 -0000 1.8 @@ -176,13 +176,20 @@ + -       + + + + + + + @@ -192,7 +199,13 @@ - + + + + + + + Index: lams_tool_lamc/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v diff -u -r1.13 -r1.14 --- lams_tool_lamc/web/WEB-INF/struts-config.xml 20 Nov 2005 12:38:17 -0000 1.13 +++ lams_tool_lamc/web/WEB-INF/struts-config.xml 21 Nov 2005 13:30:28 -0000 1.14 @@ -109,6 +109,12 @@ path=".answers" redirect="true" /> + +