Fix conflicts

1 files changed, 8 insertions, 1 deletions

diff --git a/yaksh/models.py b/yaksh/models.py
index 8db054d..6a6fe12 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -2250,7 +2250,14 @@ class AnswerPaper(models.Model):
         return questions
 
     def set_extra_time(self, time=0):
-        self.extra_time = time
+        now = timezone.now()
+        self.extra_time += time
+        if self.status == 'completed' and self.end_time < now:
+            self.extra_time = time
+            quiz_time = self.question_paper.quiz.duration
+            self.start_time = now - timezone.timedelta(minutes=quiz_time)
+            self.end_time = now + timezone.timedelta(minutes=time)
+            self.status = 'inprogress'
         self.save()
 
     def time_left(self):