From b277f9191bf8720533901e58db36851675b8f430 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Fri, 3 Feb 2017 01:28:50 +0530
Subject: added skip question feature. closes #191

The can_skip_questions attribute is to be set True for students to be able to skip questions.
If it is set as False, students wont be able to skip to the next question.
---
 yaksh/templates/exam.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'yaksh/templates/exam.html')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 101f3f3..00633a3 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -31,6 +31,7 @@
         <p> Question Navigator </p>
         <ul class="pagination pagination-sm">
             {% for qid in paper.questions.all %}
+                {%if paper.question_paper.quiz.can_skip_questions%}
                 {% if qid in paper.questions_unanswered.all %}
                 {% if qid.id == question.id %}
                 <li class="active"><a style="width:25%" href="#"data-toggle="tooltip"
@@ -44,6 +45,9 @@
                 {% if qid in paper.questions_answered.all %}
                 <li class="disabled"><a style="background-color:#B4B8BA; width:25%" href="#" data-toggle="tooltip" title="{{ qid.description }}" >{{ forloop.counter }}</a></li>
                 {% endif %}
+                {% else %}
+                <li><a style="width:25%" href="#" data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a></li>
+                {% endif %}
                 {% endfor %}
             </ul>
             <p>Question(s) left: <b>{{ paper.questions_left }}</b></p>
-- 
cgit 


From 1d5cd5253b125eb6406dd67e9f267c208658bcfc Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Fri, 3 Feb 2017 14:40:50 +0530
Subject: renamed quiz model attribute from can_skip_questions to allow_skip

---
 yaksh/templates/exam.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'yaksh/templates/exam.html')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 00633a3..dfcaf2d 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -31,8 +31,8 @@
         <p> Question Navigator </p>
         <ul class="pagination pagination-sm">
             {% for qid in paper.questions.all %}
-                {%if paper.question_paper.quiz.can_skip_questions%}
-                {% if qid in paper.questions_unanswered.all %}
+                {%if paper.question_paper.quiz.allow_skip %}
+                {% if qid in paper.get_questions_unanswered %}
                 {% if qid.id == question.id %}
                 <li class="active"><a style="width:25%" href="#"data-toggle="tooltip"
                     title="{{ qid.description|striptags }}"
@@ -42,11 +42,15 @@
                     onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')">{{ forloop.counter }}</a></li>
                 {% endif %}
                 {% endif %}
-                {% if qid in paper.questions_answered.all %}
+                {% if qid in paper.get_questions_answered %}
                 <li class="disabled"><a style="background-color:#B4B8BA; width:25%" href="#" data-toggle="tooltip" title="{{ qid.description }}" >{{ forloop.counter }}</a></li>
                 {% endif %}
                 {% else %}
-                <li><a style="width:25%" href="#" data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a></li>
+                {% if qid.id == question.id %}
+                <li class="active"><a style="width:25%" data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a></li>
+                {% else %}
+                <li  class="disabled"><a style="width:25%" data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a></li>
+                {% endif %}
                 {% endif %}
                 {% endfor %}
             </ul>
-- 
cgit