Merge branch 'peer_support' into bookserver

Author: runestonetest

conf.py

@@ -32,7 +32,7 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     "sphinx.ext.mathjax",
-    "recommonmark",
+    "myst_parser",
     "sphinx.ext.intersphinx",
 ] + runestone_extensions()
 
@@ -322,7 +322,7 @@
 # It True, sets js files from Sphinx & Runestone to be loaded with defer attr
 # substantially speeding up page rendering. May cause issues with books that
 # have custom directives or raw html that assume jquery or another library
-# is loaded before body is parsed. 
+# is loaded before body is parsed.
 html_defer_js = True
 
 # Output file base name for HTML help builder.

package-lock.json

@@ -18,9 +18,9 @@
     "author": "",
     "license": "ISC",
     "devDependencies": {
-        "css-minimizer-webpack-plugin": "^3.0.0",
         "copy-webpack-plugin": "^8.0.0",
         "css-loader": "^5.0.0",
+        "css-minimizer-webpack-plugin": "^3.0.0",
         "eslint": "^7.0.0",
         "html-loader": "^2.0.0",
         "html-webpack-plugin": "^5.0.0",
@@ -37,6 +37,7 @@
         "handsontable": "7.2.2",
         "jexcel": "^3.9.1",
         "jquery-ui": "1.10.4",
+        "select2": "^4.1.0-rc.0",
         "sql.js": "1.5.0",
         "vega-embed": "3.14.0",
         "wavedrom": "^2.0.0"

package.json

@@ -8,4 +8,5 @@ selenium>=2.53.6
 pyvirtualdisplay
 pytest
 pylint
-readme-renderer>24
+readme-renderer>24
+myst_parser

requirements-dev.in

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    pip-compile --output-file=requirements-dev.txt requirements-dev.in requirements.in
@@ -8,8 +8,12 @@ alabaster==0.7.12
     # via sphinx
 astroid==2.6.5
     # via pylint
-attrs==21.2.0
+atomicwrites==1.4.0
     # via pytest
+attrs==21.2.0
+    # via
+    #   markdown-it-py
+    #   pytest
 babel==2.9.1
     # via sphinx
 bleach==3.3.1
@@ -18,7 +22,7 @@ certifi==2021.5.30
     # via requests
 charset-normalizer==2.0.3
     # via requests
-click<8.0
+click==7.1.2
     # via
     #   -r requirements.in
     #   pip-tools
@@ -27,10 +31,16 @@ codechat==1.8.8
 cogapp==3.0.0
     # via -r requirements.in
 colorama==0.4.4
-    # via twine
+    # via
+    #   pylint
+    #   pytest
+    #   sphinx
+    #   tqdm
+    #   twine
 docutils==0.16
     # via
     #   codechat
+    #   myst-parser
     #   readme-renderer
     #   sphinx
 easyprocess==0.3
@@ -50,17 +60,27 @@ iniconfig==1.1.1
 isort==5.9.3
     # via pylint
 jinja2==3.0.1
-    # via sphinx
+    # via
+    #   myst-parser
+    #   sphinx
 keyring==23.0.1
     # via twine
 lazy-object-proxy==1.6.0
     # via astroid
 lxml==4.6.3
     # via codechat
+markdown-it-py==1.1.0
+    # via
+    #   mdit-py-plugins
+    #   myst-parser
 markupsafe==2.0.1
     # via jinja2
 mccabe==0.6.1
     # via pylint
+mdit-py-plugins==0.2.8
+    # via myst-parser
+myst-parser==0.15.1
+    # via -r requirements-dev.in
 packaging==21.0
     # via
     #   bleach
@@ -95,17 +115,21 @@ pytz==2021.1
     # via babel
 pyvirtualdisplay==2.2
     # via -r requirements-dev.in
+pywin32-ctypes==0.2.0
+    # via keyring
+pyyaml==5.4.1
+    # via myst-parser
 readme-renderer==29.0
     # via
     #   -r requirements-dev.in
     #   twine
+requests-toolbelt==0.9.1
+    # via twine
 requests==2.26.0
     # via
     #   requests-toolbelt
     #   sphinx
     #   twine
-requests-toolbelt==0.9.1
-    # via twine
 rfc3986==1.5.0
     # via twine
 selenium==3.141.0
@@ -121,6 +145,7 @@ snowballstemmer==2.1.0
 sphinx==3.5.4
     # via
     #   -r requirements.in
+    #   myst-parser
     #   sphinxcontrib-paverutils
 sphinxcontrib-applehelp==1.0.2
     # via sphinx

requirements-dev.txt

@@ -5,21 +5,22 @@
 
 from .activecode import ActiveCode
 from .animation import Animation
-from .mchoice import MChoice, QuestionNumber
 from .blockly import Blockly
-from .quizly import Quizly
-from .khanex import Khanex
 from .codelens import Codelens
 from .clickableArea import ClickableArea
 from .datafile import DataFile
 from .disqus import DisqusDirective
 from .dragndrop import DragNDrop
 from .fitb import FillInTheBlank
+from .groupsub import GroupSubmission
+from .khanex import Khanex
 from .selectquestion import SelectQuestion
 from .matrixeq import MatrixEq
+from .mchoice import MChoice, QuestionNumber
 from .meta import Meta
 from .parsons import ParsonsProblem
 from .poll import Poll
+from .quizly import Quizly
 from .reveal import RevealDirective
 from .shortanswer import JournalDirective
 from .showeval import ShowEval
@@ -146,8 +147,8 @@ def setup(app):
     try:
         for c in setup.custom_js_files:
             if isinstance(c, dict):
-                #peel off filename, pass rest of key/values on as kwargs
-                filename = c.pop("file") 
+                # peel off filename, pass rest of key/values on as kwargs
+                filename = c.pop("file")
                 app.add_autoversioned_javascript(filename, **c)
             else:
                 app.add_autoversioned_javascript(c)
@@ -244,6 +245,7 @@ def build(options):
     "datafile": DataFile,
     "disqus": DisqusDirective,
     "dragndrop": DragNDrop,
+    "groupsub": GroupSubmission,
     "parsonsprob": ParsonsProblem,
     "poll": Poll,
     "quizly": Quizly,

runestone/__init__.py

@@ -1194,8 +1194,9 @@ Yet another is that there is an internal error.  The internal error message is:
         }
     }
 
-    logCurrentAnswer() {
-        this.logRunEvent({
+    // the sid parameter is optional and is used for group submissions
+    async logCurrentAnswer(sid) {
+        let data = {
             div_id: this.divid,
             code: this.editor.getValue(),
             language: this.language,
@@ -1204,14 +1205,22 @@ Yet another is that there is an internal error.  The internal error message is:
             prefix: this.pretext,
             suffix: this.suffix,
             partner: this.partner,
-        }); // Log the run event
+        }; // Log the run event
+        if (typeof sid !== "undefined") {
+            data.sid = sid;
+        }
+        await this.logRunEvent(data);
         // If unit tests were run there will be a unit_results
         if (this.unit_results) {
-            this.logBookEvent({
+            let unitData = {
                 act: this.unit_results,
                 div_id: this.divid,
                 event: "unittest",
-            });
+            };
+            if (typeof sid !== "undefined") {
+                unitData.sid = sid;
+            }
+            await this.logBookEvent(unitData)
         }
     }
 

runestone/activecode/js/activecode.js

@@ -233,8 +233,8 @@ export default class SQLActiveCode extends ActiveCode {
         return Promise.resolve("done");
     }
 
-    logCurrentAnswer() {
-        this.logRunEvent({
+    async logCurrentAnswer(sid) {
+        let data = {
             div_id: this.divid,
             code: this.editor.getValue(),
             language: this.language,
@@ -243,15 +243,23 @@ export default class SQLActiveCode extends ActiveCode {
             prefix: this.pretext,
             suffix: this.suffix,
             partner: this.partner,
-        }); // Log the run event
+        }; // Log the run event
+        if (typeof sid !== "undefined") {
+            data.sid = sid;
+        }
+        await this.logRunEvent(data);
 
         if (this.unit_results) {
-            this.logBookEvent({
+            let unitData = {
                 event: "unittest",
                 div_id: this.divid,
                 course: eBookConfig.course,
                 act: this.unit_results,
-            });
+            };
+            if (typeof sid !== "undefined") {
+                unitData.sid = sid;
+            }
+            await this.logBookEvent(unitData);
         }
     }