Merge pull request #509 from edx/grady/ORA-666

Added in conditional logic to the Submission Messaging Section

openassessment/templates/openassessmentblock/response/oa_response_submitted.html

@@ -21,7 +21,15 @@
 
         <div class="step__message message message--complete">
             <h3 class="message__title">{% trans "Your Response Has Been Submitted" %}</h3>
-            <div class="message__content">{% blocktrans %}You'll receive your grade after some of your peers have assessed your response and you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> and <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> steps{% endblocktrans %}.</div>
+            <div class="message__content">
+                {% if has_peer and has_self %}
+                    {% blocktrans %}You'll receive your grade after some of your peers have assessed your response and you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> and <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> steps{% endblocktrans %}.
+                {% elif has_peer %}
+                    {% blocktrans %}You'll receive your grade after some of your peers have assessed your response and you complete the <a data-behavior="ui-scroll" href="#openassessment__peer-assessment">peer assessment</a> step.{% endblocktrans %}
+                {% elif has_self %}
+                    {% blocktrans %}You'll receive your grade after you complete the <a data-behavior="ui-scroll" href="#openassessment__self-assessment">self assessment</a> step.{% endblocktrans %}
+                {% endif %}
+            </div>
         </div>
 
         <div class="step__content">

openassessment/xblock/submission_mixin.py

@@ -317,6 +317,9 @@ class SubmissionMixin(object):
             context["submission_due"] = due_date
 
         context['allow_file_upload'] = self.allow_file_upload
+        context['has_peer'] = 'peer-assessment' in self.assessment_steps
+        context['has_self'] = 'self-assessment' in self.assessment_steps
+
         if self.allow_file_upload:
             context['file_url'] = self._get_download_url()
 

openassessment/xblock/test/data/submission_closed.xml

@@ -84,7 +84,6 @@
         </criterion>
     </rubric>
     <assessments>
-        <assessment name="peer-assessment" must_grade="5" must_be_graded_by="3" />
         <assessment name="self-assessment" />
     </assessments>
 </openassessment>

openassessment/xblock/test/data/submission_no_deadline.xml

@@ -85,6 +85,5 @@
     </rubric>
     <assessments>
         <assessment name="peer-assessment" must_grade="5" must_be_graded_by="3" />
-        <assessment name="self-assessment" />
     </assessments>
 </openassessment>

openassessment/xblock/test/test_submission.py

@@ -89,7 +89,9 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
             xblock, 'openassessmentblock/response/oa_response_unavailable.html',
             {
                 'allow_file_upload': False,
-                'submission_start': dt.datetime(4999, 4, 1).replace(tzinfo=pytz.utc)
+                'submission_start': dt.datetime(4999, 4, 1).replace(tzinfo=pytz.utc),
+                'has_peer': True,
+                'has_self': True
             }
         )
 
@@ -109,6 +111,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
             {
                 'student_submission': submission,
                 'allow_file_upload': False,
+                'has_peer': True,
+                'has_self': True
             }
         )
 
@@ -122,6 +126,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
                 'save_status': 'This response has not been saved.',
                 'submit_enabled': False,
                 'submission_due': dt.datetime(2999, 5, 6).replace(tzinfo=pytz.utc),
+                'has_peer': True,
+                'has_self': True
             }
         )
 
@@ -134,6 +140,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
                 'saved_response': '',
                 'save_status': 'This response has not been saved.',
                 'submit_enabled': False,
+                'has_peer': True,
+                'has_self': False
             }
         )
 
@@ -152,6 +160,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
                 'save_status': 'This response has been saved but not submitted.',
                 'submit_enabled': True,
                 'submission_due': dt.datetime(2999, 5, 6).replace(tzinfo=pytz.utc),
+                'has_peer': True,
+                'has_self': True
             }
         )
 
@@ -167,6 +177,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
                 'submission_due': dt.datetime(2999, 5, 6).replace(tzinfo=pytz.utc),
                 'student_submission': submission,
                 'allow_file_upload': False,
+                'has_peer': True,
+                'has_self': True
             }
         )
 
@@ -177,6 +189,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
             {
                 'allow_file_upload': False,
                 'submission_due': dt.datetime(2014, 4, 5).replace(tzinfo=pytz.utc),
+                'has_peer': False,
+                'has_self': True
             }
         )
 
@@ -192,6 +206,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
                 'submission_due': dt.datetime(2014, 4, 5).replace(tzinfo=pytz.utc),
                 'student_submission': submission,
                 'allow_file_upload': False,
+                'has_peer': False,
+                'has_self': True
             }
         )
 
@@ -215,6 +231,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
                 'submission_due': dt.datetime(2999, 5, 6).replace(tzinfo=pytz.utc),
                 'student_submission': submission,
                 'allow_file_upload': False,
+                'has_peer': True,
+                'has_self': True
             }
         )
 
@@ -238,6 +256,8 @@ class SubmissionRenderTest(XBlockHandlerTestCase):
                 'submission_due': dt.datetime(2014, 4, 5).replace(tzinfo=pytz.utc),
                 'student_submission': submission,
                 'allow_file_upload': False,
+                'has_peer': False,
+                'has_self': True
             }
         )