From dfb8e9f0e3b6ad0c84cda0cdbddf2ab16fc8345c Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Fri, 23 Aug 2013 13:48:59 -0400 Subject: [PATCH] Fix max score calculation --- .../combined_open_ended_modulev1.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py index 113cc43e68..b6b0d99456 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py @@ -839,7 +839,6 @@ class CombinedOpenEndedV1Module(): for i in xrange(0, len(self.task_states)): # For each task, extract all student scores on that task (each attempt for each task) last_response = self.get_last_response(i) - max_score = last_response.get('max_score', None) score = last_response.get('all_scores', None) if score is not None: # Convert none scores and weight scores properly @@ -858,9 +857,9 @@ class CombinedOpenEndedV1Module(): else: score = 0 - if max_score is not None: + if self._max_score is not None: # Weight the max score if it is not None - max_score *= float(weight) + max_score = self._max_score * float(weight) else: # Without a max_score, we cannot have a score! score = None @@ -880,8 +879,7 @@ class CombinedOpenEndedV1Module(): ''' max_score = None if self.check_if_done_and_scored(): - last_response = self.get_last_response(self.current_task_number) - max_score = last_response['max_score'] + max_score = self._max_score return max_score def get_progress(self):