Merge pull request #128 from prathamesh920/bug_fixes

Bug fixes

1 files changed, 15 insertions, 8 deletions

diff --git a/yaksh/models.py b/yaksh/models.py
index 898662c..acb46f2 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -786,21 +786,28 @@ class AnswerPaper(models.Model):
             Adds the completed question to the list of answered
             questions and returns the next question.
         """
+        next_question = self.next_question(question_id)
         self.questions_answered.add(question_id)
         self.questions_unanswered.remove(question_id)
+        if next_question.id == int(question_id):
+            return None
+        return next_question
 
-        return self.current_question()
-
-    def skip(self, question_id):
+    def next_question(self, question_id):
         """
             Skips the current question and returns the next sequentially
              available question.
         """
-        questions = self.questions_unanswered.all()
-        question_cycle = cycle(questions)
-        for question in question_cycle:
-            if question.id==int(question_id):
-                return question_cycle.next()
+        unanswered_questions = self.questions_unanswered.all()
+        questions = list(unanswered_questions.values_list('id', flat=True))
+        if len(questions) == 0:
+            return None
+        try:
+            index =  questions.index(int(question_id))
+            next_id = questions[index+1]
+        except (ValueError, IndexError):
+            next_id = questions[0]
+        return unanswered_questions.get(id=next_id)
 
     def time_left(self):
         """Return the time remaining for the user in seconds."""