diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 32558e32bb..8c49417af9 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -282,6 +282,13 @@ div.combined-rubric-container {
}
}
+ label.choicegroup_partialcorrect {
+ &:before {
+ margin-right: 15px;
+ content: url('../images/partially-correct-icon.png');
+ }
+ }
+
label.choicegroup_incorrect {
&:before {
margin-right: 15px;
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
index 0b2b0fdaec..a072d5ad5e 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_rubric.py
@@ -224,7 +224,14 @@ class CombinedOpenEndedRubric(object):
actual_scores[i] += [j]
actual_scores = [sum(i)/len(i) for i in actual_scores]
- correct = [int(a>.66) for a in actual_scores]
+ correct = []
+ for (i,a) in enumerate(actual_scores):
+ if int(a)/max_scores[i]==1:
+ correct.append(1)
+ elif int(a)==0:
+ correct.append(0)
+ else:
+ correct.append(.5)
html = self.system.render_template('{0}/open_ended_combined_rubric.html'.format(self.TEMPLATE_DIR),
{'categories': rubric_categories,
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
index e1e4643afe..afaa657937 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
@@ -697,7 +697,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
else:
post_assessment = ""
correct = ""
- previous_answer = self.initial_display
+ previous_answer = ""
context = {
'prompt': self.child_prompt,
diff --git a/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html b/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
index 158ec1f981..1ad11be024 100644
--- a/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
+++ b/lms/templates/combinedopenended/openended/open_ended_combined_rubric.html
@@ -14,6 +14,8 @@
%if len(category['options'][j]['grader_types'])>0:
%if correct[i]==1:
+ %elif correct[i]==.5:
+
%else:
%endif