renamed quiz model attribute from can_skip_questions to allow_skip

1 files changed, 8 insertions, 4 deletions

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>