Merge branch 'master' into grading

Author: zihan21206

poetry.lock

@@ -34,7 +34,7 @@ license = "GPL"
 name = "runestone"
 readme = "README.rst"
 repository = "https://github.com/RunestoneInteractive/RunestoneComponents"
-version = "6.4.0"
+version = "6.4.4dev"
 
 # See https://python-poetry.org/docs/pyproject/#include-and-exclude.
 include = [
@@ -90,7 +90,7 @@ jinja2 = "<3.1.0"
 Paver = ">=1.2.4"
 python = "^3.7.0"
 six = ">1.12"
-Sphinx = ">=4.4.0"
+Sphinx = ">=4.4.0,<6.0.0"
 sphinxcontrib-paverutils = ">=1.17"
 SQLAlchemy = ">=1.4.0"
 
@@ -136,4 +136,4 @@ asyncio_mode = "auto"
 
 
 [tool.mypy]
-ignore_missing_imports = true
+ignore_missing_imports = true

pyproject.toml

@@ -121,6 +121,7 @@ export class ActiveCode extends RunestoneBase {
         }
         suffStart = this.code.indexOf("====");
         if (suffStart > -1) {
+            // The +5 gets past the ====\n
             this.suffix = this.code.substring(suffStart + 5);
             this.code = this.code.substring(0, suffStart);
         }

runestone/activecode/js/activecode.js

@@ -101,6 +101,20 @@ export default class LiveCode extends ActiveCode {
 
         // extract the class names so files can be named properly
         if (this.suffix && this.language == "java") {
+            // the suffix contains unit test code and should include and import of junit
+            // import static org.junit.Assert.*;
+            // import org.junit.*;
+            // import java.io.*;
+            if (this.suffix.indexOf("import org.junit") <0 ) {
+                console.log(`Missing imports in unit tests:
+                    ${this.suffix}`);
+                // alert("The unit tests for this problem are incomplete, Please report this.");
+                this.suffix = `
+                import static org.junit.Assert.*;
+                import org.junit.*;
+                import java.io.*;
+                ` + this.suffix;
+            }
             let classMatch = new RegExp(/public class\s+(\w+)[\s+{]/);
             source = await this.buildProg(false);
             let m = source.match(classMatch);

runestone/activecode/js/livecode.js

@@ -21,7 +21,10 @@ function getCompletions() {
             currentPathname.lastIndexOf("?")
         );
     }
-    var data = { lastPageUrl: currentPathname };
+    var data = {
+        lastPageUrl: currentPathname,
+        isPtxBook: isPreTeXt()
+     };
     jQuery
         .ajax({
             url: `${eBookConfig.new_server_prefix}/logger/getCompletionStatus`,
@@ -40,7 +43,7 @@ function getCompletions() {
                     completionClass = "buttonAskCompletion";
                     completionMsg = "Mark as Completed";
                 }
-                $("#main-content").append(
+                $("#scprogresscontainer").append(
                     '<div style="text-align:center"><button class="btn btn-lg ' +
                         completionClass +
                         '" id="completionButton">' +
@@ -274,6 +277,14 @@ function enableCompletions() {
 // call enable user highlights after login
 $(document).on("runestone:login", enableCompletions);
 
+function isPreTeXt() {
+    let ptxMarker = document.querySelector("body.pretext");
+    if (ptxMarker) {
+        return true;
+    } else {
+        return false;
+    }
+}
 // _ processPageState
 // -------------------------
 function processPageState(completionFlag) {
@@ -285,11 +296,14 @@ function processPageState(completionFlag) {
             currentPathname.lastIndexOf("?")
         );
     }
+    // Is this a ptx book?
+    let isPtxBook = isPreTeXt()
     var data = {
         lastPageUrl: currentPathname,
         lastPageScrollLocation: $(window).scrollTop(),
         completionFlag: completionFlag,
         course: eBookConfig.course,
+        isPtxBook: isPtxBook,
     };
     $(document).ajaxError(function (e, jqhxr, settings, exception) {
         console.log("Request Failed for " + settings.url);

runestone/common/js/user-highlights.js

@@ -491,15 +491,6 @@ export default class Parsons extends RunestoneBase {
             //areaHeight += (blocks.length);
         }
         // + 40 to areaHeight to provide some additional buffer in case any text overflow still happens - Vincent Qiu (September 2020)
-        this.areaHeight = areaHeight + 40;
-        $(this.sourceArea).css({
-            width: this.areaWidth + 2,
-            height: areaHeight,
-        });
-        $(this.answerArea).css({
-            width: this.options.pixelsPerIndent * indent + this.areaWidth + 2,
-            height: areaHeight,
-        });
         if (indent > 0 && indent <= 4) {
             $(this.answerArea).addClass("answer" + indent);
         } else {
@@ -558,6 +549,19 @@ export default class Parsons extends RunestoneBase {
         } else {
             pairedBins = [];
         }
+        areaHeight += pairedBins.length * 10;  // the paired bins take up extra space which can
+                                               // cause the blocks to spill out.  This
+                                               // corrects that by adding a little extra
+        this.areaHeight = areaHeight + 40;
+        $(this.sourceArea).css({
+            width: this.areaWidth + 2,
+            height: areaHeight,
+        });
+        $(this.answerArea).css({
+            width: this.options.pixelsPerIndent * indent + this.areaWidth + 2,
+            height: areaHeight,
+        });
+
         this.pairedBins = pairedBins;
         this.pairedDivs = pairedDivs;
         if (this.options.numbered != undefined) {