Merge pull request #52 from riknos314/logFixes

updated jsComponents to use this.logBookEvents

Author: bnmnetp

runestone/assess/js/fitb.js

@@ -43,11 +43,15 @@ function FITB (opts) {
         this.init(opts);
     }
 }
+
+FITB.prototype = new RunestoneBase();
+
 /*===================================
 ===    Setting FITB variables     ===
 ===================================*/
 
 FITB.prototype.init = function (opts) {
+    RunestoneBase.apply(this, arguments);
     var orig = opts.orig;    // entire <p> element
     this.origElem = orig;
     this.divid = orig.id;
@@ -241,7 +245,7 @@ FITB.prototype.checkFITBStorage = function () {
     this.evaluateAnswers();
     this.renderFITBFeedback();
     var answerInfo = "answer:" + this.given_arr + ":" + (this.isCorrect ? "correct" : "no");
-    logBookEvent({"event": "fillb", "act": answerInfo, "div_id": this.divid});
+    this.logBookEvent({"event": "fillb", "act": answerInfo, "div_id": this.divid});
     this.enableCompareButton.disabled = false;
 };
 FITB.prototype.evaluateAnswers = function () {

runestone/assess/js/mchoice.js

@@ -34,11 +34,14 @@ function MultipleChoice (opts) {
     }
 }
 
+MultipleChoice.prototype = new RunestoneBase();
+
 /*===================================
 ===     Setting MC variables      ===
 ===================================*/
 
 MultipleChoice.prototype.init = function (opts) {
+    RunestoneBase.apply(this, arguments);
     var orig = opts.orig;    // entire <ul> element
     this.origElem = orig;
 
@@ -198,8 +201,11 @@ MultipleChoice.prototype.renderMCFormOpts = function () {
 
         // Create the label for the input
         var label = document.createElement("label");
-        $(label).attr("for", optid);
-        $(label).text(this.answerList[k].content);
+        var labelspan = document.createElement("span");
+        label.appendChild(input);
+        label.appendChild(labelspan);
+        //$(label).attr("for", optid);
+        $(labelspan).text(this.answerList[k].content);
 
         // create the object to store in optionArray
         var optObj = {
@@ -209,7 +215,6 @@ MultipleChoice.prototype.renderMCFormOpts = function () {
         this.optionArray.push(optObj);
 
         // add the option to the form
-        this.optsForm.appendChild(input);
         this.optsForm.appendChild(label);
         this.optsForm.appendChild(document.createElement("br"));
 
@@ -392,7 +397,7 @@ MultipleChoice.prototype.populateMCMALocalStorage = function () {
 
 MultipleChoice.prototype.logMCMAsubmission = function () {
     var answerInfo = "answer:" + this.givenlog.substring(0, this.givenlog.length - 1) + ":" + (this.correctCount == this.correctList.length ? "correct" : "no");
-    logBookEvent({"event": "mChoice", "act": answerInfo, "div_id": this.divid});
+    this.logBookEvent({"event": "mChoice", "act": answerInfo, "div_id": this.divid});
 };
 
 
@@ -444,7 +449,7 @@ MultipleChoice.prototype.populateMCMFLocalStorage = function () {
 
 MultipleChoice.prototype.logMCMFsubmission = function () {
     var answerInfo = "answer:" + this.givenArray[0] + ":" + (this.givenArray[0] == this.correctIndexList[0] ? "correct" : "no");
-    logBookEvent({"event": "mChoice", "act": answerInfo, "div_id": this.divid});
+    this.logBookEvent({"event": "mChoice", "act": answerInfo, "div_id": this.divid});
 };
 
 MultipleChoice.prototype.renderMCMFFeedback = function (correct, feedbackText) {

runestone/assess/js/timed.js

@@ -18,12 +18,14 @@ function Timed (opts) {
     }
 }
 
+Timed.prototype = new RunestoneBase();
 
 /*====================================
 === Setting Timed Assess Variables ===
 ====================================*/
 
 Timed.prototype.init = function (opts) {
+    RunestoneBase.apply(this, arguments);
     var orig = opts.orig;
     this.origElem = orig; // the entire element of this timed assessment and all of its children
     this.divid = orig.id;
@@ -306,7 +308,7 @@ Timed.prototype.startAssessment = function () {
             this.running = 1;
             $(this.timedDiv).show();
             this.increment();
-            logBookEvent({"event": "timedExam", "act": "start", "div_id": this.divid});
+            this.logBookEvent({"event": "timedExam", "act": "start", "div_id": this.divid});
             localStorage.setItem(eBookConfig.email + ":" + this.divid, "started");
         }
     } else {
@@ -514,7 +516,7 @@ Timed.prototype.storeScore = function () {
 };
 
 Timed.prototype.logScore = function () {
-    logBookEvent({"event": "timedExam", "act": "finish", "div_id": this.divid, "correct": this.score, "incorrect": this.incorrect, "skipped": this.skipped, "time": this.timeTaken});
+    this.logBookEvent({"event": "timedExam", "act": "finish", "div_id": this.divid, "correct": this.score, "incorrect": this.incorrect, "skipped": this.skipped, "time": this.timeTaken});
 };
 
 Timed.prototype.restoreFromStorage = function () {

runestone/clickableArea/js/clickable.js

@@ -8,16 +8,6 @@
 ===           Isaiah Mayerchak           ===
 ===                7/1/15                ===
 ==========================================*/
-function RunestoneBase () {   // Basic parent stuff
-
-}
-RunestoneBase.prototype.logBookEvent = function (info) {
-    console.log("logging event " + this.divid);
-};
-RunestoneBase.prototype.logRunEvent = function (info) {
-    console.log("running " + this.divid);
-};
-
 var CAList = {};    // Dictionary that contains all instances of ClickableArea objects
 
 

runestone/datafile/datafile.js runestone/datafile/js/datafile.jsrunestone/datafile/datafile.js renamed to runestone/datafile/js/datafile.js

@@ -9,16 +9,6 @@
 ===                6/8/15                ===
 ==========================================*/
 
-function RunestoneBase () {   // Basic parent stuff
-
-}
-RunestoneBase.prototype.logBookEvent = function (info) {
-    console.log("logging event " + this.divid);
-};
-RunestoneBase.prototype.logRunEvent = function (info) {
-    console.log("running " + this.divid);
-};
-
 var dfList = {};    // Dictionary that contains all instances of Datafile objects
 
 

runestone/poll/js/poll.js

@@ -18,7 +18,7 @@ function submitPoll(div_id) {
     var eventInfo = {'event':'poll', 'act':act, 'div_id':div_id};
 
     // log the response to the database
-    logBookEvent(eventInfo); // in bookfuncs.js
+    this.logBookEvent(eventInfo); // in bookfuncs.js
 
     // log the fact that the user has answered the poll to local storage
     localStorage.setItem(div_id, "true");

runestone/shortanswer/js/shortanswer.js

@@ -40,7 +40,7 @@ function submitJournal(directive_id) {
                       function(data) {
                         console.log(data.message);
                       });  */
-    logBookEvent({'event': 'shortanswer', 'act': JSON.stringify(value), 'div_id': directive_id});
+    this.logBookEvent({'event': 'shortanswer', 'act': JSON.stringify(value), 'div_id': directive_id});
 }