diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py index 9da1060b26..5236e4bc78 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py @@ -513,7 +513,7 @@ class CombinedOpenEndedV1Module(): pass return return_html - def get_results(self, get): + def get_rubric(self, get): """ Gets the results of a given grader via ajax. Input: AJAX get dictionary @@ -531,11 +531,12 @@ class CombinedOpenEndedV1Module(): rubric_html = self.rubric_renderer.render_combined_rubric(stringify_children(self.static_data['rubric']), rubric_scores, grader_types, feedback_items) + response_dict = all_responses[-1] context = {'results': rubric_html, 'task_number': task_number + 1, 'task_name' : response_dict['human_task']} html = self.system.render_template('combined_open_ended_results.html', context) return {'html': html, 'success': True} - def get_results_old(self, get): + def get_results(self, get): """ Gets the results of a given grader via ajax. Input: AJAX get dictionary diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss index 00c0f31a1e..294ac86d78 100644 --- a/lms/static/sass/course/_rubric.scss +++ b/lms/static/sass/course/_rubric.scss @@ -1,5 +1,6 @@ .rubric { margin: 0px 0px; + color: #3C3C3C; tr { margin:0px 0px; height: 100%; diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html index 935cff3b7b..e219814744 100644 --- a/lms/templates/combined_open_ended.html +++ b/lms/templates/combined_open_ended.html @@ -18,7 +18,9 @@ - +