Merge pull request #693 from edx/waheed/tnl2000-fix-student-submission-on-grading

Fixed student can't view their submission after recieving grades.

openassessment/templates/openassessmentblock/grade/oa_grade_complete.html

@@ -28,9 +28,7 @@
                 <article class="submission__answer__display step__content__section">
                     <h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3>
 
-                    <div class="submission__answer__display__content">
-                        {{ student_submission.answer.text|linebreaks }}
-                    </div>
+                    {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label="Your response to the question above:" %}
 
                     {% if allow_file_upload and file_url %}
                     <h3 class="submission__answer__display__title">

openassessment/templates/openassessmentblock/response/oa_response_graded.html

@@ -22,9 +22,7 @@
             <article class="submission__answer__display">
                 <h3 class="submission__answer__display__title">{% trans "Your Response" %}</h3>
 
-                <div class="submission__answer__display__content">
-                    {{ student_submission.answer.text|linebreaks }}
-                </div>
+                {% include "openassessmentblock/oa_submission_answer.html" with answer=student_submission.answer answer_text_label="Your response to the question above:" %}
 
                 {% if allow_file_upload and file_url %}
                 <h3 class="submission__answer__display__title">{% trans "Your Image" %}</h3>

openassessment/xblock/grade_mixin.py

@@ -13,6 +13,8 @@ from openassessment.assessment.api import ai as ai_api
 from openassessment.assessment.errors import SelfAssessmentError, PeerAssessmentError
 from submissions import api as sub_api
 
+from data_conversion import create_submission_dict
+
 
 class GradeMixin(object):
     """Grade Mixin introduces all handlers for displaying grades
@@ -133,7 +135,7 @@ class GradeMixin(object):
         context = {
             'score': score,
             'feedback_text': feedback_text,
-            'student_submission': student_submission,
+            'student_submission': create_submission_dict(student_submission, self.prompts),
             'peer_assessments': peer_assessments,
             'self_assessment': self_assessment,
             'example_based_assessment': example_based_assessment,

openassessment/xblock/test/test_grade.py

@@ -61,6 +61,9 @@ class TestGrade(XBlockHandlerTestCase):
         self.assertIn(u'єאςєɭɭєภՇ ฬ๏гк!', resp.decode('utf-8'))
         self.assertIn(u'Good job!', resp.decode('utf-8'))
 
+        # Verify that student submission is in the view
+        self.assertIn(self.SUBMISSION[1], resp.decode('utf-8'))
+
         # Verify that the submission and peer steps show that we're graded
         # This isn't strictly speaking part of the grade step rendering,
         # but we've already done all the setup to get to this point in the flow,
@@ -69,6 +72,9 @@ class TestGrade(XBlockHandlerTestCase):
         self.assertIn('response', resp.lower())
         self.assertIn('complete', resp.lower())
 
+        # Verify that student submission is in the view
+        self.assertIn(self.SUBMISSION[1], resp.decode('utf-8'))
+
         resp = self.request(xblock, 'render_peer_assessment', json.dumps(dict()))
         self.assertIn('peer', resp.lower())
         self.assertIn('complete', resp.lower())