diff --git a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
index 898daf3769..d2a3fdc385 100644
--- a/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
+++ b/common/lib/xmodule/xmodule/combined_open_ended_modulev1.py
@@ -591,15 +591,22 @@ class CombinedOpenEndedV1Module():
for ri in all_responses:
for i in xrange(0,len(ri['rubric_scores'])):
feedback = ri['feedback_dicts'][i].get('feedback','')
+ rubric_data = self.rubric_renderer.render_rubric(stringify_children(self.static_data['rubric']), ri['rubric_scores'][i])
+ if rubric_data['success']:
+ rubric_html = rubric_data['html']
+ else:
+ rubric_html = ''
context = {
- 'rubric_html': self.rubric_renderer.render_rubric(stringify_children(self.static_data['rubric']), ri['rubric_scores'][i]),
+ 'rubric_html': rubric_html,
'grader_type': ri['grader_type'],
- 'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
- 'human_grader_types' : HUMAN_GRADER_TYPE,
'feedback' : feedback,
}
context_list.append(context)
- feedback_table = self.system.render_template('open_ended_result_table.html', {'context_list' : context_list})
+ feedback_table = self.system.render_template('open_ended_result_table.html', {
+ 'context_list' : context_list,
+ 'grader_type_image_dict' : GRADER_TYPE_IMAGE_DICT,
+ 'human_grader_types' : HUMAN_GRADER_TYPE,
+ })
context = {
'results': feedback_table,
'task_name' : "Combined Results",
diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 119b8b044a..87ec30d037 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -119,6 +119,7 @@ div.combined-rubric-container {
}
}
}
+ margin-bottom: 5px;
}
div.result-container {
@@ -252,6 +253,11 @@ div.result-container {
}
}
}
+ .rubric-result {
+ font-size: .9em;
+ padding: 2px;
+ display: inline-table;
+ }
}
diff --git a/lms/templates/open_ended_result_table.html b/lms/templates/open_ended_result_table.html
index 741e491771..71600cb19d 100644
--- a/lms/templates/open_ended_result_table.html
+++ b/lms/templates/open_ended_result_table.html
@@ -1,14 +1,21 @@
-% for context in context_list:
- % if context['grader_type'] in grader_type_image_dict:
+% for co in context_list:
+ % if co['grader_type'] in grader_type_image_dict:
+ <%grader_type=co['grader_type']%>
<% grader_image = grader_type_image_dict[grader_type] %>
% if grader_type in human_grader_types:
<% human_title = human_grader_types[grader_type] %>
% else:
<% human_title = grader_type %>
% endif
-
- % endif
- ${rubric_html}
- ${feedback}
+