Adding self evaluations to the grading UI

apps/openassessment/assessment/peer_api.py

@@ -347,7 +347,7 @@ def get_assessments(submission_id):
     """
     try:
         submission = Submission.objects.get(uuid=submission_id)
-        return get_assessment_review(submission, "PE")
+        return get_assessment_review(submission)
     except DatabaseError:
         error_message = _(
             u"Error getting assessments for submission {}".format(submission_id)

apps/openassessment/assessment/serializers.py

@@ -134,7 +134,7 @@ class AssessmentSerializer(serializers.ModelSerializer):
         )
 
 
-def get_assessment_review(submission, score_type):
+def get_assessment_review(submission):
     """Get all information pertaining to an assessment for review.
 
     Given an assessment serializer, return a serializable formatted model of
@@ -144,8 +144,6 @@ def get_assessment_review(submission, score_type):
     Args:
         submission (Submission): The Submission Model object to get
             assessment reviews for.
-        score_type (str): The score type we want to get assessments back for
-            to review.
 
     Returns:
         (list): A list of assessment reviews, combining assessments with
@@ -188,9 +186,7 @@ def get_assessment_review(submission, score_type):
     """
     return [
         full_assessment_dict(assessment)
-        for assessment in Assessment.objects.filter(
-            submission=submission, score_type=score_type
-        )
+        for assessment in Assessment.objects.filter(submission=submission)
     ]
 
 

apps/openassessment/templates/openassessmentblock/grade/oa_grade_complete.html

@@ -69,6 +69,8 @@
                                 {% endwith %}
                             {% endfor %}
 
+                            {% for part in self_assessment.parts %}
+                                {% if part.option.criterion.name == criterion.name %}
                             <li class="answer self-assessment"
                                 id="question--{{ criterion_num }}__answer--self">
                                 <h5 class="answer__title">
@@ -84,6 +86,8 @@
                                     {{ part.option.explanation }}
                                 </span>
                             </li>
+                                {% endif %}
+                            {% endfor %}
                         </ul>
                     </li>
                     {% endwith %}

apps/openassessment/xblock/grade_mixin.py

@@ -27,12 +27,20 @@ class GradeMixin(object):
             )
             student_score = workflow["score"]
             assessments = peer_api.get_assessments(student_submission["uuid"])
+            peer_assessments = []
+            self_assessment = None
+            for assessment in assessments:
+                if assessment["score_type"] == "PE":
+                    peer_assessments.append(assessment)
+                else:
+                    self_assessment = assessment
             median_scores = peer_api.get_assessment_median_scores(
                 student_submission["uuid"],
                 assessment_ui_model["must_be_graded_by"]
             )
             context["student_submission"] = student_submission
-            context["peer_assessments"] = assessments
+            context["peer_assessments"] = peer_assessments
+            context["self_assessment"] = self_assessment
             context["rubric_criteria"] = self.rubric_criteria
             context["score"] = student_score
             for criterion in context["rubric_criteria"]: