in_time logic added

Author: hypnocapybara

quiz/models.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 import re
 import json
+from datetime import datetime, timedelta
 
 from django.db import models
 from django.core.exceptions import ValidationError, ImproperlyConfigured
@@ -587,3 +588,6 @@ class Meta:
 
     def __str__(self):
         return self.content
+
+    def check_in_time(self):
+        return (self.question_take_time + timedelta(seconds=self.seconds_to_answer)) > datetime.now()

quiz/views.py

@@ -1,4 +1,5 @@
 import random
+from datetime import datetime
 
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.exceptions import PermissionDenied
@@ -157,6 +158,8 @@ def dispatch(self, request, *args, **kwargs):
     def get_form(self, form_class):
         if self.logged_in_user:
             self.question = self.sitting.get_first_question()
+            self.question.question_take_time = datetime.now()
+            self.question.save()
             self.progress = self.sitting.progress()
         else:
             self.question = self.anon_next_question()
@@ -201,8 +204,9 @@ def form_valid_user(self, form):
         guess = form.cleaned_data['answers']
         is_correct = self.question.check_if_correct(guess)
         # HERE FIX
+        is_in_time = self.question.check_in_time()
 
-        if is_correct is True:
+        if is_correct and is_in_time:
             self.sitting.add_to_score(1)
             progress.update_score(self.question, 1, 1)
         else:
@@ -212,6 +216,7 @@ def form_valid_user(self, form):
         if self.quiz.answers_at_end is not True:
             self.previous = {'previous_answer': guess,
                              'previous_outcome': is_correct,
+                             'previous_in_time': is_in_time,
                              'previous_question': self.question,
                              'answers': self.question.get_answers(),
                              'question_type': {self.question