Add start, end times to a sitting; display completion date on marking page

diff --git a/quiz/models.py b/quiz/models.py
index 8a7a18d253665593a7c521b2b22b2895ff0a2919..7549e50e186098ab69b349b711d97f6a12a2ceef 100644 (file)
--- a/quiz/models.py
+++ b/quiz/models.py
@@ -4,6 +4,7 @@ import json
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator
+from django.utils.timezone import now
 
 from model_utils.managers import InheritanceManager
 
@@ -358,6 +359,9 @@ class Sitting(models.Model):
 
     objects = SittingManager()
 
+    start = models.DateTimeField(auto_now_add=True)
+    end = models.DateTimeField(null=True, blank=True)
+
     class Meta:
         permissions = (("view_sittings", "Can see completed exams."),)
 
@@ -409,6 +413,7 @@ class Sitting(models.Model):
 
     def mark_quiz_complete(self):
         self.complete = True
+        self.end = now()
         self.save()
 
     def add_incorrect_question(self, question):

diff --git a/quiz/templates/quiz/sitting_list.html b/quiz/templates/quiz/sitting_list.html
index d540753b738320cbc30bb50b6b878d42de227394..e838ee1c478959473da190c30c534186673ba39a 100644 (file)
--- a/quiz/templates/quiz/sitting_list.html
+++ b/quiz/templates/quiz/sitting_list.html
@@ -11,6 +11,7 @@
                        <tr>
                          <th>User</th>
                          <th>Quiz</th>
+                         <th>Completed</th>
                          <th>Score (%)</th>
                          <th></th>
                        </tr>
@@ -22,6 +23,7 @@
                                <td><input type="text" name="user_filter" /></td>
                                <td><input type="text" name="quiz_filter" /></td>
                                <td></td>
+                               <td></td>
                                <td><button type="submit">Filter</button></td>
                          </form>
                        </tr>
@@ -32,6 +34,7 @@
                        <tr>
                          <td>{{ sitting.user }}</td>
                          <td>{{ sitting.quiz }}</td>
+                         <td>{{ sitting.end|date }}</td>
                          <td>{{ sitting.get_percent_correct }}</td>
                          <td>
                                <a href="{% url 'quiz_marking_detail' pk=sitting.id %}">