From 6aeda97b5f37fc7ce50b7fd1f1e0465c42ba0969 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Mon, 15 Jan 2018 17:40:06 +0530
Subject: Add shuffle testcases option to questions

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index ed69657..b02487c 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -29,6 +29,7 @@
   <tr><td>Snippet: <td>{{ qform.snippet }}
   <tr><td>Minimum Time(in minutes):<td> {{ qform.min_time }}
   <tr><td>Partial Grading: <td>{{ qform.partial_grading }}
+  <tr><td>Shuffle Testcases: <td> {{ qform.shuffle_testcases }}
   <tr><td>Grade Assignment Upload:<td> {{ qform.grade_assignment_upload }}
   <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,
-- 
cgit 


From 98775e565c99fd6486fb5908a5ca9be491db9b1c Mon Sep 17 00:00:00 2001
From: mahesh
Date: Tue, 16 Jan 2018 01:13:49 +0530
Subject: Add test case order in view_answerpaper

---
 yaksh/templates/yaksh/view_answerpaper.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 410b578..971ef77 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -34,7 +34,7 @@
     Start time: {{ paper.start_time }} <br/>
     End time : {{ paper.end_time }} <br/>
     Percentage obtained: {{ paper.percent }}% <br/>
-    {% if paper.passed == 0 %}
+    {% if paper.passed %}
     Status : <b style="color: red;"> Failed </b><br/>
     {% else %}
     Status : <b style="color: green;"> Passed </b><br/>
@@ -55,7 +55,8 @@
             <h5><u>Question:</u></h5> <strong>{{ question.description|safe }}</strong>
             {% if question.type == "mcq" or question.type == "mcc" %}
                 <h5> <u>Choices:</u></h5>
-                {% for testcase in question.get_test_cases %}
+                {% get_ordered_testcases question paper as testcases %}
+                {% for testcase in testcases %}
                 {% if testcase.correct %}
                    <br/>
                    <strong>{{ forloop.counter }}. {{ testcase.options|safe }}</strong>
-- 
cgit 


From f531b9ca9c088263a53aff8574e93b74945b468f Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 16 Feb 2018 16:30:55 +0530
Subject: Add shuffle_testcases to QuestionPaper model instead of Question

---
 yaksh/templates/yaksh/add_question.html         | 1 -
 yaksh/templates/yaksh/design_questionpaper.html | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index b02487c..ed69657 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -29,7 +29,6 @@
   <tr><td>Snippet: <td>{{ qform.snippet }}
   <tr><td>Minimum Time(in minutes):<td> {{ qform.min_time }}
   <tr><td>Partial Grading: <td>{{ qform.partial_grading }}
-  <tr><td>Shuffle Testcases: <td> {{ qform.shuffle_testcases }}
   <tr><td>Grade Assignment Upload:<td> {{ qform.grade_assignment_upload }}
   <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,
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 1656e2b..d982d27 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -192,10 +192,14 @@ select
 
     <div class="tab-pane" id="finish">
         <center>
-            <h5>Almost finished creating your question paper</h5>
+            <h5><u>Almost finished creating your question paper</u></h5>
             <label style="float: none;">
                 {{ qpaper_form.shuffle_questions }}
-                <span>Auto shuffle.</span>
+                <span>Shuffle questions' order for each student</span>
+            </label> <br><br>
+            <label style="float: none;">
+                {{ qpaper_form.shuffle_testcases }}
+                <span>Shuffle MCQ/MCC options for each student</span>
             </label> <br><br>
             <input class ="btn primary large" type="submit" name="save" id="save" value="Save question paper">
             <br>
-- 
cgit 


From 21181922ee2b4d69fa62ae9725fcda759b475b80 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Tue, 20 Feb 2018 12:41:59 +0530
Subject: TestCaseOrder created only mcc/mcq questions

---
 yaksh/templates/yaksh/user_data.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 45867d2..ce2533e 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -74,8 +74,7 @@ User IP address: {{ paper.user_ip }}
                         {% endif %}
                     {% endfor %}
 
-            {% elif question.type == "integer" or question.type == "string"
-               or question.type == "float" %}
+            {% elif question.type == "integer" or question.type == "string" or question.type == "float" %}
                 <h5> <u>Correct Answer:</u></h5>
                     {% for testcase in question.get_test_cases %}
                     <strong>{{ testcase.correct|safe }}</strong>
-- 
cgit 


From 9c9e505e79abce0cae6b341880ed9f8a4e31a8be Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 2 Feb 2018 15:22:25 +0530
Subject: Add jumble question type

---
 yaksh/templates/yaksh/add_question.html |  1 +
 yaksh/templates/yaksh/question.html     | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index ed69657..79c132c 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -64,6 +64,7 @@
       <option value="integertestcase">Integer </option>
       <option value="stringtestcase"> String </option>
       <option value="floattestcase"> Float </option>
+      <option value="arrangetestcase">Arrange options </option>
   </select></p>
   <center>
     <button class="btn" type="submit" name="save_question">Save</button>
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 9d6ce48..ed04963 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -21,6 +21,7 @@
 <script src="{{ URL_ROOT }}/static/yaksh/js/codemirror/mode/clike/clike.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/codemirror/mode/shell/shell.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/mathjax/MathJax.js?config=TeX-MML-AM_CHTML"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery-sortable.js"></script>
 <script>
 init_val = '{{ last_attempt|escape_quotes|safe }}';
 lang = "{{ question.language }}"
@@ -175,10 +176,12 @@ question_type = "{{ question.type }}"
                                 {% else %}
                                     <h5>(CASE SENSITIVE)</h5>
                                 {% endif %}
-
                              {% elif question.type == "float" %}
                              (FILL IN THE BLANKS WITH FLOAT ANSWER)
+                             {% elif question.type == "arrange" %}
+                            (ARRANGE THE OPTIONS IN CORRECT ORDER)
                              {% endif %}
+
                         </u>
                         <font class=pull-right>(Marks : {{ question.points }}) </font>
                       </h4>
@@ -251,6 +254,21 @@ question_type = "{{ question.type }}"
                      <input type=file id="assignment" name="assignment" multiple="">
                      <hr>
                      {% endif %}
+
+                     {% if question.type == "arrange" %}
+                     <input name="answer" type="hidden" id='arrange_order'/>
+                     <ol class="arrange">
+                     {% for test_case in test_cases %}
+                      <li id = {{test_case.id}}>{{test_case.options| safe }}</li>
+                     {% endfor %}
+                    </ol>
+                     <script type="text/javascript">
+                      var arrange = $("ol.arrange");
+                      var order_array = $(arrange).sortable(['serialize']);
+                     </script>
+                     {% endif %}
+
+
                      {% if question.type == "code" %}
                      <div class="row">
                          <div class="col-md-9">
@@ -269,6 +287,9 @@ question_type = "{{ question.type }}"
          <br><button class="btn btn-primary" type="submit" name="check" id="check">Submit Answer</button>&nbsp;&nbsp;
          {% elif question.type == "upload" %}
          <br><button class="btn btn-primary" type="submit" name="check" id="check" onClick="return validate();">Upload</button>&nbsp;&nbsp;
+         {% elif question.type == "arrange" %}
+         <br><button class="btn btn-primary" type="submit" name="check" id="check" onClick="return user_arranged_options();">Submit Answer</button>&nbsp;&nbsp;
+
 
          {% else %}
            {% if question in paper.get_questions_unanswered or quiz.is_exercise %}
-- 
cgit 


From 453a5d8f191b62af45426d5c98a99552c34ba396 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Mon, 5 Feb 2018 17:06:09 +0530
Subject: Include Rebase changes from shuffle testcases

---
 yaksh/templates/yaksh/question.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index ed04963..e67a260 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -257,11 +257,14 @@ question_type = "{{ question.type }}"
 
                      {% if question.type == "arrange" %}
                      <input name="answer" type="hidden" id='arrange_order'/>
+                     <div class="list-group">
                      <ol class="arrange">
                      {% for test_case in test_cases %}
-                      <li id = {{test_case.id}}>{{test_case.options| safe }}</li>
+                      <li class="list-group-item" id={{test_case.id}}>{{test_case.options| safe }}</li>
                      {% endfor %}
-                    </ol>
+                      </ol>
+                    </div>
+
                      <script type="text/javascript">
                       var arrange = $("ol.arrange");
                       var order_array = $(arrange).sortable(['serialize']);
-- 
cgit 


From 537d0fc5c5884ab620e587ff977ed61a2a50504d Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Mon, 5 Feb 2018 20:04:43 +0530
Subject: Add arrange options type question in answerpaper htmls

---
 yaksh/templates/yaksh/grade_user.html       | 19 ++++++++++++++++++-
 yaksh/templates/yaksh/user_data.html        | 18 ++++++++++++++++++
 yaksh/templates/yaksh/view_answerpaper.html | 21 ++++++++++++++++++---
 3 files changed, 54 insertions(+), 4 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 93f00e0..09887c4 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -167,7 +167,7 @@ Status : <b style="color: red;"> Failed </b><br/>
                     {% endif %}
                     {% endfor %}
 
-            {% elif question.type == "integer" or "string" or "float" %}
+            {% elif question.type == "integer" or question.type == "string" or question.type == "float" %}
                 <h5> <u>Correct Answer:</u></h5>
                     {% for testcase in question.get_test_cases %}
                     <strong>{{ testcase.correct|safe }}</strong>
@@ -175,6 +175,14 @@ Status : <b style="color: red;"> Failed </b><br/>
                     <strong>{{ testcase.error_margin|safe }}</strong>
                     {% endif %}
                     {% endfor %}
+              {% elif question.type == "arrange" %}
+              <h5> <u>Correct Order:</u></h5>
+              <div class="list-group" >
+              {% for testcase in question.get_test_cases %}
+                    <li class="list-group-item"><strong>{{ testcase.options|safe }}</strong></li>
+              {% endfor %}
+              </div>
+
             {% else %}
                 <h5> <u>Test cases: </u></h5>
                     {% for testcase in question.get_test_cases %}
@@ -307,6 +315,15 @@ Status : <b style="color: red;"> Failed </b><br/>
         {% endif %}
         {% endfor %}
         </div>
+
+        {% elif question.type == "arrange"%}
+        <div class="well well-sm">
+          {% get_arrange_user_answer ans.answer.answer question as tc_list %}
+        {% for testcases in tc_list %}
+         <li>{{ testcases.options.strip|safe }}</li>
+        {% endfor %}
+        </div>
+
         {% else %}
          <div class="well well-sm">
         {{ ans.answer.answer.strip|safe }}
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index ce2533e..fe3f2a6 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -80,6 +80,13 @@ User IP address: {{ paper.user_ip }}
                     <strong>{{ testcase.correct|safe }}</strong>
                     {% endfor %}
 
+            {% elif question.type == "arrange" %}
+              <h5> <u>Correct Order:</u></h5>
+              <div class="list-group" >
+              {% for testcase in question.get_test_cases %}
+                    <li class="list-group-item"><strong>{{ testcase.options|safe }}</strong></li>
+              {% endfor %}
+              </div>
 
             {% else %}
                 <h5> <u>Test cases: </u></h5>
@@ -99,6 +106,7 @@ User IP address: {{ paper.user_ip }}
         {% endif %}
             <div class="panel-body">
                 <h5><u>Student answer:</u></h5>
+
         {% if question.type == "mcc"%}
         <div class="well well-sm">
         {% for testcases in question.get_test_cases %}
@@ -107,6 +115,7 @@ User IP address: {{ paper.user_ip }}
         {% endif %}
         {% endfor %}
         </div>
+
         {% elif question.type == "mcq"%}
         <div class="well well-sm">
         {% for testcases in question.get_test_cases %}
@@ -115,6 +124,15 @@ User IP address: {{ paper.user_ip }}
         {% endif %}
         {% endfor %}
         </div>
+
+        {% elif question.type == "arrange"%}
+        <div class="well well-sm">
+          {% get_arrange_user_answer answers.0.answer question as tc_list %}
+        {% for testcases in tc_list %}
+         <li>{{ testcases.options.strip|safe }}</li>
+        {% endfor %}
+        </div>
+
         {%else%}
                  <div class="well well-sm">
                  {{ answers.0.answer|safe }}
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 971ef77..3d39092 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -35,9 +35,9 @@
     End time : {{ paper.end_time }} <br/>
     Percentage obtained: {{ paper.percent }}% <br/>
     {% if paper.passed %}
-    Status : <b style="color: red;"> Failed </b><br/>
-    {% else %}
     Status : <b style="color: green;"> Passed </b><br/>
+    {% else %}
+    Status : <b style="color: red;"> Failed </b><br/>
     {% endif %}
     </p>
 
@@ -67,12 +67,20 @@
                 {% endif %}
                 {% endfor %}
 
-            {% elif question.type == "integer" or "string" or "float" %}
+            {% elif question.type == "integer" or question.type == "string" or question.type == "float" %}
                 <h5> <u>Correct Answer:</u></h5>
                     {% for testcase in question.get_test_cases %}
                     <strong>{{ testcase.correct|safe }}</strong>
                     {% endfor %}
 
+            {% elif question.type == "arrange" %}
+              <h5> <u>Correct Order:</u></h5>
+              <div class="list-group">
+              {% for testcase in question.get_test_cases %}
+                    <li class="list-group-item"><strong>{{ testcase.options|safe }}</strong></li>
+              {% endfor %}
+              </div>
+
             {% else %}
                 <h5> <u>Test cases: </u></h5>
                     {% for testcase in question.get_test_cases %}
@@ -108,6 +116,13 @@
         {% endif %}
         {% endfor %}
         </div>
+        {% elif question.type == "arrange"%}
+        <div class="well well-sm">
+          {% get_arrange_user_answer answers.0.answer question as tc_list %}
+        {% for testcases in tc_list %}
+         <li>{{ testcases.options.strip|safe }}</li>
+        {% endfor %}
+        </div>
         {% elif question.type == "upload" and has_user_assignment %}
                 <a href="{{URL_ROOT}}/exam/download/user_assignment/{{question.id}}/{{data.user.id}}/{{paper.question_paper.quiz.id}}">
                 <div class="well well-sm">
-- 
cgit 


From b3bb71b80bd10eb49c7930d9cf6be109673cbe53 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Wed, 7 Feb 2018 16:28:06 +0530
Subject: Arrange options according to last submitted answer if any

---
 yaksh/templates/yaksh/question.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index e67a260..3bdabd1 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -256,6 +256,9 @@ question_type = "{{ question.type }}"
                      {% endif %}
 
                      {% if question.type == "arrange" %}
+                     {% if last_attempt %}
+                     {% get_arrange_user_answer last_attempt question as test_cases %}
+                     {% endif %}
                      <input name="answer" type="hidden" id='arrange_order'/>
                      <div class="list-group">
                      <ol class="arrange">
-- 
cgit 


From 07be6be0e805e17e45290b0e8137c044b2094edc Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 9 Feb 2018 15:43:44 +0530
Subject: Change custom filter function to get_answer_for_arrange_options

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 09887c4..8430e91 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -318,7 +318,7 @@ Status : <b style="color: red;"> Failed </b><br/>
 
         {% elif question.type == "arrange"%}
         <div class="well well-sm">
-          {% get_arrange_user_answer ans.answer.answer question as tc_list %}
+          {% get_answer_for_arrange_options ans.answer.answer question as tc_list %}
         {% for testcases in tc_list %}
          <li>{{ testcases.options.strip|safe }}</li>
         {% endfor %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 3bdabd1..b65073a 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -257,7 +257,7 @@ question_type = "{{ question.type }}"
 
                      {% if question.type == "arrange" %}
                      {% if last_attempt %}
-                     {% get_arrange_user_answer last_attempt question as test_cases %}
+                     {% get_answer_for_arrange_options last_attempt question as test_cases %}
                      {% endif %}
                      <input name="answer" type="hidden" id='arrange_order'/>
                      <div class="list-group">
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index fe3f2a6..9449fcc 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -127,7 +127,7 @@ User IP address: {{ paper.user_ip }}
 
         {% elif question.type == "arrange"%}
         <div class="well well-sm">
-          {% get_arrange_user_answer answers.0.answer question as tc_list %}
+          {% get_answer_for_arrange_options answers.0.answer question as tc_list %}
         {% for testcases in tc_list %}
          <li>{{ testcases.options.strip|safe }}</li>
         {% endfor %}
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 3d39092..7cbec91 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -118,7 +118,7 @@
         </div>
         {% elif question.type == "arrange"%}
         <div class="well well-sm">
-          {% get_arrange_user_answer answers.0.answer question as tc_list %}
+          {% get_answer_for_arrange_options answers.0.answer question as tc_list %}
         {% for testcases in tc_list %}
          <li>{{ testcases.options.strip|safe }}</li>
         {% endfor %}
-- 
cgit