Merge pull request #243 from edx/cdodge/content-tweeks

Tweek review status pages

edx_proctoring/api.py

@@ -1486,6 +1486,7 @@ def _get_proctored_exam_context(exam, attempt, course_id, is_practice_exam=False
     """
     Common context variables for the Proctored and Practice exams' templates.
     """
+    has_due_date = True if exam['due_date'] is not None else False
     attempt_time = attempt['allowed_time_limit_mins'] if attempt else exam['time_limit_mins']
     total_time = humanized_time(attempt_time)
     progress_page_url = ''
@@ -1506,6 +1507,7 @@ def _get_proctored_exam_context(exam, attempt, course_id, is_practice_exam=False
         'exam_id': exam['id'],
         'progress_page_url': progress_page_url,
         'is_sample_attempt': is_practice_exam,
+        'has_due_date': has_due_date,
         'has_due_date_passed': _has_due_date_passed(exam['due_date']),
         'does_time_remain': _does_time_remain(attempt),
         'enter_exam_endpoint': reverse('edx_proctoring.proctored_exam.attempt.collection'),

edx_proctoring/templates/proctored_exam/rejected.html

@@ -6,14 +6,14 @@
     {% endblocktrans %}
   </h3>
 
-  {% include 'proctored_exam/visit_exam_content.html' %}
-
   <p>
     {% blocktrans %}
       You are no longer eligible for academic credit for this course, regardless of your final grade.
       If you have questions about the status of your proctored exam results, contact {{ platform_name }} Support.
     {% endblocktrans %}
   </p>
+  {% include 'proctored_exam/visit_exam_content.html' %}
+
   <hr>
   <p>
     {% blocktrans %}

edx_proctoring/templates/proctored_exam/submitted.html

@@ -5,9 +5,6 @@
       You have submitted this proctored exam for review
     {% endblocktrans %}
   </h3>
-
-  {% include 'proctored_exam/visit_exam_content.html' %}
-
   <p>
     {% blocktrans %}
       &#8226; After you quit the proctoring session, the recorded data is uploaded for review. </br>
@@ -15,6 +12,8 @@
     {% endblocktrans %}
   </p>
 
+  {% include 'proctored_exam/visit_exam_content.html' %}
+
   <p>
     {% blocktrans %}
       If you have questions about the status of your proctored exam results, contact {{ platform_name }} Support.

edx_proctoring/templates/proctored_exam/verified.html

@@ -6,14 +6,13 @@
     {% endblocktrans %}
   </h3>
 
-  {% include 'proctored_exam/visit_exam_content.html' %}
-
   <p>
     {% blocktrans %}
       You are eligible to purchase academic credit for this course if you complete all required exams
       and also achieve a final grade that meets the credit requirements for the course.
     {% endblocktrans %}
   </p>
+    {% include 'proctored_exam/visit_exam_content.html' %}
   <hr>
   <p>
     {% blocktrans %}

edx_proctoring/templates/proctored_exam/visit_exam_content.html

 {% load i18n %}
 {% if has_due_date_passed %}
-
+  <hr>
   <p>
     {% blocktrans %}
-      If you want to view your exam questions and responses, click on the button “let me see my exam”.
-      When you clicked the button, you will be taken directly to the exam content. The exam’s status will
-      still be visible to you in the left navigation pane.
+      To view your exam questions and responses, select <strong>View my exam</strong>. The exam's review status is shown in the left navigation pane.
     {% endblocktrans %}
   </p>
   <p>
     <button type="button" name="visit-exam-content" class="visit-exam-button exam-action-button btn btn-pl-primary btn-base" data-action-url="{{update_is_status_acknowledge_url}}">
-        {% trans "Let me see my exam" %}
+        {% trans "View my exam" %}
     </button>
     <div class="clearfix"></div>
   </p>
@@ -37,4 +35,10 @@
       }
     );
   </script>
+{% elif has_due_date %}
+  <p>
+    {% blocktrans %}
+      After the due date for this exam has passed, you will be able to review your answers on this page.
+    {% endblocktrans %}
+  </p>
 {% endif %}