Merge pull request #1344 from Xinying329/master

Updated log book event in the toggle feature

Author: bnmnetp

runestone/activecode/js/activecode.js

@@ -217,6 +217,7 @@ export class ActiveCode extends RunestoneBase {
                         "2px solid #b43232"
                     );
                     this.isAnswered = true;
+                    // the first time the student types in the write-code box
                     this.logBookEvent({
                         event: "activecode",
                         act: "edit",
@@ -265,9 +266,7 @@ export class ActiveCode extends RunestoneBase {
         // The run is finished; re-enable the button.
         this.runButton.disabled = false;
         this.runCount += 1;
-        if (this.is_toggle && this.runCount == 3) {
-            alert("Help is Available Using the Toggle Question Selector");
-        }
+        this.toggleAlert();
     }
 
     createControls() {
@@ -281,7 +280,7 @@ export class ActiveCode extends RunestoneBase {
         $(butt).addClass("btn btn-success run-button");
         ctrlDiv.appendChild(butt);
         this.runButton = butt;
-        console.log("adding click function for run");
+        // console.log("adding click function for run");
         this.runButton.onclick = this.runButtonHandler.bind(this);
         $(butt).attr("type", "button");
 
@@ -1272,6 +1271,19 @@ Yet another is that there is an internal error.  The internal error message is:
         }
     }
 
+    toggleAlert(){
+        if (this.is_toggle && this.runCount == 3) {
+            if (this.errinfo != "success" || this.unit_results.substring(8,11)!=100.0){
+                setTimeout(function() {alert("Help is Available Using the Toggle Question Selector! You can try the Mixed-up Question first."); }, 500);
+                this.logBookEvent({
+                    event: "togglealert",
+                    act: "Help is Available Using the Toggle Question Selector",
+                    div_id: this.divid,
+                })
+            }
+        }
+    }
+
     /* runProg has several async elements to it.
      * 1. Skulpt runs the python program asynchronously
      * 2. The history is restored asynchronously

runestone/selectquestion/js/selectone.js

@@ -307,13 +307,20 @@ export default class SelectOne extends RunestoneBase {
         let closeButton = document.createElement("button");
         $(closeButton).text("Close Preview");
         $(closeButton).addClass("btn btn-default");
-        $(closeButton).click(function (event) {
-            $("#toggle-preview").html("");
-            toggleQuestionSelect.value = $("#" + parentID).data(
-                "toggle_current"
-            );
-            $("#component-preview").hide();
-        });
+        closeButton.addEventListener("click",
+            function () {
+                $("#toggle-preview").html("");
+                toggleQuestionSelect.value = $("#" + parentID).data(
+                    "toggle_current"
+                );
+                $("#component-preview").hide();
+                this.logBookEvent({
+                    event: "close_toggle",
+                    act: toggleQuestionSelect.value,
+                    div_id: toggleQuestionSelect.parentElement.id
+                });
+         }.bind(this)
+         );
         $("#toggle-buttons").append(closeButton);
 
         // if "lock" is not in toggle options, then allow adding more buttons to the preview panel