Merge branch 'master' of github.com:RunestoneInteractive/RunestoneComponents

Author: bnmnetp

runestone/hparsons/hparsons.py

@@ -37,7 +37,7 @@ def setup(app):
 
 
 TEMPLATE_START = """
-<div>
+<div class="runestone">
 <div data-component="hparsons" id=%(divid)s data-question_label="%(question_label)s" class="alert alert-warning hparsons_section">
 <div class="hp_question col-md-12">
 """

runestone/hparsons/js/blockGrader.js

@@ -94,6 +94,8 @@ export default class BlockBasedGrader {
             state = "correct";
         } else if (!isCorrectOrder && state != "incorrectTooShort") {
             state = "incorrectMoveBlocks";
+        } else if (!this.correctLength && state != "incorrectTooShort") {
+            state = "incorrectMoveBlocks";
         }
         this.calculatePercent();
         this.graderState = state;

runestone/hparsons/js/hparsons-sql.js

@@ -11,7 +11,7 @@ if (hpList === undefined) hpList = {};
 
 import "./horizontal-parsons.js";
 
-export default class SQLHParons extends RunestoneBase {
+export default class SQLHParsons extends RunestoneBase {
     constructor(opts) {
         super(opts);
         // copied from activecode
@@ -75,6 +75,7 @@ export default class SQLHParons extends RunestoneBase {
 
     // copied from activecode, already modified to add parsons
     createEditor() {
+        console.log('test create editor hparsons')
         this.outerDiv = document.createElement("div");
         $(this.origElem).replaceWith(this.outerDiv);
         let parsonsHTML = `<horizontal-parsons id='${this.divid}-hparsons'`;
@@ -159,6 +160,7 @@ export default class SQLHParons extends RunestoneBase {
     }
 }
 
+
 /*=================================
 == Find the custom HTML tags and ==
 ==   execute our code on them    ==
@@ -168,7 +170,7 @@ $(document).on("runestone:login-complete", function () {
         if ($(this).closest("[data-component=timedAssessment]").length == 0) {
             // If this element exists within a timed component, don't render it here
             // try {
-            hpList[this.id] = new SQLHParons({
+            hpList[this.id] = new SQLHParsons({
                 orig: this,
                 useRunestoneServices: eBookConfig.useRunestoneServices,
             });
@@ -179,3 +181,10 @@ $(document).on("runestone:login-complete", function () {
         }
     });
 });
+
+if (typeof window.component_factory === "undefined") {
+    window.component_factory = {};
+}
+window.component_factory["hparsons"] = function (opts) {
+    return new SQLHParsons(opts);
+};