udpated

pgbovine · mmmicedcoffee · commit 63ff13945aed · 2014-01-31T13:15:20.000-05:00
diff --git a/v3/bottle_server.py b/v3/bottle_server.py
@@ -12,6 +12,9 @@
 import cStringIO
 import json
 import pg_logger
+import urllib
+import urllib2
+
 
 @route('/<filepath:path>')
 def index(filepath):
@@ -46,7 +49,9 @@ def load_matrix_problem():
   assert prob_name in ('python_comprehension-1',)
 
   fn = 'matrix-demo/' + prob_name + '.py'
-  cod = open(fn).read()
+  f = open(fn)
+  cod = f.read()
+  f.close()
 
   import doctest
   import sys
@@ -73,16 +78,22 @@ def submit_matrix_problem():
   test_cod = open(test_fn).read()
 
   # concatenate!
-  script = test_cod + '\n' + user_code + '\nimport doctest\ndoctest.testmod()'
-
-  import simple_sandbox
-
-  def json_finalizer(executor):
-    return json.dumps(dict(code=executor.executed_script,
-                           user_stdout=executor.user_stdout.getvalue(),
-                           user_stderr=executor.user_stderr.getvalue()))
-
-  return simple_sandbox.exec_str(script, json_finalizer)
+  script = test_cod + '\n' + user_code + \
+'''
+import doctest
+(n_fail, n_tests) = doctest.testmod(verbose=False)
+if n_fail == 0:
+    print("All %d tests passed!" % n_tests)
+'''
+
+  url = 'http://ec2-107-20-94-197.compute-1.amazonaws.com/cgi-bin/run_code.py'
+  values = {'user_script' : script}
+
+  data = urllib.urlencode(values)
+  req = urllib2.Request(url, data)
+  response = urllib2.urlopen(req)
+  the_page = response.read()
+  return the_page
 
 
 if __name__ == "__main__":
diff --git a/v3/js/matrixtutor.js b/v3/js/matrixtutor.js
@@ -116,6 +116,10 @@ $(document).ready(function() {
       $('#pyOutputPane #editBtn').click(function() {
         enterEditMode();
       });
+
+      $('#gradeStdout,#gradeStderr').val(''); // clear 'em
+      $('#submitGradeBtn').html('Submit for Grading');
+      $('#submitGradeBtn').attr('disabled', false);
     }
     else if (appMode == 'display_no_frills') {
       $("#pyInputPane").hide();
@@ -142,7 +146,7 @@ $(document).ready(function() {
       $("#pyOutputPane,#gradingPane").hide();
       $("#embedLinkDiv").hide();
 
-      var backendOptionsObj = {cumulative_mode: ($('#cumulativeModeSelector').val() == 'true'),
+      var backendOptionsObj = {cumulative_mode: false,
                                heap_primitives: false,
                                show_only_outputs: false,
                                py_crazy_mode: false,
@@ -222,11 +226,6 @@ $(document).ready(function() {
 
   var queryStrOptions = getQueryStringOptions();
 
-  // ugh, ugly tristate due to the possibility of each being undefined
-  if (queryStrOptions.cumulativeState !== undefined) {
-    $('#cumulativeModeSelector').val(queryStrOptions.cumulativeState);
-  }
-
   appMode = $.bbq.getState('mode'); // assign this to the GLOBAL appMode
   if ((appMode == "display") && queryStrOptions.preseededCode /* jump to display only with pre-seeded code */) {
     preseededCurInstr = queryStrOptions.preseededCurInstr; // ugly global
@@ -273,12 +272,18 @@ $(document).ready(function() {
 
 
   $('#submitGradeBtn').bind('click', function() {
+    $('#submitGradeBtn').html('Now Grading ...');
+    $('#submitGradeBtn').attr('disabled', true);
+
     $.get('submit_matrix_problem',
           {submitted_code: pyInputCodeMirror.getValue(),
            problem_name: 'python_comprehension-1'},
           function(dataFromBackend) {
             $('#gradeStdout').val(dataFromBackend.user_stdout);
             $('#gradeStderr').val(dataFromBackend.user_stderr);
+
+            $('#submitGradeBtn').html('Submit for Grading');
+            $('#submitGradeBtn').attr('disabled', false);
           },
           "json");
 
diff --git a/v3/matrixtutor.html b/v3/matrixtutor.html
@@ -99,13 +99,13 @@ <h1 style="margin-bottom: 15px; font-size: 14pt;">Problem: python_comprehension-
 </p>
 
 <p>
-Program output:<br/>
-<textarea id="gradeStdout" cols="100" rows="20" wrap="off" readonly></textarea>
+Grader output:<br/>
+<textarea id="gradeStdout" cols="80" rows="12" wrap="off" readonly></textarea>
 </p>
 
 <p>
-Errors:<br/>
-<textarea id="gradeStderr" cols="100" rows="10" wrap="off" readonly></textarea>
+Grader errors:<br/>
+<textarea id="gradeStderr" cols="80" rows="4" wrap="off" readonly></textarea>
 </p>
 
 </div>
