Merge branch 'master' into peer_support

Author: runestonetest

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

@@ -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

@@ -476,8 +476,8 @@ export class ActiveCode extends RunestoneBase {
                     if (!didAgree) {
                         didAgree = confirm(
                             "Pair Programming should only be used with the consent of your instructor." +
-                                "Your partner must be a registered member of the class and have agreed to pair with you." +
-                                "By clicking OK you certify that both of these conditions have been met."
+                            "Your partner must be a registered member of the class and have agreed to pair with you." +
+                            "By clicking OK you certify that both of these conditions have been met."
                         );
                         if (didAgree) {
                             localStorage.setItem("partnerAgree", "true");
@@ -520,13 +520,13 @@ export class ActiveCode extends RunestoneBase {
         $(butt).attr(
             "href",
             "http://" +
-                chatcodesServer +
-                "/new?" +
-                $.param({
-                    topic: window.location.host + "-" + this.divid,
-                    code: this.editor.getValue(),
-                    lang: "Python",
-                })
+            chatcodesServer +
+            "/new?" +
+            $.param({
+                topic: window.location.host + "-" + this.divid,
+                code: this.editor.getValue(),
+                lang: "Python",
+            })
         );
         this.chatButton = butt;
         chatBar.appendChild(butt);
@@ -913,7 +913,7 @@ export class ActiveCode extends RunestoneBase {
         });
     }
 
-    toggleEditorVisibility() {}
+    toggleEditorVisibility() { }
 
     addErrorMessage(err) {
         // Add the error message
@@ -1051,7 +1051,7 @@ Yet another is that there is an internal error.  The internal error message is:
                     var xl = eval(x);
                     xl = xl.map(pyStr);
                     x = xl.join(" ");
-                } catch (err) {}
+                } catch (err) { }
             }
         }
         $(this.output).css("visibility", "visible");
@@ -1155,7 +1155,7 @@ Yet another is that there is an internal error.  The internal error message is:
         if (
             this.historyScrubber &&
             this.history[$(this.historyScrubber).slider("value")] !=
-                this.editor.getValue()
+            this.editor.getValue()
         ) {
             saveCode = "True";
             this.history.push(this.editor.getValue());
@@ -1188,8 +1188,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(),
             lang: this.language,
@@ -1198,14 +1199,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(),
             lang: 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);
         }
     }
 
@@ -291,9 +299,8 @@ export default class SQLActiveCode extends ActiveCode {
         }
         let pct = (100 * this.passed) / (this.passed + this.failed);
         pct = pct.toLocaleString(undefined, { maximumFractionDigits: 2 });
-        result += `You passed ${this.passed} out of ${
-            this.passed + this.failed
-        } tests for ${pct}%`;
+        result += `You passed ${this.passed} out of ${this.passed + this.failed
+            } tests for ${pct}%`;
         this.unit_results = `percent:${pct}:passed:${this.passed}:failed:${this.failed}`;
         return result;
     }