✨ Fix hiding test cases

Author: zihan21206

runestone/hparsons/hparsons.py

@@ -43,13 +43,13 @@ def setup(app):
 TEMPLATE_START = """
         <div>
         <div data-component="hparsons" id="%(divid)s" data-question_label="%(question_label)s" class="alert alert-warning hparsons" >
-        <div>
+        <div class="hparsons_question hparsons-text" >
     """
 
 TEMPLATE_END = """
         </div>
-        <div class="hparsons_question hparsons-text" >%(problem)s</div>
-        <div class="hparsons %(hidetests)s" %(textentry)s %(nostrictmatch)s>
+        <div>%(instructions)s</div>
+        <div class="hparsons" %(textentry)s %(nostrictmatch)s %(hidetests)s>
             <pre>%(settings)s</pre>
         </div>
         </div>
@@ -147,7 +147,7 @@ def run(self):
         else:
             self.options['textentry'] = ''
         if "hidetests" in self.options:
-            self.options['hidetests'] = 'hidetests'
+            self.options['hidetests'] = ' data-hidetests="true"'
         else:
             self.options['hidetests'] = ''
         if "nostrictmatch" in self.options:
@@ -167,7 +167,7 @@ def run(self):
                 has_content = True
                 delimitiers_index[i] = self.content.index(delimitiers[i])
         if has_content:
-            sorted_index, sorted_delimiters = [list(t) for t in zip(*[pair for pair in sorted(zip(delimitiers_index, delimitiers)) if pair[0] > 0])]
+            sorted_index, sorted_delimiters = [list(t) for t in zip(*[pair for pair in sorted(zip(delimitiers_index, delimitiers)) if pair[0] >= 0])]
         else:
             sorted_index = []
             sorted_delimiters = []
@@ -178,9 +178,9 @@ def run(self):
 
         if '--problem--' in sorted_delimiters:
             index = sorted_delimiters.index('--problem--')
-            self.options['problem'] = '\n'.join(content[(sorted_index[index] + 1): (sorted_index[index + 1] if index + 1 < len(sorted_index) else len(content))])
+            self.options['instructions'] = '\n'.join(content[(sorted_index[index] + 1): (sorted_index[index + 1] if index + 1 < len(sorted_index) else len(content))])
         else:
-            self.options['problem'] = 'empty problem'
+            self.options['instructions'] = 'empty problem'
 
         if '--blocks--' in sorted_delimiters:
             index = sorted_delimiters.index('--blocks--')
@@ -224,12 +224,13 @@ def run(self):
 
         # exist in short answer and mchoice but not parsons
         # For MChoice its better to insert the qnum into the content before further processing.
-        self.updateContent()
+        # self.updateContent()
 
+        # TODO: fix the nested parse
         # same as mchoice, different from parsons. i think it is for generating instructions.
         # parsons:
         # self.state.nested_parse(
-        #     self.options["instructions"], self.content_offset, parsons_node
+        #     self.options['instructions'], self.content_offset, hparsons_node
         # )
 
 

runestone/hparsons/js/hparsons.js

@@ -60,6 +60,7 @@ export default class HParsons extends RunestoneBase {
         console.log($(this.origElem).data("textentry"))
         let settings = JSON.parse($(this.origElem).children()[0].innerText)
         attributes += ' input-type=' + ($(this.origElem).data("textentry") ? 'text' : 'parsons' );
+        attributes += $(this.origElem).data("hidetests") ? ' hidetests="true"': '';
         $(this.origElem).html('<regex-element' + attributes + '></regex-element>');
         let regexElement = $(this.origElem).children()[0];
         if ($(this.origElem).data("nostrictmatch")) {

runestone/hparsons/js/regex-element.js

@@ -15913,8 +15913,14 @@ class UnitTestTable {
         this.el = document.createElement('div');
         this.el.id = 'regextool-' + this.parentElement.toolNumber + '-unittest-table';
         this.el.classList.add('regex-unittest');
+        if (this.parentElement.getAttribute('hidetests')) {
+            this.el.style.display = 'none';
+        }
+        else {
+            this.el.style.display = 'block';
+        }
         // the element is hidden initially.
-        this.el.classList.add('collapse');
+        // this.el.classList.add('collapse');
         // columns enabled besides the status column
         // TODO: only enabled notes for study 0 and 1
         this.columnsEnabled = ['actualOutput', 'expectedOutput', 'input', 'notes'];
@@ -16015,7 +16021,7 @@ class UnitTestTable {
         // creating the status(the first) column
         const row = document.createElement('tr');
         let status = result.success ? (JSON.stringify(result.match) === JSON.stringify(testCase.expect) ? 'Pass' : 'Fail') : 'Error';
-        console.log(status);
+        // console.log(status)
         // if (status == 'Pass' && JSON.stringify(testCase.expect) != '[]' && this.noGroupsAllowed && window.pyodide.globals.unit_match_group_cnt != 1) {
         //     status = 'Fail'
         //     // fail because no group is allowed
@@ -16813,7 +16819,7 @@ class RegexElement extends HTMLElement {
         };
         this.logEvent(problemFinished);
     };
-    static get observedAttributes() { return ['input-type', 'problem-id']; }
+    static get observedAttributes() { return ['input-type', 'problem-id', 'hidetests']; }
     attributeChangedCallback(name, oldValue, newValue) {
         switch (name) {
             case 'input-type': {
@@ -16824,6 +16830,14 @@ class RegexElement extends HTMLElement {
                 this.problemId = newValue;
                 break;
             }
+            case 'hidetests': {
+                if (newValue) {
+                    this.unitTestTable.el.style.display = 'none';
+                }
+                else {
+                    this.unitTestTable.el.style.display = 'block';
+                }
+            }
         }
     }
     initRegexInput(inputDiv) {

runestone/hparsons/test/_sources/index.rst

@@ -8,11 +8,13 @@ Horizontal Parsons + Regex
 ---------------------------
 
 .. hparsons:: codeexample1
-    :hidetests:
     :nostrictmatch:
 
     --problem--
-    Capture words that start with a vowel letter(aeiou), but ends with a non-vowel letter. There can be 0 or more letters in between. Also, it is not allowed to have other characters besides letter in between. e.g. your regular expression should match unicorn, element, but should not match: banana, apple. All letters are lowercase.
+    Capture words that start with a vowel letter(aeiou), but ends with a non-vowel letter. 
+    There can be 0 or more letters in between. 
+    Also, it is not allowed to have other characters besides letter in between.
+    e.g. your regular expression should match unicorn, element, but should not match: banana, apple. All letters are lowercase.
     --blocks--
     [a-z]
     [aeiou]
@@ -54,6 +56,7 @@ Horizontal Parsons + Regex
 
 .. hparsons:: codeexample2
     :textentry:
+    :hidetests:
 
     content content content