From ce995e06e3509a1340061c51dfa08a65c69eef66 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Mon, 14 Aug 2017 12:10:42 +0530
Subject: Front-end modification for improved code server

Added JQuery to handle request.
Sends ajax request and gets json as response.
json contains token i.e uid which is answer id.
Using uid, an ajax request is sent after every 2 secs till the server
gives the desire result.
If the code result has error then html is written on the document.
If the result has correct answer then next question is displayed.

*includes function for string will not work for older browers.
Will substitute with a different function in next commit.
---
 yaksh/templates/yaksh/question.html | 51 +++++--------------------------------
 1 file changed, 6 insertions(+), 45 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index ee33523..9df2fef 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -15,7 +15,7 @@
 {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh/js/question.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/requesthandler.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/codemirror/lib/codemirror.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/codemirror/mode/python/python.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/codemirror/mode/clike/clike.js"></script>
@@ -79,7 +79,7 @@ function validate(){
     }
     else
     {
-        return true;
+        send_request();
     }
 }
 
@@ -89,47 +89,8 @@ function call_skip(url)
     form.action = url
     form.submit();
 }
-</script>
-<script>
-
-  var init_val = '{{ last_attempt|escape_quotes|safe }}';
-  var global_editor = {};
-  $(document).ready(function(){
-  // Codemirror object, language modes and initial content
-  // Get the textarea node
-  var textarea_node = document.querySelector('#answer');
-
-  var lang = "{{ question.language }}"
-  var mode_dict = {
-    'python': 'python',
-    'c': 'text/x-csrc',
-    'cpp': 'text/x-c++src',
-    'java': 'text/x-java',
-    'bash': 'text/x-sh',
-    'scilab': 'text/x-csrc'
-  }
-
-  // Code mirror Options
-  var options = {
-      mode: mode_dict[lang],
-      gutter: true,
-      lineNumbers: true,
-      onChange: function (instance, changes) {
-          render();
-      }
-  };
-
-  // Initialize the codemirror editor
-  global_editor.editor = CodeMirror.fromTextArea(textarea_node, options);
-
-  // Setting code editors initial content
-  global_editor.editor.setValue(init_val);
-
-  function reset_editor() {
-      global_editor.editor.setValue(init_val);
-      global_editor.editor.clearHistory();
-  }
-    });
+init_val = '{{ last_attempt|escape_quotes|safe }}';
+lang = "{{ question.language }}"
 </script>
 
 {% endblock script %}
@@ -239,13 +200,13 @@ 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/>
+         <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;
 
          {% else %}
            {% if question in paper.get_questions_unanswered %}
-           <button class="btn btn-primary" type="submit" name="check" id="check" onClick="submitCode();">Check Answer <span class="glyphicon glyphicon-cog"></span></button>&nbsp;&nbsp;
+           <button class="btn btn-primary" type="submit" name="check" id="check" >Check Answer <span class="glyphicon glyphicon-cog"></span></button>&nbsp;&nbsp;
            {% endif %}
          {% endif %}
 
-- 
cgit