Merge pull request #134 from edx/afzaledx/sol-1166_refactor_student_view

Separating the views for proctored, practice and timed exams.

edx_proctoring/callbacks.py

@@ -50,7 +50,7 @@ def start_exam_callback(request, attempt_code):  # pylint: disable=unused-argume
 
     mark_exam_attempt_as_ready(attempt['proctored_exam']['id'], attempt['user']['id'])
 
-    template = loader.get_template('proctoring/proctoring_launch_callback.html')
+    template = loader.get_template('proctored_exam/proctoring_launch_callback.html')
 
     poll_url = reverse(
         'edx_proctoring.anonymous.proctoring_poll_status',

edx_proctoring/templates/proctoring/seq_proctored_practice_exam_entrance.html → edx_proctoring/templates/practice_exam/entrance.html

@@ -25,7 +25,7 @@
     <i class="fa fa-arrow-circle-right start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}" data-attempt-proctored=true data-start-immediately=false></i>
   </button>
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/footer.html' %}
 
 <script type="text/javascript">
 

edx_proctoring/templates/proctoring/seq_proctored_practice_exam_error.html → edx_proctoring/templates/practice_exam/error.html

@@ -26,7 +26,7 @@
     </a>
   </button>
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/footer.html' %}
 <script type="text/javascript">
   $('.start-timed-exam').click(
     function(event) {

edx_proctoring/templates/proctored_exam/__init__.py

+"""
+We need python think this is a python module
+"""

edx_proctoring/templates/proctoring/seq_proctored_exam_entrance.html → edx_proctoring/templates/proctored_exam/entrance.html

@@ -64,7 +64,7 @@
     <div class="clearfix"></div>
     </div>
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/footer.html' %}
 
 <script type="text/javascript">
   var startProctoredExam = function(selector, exam_id, action_url, start_immediately, attempt_proctored) {
@@ -90,7 +90,7 @@
       alert(msg);
     });
   };
-  
+
   var inProcess = false;
 
   var disableClickEvent = function (selector) {
@@ -110,7 +110,7 @@
       $( this ).css('cursor', 'pointer');
     });
   };
-  
+
   $('.start-timed-exam').click(
     function() {
       if (!inProcess) {

edx_proctoring/templates/proctoring/seq_proctored_exam_error.html → edx_proctoring/templates/proctored_exam/error.html

@@ -33,4 +33,4 @@
   </p>
   <div class="clearfix"></div>
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/footer.html' %}

edx_proctoring/templates/proctoring/seq_proctored_exam_instructions.html → edx_proctoring/templates/proctored_exam/instructions.html

@@ -55,7 +55,7 @@
   </p>
   {% endif %}
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/footer.html' %}
 
 <script type="text/javascript">
 

edx_proctoring/templates/proctoring/seq_proctored_exam_ready_to_start.html → edx_proctoring/templates/proctored_exam/ready_to_start.html

@@ -33,7 +33,7 @@
     </div>
   </div>
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/footer.html' %}
 
 <script type="text/javascript">
 

edx_proctoring/templates/proctoring/seq_proctored_exam_rejected.html → edx_proctoring/templates/proctored_exam/rejected.html

@@ -33,4 +33,4 @@
   </p>
   <div class="clearfix"></div>
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/footer.html' %}

edx_proctoring/templates/proctoring/seq_proctored_exam_submitted.html → edx_proctoring/templates/proctored_exam/submitted.html

@@ -30,4 +30,4 @@
     {% endblocktrans %}
   </p>
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/footer.html' %}

edx_proctoring/templates/proctoring/seq_proctored_exam_verified.html → edx_proctoring/templates/proctored_exam/verified.html

@@ -26,4 +26,4 @@
     {% endblocktrans %}
   </p>
 </div>
-{% include 'proctoring/seq_proctored_exam_footer.html' %}
+{% include 'proctored_exam/seq_proctored_exam_footer.html' %}

edx_proctoring/templates/proctoring/seq_timed_exam_expired.html

-{% load i18n %}
-<div class="critical-time sequence proctored-exam entrance" data-exam-id="{{exam_id}}">
-  <h3>
-    {% blocktrans %}
-      You did not complete the exam in the allotted time
-    {% endblocktrans %}
-  </h3>
-  <p>
-    {% blocktrans %}
-      You are not eligible to receive credit for this exam because you did not submit
-      your exam responses before time expired. Other work that you have completed in this
-      course contributes to your final grade. See the <a href="{{progress_page_url}}">Progress page</a>
-      for your current grade in the course.
-    {% endblocktrans %}
-  </p>
-  <div class="proctored-exam-message">
-    <p>
-      {% blocktrans %}
-        Other work that you have completed in this course contributes to your final grade.
-      {% endblocktrans %}
-    </p>
-  </div>
-</div>
-{% include 'proctoring/seq_timed_exam_footer.html' %}

edx_proctoring/templates/timed_exam/__init__.py

+"""
+We need python think this is a python module
+"""

edx_proctoring/templates/proctoring/seq_timed_exam_entrance.html → edx_proctoring/templates/timed_exam/entrance.html

@@ -12,16 +12,16 @@
     </strong>
     {% trans "As soon as you indicate that you are ready to start the exam, you will have "%} {{total_time|lower}} {% trans " to complete the exam." %}
   </p>
-  <div class="gated-sequence">
-    <a class='start-timed-exam' data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}">
+  <button class="gated-sequence start-timed-exam" data-ajax-url="{{enter_exam_endpoint}}" data-exam-id="{{exam_id}}">
+    <a>
       {% blocktrans %}
         I'm ready! Start this timed exam.
       {% endblocktrans %}
-        <i class="fa fa-arrow-circle-right"></i>
-      </a>
-  </div>
+      <i class="fa fa-arrow-circle-right"></i>
+    </a>
+  </button>
 </div>
-{% include 'proctoring/seq_timed_exam_footer.html' %}
+{% include 'timed_exam/footer.html' %}
 
 <script type="text/javascript">
 

edx_proctoring/templates/proctoring/seq_timed_exam_ready_to_submit.html → edx_proctoring/templates/timed_exam/ready_to_submit.html

@@ -2,7 +2,7 @@
 <div class="sequence timed-exam completed" data-exam-id="{{exam_id}}">
   <h3>
     {% blocktrans %}
-      This is the end of your timed exam
+      Are you sure you want to end your timed exam?
     {% endblocktrans %}
   </h3>
   <p>
@@ -11,11 +11,22 @@
       and your worked will then be graded.
     {% endblocktrans %}
   </p>
-  <button type="button" name="submit-timed-exam" class="exam-action-button" data-action="submit" data-exam-id="{{exam_id}}" data-change-state-url="{{change_state_url}}" >
-    {% blocktrans %}
-      I'm ready! Submit my answers and end my timed exam
-    {% endblocktrans %}
-  </button>
+  <div>
+    <button type="button" name="submit-proctored-exam" class="exam-action-button" data-action="submit" data-exam-id="{{exam_id}}" data-change-state-url="{{change_state_url}}">
+      {% blocktrans %}
+        Yes, end my timed exam
+      {% endblocktrans %}
+    </button>
+  </div>
+  {% if does_time_remain %}
+    <div>
+      <button type="button" name="goback-proctored-exam" class="exam-action-button" data-action="start" data-exam-id="{{exam_id}}" data-change-state-url="{{change_state_url}}">
+        {% blocktrans %}
+          No, I'd like to continue working
+        {% endblocktrans %}
+      </button>
+    </div>
+  {% endif %}
 </div>
 <script type="text/javascript">
   $('.exam-action-button').click(

edx_proctoring/templates/timed_exam/submitted.html

+{% load i18n %}
+<div class="sequence proctored-exam completed" data-exam-id="{{exam_id}}">
+  <h3>
+    {% blocktrans %}
+      You have submitted your timed exam
+    {% endblocktrans %}
+  </h3>
+
+  <h4>
+    {% blocktrans %}
+      Your timed exam status: <b> Completed </b>
+    {% endblocktrans %}
+  </h4>
+  <hr>
+  <p>
+    {% blocktrans %}
+      As you have submitted your exam, you will not be able to re-enter it. Your grades for this timed exam will be immediately available on the <a href="{{progress_page_url}}">Progress</a> page.
+    {% endblocktrans %}
+  </p>
+</div>

edx_proctoring/views.py

@@ -300,8 +300,6 @@ class StudentProctoredExamAttempt(AuthenticatedAPIView):
                 remaining_time=humanized_time(int(round(time_remaining_seconds / 60.0, 0)))
             )
 
-            print attempt['accessibility_time_string']
-
             return Response(
                 data=attempt,
                 status=status.HTTP_200_OK