Merge remote-tracking branch 'origin/master'

# Conflicts:
#	runestone/activecode/css/activecode.css
#	runestone/activecode/js/activecode.js

Author: ascholerChemeketa

pyproject.toml

@@ -34,7 +34,7 @@ license = "GPL"
 name = "runestone"
 readme = "README.rst"
 repository = "https://github.com/RunestoneInteractive/RunestoneComponents"
-version = "6.5.4"
+version = "6.6.0"
 
 # See https://python-poetry.org/docs/pyproject/#include-and-exclude.
 include = [

runestone/__main__.py

@@ -340,7 +340,8 @@ def rs2ptx(course, sourcedir, outdir):
     """
     os.chdir(findProjectRoot())
     sys.path.insert(0, os.getcwd())
-    del os.environ["DBURL"]
+    if "DBURL" in os.environ:
+        del os.environ["DBURL"]
     try:
         import pavement
     except Exception as e:

runestone/activecode/css/activecode.css

@@ -57,10 +57,6 @@
     clear: both;
 }
 
-.ac_section .clearfix {
-    position: initial;
-}
-
 .unittest-results {
     margin-left: 20px;
 }
@@ -75,12 +71,6 @@
     background-color: lightgray;
 }
 
-.python_check_results {
-    margin-top: 20px;
-    padding-top: 0px;
-    padding-bottom: 0px;
-}
-
 .python_check_results pre {
     background-color: #f5f5f5;
 }
@@ -160,4 +150,12 @@
 
 .codelens {
     margin-bottom: 20px;
-}
+}
+
+.codecoach {
+    margin-top: 20px;
+}
+
+.ac_section .alert h3:first-child {
+    margin-top: 0px;
+  }

runestone/activecode/js/activecode.js

@@ -721,6 +721,19 @@ export class ActiveCode extends RunestoneBase {
                 $(this.graphics).addClass("visible-ac-canvas");
             }.bind(this)
         );
+
+        //Anything that wants to add output to coachdiv can do so after the h3
+        // all those elements will be cleared with each run and coach display will be
+        // reset to none. Any component that adds content after a run should set display
+        // to block to ensure visibility
+        var coachDiv = document.createElement("div");
+        coachDiv.classList.add("alert", "alert-warning", "codecoach");
+        $(coachDiv).css("display", "none");
+        let coachHead = coachDiv.appendChild(document.createElement("h3"));
+        coachHead.textContent = "Code Coach";
+        this.outerDiv.appendChild(coachDiv);
+        this.codecoach = coachDiv;
+
         outDiv.appendChild(this.output);
         outDiv.appendChild(this.graphics);
         this.outerDiv.appendChild(outDiv);
@@ -730,11 +743,6 @@ export class ActiveCode extends RunestoneBase {
         $(lensDiv).css("display", "none");
         this.codelens = lensDiv;
         this.outerDiv.appendChild(lensDiv);
-        var coachDiv = document.createElement("div");
-        coachDiv.classList.add("codecoach");
-        $(coachDiv).css("display", "none");
-        this.codecoach = coachDiv;
-        this.outerDiv.appendChild(coachDiv);
     }
 
     disableSaveLoad() {
@@ -903,38 +911,6 @@ export class ActiveCode extends RunestoneBase {
             div_id: this.divid,
         });
     }
-    // <iframe id="%(divid)s_codelens" width="800" height="500" style="display:block"src="#">
-    // </iframe>
-    showCodeCoach() {
-        var myIframe;
-        var srcURL;
-        var cl;
-        var div_id = this.divid;
-        if (this.codecoach === null) {
-            this.codecoach = document.createElement("div");
-            this.codecoach.style.display = "block";
-        }
-        cl = this.codecoach.firstChild;
-        if (cl) {
-            this.codecoach.removeChild(cl);
-        }
-        srcURL = eBookConfig.app + "/admin/diffviewer?divid=" + div_id;
-        myIframe = document.createElement("iframe");
-        myIframe.setAttribute("id", div_id + "_coach");
-        myIframe.setAttribute("width", "100%");
-        myIframe.setAttribute("height", "500px");
-        myIframe.setAttribute("style", "display:block");
-        myIframe.style.background = "#fff";
-        myIframe.style.width = "100%";
-        myIframe.src = srcURL;
-        this.codecoach.appendChild(myIframe);
-        $(this.codecoach).show();
-        this.logBookEvent({
-            event: "coach",
-            act: "view",
-            div_id: this.divid,
-        });
-    }
 
     toggleEditorVisibility() {}
 
@@ -1296,13 +1272,8 @@ Yet another is that there is an internal error.  The internal error message is:
     }
 
     async checkPythonSyntax() {
-        let checkDiv = this.outerDiv.querySelector("div.python_check_results");
-        if( checkDiv != null )
-            checkDiv.remove();
-
         let code = this.editor.getValue();
-
-        fetch('/ns/books/python_check', {
+        fetch('/ns/coach/python_check', {
             method: 'POST',
             body: code
         })
@@ -1332,17 +1303,12 @@ Yet another is that there is an internal error.  The internal error message is:
                 message = message.slice(0,-1);  //remove trailing newline
 
                 //Render
-                checkDiv = document.createElement("div");
-                checkDiv.classList.add("python_check_results","alert", "alert-warning");
-                let checkHead = checkDiv.appendChild(document.createElement("h3"));
-                checkHead.textContent = "Syntax Tips";
+                let checkDiv = document.createElement("div");
+                checkDiv.classList.add("python_check_results");
                 let checkPre = checkDiv.appendChild(document.createElement("pre"));
-                //checkPre.classList.add("alert-warning");
                 checkPre.textContent = message;
-
-                //Squeeze check_results right before output pane
-                const outDiv = this.outDiv;
-                outDiv.parentNode.insertBefore(checkDiv, outDiv);
+                this.codecoach.append(checkDiv);
+                $(this.codecoach).css("display", "block");
             }
         })
         .catch(err => {
@@ -1375,6 +1341,10 @@ Yet another is that there is an internal error.  The internal error message is:
         var prog = await this.buildProg(true);
         this.saveCode = "True";
         $(this.output).text("");
+
+        //clear anything after header in codecoach
+        $(this.codecoach).children().slice(1).remove();
+
         while ($(`#${this.divid}_errinfo`).length > 0) {
             $(`#${this.divid}_errinfo`).remove();
         }

runestone/hparsons/hparsons.py

@@ -102,10 +102,16 @@ class HParsonsDirective(RunestoneIdDirective):
         Here is the problem description. It must ends with the tildes.
         Make sure you use the correct delimitier for each section below.
         ~~~~
+        --hiddenprefix--
+        // code that is for scaffolding the execution (e.g. initializing database)
         --blocks--
         block 1
         block 2
         block 3
+        --hiddensuffix--
+        // code that is for scaffolding unittest/execution (e.g. adding query for database)
+        // most of the time the hiddensuffix is just "select * from table" to
+        //      get all entries from the table to test the update or other operations.
         --unittest--
         assert 1,1 == world
         assert 0,1 == hello