Merge branch 'async_work'

# Conflicts:
#	runestone/common/js/runestonebase.js

Author: bnmnetp

package-lock.json

@@ -111,6 +111,12 @@ export class ActiveCode extends RunestoneBase {
             this.caption = "ActiveCode";
         }
         this.addCaption("runestone");
+        setTimeout(
+            function () {
+                this.editor.refresh();
+            }.bind(this),
+            1000
+        );
         if (this.autorun) {
             $(document).ready(this.runProg.bind(this));
         }
@@ -735,60 +741,6 @@ export class ActiveCode extends RunestoneBase {
         }
     }
 
-    async loadEditor() {
-        var data = {
-            acid: this.divid,
-        };
-        if (this.sid !== undefined) {
-            data["sid"] = this.sid;
-        }
-
-        let request = new Request(eBookConfig.ajaxURL + "getprog", {
-            method: "POST",
-            headers: this.jsonHeaders,
-            body: JSON.stringify(data),
-        });
-        let response = await fetch(request);
-        let res = await response.json();
-
-        if (res.source) {
-            this.editor.setValue(res.source);
-            setTimeout(
-                function () {
-                    this.editor.refresh();
-                }.bind(this),
-                500
-            );
-            $(this.loadButton).tooltip({
-                placement: "bottom",
-                title: $.i18n("msg_activecode_loaded_code"),
-                trigger: "manual",
-            });
-        } else {
-            $(this.loadButton).tooltip({
-                placement: "bottom",
-                title: $.i18n("msg_activecode_no_saved_code"),
-                trigger: "manual",
-            });
-        }
-
-        this.logBookEvent({
-            event: "activecode",
-            act: "load",
-            div_id: this.divid,
-        }); // Log the run event
-
-        $(this.loadButton).tooltip("show");
-        setTimeout(
-            function () {
-                $(this.loadButton).tooltip("destroy");
-            }.bind(this),
-            4000
-        );
-
-        return response;
-    }
-
     async createGradeSummary() {
         // get grade and comments for this assignment
         // get summary of all grades for this student

runestone/activecode/js/activecode.js

@@ -30,6 +30,7 @@ def test_hello(self):
         rb = t1.find_element_by_class_name("run-button")
         self.assertIsNotNone(rb)
         rb.click()
+        time.sleep(0.5)
         output = t1.find_element_by_class_name("ac_output")
         self.assertEqual(output.text.strip(), "Hello World")
 
@@ -53,6 +54,7 @@ def test_hidden(self):
         rb = t1.find_element_by_class_name("run-button")
         self.assertIsNotNone(rb)
         rb.click()
+        time.sleep(0.5)
         output = t1.find_element_by_class_name("ac_output")
         self.assertIn("My Code", output.text.strip())
         self.assertIn("hidden code", output.text.strip())
@@ -82,9 +84,9 @@ def test_history(self):
             # """,
             #     interceptor,
             # )
-            window.scrollTo(0, 0);
+            self.driver.execute_script("window.scrollTo(0, 0);")
             rb.click()
-            
+
         ta = t1.find_element_by_class_name("cm-s-default")
         self.assertIsNotNone(ta)
         self.driver.execute_script(
@@ -171,6 +173,7 @@ def test_sql_activecode(self):
         rb = t2.find_element_by_class_name("run-button")
         self.assertIsNotNone(rb)
         rb.click()
+        time.sleep(0.5)
         res = self.driver.find_element_by_id("sql1_sql_out")
         self.assertIsNotNone(res)
         out = self.driver.find_element_by_id("sql1_stdout")
@@ -205,8 +208,9 @@ def test_altair(self):
         rb.click()
         out = t2.find_element_by_id("alt_kiva_bar1_stdout")
         self.assertIsNotNone(out)
-        self.assertTrue("mark = bar" in out.text)
-        self.assertTrue("{'field': 'customer', 'type': 'nominal'}" in out.text)
+        time.sleep(.5)
+        self.assertIn("mark = bar", out.text)
+        self.assertIn("{'field': 'customer', 'type': 'nominal'}", out.text)
         can = t2.find_element_by_tag_name("canvas")
         self.assertIsNotNone(can)
 
@@ -219,8 +223,9 @@ def test_image(self):
         rb.click()
         out = t2.find_element_by_id("ac14_7_2_stdout")
         self.assertIsNotNone(out)
+        time.sleep(1)
         self.assertTrue("400" in out.text)
         self.assertTrue("244" in out.text)
-        self.assertTrue("165 161 158" in out.text)
+        self.assertTrue(("165 161 158" in out.text) or ("165 162 157" in out.text))
         can = t2.find_element_by_tag_name("canvas")
         self.assertIsNotNone(can)

runestone/activecode/test/test_activecode.py

@@ -151,7 +151,7 @@ export default class RunestoneBase {
                 );
                 try {
                     let response = await fetch(request);
-                    let data = await response.json();
+                    data = await response.json();
                     this.repopulateFromStorage(data);
                 } catch (err) {
                     try {
@@ -167,6 +167,7 @@ export default class RunestoneBase {
             this.checkLocalStorage(); // just go right to local storage
         }
     }
+
     loadData(data) {
         // for most classes, loadData doesn't do anything. But for Parsons, and perhaps others in the future,
         // initialization can happen even when there's no history to be loaded

runestone/common/js/runestonebase.js

@@ -37,6 +37,7 @@ export default class SelectOne extends RunestoneBase {
         this.not_seen_ever = $(opts.orig).data("not_seen_ever");
         this.selector_id = $(opts.orig).first().attr("id");
         this.primaryOnly = $(opts.orig).data("primary");
+        this.ABExperiment = $(opts.orig).data("ab");
         opts.orig.id = this.selector_id;
     }
     /**
@@ -72,59 +73,52 @@ export default class SelectOne extends RunestoneBase {
         if (this.primaryOnly) {
             data.primary = this.primaryOnly;
         }
+        if (this.ABExperiment) {
+            data.AB = this.ABExperiment;
+        }
         let opts = this.origOpts;
         let selectorId = this.selector_id;
-        let myPromise = new Promise(
-            function (resolve, reject) {
-                $.getJSON(
-                    "/runestone/ajax/get_question_source",
-                    data,
-                    function (htmlsrc) {
-                        if (htmlsrc.indexOf("No preview") >= 0) {
-                            alert(
-                                `Error: Not able to find a question for ${selectorId} based on the criteria`
-                            );
-                            resolve("done");
-                            return;
-                        }
-                        let res;
-                        if (opts.timed) {
-                            // timed components are not rendered immediately, only when the student
-                            // starts the assessment and visits this particular entry.
-                            res = createTimedComponent(htmlsrc, {
-                                timed: true,
-                                selector_id: selectorId,
-                                assessmentTaken: opts.assessmentTaken,
-                            });
-                            // replace the entry in the timed assessment's list of components
-                            // with the component created by createTimedComponent
-                            for (let component of opts.rqa) {
-                                if (component.question == self) {
-                                    component.question = res.question;
-                                    break;
-                                }
-                            }
-                            self.realComponent = res.question;
-                            self.containerDiv = res.question.containerDiv;
-                            self.realComponent.selectorId = selectorId;
-                        } else {
-                            // just render this component on the page in its usual place
-                            res = renderRunestoneComponent(
-                                htmlsrc,
-                                selectorId,
-                                {
-                                    selector_id: selectorId,
-                                    useRunestoneServices: true,
-                                }
-                            );
-                        }
-                        console.log("resolving selectquestion");
-                        resolve("done");
-                    }
-                );
-            }.bind(this)
-        );
-        return myPromise;
+        let request = new Request("/runestone/ajax/get_question_source", {
+            method: "POST",
+            headers: this.jsonHeaders,
+            body: JSON.stringify(data),
+        });
+        let response = await fetch(request);
+        let htmlsrc = await response.json();
+        if (htmlsrc.indexOf("No preview") >= 0) {
+            alert(
+                `Error: Not able to find a question for ${selectorId} based on the criteria`
+            );
+            return response;
+        }
+        let res;
+        if (opts.timed) {
+            // timed components are not rendered immediately, only when the student
+            // starts the assessment and visits this particular entry.
+            res = createTimedComponent(htmlsrc, {
+                timed: true,
+                selector_id: selectorId,
+                assessmentTaken: opts.assessmentTaken,
+            });
+            // replace the entry in the timed assessment's list of components
+            // with the component created by createTimedComponent
+            for (let component of opts.rqa) {
+                if (component.question == self) {
+                    component.question = res.question;
+                    break;
+                }
+            }
+            self.realComponent = res.question;
+            self.containerDiv = res.question.containerDiv;
+            self.realComponent.selectorId = selectorId;
+        } else {
+            // just render this component on the page in its usual place
+            res = renderRunestoneComponent(htmlsrc, selectorId, {
+                selector_id: selectorId,
+                useRunestoneServices: true,
+            });
+        }
+        return response;
     }
 }
 

runestone/selectquestion/js/selectone.js

@@ -33,27 +33,22 @@
 # ----------------------------------
 from docutils import nodes
 from docutils.parsers.rst import directives
-from sqlalchemy import Table
 
 # local imports
 # -------------
 from runestone.server.componentdb import (
-    addAssignmentQuestionToDB,
     addQuestionToDB,
     addHTMLToDB,
-    get_engine_meta,
     maybeAddToAssignment,
 )
 from runestone.common.runestonedirective import (
     RunestoneIdDirective,
-    RunestoneNode,
-    add_i18n_js,
 )
 
 
 TEMPLATE = """
 <div class="runestone alert alert-warning">
-<div data-component="selectquestion" id={component_id} {selector} {points} {proficiency} {min_difficulty} {max_difficulty} {autogradable} {not_seen_ever} {primary}>
+<div data-component="selectquestion" id={component_id} {selector} {points} {proficiency} {min_difficulty} {max_difficulty} {autogradable} {not_seen_ever} {primary} {AB}>
     <p>Loading ...</p>
 </div>
 </div>
@@ -75,6 +70,7 @@ class SelectQuestion(RunestoneIdDirective):
        :points: number of points for this question
        :min_difficulty: minimum difficulty level
        :max_difficulty: maximum difficulty level
+       :ab: experiment_name
 
        Difficulty is measured in one of two ways. For things like multiple choice and
        fill in the blank, we can use the % of students that get the answer correct on
@@ -96,6 +92,7 @@ class SelectQuestion(RunestoneIdDirective):
             "autogradable": directives.flag,
             "not_seen_ever": directives.flag,
             "primary": directives.flag,
+            "ab": directives.unchanged,
         }
     )
 
@@ -170,6 +167,13 @@ def run(self):
         else:
             self.options["primary"] = ""
 
+        if "ab" in self.options:
+            if len(self.question_bank_choices.split(",")) != 2:
+                raise self.severe("AB questions must have 2 options for :fromid:")
+            self.options["AB"] = f"data-ab={self.options['ab']}"
+        else:
+            self.options["AB"] = ""
+
         maybeAddToAssignment(self)
 
         res = TEMPLATE.format(**self.options)

runestone/selectquestion/selectone.py

@@ -98,38 +98,38 @@ export default class Timed extends RunestoneBase {
         }
     }
 
-    checkAssessmentStatus() {
+    async checkAssessmentStatus() {
         // Has the user taken this exam?  Inquiring minds want to know
         // If a user has not taken this exam then we want to make sure
         // that if a question has been seen by the student before we do
         // not populate previous answers.
-        let self = this;
-        let p = new Promise(function (resolve, reject) {
-            let sendInfo = {
-                div_id: self.divid,
-                course_name: eBookConfig.course,
-            };
-            console.log(sendInfo);
-            if (eBookConfig.useRunestoneServices) {
-                jQuery.getJSON(
-                    eBookConfig.ajaxURL + "tookTimedAssessment",
-                    sendInfo,
-                    function (data, status) {
-                        self.taken = data.tookAssessment;
-                        self.assessmentTaken = self.taken;
-                        if (!self.taken) {
-                            localStorage.clear();
-                        }
-                        resolve();
-                    }
-                ); // end getJSON
-            } else {
-                self.taken = false;
-                self.assessmentTaken = false;
-                resolve();
+        let response = Promise.resolve();
+        let sendInfo = {
+            div_id: this.divid,
+            course_name: eBookConfig.course,
+        };
+        console.log(sendInfo);
+        if (eBookConfig.useRunestoneServices) {
+            let request = new Request(
+                eBookConfig.ajaxURL + "tookTimedAssessment",
+                {
+                    method: "POST",
+                    headers: this.jsonHeaders,
+                    body: JSON.stringify(sendInfo),
+                }
+            );
+            response = await fetch(request);
+            let data = await response.json();
+            this.taken = data.tookAssessment;
+            this.assessmentTaken = this.taken;
+            if (!this.taken) {
+                localStorage.clear();
             }
-        }); // end promise
-        return p;
+        } else {
+            this.taken = false;
+            this.assessmentTaken = false;
+        }
+        return response;
     }
 
     /*===============================