From e1f467bd5e366ed8b16bd71b66338a7b42fda72a Mon Sep 17 00:00:00 2001
From: adityacp
Date: Mon, 2 Jan 2017 15:29:43 +0530
Subject: Add minor template change in questions

---
 yaksh/templates/yaksh/add_question.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index 77a7b3a..75802b4 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -25,7 +25,6 @@
   <tr><td>Tags: <td>{{ qform.tags }}
   <tr><td>Snippet: <td>{{ qform.snippet }}
   <tr><td>Partial Grading: <td>{{ qform.partial_grading }}
-  <tr><td> Test Case Type: <td> {{ qform.test_case_type }}{{ qform.test_case_type.errors }}
   <tr><td> File: <td> {{ fileform.file_field }}{{ fileform.file_field.errors }}
   {% if uploaded_files %}<br><b>Uploaded files:</b><br>Check on delete to delete files,
   extract to extract files and hide to hide files from student(if required)<br>
-- 
cgit 


From feeb605573357fd8056f103b1043e192838bb23d Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Tue, 3 Jan 2017 15:21:30 +0530
Subject: MCQ/MCC choices HTML tags are rendered.

---
 yaksh/templates/yaksh/grade_user.html       | 2 +-
 yaksh/templates/yaksh/question.html         | 4 ++--
 yaksh/templates/yaksh/user_data.html        | 2 +-
 yaksh/templates/yaksh/view_answerpaper.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 6fb8187..ec8c244 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -130,7 +130,7 @@ Status : <b style="color: green;"> Passed </b><br/>
             {% if question.type == "mcq" or question.type == "mcc" %}
                 <h5> <u>Choices:</u></h5>
                 {% for testcase in question.get_test_cases %}
-                    <br/><strong>{{ forloop.counter }}. {{ testcase.options }}</strong>
+                    <br/><strong>{{ forloop.counter }}. {{ testcase.options|safe }}</strong>
                     {% endfor %}
             {% else %}
                 <h5> <u>Test cases: </u></h5>
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 8b2012c..ba64b63 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -173,7 +173,7 @@ function call_skip(url)
                         </p>
                      {% endif %}
                      {% for test_case in test_cases %}
-                     <input name="answer" type="radio" value="{{ test_case.options }}" />{{ test_case.options }} <br/>
+                     <input name="answer" type="radio" value="{{ test_case.options }}" />{{ test_case.options|safe }} <br/>
                      {% endfor %}
                      {% endif %}
                      {% if question.type == "mcc" %}
@@ -189,7 +189,7 @@ function call_skip(url)
                         </p>
                      {% endif %}
                      {% for test_case in test_cases %}
-                     <input name="answer" type="checkbox" value="{{ test_case.options }}"> {{ test_case.options }}
+                     <input name="answer" type="checkbox" value="{{ test_case.options }}"> {{ test_case.options|safe }}
                      <br>
                      {% endfor %}
                      {% endif %}
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 856433d..9c11dd9 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -66,7 +66,7 @@ User IP address: {{ paper.user_ip }}
             {% if question.type == "mcq" or question.type == "mcc" %}
                 <h5> <u>Choices:</u></h5>
                 {% for testcase in question.get_test_cases %}
-                    <br/><strong>{{ forloop.counter }}. {{ testcase.options }}</strong>
+                    <br/><strong>{{ forloop.counter }}. {{ testcase.options|safe }}</strong>
                     {% endfor %}
             {% else %}
                 <h5> <u>Test cases: </u></h5>
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 9dfbda0..8dec5b3 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -42,7 +42,7 @@
             {% if question.type == "mcq" or question.type == "mcc" %}
             <h5> <u>Choices:</u></h5>
             {% for testcase in question.get_test_cases %}
-            <br/><strong>{{ forloop.counter }}. {{ testcase.options }}</strong>
+            <br/><strong>{{ forloop.counter }}. {{ testcase.options|safe }}</strong>
             {% endfor %}
             {%endif%}
             
-- 
cgit 


From 25eb8d10045e1af6ab7c282b8df0b008223be545 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Tue, 3 Jan 2017 17:57:01 +0530
Subject: added completed and inprogress papers' status in monitor

---
 yaksh/templates/yaksh/monitor.html | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index 7a3297b..0ad6401 100644
--- a/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
@@ -1,4 +1,5 @@
 {% extends "manage.html" %}
+{% load custom_filters %}
 
 {% block pagetitle %} Quiz results {% endblock pagetitle %}
 
@@ -49,6 +50,14 @@ $(document).ready(function()
 
 {% if papers %}
 <p>Number of papers: {{ papers|length }} </p>
+{% completed papers as completed_papers %}
+ {# template tag used to get the count of completed papers #}
+ <p>Papers completed: <b> {{ completed_papers }} </b></p>
+
+{% inprogress papers as inprogress_papers %}
+ {# template tag used to get the count of inprogress papers #}
+ <p>Papers in progress:<b>  {{ inprogress_papers }} </b></p>
+
 <p><a href="{{URL_ROOT}}/exam/manage/statistics/question/{{papers.0.question_paper.id}}">Question Statisitics</a></p>
 <p><a href="{{URL_ROOT}}/exam/manage/monitor/download_csv/{{papers.0.question_paper.id}}">Download CSV</a></p>
 <table id="result-table" class="tablesorter table">
-- 
cgit 


From 9fc46fc74e87a30f9dcaada88815a5ec8814d5fd Mon Sep 17 00:00:00 2001
From: adityacp
Date: Fri, 6 Jan 2017 14:55:25 +0530
Subject: Change image in docs and other minor docs changes

---
 yaksh/templates/yaksh/question.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 8b2012c..fe696fe 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -140,7 +140,7 @@ function call_skip(url)
                  <div class="panel-heading">
                      <h4><u> {{ question.summary }}
                              {% if question.type == "mcq" %}
-                             (Multiple Choice Questions)
+                             (Single Correct Choice Questions)
                              {% elif question.type == "mcc" %}
                              (Multiple Correct Choices)
                              {% elif question.type == "code" %}
-- 
cgit 


From 57a5d99c7ed5aed498943686b2c951bdaba3852a Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Fri, 13 Jan 2017 01:24:27 +0530
Subject: Fixed a bug which would mark all MCQ and MCC questions' answers as
 correct

1. Due to the new evaluator, an unchecked bug, which marked all mcq and mcc attempts as correct, despite actually marking the wrong answer, has been fixed.
2. Added Test case to check for incorrect mcq and mcc questions
3. question.html would also render error msg for mcq and mcc questions. This has also been fixed.
---
 yaksh/templates/yaksh/question.html | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 7cbca57..6473c2f 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -161,33 +161,11 @@ function call_skip(url)
                  </div>
                  <div class="panel-body">
                      {% if question.type == "mcq" %}
-                    {% if error_message %}
-                        <p>
-                        <div class="panel panel-danger">
-                        <div class="panel-heading">
-                        {% for err in error_message %}
-                            {{ err }}
-                        {% endfor %}
-                        </div>
-                        </div>
-                        </p>
-                     {% endif %}
                      {% for test_case in test_cases %}
                      <input name="answer" type="radio" value="{{ test_case.options }}" />{{ test_case.options|safe }} <br/>
                      {% endfor %}
                      {% endif %}
                      {% if question.type == "mcc" %}
-                    {% if error_message %}
-                        <p>
-                        <div class="panel panel-danger">
-                        <div class="panel-heading">
-                        {% for err in error_message %}
-                            {{ err }}
-                        {% endfor %}
-                        </div>
-                        </div>
-                        </p>
-                     {% endif %}
                      {% for test_case in test_cases %}
                      <input name="answer" type="checkbox" value="{{ test_case.options }}"> {{ test_case.options|safe }}
                      <br>
-- 
cgit