revert parsons back to pre-RSE0001 implementation

Author: bnmnetp

runestone/parsons/README.rst

@@ -0,0 +1,7 @@
+Parsons Directive
+=================
+
+The master repository for the parsons problems code is https://github.com/vkaravir/js-parsons.git
+
+If you want to make customizations ONLY for runestone you should use the fork at https://github.com/bnmnetp/js-parsons.git
+

runestone/parsons/__init__.py

@@ -1 +1,3 @@
+
 from .parsons import *
+

runestone/parsons/css/parsons.css

@@ -72,13 +72,13 @@ li.correctPosition, .testcase.pass {
 .testcase .msg { font-weight: bold; }
 .testcase .error { color: red;}
 .testcase .feedback { font-weight: bolder;}
-.testcase.fail .expected, .testcase.fail .actual {
-    color: red;
+.testcase.fail .expected, .testcase.fail .actual { 
+    color: red; 
     font-weight: bolder;
 }
-.testcase .output {
-    display: block;
-    white-space: pre;
+.testcase .output { 
+    display: block; 
+    white-space: pre; 
     background-color: #555555;
     color: white;
     font-size: 12px;

runestone/parsons/js/lib/jquery-ui.min.js

@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-__author__ = 'isaiahmayerchak'
+__author__ = 'hewner'
 
 import re
 from docutils import nodes
@@ -28,44 +28,17 @@ def setup(app):
     app.add_stylesheet('parsons.css')
     app.add_stylesheet('lib/prettify.css')
 
-    app.add_node(ParsonsNode, html=(visit_prs_node, depart_prs_node))
-
     # includes parsons specific javascript headers
     # parsons-noconflict reverts underscore and
     # jquery to their original versions
+    app.add_javascript('lib/jquery.min.js')
+    app.add_javascript('lib/jquery-ui.min.js')
     app.add_javascript('lib/prettify.js')
     app.add_javascript('lib/underscore-min.js')
     app.add_javascript('lib/lis.js')
     app.add_javascript('parsons.js')
-    app.add_javascript('parsonsaux.js')
-
-
-TEMPLATE = '''
-    <pre data-component="parsons" id="%(divid)s">
-        <span data-question>%(qnumber)s: %(instructions)s</span>%(code)s</pre>
-    '''
-
-class ParsonsNode(nodes.General, nodes.Element):
-    def __init__(self,content):
-        """
-        Arguments:
-        - `self`:
-        - `content`:
-        """
-        super(ParsonsNode,self).__init__()
-        self.prs_options = content
-
-def visit_prs_node(self,node):
-    res = TEMPLATE % node.prs_options
-
-    self.body.append(res)
+    app.add_javascript('parsons-noconflict.js')
 
-def depart_prs_node(self,node):
-    ''' This is called at the start of processing an datafile node. If parsons had recursive nodes
-        etc and did not want to do all of the processing in visit_prs_node any finishing touches could be
-        added here.
-    '''
-    pass
 
 class ParsonsProblem(Assessment):
     required_arguments = 1
@@ -76,13 +49,18 @@ class ParsonsProblem(Assessment):
 
     def run(self):
         """
-   Instructions for solving the problem should be written and then a line with -----
+
+   Instructions for solving the problem should be written and then a line with ----- 
    signals the beginning of the code.  If you want more than one line in a single
    code block, seperate your code blocks with =====.
+
    Both the instructions sections and code blocks are optional. If you don't include any
    =====, the code will assume you want each line to be its own code block.
+
 Example:
+
 .. parsonsprob:: unqiue_problem_id_here
+
    Solve my really cool parsons problem...if you can.
    -----
    def findmax(alist):
@@ -98,24 +76,173 @@ def findmax(alist):
             curmax = item
    =====
       return curmax
+
+
         """
-        self.options['divid'] = self.arguments[0]
-        self.options['qnumber'] = self.getNumber()
-        self.options['instructions'] = ""
-        self.options['code'] = self.content
+
+        template_values = {}
+        template_values['qnumber'] = self.getNumber()
+        template_values['unique_id'] = self.lineno
+        template_values['instructions'] = ""
+        code = self.content
+
         if '-----' in self.content:
             index = self.content.index('-----')
-            self.options['instructions'] = "\n".join(self.content[:index])
-            self.options['code'] = self.content[index + 1:]
+            template_values['instructions'] = "\n".join(self.content[:index])
+            code = self.content[index + 1:]
 
-        if '=====' in self.options['code']:
-            self.options['code'] = "\n".join(self.options['code'])
-
-            self.options['code'] = self.options['code'].replace('=====', '---')
+        if '=====' in code:
+            template_values['code'] = self.parse_multiline_parsons(code);
         else:
-            self.options['code'] = "\n".join(self.options['code'])
-
-        self.options['divid'] = self.arguments[0]
+            template_values['code'] = "\n".join(code)
+
+        template_values['divid'] = self.arguments[0]
+
+        TEMPLATE = '''
+        <div class='parsons alert alert-warning' id="parsons-%(unique_id)s">
+        <div class="parsons-text">%(qnumber)s: %(instructions)s<br /><br /></div>
+        <div style="clear:left;"></div>
+        <div id="parsons-orig-%(unique_id)s" style="display:none;">%(code)s</div>
+        <div class="sortable-code-container">
+        <div id="parsons-sortableTrash-%(unique_id)s" class="sortable-code"></div>
+        <div id="parsons-sortableCode-%(unique_id)s" class="sortable-code"></div>
+        <div style="clear:left;"></div>
+        </div>
+        <div class="parsons-controls">
+        <input type="button" class='btn btn-success' id="checkMe%(unique_id)s" value="Check Me"/>
+        <input type="button" class='btn btn-default' id="reset%(unique_id)s" value="Reset"/>
+        <div id="parsons-message-%(unique_id)s"></div>
+        </div>
+        </div>
+
+    <script>
+        $pjQ(document).ready(function(){
+            var rb = new RunestoneBase();
+            $("#parsons-%(unique_id)s").not(".sortable-code").not(".parsons-controls").on("click", function(){
+                 $('html, body').animate({
+                    scrollTop: ($("#parsons-%(unique_id)s").offset().top - 50)
+                }, 700);
+            }).find(".sortable-code, .parsons-controls").click(function(e) {
+                return false;
+                });
+            var msgBox = $("#parsons-message-%(unique_id)s");
+            msgBox.hide();
+        var displayErrors = function (fb) {
+            if(fb.errors.length > 0) {
+                    var hash = pp_%(unique_id)s.getHash("#ul-parsons-sortableCode-%(unique_id)s");
+                    msgBox.fadeIn(500);
+                    msgBox.attr('class','alert alert-danger');
+                    msgBox.html(fb.errors[0]);
+                    rb.logBookEvent({'event':'parsons', 'act':hash, 'div_id':'%(divid)s'});
+
+            } else {
+                    rb.logBookEvent({'event':'parsons', 'act':'yes', 'div_id':'%(divid)s'});
+                    msgBox.fadeIn(100);
+                    msgBox.attr('class','alert alert-success');
+                    msgBox.html("Perfect!")
+                }
+
+        }
+
+        $(window).load(function() {
+            // set min width and height
+            var sortableul = $("#ul-parsons-sortableCode-%(unique_id)s");
+            var trashul = $("#ul-parsons-sortableTrash-%(unique_id)s");
+            var sortableHeight = sortableul.height();
+            var sortableWidth = sortableul.width();
+            var trashWidth = trashul.width();
+            var trashHeight = trashul.height();
+            var minHeight = Math.max(trashHeight,sortableHeight);
+            var minWidth = Math.max(trashWidth, sortableWidth);
+            trashul.css("min-height",minHeight + "px");
+            sortableul.css("min-height",minHeight + "px");
+            sortableul.height(minHeight);
+            trashul.css("min-width",minWidth + "px");
+            sortableul.css("min-width",minWidth + "px");
+        });
+ 
+
+        var pp_%(unique_id)s = new ParsonsWidget({
+                'sortableId': 'parsons-sortableCode-%(unique_id)s',
+        'trashId': 'parsons-sortableTrash-%(unique_id)s',
+                'max_wrong_lines': 1,
+                'solution_label': 'Drop blocks here',
+                'feedback_cb' : displayErrors
+        });
+        pp_%(unique_id)s.init($pjQ("#parsons-orig-%(unique_id)s").text());
+    pp_%(unique_id)s.shuffleLines();
+            
+        if(localStorage.getItem('%(divid)s') && localStorage.getItem('%(divid)s-trash')) {
+            try {
+                var solution = localStorage.getItem('%(divid)s');
+                var trash = localStorage.getItem('%(divid)s-trash');
+                pp_%(unique_id)s.createHTMLFromHashes(solution,trash);
+                pp_%(unique_id)s.getFeedback();
+            } catch(err) {
+                var text = "An error occured restoring old %(divid)s state.  Error: ";
+                console.log(text + err.message);
+            }
+
+        }
+            $pjQ("#reset%(unique_id)s").click(function(event){
+              event.preventDefault();
+              pp_%(unique_id)s.shuffleLines();
+            
+            // set min width and height
+            var sortableul = $("#ul-parsons-sortableCode-%(unique_id)s");
+            var trashul = $("#ul-parsons-sortableTrash-%(unique_id)s");
+            var sortableHeight = sortableul.height();
+            var sortableWidth = sortableul.width();
+            var trashWidth = trashul.width();
+            var trashHeight = trashul.height();
+            var minHeight = Math.max(trashHeight,sortableHeight);
+            var minWidth = Math.max(trashWidth, sortableWidth);
+            trashul.css("min-height",minHeight + "px");
+            sortableul.css("min-height",minHeight + "px");
+            trashul.css("min-width",minWidth + "px");
+            sortableul.css("min-width",minWidth + "px");
+              msgBox.hide();
+            });
+            
+            $pjQ("#checkMe%(unique_id)s").click(function(event){
+              event.preventDefault();
+              var hash = pp_%(unique_id)s.getHash("#ul-parsons-sortableCode-%(unique_id)s");
+              localStorage.setItem('%(divid)s',hash);
+              hash = pp_%(unique_id)s.getHash("#ul-parsons-sortableTrash-%(unique_id)s");
+              localStorage.setItem('%(divid)s-trash',hash);
+            
+            pp_%(unique_id)s.getFeedback();
+            msgBox.fadeIn(100);
+            
+            });
+            
+        });
+            
+
+    </script>
+
+'''
 
         self.assert_has_content()
-        return [ParsonsNode(self.options)]
+        return [nodes.raw('', TEMPLATE % template_values, format='html')]
+
+    def parse_multiline_parsons(self, lines):
+        current_block = []
+        results = []
+        for line in lines:
+            if (line == '====='):
+                results.append(self.convert_leading_whitespace_for_block(current_block))
+                current_block = []
+            else:
+                current_block.append(line)
+        results.append(self.convert_leading_whitespace_for_block(current_block))
+        return "\n".join(results)
+
+    def convert_leading_whitespace_for_block(self, block):
+        whitespaceMatcher = re.compile("^\s*")
+        initialWhitespace = whitespaceMatcher.match(block[0]).end()
+        result = block[0]
+        for line in block[1:]:
+            result += '\\n'  # not a line break...the literal characters \n
+            result += line[initialWhitespace:]
+        return result