Add feedback text to self assessments

Also includes fix to default text, and removal of a seemingly unused,
hardcoded 'estimated_time' context variable. A11y test uncommented.

openassessment/xblock/defaults.py

@@ -63,13 +63,13 @@ DEFAULT_RUBRIC_CRITERIA = [
 # The rubric's feedback prompt is a set of instructions letting the student
 # know they can provide additional free form feedback in their assessment.
 DEFAULT_RUBRIC_FEEDBACK_PROMPT = """
-(Optional) What aspects of this response stood out to you? What did it do well? How could it improve?
+(Optional) What aspects of this response stood out to you? What did it do well? How could it be improved?
 """
 
 # The rubric's feedback text is the default text displayed and used as
 # the student's response to the feedback prompt
 DEFAULT_RUBRIC_FEEDBACK_TEXT = """
-I noticed that this response...
+I think that this response...
 """
 
 DEFAULT_EXAMPLE_ANSWER = (

openassessment/xblock/peer_assessment_mixin.py

@@ -165,7 +165,6 @@ class PeerAssessmentMixin(object):
 
         context_dict = {
             "rubric_criteria": self.rubric_criteria_with_labels,
-            "estimated_time": "20 minutes",  # TODO: Need to configure this.
             "allow_latex": self.allow_latex,
         }
 

openassessment/xblock/self_assessment_mixin.py

@@ -87,8 +87,12 @@ class SelfAssessmentMixin(object):
             else:
                 submission = submission_api.get_submission(self.submission_uuid)
                 context["rubric_criteria"] = self.rubric_criteria_with_labels
-                context["estimated_time"] = "20 minutes"  # TODO: Need to configure this.
                 context["self_submission"] = create_submission_dict(submission, self.prompts)
+                if self.rubric_feedback_prompt is not None:
+                    context["rubric_feedback_prompt"] = self.rubric_feedback_prompt
+
+                if self.rubric_feedback_default_text is not None:
+                    context['rubric_feedback_default_text'] = self.rubric_feedback_default_text
 
                 # Determine if file upload is supported for this XBlock and what kind of files can be uploaded.
                 context["file_upload_type"] = self.file_upload_type

openassessment/xblock/static/sass/oa/views/_oa-base.scss

@@ -719,6 +719,15 @@
       // genereal feedback question
       .assessment__rubric__question--feedback {
 
+        .wrapper--input {
+          margin-top: $baseline-v;
+        }
+
+        .question__title__copy {
+          @include margin-left(0);
+          white-space: pre-wrap;
+        }
+
         textarea {
           @extend %ui-content-longanswer;
           min-height: ($baseline-v*5);

openassessment/xblock/test/test_peer.py

@@ -304,7 +304,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         # No submission, so the peer step should be unavailable
         expected_context = {
             'graded': 0,
-            'estimated_time': '20 minutes',
             'submit_button_text': 'Submit your assessment & move to response #2',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
@@ -320,7 +319,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         expected_context = {
             'peer_due': dt.datetime(2000, 1, 1).replace(tzinfo=pytz.utc),
             'graded': 0,
-            'estimated_time': '20 minutes',
             'submit_button_text': 'Submit your assessment & move to response #2',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
@@ -336,7 +334,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         expected_context = {
             'peer_start': dt.datetime(2999, 1, 1).replace(tzinfo=pytz.utc),
             'graded': 0,
-            'estimated_time': '20 minutes',
             'submit_button_text': 'Submit your assessment & move to response #2',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
@@ -355,7 +352,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         # Expect to be in the waiting for peers state
         expected_context = {
             'graded': 0,
-            'estimated_time': '20 minutes',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
             'review_num': 1,
@@ -392,7 +388,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         # We should pull the other student's submission
         expected_context = {
             'graded': 0,
-            'estimated_time': '20 minutes',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
             'review_num': 1,
@@ -415,7 +410,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
 
         expected_context = {
             'graded': 0,
-            'estimated_time': '20 minutes',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
             'review_num': 1,
@@ -439,7 +433,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         expected_context = {
             'peer_due': dt.datetime(2000, 1, 1).replace(tzinfo=pytz.utc),
             'graded': 0,
-            'estimated_time': '20 minutes',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
             'review_num': 1,
@@ -475,7 +468,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         expected_context = {
             'peer_due': dt.datetime(2000, 1, 1).replace(tzinfo=pytz.utc),
             'graded': 0,
-            'estimated_time': '20 minutes',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
             'review_num': 1,
@@ -503,7 +495,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         expected_context = {
             'peer_due': dt.datetime(2000, 1, 1).replace(tzinfo=pytz.utc),
             'graded': 0,
-            'estimated_time': '20 minutes',
             'submit_button_text': 'submit your assessment & move to response #2',
             'rubric_criteria': xblock.rubric_criteria,
             'must_grade': 5,
@@ -534,7 +525,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         # Continued grading should still be available,
         # but since there are no other submissions, we're in the waiting state.
         expected_context = {
-            'estimated_time': '20 minutes',
              'graded': 0,
              'must_grade': 5,
              'peer_due': dt.datetime(2000, 1, 1).replace(tzinfo=pytz.utc),
@@ -562,7 +552,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         )
 
         expected_context = {
-            'estimated_time': '20 minutes',
              'graded': 0,
              'must_grade': 5,
              'peer_due': dt.datetime(2000, 1, 1).replace(tzinfo=pytz.utc),
@@ -588,7 +577,6 @@ class TestPeerAssessmentRender(XBlockHandlerTestCase):
         # Bugfix: This used to cause a KeyError when students would click "Peer Assessment"
         # (indicating "continued grading") before making a submission.
         expected_context = {
-            'estimated_time': '20 minutes',
             'graded': 0,
             'must_grade': 5,
             'review_num': 1,

openassessment/xblock/test/test_self.py

@@ -266,7 +266,6 @@ class TestSelfAssessmentRender(XBlockHandlerTestCase):
             xblock, 'openassessmentblock/self/oa_self_assessment.html',
             {
                 'rubric_criteria': xblock.rubric_criteria,
-                'estimated_time': '20 minutes',
                 'self_submission': submission,
                 'file_upload_type': None,
                 'self_file_url': '',

test/acceptance/accessibility.py

@@ -47,11 +47,9 @@ class SelfAssessmentA11yTest(OpenAssessmentA11yTest):
         self.submission_page.visit()
         self._check_a11y(self.submission_page)
 
-        # TODO: There is an accessibility error on the self-review form due to TNL-3882.
-        # Commenting out test code so the check doesn't have to be disabled for the whole page.
-        # self.submission_page.visit().submit_response(self.SUBMISSION)
-        # self.self_asmnt_page.wait_for_page().wait_for_response()
-        # self._check_a11y(self.self_asmnt_page)
+        self.submission_page.visit().submit_response(self.SUBMISSION)
+        self.self_asmnt_page.wait_for_page().wait_for_response()
+        self._check_a11y(self.self_asmnt_page)
 
 
 class PeerAssessmentA11yTest(OpenAssessmentA11yTest):