🔥 Removing options that are not working currently

Author: zihan21206

runestone/hparsons/hparsons.py

@@ -49,7 +49,6 @@ def setup(app):
 <textarea data-lang="%(language)s" 
     %(optional)s
     %(dburl)s
-    %(textentry)s
     %(reuse)s
     %(randomize)s
     %(blockanswer)s
@@ -98,9 +97,7 @@ class HParsonsDirective(RunestoneIdDirective):
        :language: sql, regex
        :dburl: only for sql -- url to load database
        :randomize: randomize the order of horizontal parsons
-       TODO: fix textentry
        :reuse: only for parsons -- make the blocks reusable
-       :textentry: if you will use text entry instead of horizontal parsons
        :blockanswer: 0 1 2 3 # Provide answer for block-based feedback. Please note that the number of block start from 0. If not provided, will use execution based feedback.
 
         Here is the problem description. It must ends with the tildes.
@@ -110,9 +107,6 @@ class HParsonsDirective(RunestoneIdDirective):
         block 1
         block 2
         block 3
-        --explanations--
-        explanations for block 1
-        explanations for block 2
         --unittest--
         assert 1,1 == world
         assert 0,1 == hello
@@ -127,7 +121,6 @@ class HParsonsDirective(RunestoneIdDirective):
         {
             "dburl": directives.unchanged,
             "language": directives.unchanged,
-            "textentry": directives.flag,
             "reuse": directives.flag,
             "randomize": directives.flag,
             "blockanswer": directives.unchanged,
@@ -139,11 +132,6 @@ def run(self):
 
         env = self.state.document.settings.env
 
-        if "textentry" in self.options:
-            self.options['textentry'] = ' data-textentry="true"'
-        else:
-            self.options['textentry'] = ''
-
         if "reuse" in self.options:
             self.options['reuse'] = ' data-reuse="true"'
         else:

runestone/hparsons/js/BlockFeedback.js

@@ -41,8 +41,8 @@ export default class BlockFeedback extends HParsonsFeedback {
             this.grader.answer = this.hparsons.hparsonsInput.getParsonsTextArray();
             this.grade = this.grader.grade();
             if (this.grade == "correct") {
-                this.solved = true;
                 $(this.hparsons.runButton).prop("disabled", true);
+                this.solved = true;
             }
         }
     }
@@ -114,11 +114,15 @@ export default class BlockFeedback extends HParsonsFeedback {
             );
         }
         $(this.messageDiv).hide();
+    }
 
-        // TODO: might need to change this
-        $(this.hparsons.runButton).prop("disabled", false);
-        // this.checkCount = 0;
-        this.solved = false;
+    reset() {
+        if (this.solved) {
+            this.checkCount = 0;
+            $(this.hparsons.runButton).prop("disabled", false);
+            this.solved = false;
+        }
+        this.clearFeedback();
     }
 
 }

runestone/hparsons/js/SQLFeedback.js

@@ -36,6 +36,10 @@ export default class SQLFeedback extends HParsonsFeedback {
         $(this.outDiv).hide();
     }
 
+    reset() {
+        this.clearFeedback();
+    }
+
     init() {
         // adapted from activecode-sql
         // fnprefix sets the path to load the sql-wasm.wasm file

runestone/hparsons/js/hparsons-sql.js

@@ -18,7 +18,6 @@ export default class SQLHParons extends RunestoneBase {
         var suffStart;
         // getting settings
         var orig = $(opts.orig).find("textarea")[0];
-        this.textentry = $(orig).data('textentry') ? true : false;
         this.reuse = $(orig).data('reuse') ? true : false;
         this.randomize = $(orig).data('randomize') ? true : false;
         this.isBlockGrading = $(orig).data('blockanswer') ? true : false;
@@ -79,11 +78,7 @@ export default class SQLHParons extends RunestoneBase {
         this.outerDiv = document.createElement("div");
         $(this.origElem).replaceWith(this.outerDiv);
         let parsonsHTML = `<horizontal-parsons id='${this.divid}-hparsons'`
-        if (this.textentry) {
-            parsonsHTML += ` input-type='text' `;
-        } else {
-            parsonsHTML += ` input-type='parsons' `;
-        }
+        parsonsHTML += ` input-type='parsons' `;
         if (this.reuse) {
             parsonsHTML += ` reuse-blocks="true"`;
         }
@@ -138,7 +133,7 @@ export default class SQLHParons extends RunestoneBase {
         this.resetButton = resetBtn;
         this.resetButton.onclick = () => {
             this.hparsonsInput.resetInput();
-            this.feedbackController.clearFeedback();
+            this.feedbackController.reset();
         }
         $(resetBtn).attr("type", "button");
 

runestone/hparsons/js/hparsonsFeedback.js

@@ -17,7 +17,12 @@ export default class HParsonsFeedback {
     }
 
     clearFeedback() {
-        // called when Reset is clicked or input is changed
+        // called when input is changed
         console.log('clearFeedback method not implemented in feedback!');
     }
+    
+    reset() {
+        // called when reset is clicked
+        console.log('reset method not implemented in feedback!');
+    }
 }