From 059034c0ec77d130eeb55af62c456773c2a64b2a Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Wed, 11 Jan 2017 18:18:06 +0530
Subject: changed mcq to single correct choice

---
 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 6218b18..27b2956 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -142,7 +142,7 @@ function call_skip(url)
                  <div class="panel-heading">
                      <h4><u> {{ question.summary }}
                              {% if question.type == "mcq" %}
-                             (Single Correct Choice Questions)
+                             (Single Correct Choice)
                              {% elif question.type == "mcc" %}
                              (Multiple Correct Choices)
                              {% elif question.type == "code" %}
-- 
cgit 


From 4ef5f9377c27a3e88ae3a1a4e2a446984fc14b70 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Thu, 26 Jan 2017 01:43:47 +0530
Subject: added integer based question type

---
 yaksh/templates/exam.html                   |  8 ++++++--
 yaksh/templates/yaksh/add_question.html     |  1 +
 yaksh/templates/yaksh/grade_user.html       |  7 +++++++
 yaksh/templates/yaksh/question.html         | 13 ++++++++++++-
 yaksh/templates/yaksh/user_data.html        |  8 ++++++++
 yaksh/templates/yaksh/view_answerpaper.html |  7 +++++++
 6 files changed, 41 insertions(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index b497cc0..ae1a620 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -84,9 +84,13 @@
       <div class="panel-body"><pre><code>{{ error }}</code></pre></div>
       </div>
       {% endfor %}
-
+                    {% if error != "Incorrect answer" %}
+                    <div class="panel-heading">Testcase No. {{ forloop.counter }}</div>
+                    <div class="panel-body"><pre><code>{{ error }}</code></pre></div>
+                    {% endif %}
                     </div>
-                {% endif %}
+                {% endfor %}
+                </div>
             {% endif %}
             </div>
         </div>
diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index 75802b4..a1b5e90 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -56,6 +56,7 @@
       <option value="stdiobasedtestcase">StdIO </option>
       <option value="mcqtestcase">MCQ/MCC </option>
       <option value="hooktestcase">Hook </option>
+      <option value="integertestcase">Integer </option>
   </select></p>
   <center>
     <button class="btn" type="submit" name="save_question">Save</button>
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 63ff5eb..7801b0b 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -139,6 +139,13 @@ Status : <b style="color: green;"> Passed </b><br/>
                     {{ forloop.counter }}. {{ testcase.options|safe }}</strong>
                     {% endif %}
                     {% endfor %}
+
+            {% elif question.type == "integer" %}
+                <h5> <u>Correct Answer:</u></h5>
+                    {% for testcase in question.get_test_cases %}
+                    <strong>{{ testcase.correct }}</strong>
+                    {% endfor %}
+
             {% else %}
                 <h5> <u>Test cases: </u></h5>
                     {% for testcase in question.get_test_cases %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 27b2956..35c8052 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -149,6 +149,8 @@ function call_skip(url)
                              (PROGRAMMING)
                              {% elif question.type == "upload" %}
                              (ASSIGNMENT UPLOAD)
+                             {% elif question.type == "integer" %}
+                             (ANSWER IN INTEGER)
                              {% endif %}
                          </u>
                          <font class=pull-right>(Marks : {{ question.points }}) </font>
@@ -167,6 +169,14 @@ function call_skip(url)
                      <input name="answer" type="radio" value="{{ test_case.options }}" />{{ test_case.options|safe }} <br/>
                      {% endfor %}
                      {% endif %}
+
+                     {% if question.type == "integer" %}
+                     Enter Integer:&nbsp;&nbsp;&nbsp;&nbsp;
+                     <input name="answer" type="textbox" id="integer" />
+                     <br/>
+                     {% endif %}
+
+
                      {% if question.type == "mcc" %}
                      {% for test_case in test_cases %}
                      <input name="answer" type="checkbox" value="{{ test_case.options }}"> {{ test_case.options|safe }}
@@ -192,10 +202,11 @@ function call_skip(url)
                      {% endif %}
         <div class="from-group">
 
-         {% if question.type == "mcq" or question.type == "mcc"%}
+         {% if question.type == "mcq" or question.type == "mcc" or question.type == "integer" %}
          <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;
+
          {% else %}
          <button class="btn btn-primary" type="submit" name="check" id="check" onClick="submitCode();">Check Answer <span class="glyphicon glyphicon-cog"></span></button>&nbsp;&nbsp;
          {% endif %}
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 9be28fb..b667676 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -75,6 +75,14 @@ User IP address: {{ paper.user_ip }}
                         {{ forloop.counter }}. {{ testcase.options|safe }}</strong>
                         {% endif %}
                     {% endfor %}
+
+            {% elif question.type == "integer" %}
+                <h5> <u>Correct Answer:</u></h5>
+                    {% for testcase in question.get_test_cases %}
+                    <strong>{{ testcase.correct }}</strong>
+                    {% endfor %}
+
+
             {% else %}
                 <h5> <u>Test cases: </u></h5>
                     {% for testcase in question.get_test_cases %}
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 5eb55df..76369db 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -51,6 +51,13 @@
                 {{ forloop.counter }}. {{ testcase.options|safe }}</strong>
                 {% endif %}
                 {% endfor %}
+
+            {% elif question.type == "integer" %}
+                <h5> <u>Correct Answer:</u></h5>
+                    {% for testcase in question.get_test_cases %}
+                    <strong>{{ testcase.correct }}</strong>
+                    {% endfor %}
+
             {% else %}
                 <h5> <u>Test cases: </u></h5>
                     {% for testcase in question.get_test_cases %}
-- 
cgit 


From ddf3e13669f7232acf6019a0f2f33f397a6e6d51 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Mon, 30 Jan 2017 16:20:18 +0530
Subject: added string based questions.

---
 yaksh/templates/yaksh/add_question.html |  1 +
 yaksh/templates/yaksh/question.html     | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index a1b5e90..de3ce56 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -57,6 +57,7 @@
       <option value="mcqtestcase">MCQ/MCC </option>
       <option value="hooktestcase">Hook </option>
       <option value="integertestcase">Integer </option>
+      <option value="stringtestcase"> String </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 35c8052..13726c0 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -142,15 +142,17 @@ function call_skip(url)
                  <div class="panel-heading">
                      <h4><u> {{ question.summary }}
                              {% if question.type == "mcq" %}
-                             (Single Correct Choice)
+                             (SINGLE CORRECT CHOICE)
                              {% elif question.type == "mcc" %}
-                             (Multiple Correct Choices)
+                             (MULTIPLE CORRECT CHOICES)
                              {% elif question.type == "code" %}
                              (PROGRAMMING)
                              {% elif question.type == "upload" %}
                              (ASSIGNMENT UPLOAD)
                              {% elif question.type == "integer" %}
                              (ANSWER IN INTEGER)
+                             {% elif question.type == "string" %}
+                             (ANSWER IN STRING)
                              {% endif %}
                          </u>
                          <font class=pull-right>(Marks : {{ question.points }}) </font>
@@ -176,6 +178,11 @@ function call_skip(url)
                      <br/>
                      {% endif %}
 
+                     {% if question.type == "string" %}
+                     Enter Text:<br/>
+                     <textarea name="answer" id="string"></textarea>
+                     <br/><br/>
+                     {% endif %}
 
                      {% if question.type == "mcc" %}
                      {% for test_case in test_cases %}
-- 
cgit 


From 321343d45bc1f4d20cd348773bd8b214d9c4d692 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Fri, 3 Feb 2017 23:42:30 +0530
Subject: added float based questions

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index de3ce56..6bd96d3 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -58,6 +58,7 @@
       <option value="hooktestcase">Hook </option>
       <option value="integertestcase">Integer </option>
       <option value="stringtestcase"> String </option>
+      <option value="floattestcase"> Float </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 13726c0..161db5a 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -153,6 +153,8 @@ function call_skip(url)
                              (ANSWER IN INTEGER)
                              {% elif question.type == "string" %}
                              (ANSWER IN STRING)
+                             {% elif question.type == "float" %}
+                             (ANSWER IN DECIMAL)
                              {% endif %}
                          </u>
                          <font class=pull-right>(Marks : {{ question.points }}) </font>
@@ -175,7 +177,7 @@ function call_skip(url)
                      {% if question.type == "integer" %}
                      Enter Integer:&nbsp;&nbsp;&nbsp;&nbsp;
                      <input name="answer" type="textbox" id="integer" />
-                     <br/>
+                     <br/><br/>
                      {% endif %}
 
                      {% if question.type == "string" %}
@@ -184,6 +186,12 @@ function call_skip(url)
                      <br/><br/>
                      {% endif %}
 
+                     {% if question.type == "float" %}
+                     Enter Decimal Value :&nbsp;&nbsp;&nbsp;&nbsp;
+                     <input name="answer" type="textbox" id="float" />
+                     <br/><br/>
+                     {% endif %}
+
                      {% if question.type == "mcc" %}
                      {% for test_case in test_cases %}
                      <input name="answer" type="checkbox" value="{{ test_case.options }}"> {{ test_case.options|safe }}
-- 
cgit 


From 23018fa38afcdfec93f1338bd783a769a0fe91e7 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Wed, 8 Feb 2017 17:48:55 +0530
Subject: changed string check names

---
 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 161db5a..930c57d 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -154,7 +154,7 @@ function call_skip(url)
                              {% elif question.type == "string" %}
                              (ANSWER IN STRING)
                              {% elif question.type == "float" %}
-                             (ANSWER IN DECIMAL)
+                             (ANSWER IN FLOAT)
                              {% endif %}
                          </u>
                          <font class=pull-right>(Marks : {{ question.points }}) </font>
-- 
cgit 


From bb95cc5a42a54e895a0b16d907af3bb9a267990d Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Thu, 9 Feb 2017 01:36:41 +0530
Subject: modified answerpaper views for integer, float and string type

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 7801b0b..8653dc7 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -140,10 +140,10 @@ Status : <b style="color: green;"> Passed </b><br/>
                     {% endif %}
                     {% endfor %}
 
-            {% elif question.type == "integer" %}
+            {% elif question.type == "integer" or "string" or "float" %}
                 <h5> <u>Correct Answer:</u></h5>
                     {% for testcase in question.get_test_cases %}
-                    <strong>{{ testcase.correct }}</strong>
+                    <strong>{{ testcase.correct|safe }}</strong>
                     {% endfor %}
 
             {% else %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 930c57d..bfc90a8 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -153,6 +153,12 @@ function call_skip(url)
                              (ANSWER IN INTEGER)
                              {% elif question.type == "string" %}
                              (ANSWER IN STRING)
+                                {% if testcase.string_check == "lower" %}
+                                    <h5>(CASE INSENSITIVE)</h5>
+                                {% else %}
+                                    <h5>(CASE SENSITIVE)</h5>
+                                {% endif %}
+
                              {% elif question.type == "float" %}
                              (ANSWER IN FLOAT)
                              {% endif %}
@@ -217,7 +223,7 @@ function call_skip(url)
                      {% endif %}
         <div class="from-group">
 
-         {% if question.type == "mcq" or question.type == "mcc" or question.type == "integer" %}
+         {% if question.type == "mcq" or "mcc" or "integer" or "float" or "string" %}
          <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;
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index b667676..832e343 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -76,10 +76,10 @@ User IP address: {{ paper.user_ip }}
                         {% endif %}
                     {% endfor %}
 
-            {% elif question.type == "integer" %}
+            {{% elif question.type == "integer" or "string" or "float" %}
                 <h5> <u>Correct Answer:</u></h5>
                     {% for testcase in question.get_test_cases %}
-                    <strong>{{ testcase.correct }}</strong>
+                    <strong>{{ testcase.correct|safe }}</strong>
                     {% endfor %}
 
 
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 76369db..633be9e 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -52,10 +52,10 @@
                 {% endif %}
                 {% endfor %}
 
-            {% elif question.type == "integer" %}
+            {% elif question.type == "integer" or "string" or "float" %}
                 <h5> <u>Correct Answer:</u></h5>
                     {% for testcase in question.get_test_cases %}
-                    <strong>{{ testcase.correct }}</strong>
+                    <strong>{{ testcase.correct|safe }}</strong>
                     {% endfor %}
 
             {% else %}
-- 
cgit 


From 1c5e1dfef3fb4af8bc070fe190cec552ef3732b0 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Thu, 9 Mar 2017 01:18:51 +0530
Subject: pep8 changes in models and user_data

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

(limited to 'yaksh/templates')

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


From ac292ed1099b49f9d0e8a7ed3699bacdd8031de3 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Sat, 11 Mar 2017 02:17:41 +0530
Subject: made minor template changes and fixed test_models

---
 yaksh/templates/exam.html           | 8 ++------
 yaksh/templates/yaksh/question.html | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 4818717..02ff70a 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -86,13 +86,9 @@
       <div class="panel-body"><pre><code>{{ error }}</code></pre></div>
       </div>
       {% endfor %}
-                    {% if error != "Incorrect answer" %}
-                    <div class="panel-heading">Testcase No. {{ forloop.counter }}</div>
-                    <div class="panel-body"><pre><code>{{ error }}</code></pre></div>
-                    {% endif %}
+
                     </div>
-                {% endfor %}
-                </div>
+                {% endif %}
             {% endif %}
             </div>
         </div>
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 93ed531..3f668cd 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -194,7 +194,7 @@ function call_skip(url)
                      {% endif %}
 
                      {% if question.type == "integer" %}
-                     Enter Integer:&nbsp;&nbsp;&nbsp;&nbsp;
+                     Enter Integer:<br/>
                      <input name="answer" type="textbox" id="integer" />
                      <br/><br/>
                      {% endif %}
@@ -206,7 +206,7 @@ function call_skip(url)
                      {% endif %}
 
                      {% if question.type == "float" %}
-                     Enter Decimal Value :&nbsp;&nbsp;&nbsp;&nbsp;
+                     Enter Decimal Value :<br/>
                      <input name="answer" type="textbox" id="float" />
                      <br/><br/>
                      {% endif %}
-- 
cgit 


From f0c7992aa21c4ab69985eb43e82f14b2764c8d8c Mon Sep 17 00:00:00 2001
From: mahesh
Date: Mon, 20 Mar 2017 17:23:16 +0530
Subject: Changed question type names

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 1bb95df..8eb7d4e 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -164,9 +164,9 @@ function call_skip(url)
                              {% elif question.type == "upload" %}
                              (ASSIGNMENT UPLOAD)
                              {% elif question.type == "integer" %}
-                             (ANSWER IN INTEGER)
+                             (FILL IN THE BLANKS WITH INTEGER ANSWER)
                              {% elif question.type == "string" %}
-                             (ANSWER IN STRING)
+                             (FILL IN THE BLANKS WITH STRING ANSWER)
                                 {% if testcase.string_check == "lower" %}
                                     <h5>(CASE INSENSITIVE)</h5>
                                 {% else %}
@@ -174,7 +174,7 @@ function call_skip(url)
                                 {% endif %}
 
                              {% elif question.type == "float" %}
-                             (ANSWER IN FLOAT)
+                             (FILL IN THE BLANKS WITH FLOAT ANSWER)
                              {% endif %}
                         </u>
                         <font class=pull-right>(Marks : {{ question.points }}) </font>
-- 
cgit 


From 99b0bd05370e92ee3663354e5ca9122b75cfb2a7 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Wed, 22 Mar 2017 12:58:04 +0530
Subject: changed input type to number in questions.html

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 45a524d..0dad59d 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -196,7 +196,7 @@ function call_skip(url)
 
                      {% if question.type == "integer" %}
                      Enter Integer:<br/>
-                     <input name="answer" type="textbox" id="integer" />
+                     <input name="answer" type="number" id="integer" />
                      <br/><br/>
                      {% endif %}
 
@@ -208,7 +208,7 @@ function call_skip(url)
 
                      {% if question.type == "float" %}
                      Enter Decimal Value :<br/>
-                     <input name="answer" type="textbox" id="float" />
+                     <input name="answer" type="number" step="any" id="float" />
                      <br/><br/>
                      {% endif %}
 
-- 
cgit