From 7e2972786599fc23c436e593fcc236defd93c88c Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Wed, 22 Nov 2017 20:49:07 +0530
Subject: Display error output without reloading.

---
 yaksh/templates/exam.html | 83 ++---------------------------------------------
 1 file changed, 3 insertions(+), 80 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index a1f0df4..f722c5f 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -82,86 +82,9 @@
             </div>
             <br/>
             {% if question.type == 'code' or question.type == 'upload' %}
-                {% if error_message %}
-                    <div class="row" id="error_panel">
-      {% for error in error_message %}
-              <div class="panel panel-danger">
-      <div class="panel-heading">Error No. {{ forloop.counter }}</div>
-      <div class="panel-body">
-      <div class="well well-sm">
-      {% if not error.type %}
-      <pre><code> {{error|safe}} </code></pre>
-      {% elif error.type == 'assertion' %}
-            {% if error.test_case %}
-      <strong> We tried your code with the following test case:</strong><br/></br>
-              <pre><code><strong style="color:#d9534f">{{error.test_case}}</strong></code></pre>
-            {% endif %}
-          <p> <b>The following error took place: </b></p>
-        <table class="table table-bordered" width="100%" id='assertion'>
-          <col width="30%">
-            <tr class = "active">
-            <td><b>Exception Name: </b></td>
-            <td><span style="color: #d9534f">{{error.exception}}</span></td>
-          </tr>
-          <tr>
-            <td><b>Exception Message: </b></td><td>{{error.message}}</td>
-          </tr>
-          <tr>
-            {% if error.traceback %}
-            <td><b>Full Traceback: </b></td>
-            <td><pre>{{error.traceback}}</pre></td>
-            {% endif %}
-          </tr>
-        </table>
-      {% elif error.type == 'stdio' %}
-        {% 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="stdio">
-          <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_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>
-          {% 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_msg}}</td>
-           </tr>
-          </table>
-        
-        {% endif %}
-        </div>
-      </div>
-      </div>
-      {% endfor %}
-
-                    </div>
-                {% endif %}
+            <div class="row" id="error_panel">
+              </div>
+            </div>
             {% endif %}
             </div>
         </div>
-- 
cgit 


From ae4e2dad126535cda41a7b4a05fdb247f9cdf737 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Thu, 23 Nov 2017 01:11:59 +0530
Subject: Render error output with django template instead of javascript

---
 yaksh/templates/exam.html                 | 16 +-----
 yaksh/templates/yaksh/error_template.html | 93 +++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+), 13 deletions(-)
 create mode 100644 yaksh/templates/yaksh/error_template.html

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index f722c5f..fede185 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -33,15 +33,6 @@
     </nav><!-- /.navbar -->
 {% endblock %}
 {% block content %}
-  <script>
-    $(document).ready(function() {
-        var ele = document.getElementById('error_panel')
-        if (ele) {
-          ele.scrollIntoView(true);
-          window.scrollBy(0, -15);
-        }
-    });
-  </script>
 <div class="container-fluid">
     <div class="col-sm-3 col-md-2 sidebar">
         <p> Question Navigator </p>
@@ -80,13 +71,12 @@
                 {% block main %}
                 {% endblock %}
             </div>
+            </div>
             <br/>
+        </div>
             {% if question.type == 'code' or question.type == 'upload' %}
-            <div class="row" id="error_panel">
-              </div>
-            </div>
+            <div class="row" id="error_panel"></div>
             {% endif %}
-            </div>
         </div>
     </div>
 </div>
diff --git a/yaksh/templates/yaksh/error_template.html b/yaksh/templates/yaksh/error_template.html
new file mode 100644
index 0000000..d42a259
--- /dev/null
+++ b/yaksh/templates/yaksh/error_template.html
@@ -0,0 +1,93 @@
+{% block css%}
+    <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/dashboard.css" type="text/css" />
+{% endblock %}
+
+{% load custom_filters %}
+
+{% if error_message %}
+<div class="col-md-12">
+    {% for error in error_message %}
+
+      <div class="panel panel-danger">
+      <div class="panel-heading">Error No. {{ forloop.counter }}</div>
+      <div class="panel-body">
+      <div class="well well-sm">
+      {% if not error.type %}
+        <pre><code> {{error|safe}} </code></pre>
+
+      {% elif error.type == 'assertion' %}
+
+        {% if error.test_case %}
+          <strong> We tried your code with the following test case:</strong>
+          <br/></br>
+          <pre><code><strong style="color:#d9534f">
+          {{error.test_case}}
+          </strong></code></pre>
+        {% endif %}
+        <p> <b>The following error took place: </b></p>
+        <table class="table table-bordered" width="100%" id='assertion'>
+        <col width="30%">
+            <tr class = "active">
+              <td><b>Exception Name: </b></td>
+              <td><span style="color: #d9534f">{{error.exception}}</span></td>
+          </tr>
+          <tr>
+            <td><b>Exception Message: </b></td><td>{{error.message}}</td>
+          </tr>
+          <tr>
+            {% if error.traceback %}
+            <td><b>Full Traceback: </b></td>
+            <td><pre>{{error.traceback}}</pre></td>
+            {% endif %}
+          </tr>
+        </table>
+
+      {% elif error.type == 'stdio' %}
+
+        {% 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="stdio">
+          <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_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>
+          {% 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_msg}}</td>
+           </tr>
+          </table>
+        {% endif %}
+        </div>
+      </div>
+      </div>
+      {% endfor %}
+    </div>
+{% endif %}
\ No newline at end of file
-- 
cgit 


From c5469243a3357a030af0047dac90ae8fbbb77e85 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Thu, 23 Nov 2017 12:59:25 +0530
Subject: Minor changes in requesthandler.js

---
 yaksh/templates/exam.html                 | 2 +-
 yaksh/templates/yaksh/error_template.html | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index fede185..63c31d6 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -73,11 +73,11 @@
             </div>
             </div>
             <br/>
-        </div>
             {% if question.type == 'code' or question.type == 'upload' %}
             <div class="row" id="error_panel"></div>
             {% endif %}
         </div>
+        </div>
     </div>
 </div>
 {% endblock %}
diff --git a/yaksh/templates/yaksh/error_template.html b/yaksh/templates/yaksh/error_template.html
index d42a259..61657ae 100644
--- a/yaksh/templates/yaksh/error_template.html
+++ b/yaksh/templates/yaksh/error_template.html
@@ -5,7 +5,6 @@
 {% load custom_filters %}
 
 {% if error_message %}
-<div class="col-md-12">
     {% for error in error_message %}
 
       <div class="panel panel-danger">
@@ -89,5 +88,4 @@
       </div>
       </div>
       {% endfor %}
-    </div>
 {% endif %}
\ No newline at end of file
-- 
cgit 


From 252449b7b96d73548f53ecd0c3256aa0e777d1dd Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Thu, 23 Nov 2017 13:54:47 +0530
Subject: Put page footer outside div container

---
 yaksh/templates/base.html           |  2 +-
 yaksh/templates/exam.html           |  9 +--------
 yaksh/templates/yaksh/question.html | 14 +++++++++-----
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index e7cc15c..3302482 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -52,6 +52,7 @@
 	       {% block content %}
 	       {% endblock %}
      </div>
+     </div>
      <footer class="footer" id="footer_div">
       <div class="logged_user_info" align="center">
             {% block info %}
@@ -61,7 +62,6 @@
          <p align="center">Developed by FOSSEE group, IIT Bombay</p>
      </div>
      </footer>
-  </div>
 
 </body>
 </html>
diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 63c31d6..6589bb5 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -66,18 +66,11 @@
             <p>Question(s) left: <b>{{ paper.questions_left }}</b></p>
         </div>
         <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-            <div class="row">
                 <div class="row">
                 {% block main %}
                 {% endblock %}
             </div>
-            </div>
-            <br/>
-            {% if question.type == 'code' or question.type == 'upload' %}
-            <div class="row" id="error_panel"></div>
-            {% endif %}
         </div>
         </div>
-    </div>
-</div>
+
 {% endblock %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index af24778..c1e0e9a 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -227,12 +227,16 @@ lang = "{{ question.language }}"
          {% if question in paper.get_questions_unanswered %}
          <button class="btn btn-primary"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')" name="skip" id="skip">Attempt Later <span class="glyphicon glyphicon-arrow-right"></span></button>
          {% endif %}
-         </div>
-                 </div>
-             </div>
-
+         {% endif %} 
+       </div>
          </form>
-         {% endif %}
+         </div>
+     </div>
+   </div>
+   <br/>
+  {% if question.type == 'code' or question.type == 'upload' %}
+  <div class="row" id="error_panel"></div>
+  {% endif %}
          
     <!-- Modal -->
     <div class="modal fade " id="upload_alert" >
-- 
cgit