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 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 5 deletions(-)

(limited to 'yaksh/templates/exam.html')

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 %}
 
-- 
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 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'yaksh/templates/exam.html')

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 %}
-- 
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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates/exam.html')

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>
         
-- 
cgit