Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java,v diff -u -r1.1 -r1.2 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java 25 Mar 2009 22:46:28 -0000 1.1 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java 7 May 2009 08:44:55 -0000 1.2 @@ -50,21 +50,24 @@ TreeMap definitionMap = new TreeMap(); - ToolOutputDefinition definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_TOTAL_SCORE, new Long(0), null); - definitionMap.put(OUTPUT_NAME_LEARNER_TOTAL_SCORE, definition); - + ToolOutputDefinition definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, new Long(0), null); + definitionMap.put(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, definition); + definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_TIME_TAKEN, new Long(0), null); definitionMap.put(OUTPUT_NAME_LEARNER_TIME_TAKEN, definition); - definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, new Long(0), null); - definitionMap.put(OUTPUT_NAME_LEARNER_NUMBER_ATTEMPTS, definition); - if (toolContentObject != null) { - Assessment assessment = (Assessment) toolContentObject; - Set questions = assessment.getQuestions(); + + Long totalMarksPossible = new Long(0); for(AssessmentQuestion question : questions) { + totalMarksPossible += question.getDefaultGrade(); + }; + definition = buildRangeDefinition(OUTPUT_NAME_LEARNER_TOTAL_SCORE, new Long(0), totalMarksPossible); + definitionMap.put(OUTPUT_NAME_LEARNER_TOTAL_SCORE, definition); + + for(AssessmentQuestion question : questions) { definition = buildRangeDefinition(String.valueOf(question.getSequenceId()), new Long(0), null); definition.setDescription(getI18NText("output.user.score.for.question", false) + question.getTitle()); definitionMap.put(String.valueOf(question.getSequenceId()), definition);