Merge pull request #21 from RunestoneInteractive/master

Updating master

Author: flysaiah

README.rst

@@ -79,7 +79,7 @@ So, you would like to help out with developing the Runestone Components.  What d
 2.  Setup your environment on your development machine
 
     1.  Make a virtual environment for testing and working  I recommend pyvenv-3.4  as it is baked in to Python 3.4 and higher.
-    2.  Rather than following the instructions above for installing runestone simply run ``pip install .`` from the top level runestone directory.  This will install all of the required prerequisites and setup the runestone install as a link to the development directory.
+    2.  Rather than following the instructions above for installing runestone simply run ``pip install -e .`` from the top level runestone directory.  This will install all of the required prerequisites and setup the runestone install as a link to the development directory.
 
 3.  When you have some changes to share, make a Pull Request.
 

runestone/activecode/activecode.py

@@ -196,7 +196,7 @@ def run(self):
         if 'timelimit' not in self.options:
             self.options['timelimit'] = 'data-timelimit=25000'
         else:
-            self.options['timelimit'] = 'data-timelimit=%d' % self.options['timelimit']
+            self.options['timelimit'] = 'data-timelimit=%s' % self.options['timelimit']
 
         if 'autorun' not in self.options:
             self.options['autorun'] = ''

runestone/activecode/js/activecode.js

@@ -116,7 +116,6 @@ def __init__(self,content):
 def visit_blank_node(self,node):
     res = ""
 
-
     res = node.template_blank_start % node.blank_options
 
     self.body.append(res)
@@ -126,7 +125,7 @@ def depart_blank_node(self,node):
     fbl = []
     res = ""
     feedCounter = 0
-
+    print self.body[-2:]
 
     for k in sorted(node.blank_options.keys()):
         if 'feedback' in k:
@@ -177,7 +176,8 @@ def run(self):
 
             Question text
             ...
-            """
+        """
+
         self.options['divid'] = self.arguments[0]
         if self.content:
             if 'iscode' in self.options:
@@ -187,23 +187,26 @@ def run(self):
         else:
             self.options['bodytext'] = '\n'
 
+        if 'correct' not in self.options:
+            raise ValueError("missing correct value in %s"%self.options['divid'])
+
         TEMPLATE_BLANK_START = '''
-        <span data-blank>%(bodytext)s<span data-answer id="%(divid)s_answer">%(correct)s</span>
+        <span data-blank>
             '''
         TEMPLATE_BLANK_OPTION = '''
-        <span data-feedback="regex" id="%(divid)s_%(feedLabel)s">%(feedExp)s</span>
-        <span data-feedback="text" for="%(divid)s_%(feedLabel)s">%(feedText)s</span>
+        <span data-feedback="regex" style="display: none" id="%(divid)s_%(feedLabel)s">%(feedExp)s</span>
+        <span data-feedback="text" style="display: none" for="%(divid)s_%(feedLabel)s">%(feedText)s</span>
             '''
         TEMPLATE_BLANK_END = '''
+        <span data-answer style="display: none" id="%(divid)s_answer">%(correct)s</span>
         </span>
         '''
 
-
-
         blankNode = BlankNode(self.options)
         blankNode.template_blank_start = TEMPLATE_BLANK_START
         blankNode.template_blank_option = TEMPLATE_BLANK_OPTION
         blankNode.template_option_end = TEMPLATE_BLANK_END
 
+        self.state.nested_parse(self.content, self.content_offset, blankNode)
 
         return [blankNode]

runestone/activecode/js/skulpt-stdlib.js

@@ -4,47 +4,17 @@ function RunestoneBase () {   // Basic parent stuff
 
 RunestoneBase.prototype.logBookEvent = function (eventInfo) {
     eventInfo.course = eBookConfig.course;
-    if (eBookConfig.logLevel > 0) {
+    if (eBookConfig.useRunestoneServices && eBookConfig.logLevel > 0) {
         jQuery.get(eBookConfig.ajaxURL + 'hsblog', eventInfo); // Log the run event
     }
     console.log("logging event " + eventInfo);
 };
 
-RunestoneBase.prototype.logRunEvent = function (info) {
+RunestoneBase.prototype.logRunEvent = function (eventInfo) {
     eventInfo.course = eBookConfig.course;
-    if (eBookConfig.logLevel > 0) {
+    if (eBookConfig.useRunestoneServices && eBookConfig.logLevel > 0) {
         jQuery.post(eBookConfig.ajaxURL + 'runlog', eventInfo); // Log the run event
     }
     console.log("running " + eventInfo);
 };
 
-
-
-if (![].includes) {
-  Array.prototype.includes = function(searchElement /*, fromIndex*/ ) {
-    'use strict';
-    var O = Object(this);
-    var len = parseInt(O.length) || 0;
-    if (len === 0) {
-      return false;
-    }
-    var n = parseInt(arguments[1]) || 0;
-    var k;
-    if (n >= 0) {
-      k = n;
-    } else {
-      k = len + n;
-      if (k < 0) {k = 0;}
-    }
-    var currentElement;
-    while (k < len) {
-      currentElement = O[k];
-      if (searchElement === currentElement ||
-         (searchElement !== searchElement && currentElement !== currentElement)) {
-        return true;
-      }
-      k++;
-    }
-    return false;
-  };
-}

runestone/activecode/js/skulpt.min.js

@@ -289,12 +289,12 @@ next line executed.
 Timed Exam Questions
 ---------------------
 
-You can add a timed exam of multiple-choice/fill-in-the-blank questions that the user can only take once.  All the feedback will be shown after the time is up or after the user has clicked the "Submit Answers" button at the end of the timed exam.  To start the timed exam click on the "Start" button.  This will also start the countdown of the time remaining.  You can pause the timer by clicking on the "Pause" button and start it again by clicking on the "Resume" button.  When you pause the timed exam the questions will be hidden.  There is also a clock icon that will display the time remaining when the reader hovers over it.
+You can add a timed exam of multiple-choice/fill-in-the-blank/clickable-area/drag-n-drop questions that the user can only take once.  All the feedback will be shown after the time is up or after the user has clicked the "Submit Answers" button at the end of the timed exam.  To start the timed exam click on the "Start" button.  This will also start the countdown of the time remaining.  You can pause the timer by clicking on the "Pause" button and start it again by clicking on the "Resume" button.  When you pause the timed exam the questions will be hidden.  There is also a clock icon that will display the time remaining when the reader hovers over it.
 
 Please note that you can currently only have one timed exam per html page.
 
 All you need is the timed directive--you can specify the time limit (in minutes), and there are options for no feedback, no results, and no time limit (in which case it will keep track of the amount of time taken to complete the exam).
-A timed exam can hold any number of multiple choice or fill in the blank questions.
+A timed exam can hold any number of multiple choice, fill in the blank, clickable area, and dragndrop components.
 
 .. timed:: timed1
     :timelimit: 10
@@ -314,20 +314,28 @@ A timed exam can hold any number of multiple choice or fill in the blank questio
 
         Under which of these conditions will a sequential search be faster than a binary search?
 
-    .. mchoice:: questiontimed2
-        :random:
-        :multiple_answers:
-        :correct: a,b,d
-        :answer_a: Red
-        :answer_b: Blue
-        :answer_c: Brown
-        :answer_d: Indigo
-        :feedback_a: Yes, red is definitely one of the colors.
-        :feedback_b: Blue is correct!
-        :feedback_c: Remember ROY G BIV!
-        :feedback_d: Yes, indigo is also in the rainbow!
-
-        Which of these are colors of the rainbow?
+    .. clickablearea:: clicktimed1
+        :question: Click on the correct cells.
+        :feedback: Remember, the operator '=' is used for assignment.
+        :table:
+        :correct: 1,1;1,4;2,3;2,4
+        :incorrect: 2,1;2,2;3,0
+
+        +------------------------+------------+----------+----------+
+        |        correct         |    N-A     |    N-A   | correct  |
+        +========================+============+==========+==========+
+        | Incorrect              | incorrect  | correct  | correct  |
+        +------------------------+------------+----------+----------+
+        | This row is incorrect  |   ...      |   ...    |   ...    |
+        +------------------------+------------+----------+----------+
+
+    .. dragndrop:: dnd2
+        :feedback: This is feedback.
+        :match_1: Drag to Answer A|||Answer A
+        :match_2: Drag me Answer B|||Answer B
+        :match_3: Drag to Answer C|||Answer C
+
+        This is a drag n drop question.
 
     .. fillintheblank:: fill1412
 
@@ -430,6 +438,7 @@ will be evaluated once they click the 'Check Me' button.
 
 .. clickablearea:: click1
     :question: Click on all assignment statements.
+    :iscode:
     :feedback: Remember, the operator '=' is used for assignment.
 
     :click-incorrect:def main()::endclick:
@@ -610,8 +619,13 @@ connect it to the print block.  Now click the run button and you should see 10 p
 in the gray output area.
 
 
-Other Languages - LiveCode
---------------------------
+Other Languages in ActiveCode
+-----------------------------
+
+Activecode now supports Java, C++ and C through a backend server, not in the browser.    You can
+use them by specifying the language to be `java`, `cpp` or `c` In addition it supports either Python3 or Python2
+outside of the browser using `python3` or `python2` as the language.   You are limited to non-graphical
+programs in any of these options.
 
 .. activecode:: lc1
    :language: java
@@ -637,6 +651,11 @@ Other Languages - LiveCode
 
    }
 
+
+Audio Tours
+-----------
+
+
 .. activecode:: ch03_4
     :nocanvas:
     :tour_1: "Overall Tour"; 1-2: Example04_Tour01_Line01; 2: Example04_Tour01_Line02; 1: Example04_Tour01_Line03;