Added in changes to the grade xblock handler to show self assessed feedback

openassessment/assessment/test/test_assessment_models.py

@@ -180,9 +180,9 @@ class AssessmentTest(CacheResetTest):
             AssessmentPart._check_all_criteria_assessed(fake_rubric_index, selected_criteria, feedback_given_criteria)
         except InvalidRubricSelection as ex:
             for criterion in expected_not_assessed:
-                self.assertTrue(criterion in ex.message)
+                self.assertTrue(criterion in str(ex))
             for criterion in expected_assessed:
-                self.assertFalse(criterion in ex.message)
+                self.assertFalse(criterion in str(ex))
             error = True
 
         self.assertTrue(error)
\ No newline at end of file

openassessment/templates/openassessmentblock/grade/oa_grade_complete.html

@@ -154,7 +154,7 @@
                                       {% if criterion.self_feedback %}
                                         <span class="answer--feedback__title__copy">{% trans "Additional Comments" %} ({{ criterion.peer_feedback|length|add:'1' }})</span>
                                       {% else %}
-                                      <span class="answer--feedback__title__copy">{% trans "Additional Comments" %} ({{ criterion.peer_feedback|length }})</span>
+                                        <span class="answer--feedback__title__copy">{% trans "Additional Comments" %} ({{ criterion.peer_feedback|length }})</span>
                                       {% endif %}
                                     </h5>
                                     {% endif %}
@@ -167,7 +167,7 @@
                                             </h6>
 
                                             <div class="feedback__value">
-                                            {{ feedback }}
+                                              {{ feedback }}
                                             </div>
                                         </li>
                                         {% endfor %}
@@ -178,7 +178,7 @@
                                             </h6>
 
                                             <div class="feedback__value">
-                                            {{ criterion.self_feedback }}
+                                              {{ criterion.self_feedback }}
                                             </div>
                                         </li>
                                         {% endif %}