From d6a757f14d6b76c8124d52057cc981403d28d71a Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 12 May 2017 18:25:53 +0530
Subject: changed stdio output

---
 yaksh/templates/exam.html           | 53 +++++++++++++++++++++++++++++++++----
 yaksh/templates/yaksh/question.html |  1 +
 2 files changed, 49 insertions(+), 5 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index a18a962..b5b6c46 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load custom_filters %}
 {% block css%}
     <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/dashboard.css" type="text/css" />
 {% endblock %}
@@ -77,13 +78,55 @@
                 {% if error_message %}
                     <div class="row" id="error_panel">
       {% for error in error_message %}
-      {% if error == "Correct answer" %}
-              <div class="panel panel-success">
-          {% else %}
               <div class="panel panel-danger">
-          {% endif %}
       <div class="panel-heading">Testcase No. {{ forloop.counter }}</div>
-      <div class="panel-body"><pre><code>{{ error }}</code></pre></div>
+      <div class="panel-body">
+      <div class="well well-sm">
+      {% if not error.expected_output %}
+      <pre><code> {{error|safe}} </code></pre>
+      {% else %}
+        {% if error.given_input %}
+       <table class="table table-bordered" width="100%">
+        <col width="30%">
+          <tr class = "active">
+          <td> For given Input value(s):</td>
+          <td>{{error.given_input}}</td>
+       </table>
+       {% endif %}
+        <table class="table table-bordered" width="100%">
+          <col width="10%">
+          <col width="40%">
+          <col width="40%">
+          <col width="10%">
+          <tr class="info">
+          <td><b><center>Line No.</center></b></td>
+          <td><b><center>Expected Output</center></b></td>
+          <td><b><center>User output</center></b></td>
+          <td><b><center>Status</center></b></td>
+          </tr>
+          {% for expected,user in error.expected_output|zip:error.user_output %}
+          <td> {{forloop.counter}} </td>
+          <td>{{expected|default:""}} </td>
+          <td>{{user|default:""}}</td>
+          {% if forloop.counter0 in error.error_no or not expected or not user %}
+          <td><span class ="glyphicon glyphicon-remove text-warning"></td>
+          {% else %}
+          <td><span class ="glyphicon glyphicon-ok text-success"></td>
+          {% endif %}
+          </tr>
+          {% endfor %}
+          </table>
+          <table width="100%" class='table table-bordered'>
+          <col width="10">
+          <tr class = "danger">
+          <td><b>Error:</b></td>
+           <td>{{error.error}}</td>
+
+          </table>
+        
+        {% endif %}
+        </div>
+      </div>
       </div>
       {% endfor %}
 
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 0dad59d..e1cdcf8 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -6,6 +6,7 @@
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/dashboard.css" type="text/css" />
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question.css" type="text/css" />
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/codemirror/lib/codemirror.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/exam.css" type="text/css" />
 <style>
     .CodeMirror{
         border-style: groove;
-- 
cgit 


From 6d8e1aa67381cd3b07e4ac89818af2a96ca05668 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Tue, 16 May 2017 18:28:49 +0530
Subject: added wordwrap for error output table

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index b5b6c46..f349b2f 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -86,32 +86,33 @@
       <pre><code> {{error|safe}} </code></pre>
       {% else %}
         {% if error.given_input %}
-       <table class="table table-bordered" width="100%">
+       <table class="table table-bordered">
         <col width="30%">
           <tr class = "active">
           <td> For given Input value(s):</td>
           <td>{{error.given_input}}</td>
+          </tr>
        </table>
        {% endif %}
-        <table class="table table-bordered" width="100%">
+        <table class="table table-bordered" width="100%" id="output">
           <col width="10%">
           <col width="40%">
           <col width="40%">
           <col width="10%">
           <tr class="info">
-          <td><b><center>Line No.</center></b></td>
-          <td><b><center>Expected Output</center></b></td>
-          <td><b><center>User output</center></b></td>
-          <td><b><center>Status</center></b></td>
+          <th><center>Line No.</center></th>
+          <th><center>Expected Output</center></th>
+          <th><center>User output</center></th>
+          <th><center>Status</center></th>
           </tr>
           {% for expected,user in error.expected_output|zip:error.user_output %}
           <td> {{forloop.counter}} </td>
           <td>{{expected|default:""}} </td>
           <td>{{user|default:""}}</td>
           {% if forloop.counter0 in error.error_no or not expected or not user %}
-          <td><span class ="glyphicon glyphicon-remove text-warning"></td>
+          <td><span class ="glyphicon glyphicon-remove text-warning"/></td>
           {% else %}
-          <td><span class ="glyphicon glyphicon-ok text-success"></td>
+          <td><span class ="glyphicon glyphicon-ok text-success"/></td>
           {% endif %}
           </tr>
           {% endfor %}
@@ -121,7 +122,7 @@
           <tr class = "danger">
           <td><b>Error:</b></td>
            <td>{{error.error}}</td>
-
+           </tr>
           </table>
         
         {% endif %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index e1cdcf8..ee33523 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -239,7 +239,7 @@ function call_skip(url)
         <div class="from-group">
 
          {% 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;
+         <br><button class="btn btn-primary" type="submit" name="check" id="check">Submit Answer</button>&nbsp;&nbsp;<br/>
          {% elif question.type == "upload" %}
          <br><button class="btn btn-primary" type="submit" name="check" id="check" onClick="return validate();">Upload</button>&nbsp;&nbsp;
 
-- 
cgit 


From 6c4ab452538fd23d67c1c2d508cb4768e601d688 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Wed, 17 May 2017 18:29:33 +0530
Subject: changes answerpaper design to accommodate new stdio error look

---
 yaksh/templates/yaksh/grade_user.html       | 57 +++++++++++++++++++++++++++--
 yaksh/templates/yaksh/user_data.html        | 54 +++++++++++++++++++++++++--
 yaksh/templates/yaksh/view_answerpaper.html | 52 +++++++++++++++++++++++++-
 3 files changed, 155 insertions(+), 8 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index c93ec10..a711fc2 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -1,4 +1,5 @@
 {% extends "manage.html" %}
+{% load custom_filters %}
 
 {% block title %} Grade User {% endblock %}
 
@@ -132,6 +133,7 @@ Status : <b style="color: green;"> Passed </b><br/>
 {% csrf_token %}
 
 {% for question, answers in paper.get_question_answers.items %}
+<div class = "well well-sm">
 <div class="panel panel-info">
         <div class="panel-heading">
             <strong> Details: {{forloop.counter}}. {{ question.summary }} 
@@ -198,10 +200,57 @@ Status : <b style="color: green;"> Passed </b><br/>
                 <div class="panel panel-danger">
                     <div class="panel-heading">Error:
             {% endif %}
-            {% for err in ans.error_list %}
-                <div><pre>{{ err }}</pre></div>
-            {% endfor %}
+            {% with ans.error_list as err %}
+            {% for error in err %}
+            {% if not error.expected_output %}
+      <pre><code> {{error|safe}} </code></pre>
+      {% else %}
+        <div class = "well well-sm">
+        {% if error.given_input %}
+       <table class="table table-bordered">
+        <col width="30%">
+          <tr class = "active">
+          <td> For given Input value(s):</td>
+          <td>{{error.given_input}}</td>
+          </tr>
+       </table>
+       {% endif %}
+        <table class="table table-bordered" width="100%" id="output">
+          <col width="10%">
+          <col width="40%">
+          <col width="40%">
+          <col width="10%">
+          <tr class="info">
+          <th><center>Line No.</center></th>
+          <th><center>Expected Output</center></th>
+          <th><center>User output</center></th>
+          <th><center>Status</center></th>
+          </tr>
+          {% for expected,user in error.expected_output|zip:error.user_output %}
+          <td> {{forloop.counter}} </td>
+          <td>{{expected|default:""}} </td>
+          <td>{{user|default:""}}</td>
+          {% if forloop.counter0 in error.error_no or not expected or not user %}
+          <td><span class ="glyphicon glyphicon-remove text-warning"/></td>
+          {% else %}
+          <td><span class ="glyphicon glyphicon-ok text-success"/></td>
+          {% endif %}
+          </tr>
+          {% endfor %}
+          </table>
+          <table width="100%" class='table table-bordered'>
+          <col width="10">
+          <tr class = "danger">
+          <td><b>Error:</b></td>
+           <td>{{error.error}}</td>
+           </tr>
+          </table>
         </div>
+        {% endif %}
+        {% endfor %}
+        {% endwith %}
+        </div>
+        
         <div class="panel-body">
         {% if question.type != "code" %}
         <div class="well well-sm">
@@ -220,6 +269,7 @@ Status : <b style="color: green;"> Passed </b><br/>
         value="{{ answer.answer.marks }}"><br><br>
     {% endwith %}
     <hr/>
+    </div>
     {% endfor %} {# for question, answers ... #}
 <div class="form-group">
 <h3>Teacher comments: </h3>
@@ -233,6 +283,7 @@ Status : <b style="color: green;"> Passed </b><br/>
 
 {% endif %} {# if paper.answers.count #}
 
+
 {% endfor %} {# for paper in data.papers #}
 
 {% endif %} {#  if data.papers #}
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 6e62b66..1af27e6 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -1,4 +1,5 @@
 {% extends "manage.html" %}
+{% load custom_filters %}
 
 {% block pagetitle %} Data for user {{ data.user.get_full_name.title }} {% endblock pagetitle %}
 
@@ -118,11 +119,56 @@ User IP address: {{ paper.user_ip }}
         {% else %}
             <div class="panel panel-danger">
             <div class="panel-heading">Error
-        
-        {% for error in answer.error_list %}
-        <div><pre><code>{{ error }}</code></pre></div>
+        {% with answer.error_list as err %}
+            {% for error in err %}
+            {% if not error.expected_output %}
+      <pre><code> {{error|safe}} </code></pre>
+      {% else %}
+        <div class = "well well-sm">
+        {% if error.given_input %}
+       <table class="table table-bordered">
+        <col width="30%">
+          <tr class = "active">
+          <td> For given Input value(s):</td>
+          <td>{{error.given_input}}</td>
+          </tr>
+       </table>
+       {% endif %}
+        <table class="table table-bordered" width="100%" id="output">
+          <col width="10%">
+          <col width="40%">
+          <col width="40%">
+          <col width="10%">
+          <tr class="info">
+          <th><center>Line No.</center></th>
+          <th><center>Expected Output</center></th>
+          <th><center>User output</center></th>
+          <th><center>Status</center></th>
+          </tr>
+          {% for expected,user in error.expected_output|zip:error.user_output %}
+          <td> {{forloop.counter}} </td>
+          <td>{{expected|default:""}} </td>
+          <td>{{user|default:""}}</td>
+          {% if forloop.counter0 in error.error_no or not expected or not user %}
+          <td><span class ="glyphicon glyphicon-remove text-warning"/></td>
+          {% else %}
+          <td><span class ="glyphicon glyphicon-ok text-success"/></td>
+          {% endif %}
+          </tr>
+          {% endfor %}
+          </table>
+          <table width="100%" class='table table-bordered'>
+          <col width="10">
+          <tr class = "danger">
+          <td><b>Error:</b></td>
+           <td>{{error.error}}</td>
+           </tr>
+          </table>
+        </div>
+        {% endif %}
         {% endfor %}
-        {% endif %}    
+        {% endwith %}
+        {% endif %}
     
     </div>
     <div class="panel-body">
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index f4c8846..71536eb 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -1,4 +1,5 @@
 {% extends "user.html" %}
+{% load custom_filters %}
 
 {% block pagetitle %} Answer Paper  for {{ quiz.description }}{% endblock pagetitle %}
 
@@ -102,7 +103,56 @@
         {% else %}
             <div class="panel panel-danger">
         {% endif %}
-    <div class="panel-heading">Autocheck: {{ answer.error }}</div>
+    <div class="panel-heading">Error:</div>
+        {% with answer.error_list as err %}
+            {% for error in err %}
+            {% if not error.expected_output %}
+      <pre><code> {{error|safe}} </code></pre>
+      {% else %}
+        <div class = "well well-sm">
+        {% if error.given_input %}
+       <table class="table table-bordered">
+        <col width="30%">
+          <tr class = "active">
+          <td> For given Input value(s):</td>
+          <td>{{error.given_input}}</td>
+          </tr>
+       </table>
+       {% endif %}
+        <table class="table table-bordered" width="100%" id="output">
+          <col width="10%">
+          <col width="40%">
+          <col width="40%">
+          <col width="10%">
+          <tr class="info">
+          <th><center>Line No.</center></th>
+          <th><center>Expected Output</center></th>
+          <th><center>User output</center></th>
+          <th><center>Status</center></th>
+          </tr>
+          {% for expected,user in error.expected_output|zip:error.user_output %}
+          <td> {{forloop.counter}} </td>
+          <td>{{expected|default:""}} </td>
+          <td>{{user|default:""}}</td>
+          {% if forloop.counter0 in error.error_no or not expected or not user %}
+          <td><span class ="glyphicon glyphicon-remove text-warning"/></td>
+          {% else %}
+          <td><span class ="glyphicon glyphicon-ok text-success"/></td>
+          {% endif %}
+          </tr>
+          {% endfor %}
+          </table>
+          <table width="100%" class='table table-bordered'>
+          <col width="10">
+          <tr class = "danger">
+          <td><b>Error:</b></td>
+           <td>{{error.error}}</td>
+           </tr>
+          </table>
+        </div>
+        {% endif %}
+        {% endfor %}
+        {% endwith %}
     <div class="panel-body">
     <pre><code>{{ answer.answer.answer.strip }}</code></pre>
     </div>
-- 
cgit 


From 77f05d3df90a70ff97285deb5bda2d91d99e65d5 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Mon, 22 May 2017 14:32:47 +0530
Subject: changes variable and dict key names along with other minor changes in
 answerpaper.

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

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index f349b2f..45b85f0 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -109,7 +109,7 @@
           <td> {{forloop.counter}} </td>
           <td>{{expected|default:""}} </td>
           <td>{{user|default:""}}</td>
-          {% if forloop.counter0 in error.error_no or not expected or not user %}
+          {% if forloop.counter0 in error.error_line_numbers or not expected or not user %}
           <td><span class ="glyphicon glyphicon-remove text-warning"/></td>
           {% else %}
           <td><span class ="glyphicon glyphicon-ok text-success"/></td>
@@ -121,7 +121,7 @@
           <col width="10">
           <tr class = "danger">
           <td><b>Error:</b></td>
-           <td>{{error.error}}</td>
+           <td>{{error.error_msg}}</td>
            </tr>
           </table>
         
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index a711fc2..9cdfb1a 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -230,7 +230,7 @@ Status : <b style="color: green;"> Passed </b><br/>
           <td> {{forloop.counter}} </td>
           <td>{{expected|default:""}} </td>
           <td>{{user|default:""}}</td>
-          {% if forloop.counter0 in error.error_no or not expected or not user %}
+          {% if forloop.counter0 in error.error_line_numbers or not expected or not user %}
           <td><span class ="glyphicon glyphicon-remove text-warning"/></td>
           {% else %}
           <td><span class ="glyphicon glyphicon-ok text-success"/></td>
@@ -242,7 +242,7 @@ Status : <b style="color: green;"> Passed </b><br/>
           <col width="10">
           <tr class = "danger">
           <td><b>Error:</b></td>
-           <td>{{error.error}}</td>
+           <td>{{error.error_msg}}</td>
            </tr>
           </table>
         </div>
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 1af27e6..a8adc22 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -149,7 +149,7 @@ User IP address: {{ paper.user_ip }}
           <td> {{forloop.counter}} </td>
           <td>{{expected|default:""}} </td>
           <td>{{user|default:""}}</td>
-          {% if forloop.counter0 in error.error_no or not expected or not user %}
+          {% if forloop.counter0 in error.error_line_numbers or not expected or not user %}
           <td><span class ="glyphicon glyphicon-remove text-warning"/></td>
           {% else %}
           <td><span class ="glyphicon glyphicon-ok text-success"/></td>
@@ -161,7 +161,7 @@ User IP address: {{ paper.user_ip }}
           <col width="10">
           <tr class = "danger">
           <td><b>Error:</b></td>
-           <td>{{error.error}}</td>
+           <td>{{error.error_msg}}</td>
            </tr>
           </table>
         </div>
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 71536eb..9edff5a 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -134,7 +134,7 @@
           <td> {{forloop.counter}} </td>
           <td>{{expected|default:""}} </td>
           <td>{{user|default:""}}</td>
-          {% if forloop.counter0 in error.error_no or not expected or not user %}
+          {% if forloop.counter0 in error.error_line_numbers or not expected or not user %}
           <td><span class ="glyphicon glyphicon-remove text-warning"/></td>
           {% else %}
           <td><span class ="glyphicon glyphicon-ok text-success"/></td>
@@ -146,7 +146,7 @@
           <col width="10">
           <tr class = "danger">
           <td><b>Error:</b></td>
-           <td>{{error.error}}</td>
+           <td>{{error.error_msg}}</td>
            </tr>
           </table>
         </div>
-- 
cgit