Add: Dynamic problems for fitb questions.

.jshintrc

@@ -7,7 +7,7 @@
         "allVisualizers",
         "console"
     ],
-    "esversion": 6,
+    "esversion": 8,
     "quotmark": true,
     "strict": "implied",
     "sub": true,

index.rst

@@ -3,6 +3,8 @@ Runestone Components
 ********************
 This site documents the working of the Runestone Components. See the `Runestone Interactive Overview <https://runestone.academy/runestone/books/published/overview/overview.html>`_ or the `Runestone instructor's guide <https://runestone.academy/runestone/static/instructorguide/index.html>`_.
 
+Demo linking to the Runestone Server docs: :ref:`assignments/grades_report endpoint`.
+
 
 Getting started
 ===============

runestone/activecode/js/activecode.js

@@ -470,8 +470,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");
@@ -514,13 +514,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);
@@ -554,6 +554,8 @@ export class ActiveCode extends RunestoneBase {
         $(this.runButton).text($.i18n("msg_activecode_save_run"));
     }
 
+    // _`addHistoryScrubber`
+    // ---------------------
     // Activecode -- If the code has not changed wrt the scrubber position value then don't save the code or reposition the scrubber
     //  -- still call runlog, but add a parameter to not save the code
     // add an initial load history button
@@ -574,14 +576,18 @@ export class ActiveCode extends RunestoneBase {
             // If this is timed and already taken we should restore history info
             this.renderScrubber();
         } else {
-            let request = new Request(eBookConfig.ajaxURL + "gethist.json", {
+            let request = new Request("/assessment/gethist", {
                 method: "POST",
                 headers: this.jsonHeaders,
                 body: JSON.stringify(reqData),
             });
             try {
                 response = await fetch(request);
                 let data = await response.json();
+                if (!response.ok) {
+                    throw new Error(`Failed to get the history data: ${data.detail}`);
+                }
+                data = data.detail;
                 if (data.history !== undefined) {
                     this.history = this.history.concat(data.history);
                     for (let t in data.timestamps) {
@@ -591,7 +597,7 @@ export class ActiveCode extends RunestoneBase {
                     }
                 }
             } catch (e) {
-                console.log("unable to fetch history");
+                console.log(`unable to fetch history: ${e}`);
             }
             this.renderScrubber(pos_last);
         }
@@ -907,7 +913,7 @@ export class ActiveCode extends RunestoneBase {
         });
     }
 
-    toggleEditorVisibility() {}
+    toggleEditorVisibility() { }
 
     addErrorMessage(err) {
         // Add the error message
@@ -1045,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");
@@ -1149,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());
@@ -1186,7 +1192,7 @@ Yet another is that there is an internal error.  The internal error message is:
         this.logRunEvent({
             div_id: this.divid,
             code: this.editor.getValue(),
-            lang: this.language,
+            language: this.language,
             errinfo: this.errinfo,
             to_save: this.saveCode,
             prefix: this.pretext,

runestone/activecode/js/activecode_sql.js

@@ -238,7 +238,7 @@ export default class SQLActiveCode extends ActiveCode {
         this.logRunEvent({
             div_id: this.divid,
             code: this.editor.getValue(),
-            lang: this.language,
+            language: this.language,
             errinfo: this.results[this.results.length - 1].status,
             to_save: this.saveCode,
             prefix: this.pretext,
@@ -292,9 +292,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;
     }

runestone/clickableArea/js/clickable.js

@@ -400,9 +400,11 @@ export default class ClickableArea extends RunestoneBase {
     }
 
     logCurrentAnswer() {
+        const answer = this.givenIndexArray.join(";");
         this.logBookEvent({
             event: "clickableArea",
-            act: this.givenIndexArray.join(";"),
+            answer: answer,
+            act: answer,
             div_id: this.divid,
             correct: this.correct ? "T" : "F",
         });

runestone/common/css/runestone-custom-sphinx-bootstrap.css

@@ -863,7 +863,7 @@ ul.dropdown-menu.globaltoc {
 
 
 /* Style lp textareas. */
-textarea#lp-result {
+textarea.lp-result {
     width: 100%;
     height: 10em;
     font-family: monospace;

runestone/common/js/bookfuncs.js

@@ -105,8 +105,7 @@ function addReadingList() {
             });
         } else {
             l = $("<div />", {
-                text:
-                    "This page is not part of the last reading assignment you visited.",
+                text: "This page is not part of the last reading assignment you visited.",
             });
         }
         $("#main-content").append(l);
@@ -206,12 +205,26 @@ class PageProgressBar {
 
 export var pageProgressTracker = {};
 
-function handlePageSetup() {
+async function handlePageSetup() {
     var mess;
-    if (eBookConfig.useRunestoneServices) {
-        jQuery.get(eBookConfig.ajaxURL + "set_tz_offset", {
-            timezoneoffset: new Date().getTimezoneOffset() / 60,
-        });
+    let headers = new Headers({
+        "Content-type": "application/json; charset=utf-8",
+        Accept: "application/json",
+    });
+    let data = { timezoneoffset: new Date().getTimezoneOffset() / 60 };
+    let request = new Request("/logger/set_tz_offset", {
+        method: "POST",
+        body: JSON.stringify(data),
+        headers: headers,
+    });
+    try {
+        let response = await fetch(request);
+        if (!response.ok) {
+            console.error(`Failed to set timezone! ${response.statusText}`);
+        }
+        data = await response.json();
+    } catch (e) {
+        console.error(`Error setting timezone ${e}`);
     }
 
     if (eBookConfig.isLoggedIn) {

runestone/common/js/runestonebase.js

@@ -20,7 +20,9 @@ import { pageProgressTracker } from "./bookfuncs.js";
 
 export default class RunestoneBase {
     constructor(opts) {
-        this.component_ready_promise = new Promise(resolve => this._component_ready_resolve_fn = resolve)
+        this.component_ready_promise = new Promise(
+            (resolve) => (this._component_ready_resolve_fn = resolve)
+        );
         this.optional = false;
         if (opts) {
             this.sid = opts.sid;
@@ -57,7 +59,7 @@ export default class RunestoneBase {
                 // is to look for doAssignment in the URL and then grab
                 // the assignment name from the heading.
                 if (location.href.indexOf("doAssignment") >= 0) {
-                    this.timedWrapper = $("h1#assignment_name").text()
+                    this.timedWrapper = $("h1#assignment_name").text();
                 } else {
                     this.timedWrapper = null;
                 }
@@ -72,37 +74,40 @@ export default class RunestoneBase {
         });
     }
 
-    // .. _logBookEvent:
-    //
-    // logBookEvent
-    // ------------
+    // _`logBookEvent`
+    //----------------
     // This function sends the provided ``eventInfo`` to the `hsblog endpoint` of the server. Awaiting this function returns either ``undefined`` (if Runestone services are not available) or the data returned by the server as a JavaScript object (already JSON-decoded).
     async logBookEvent(eventInfo) {
         if (this.graderactive) {
             return;
         }
         let post_return;
-        eventInfo.course = eBookConfig.course;
+        eventInfo.course_name = eBookConfig.course;
         eventInfo.clientLoginStatus = eBookConfig.isLoggedIn;
         eventInfo.timezoneoffset = new Date().getTimezoneOffset() / 60;
         if (this.percent) {
             eventInfo.percent = this.percent;
         }
         if (eBookConfig.useRunestoneServices && eBookConfig.logLevel > 0) {
-            let request = new Request(eBookConfig.ajaxURL + "hsblog", {
+            let request = new Request("/logger/bookevent", {
                 method: "POST",
                 headers: this.jsonHeaders,
                 body: JSON.stringify(eventInfo),
             });
             try {
                 let response = await fetch(request);
                 if (!response.ok) {
-                    throw new Error("Failed to save the log entry");
+                    let detail = await response.json();
+                    console.error(detail);
+                    throw new Error(`Failed to save the log entry ${detail}`);
+                } else {
+                    post_return = response.json();
                 }
-                post_return = response.json();
             } catch (e) {
                 if (this.isTimed) {
-                    alert(`Error: Your action was not saved! The error was ${e}`);
+                    alert(
+                        `Error: Your action was not saved! The error was ${e}`
+                    );
                 }
                 console.log(`Error: ${e}`);
             }
@@ -120,10 +125,8 @@ export default class RunestoneBase {
         return post_return;
     }
 
-    // .. _logRunEvent:
-    //
-    // logRunEvent
-    // -----------
+    // -`logRunEvent`
+    //---------------
     // This function sends the provided ``eventInfo`` to the `runlog endpoint`. When awaited, this function returns the data (decoded from JSON) the server sent back.
     async logRunEvent(eventInfo) {
         let post_promise = "done";
@@ -137,7 +140,7 @@ export default class RunestoneBase {
             eventInfo.save_code = "True";
         }
         if (eBookConfig.useRunestoneServices && eBookConfig.logLevel > 0) {
-            let request = new Request(eBookConfig.ajaxURL + "runlog.json", {
+            let request = new Request("/logger/runlog", {
                 method: "POST",
                 headers: this.jsonHeaders,
                 body: JSON.stringify(eventInfo),
@@ -192,19 +195,23 @@ export default class RunestoneBase {
                 data.sid = this.sid;
             }
             if (!eBookConfig.practice_mode && this.assessmentTaken) {
-                let request = new Request(
-                    eBookConfig.ajaxURL + "getAssessResults",
-                    {
-                        method: "POST",
-                        body: JSON.stringify(data),
-                        headers: this.jsonHeaders,
-                    }
-                );
+                let request = new Request("/assessment/results", {
+                    method: "POST",
+                    body: JSON.stringify(data),
+                    headers: this.jsonHeaders,
+                });
                 try {
                     let response = await fetch(request);
-                    data = await response.json();
-                    this.repopulateFromStorage(data);
-                    this.csresolver("server");
+                    if (response.ok) {
+                        data = await response.json();
+                        data = data.detail;
+                        this.repopulateFromStorage(data);
+                        this.csresolver("server");
+                    } else {
+                        alert(
+                            `HTTP Error getting results: ${response.statusText}`
+                        );
+                    }
                 } catch (err) {
                     try {
                         this.checkLocalStorage();
@@ -252,7 +259,7 @@ export default class RunestoneBase {
      */
     repopulateFromStorage(data) {
         // decide whether to use the server's answer (if there is one) or to load from storage
-        if (data !== null && this.shouldUseServer(data)) {
+        if (data !== null && data !== "no data" && this.shouldUseServer(data)) {
             this.restoreAnswers(data);
             this.setLocalStorage(data);
         } else {