From 7bf0532a043ddac3bc8dce7fac1f72219a923dc3 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Thu, 7 Feb 2013 17:28:31 -0500 Subject: [PATCH] Fix some issues with displaying grader info on rubric --- common/lib/xmodule/xmodule/combined_open_ended_modulev1.py | 2 +- common/lib/xmodule/xmodule/combined_open_ended_rubric.py | 2 +- lms/templates/open_ended_rubric.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py index 16df364ff6..9a594dc3a7 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py @@ -448,7 +448,7 @@ class CombinedOpenEndedV1Module(): elif task_type== "selfassessment": rubric_scores = last_post_assessment grader_types = ['SA'] - feedback_items = [] + feedback_items = [''] last_post_assessment = "" last_correctness = task.is_last_response_correct() max_score = task.max_score() diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py index 6b10b66653..303a97d11f 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py @@ -32,7 +32,7 @@ class CombinedOpenEndedRubric(object): rubric_scores = [cat['score'] for cat in rubric_categories] max_scores = map((lambda cat: cat['options'][-1]['points']), rubric_categories) max_score = max(max_scores) - html = self.system.render_template('open_ended_rubric.html', + html = self.system.render_template('open_ended_rubric.html', {'categories': rubric_categories, 'has_score': self.has_score, 'view_only': self.view_only, diff --git a/lms/templates/open_ended_rubric.html b/lms/templates/open_ended_rubric.html index 0dc4bf29f0..057e1d03b6 100644 --- a/lms/templates/open_ended_rubric.html +++ b/lms/templates/open_ended_rubric.html @@ -25,9 +25,9 @@
${option['points']} points : ${option['text']}
- % elif combined_rubric == True + % elif combined_rubric == True:
- %for grader_type in option['grader_types'] + %for grader_type in option['grader_types']: ${grader_type} %endfor ${option['points']} points : ${option['text']}