Merge pull request #43 from riknos314/timedupdates

Implemented changes to fix dependencies for timed components

Author: bnmnetp

runestone/assess/css/bootstrap.min.css

@@ -1,3 +1,16 @@
+/*==========================================
+========       Master fitb.js      =========
+============================================
+===   This file contains the JS for the  ===
+===  Runestone fillintheblank component. ===
+============================================
+===              Created By              ===
+===           Isaiah Mayerchak           ===
+===                 and                  ===
+===             Kirby Olson              ===
+===                6/4/15                ===
+==========================================*/
+
 /*=======================================
 ===         Global functions          ===
 === (used by more than one component) ===
@@ -343,3 +356,15 @@ FITB.prototype.compareFITB = function (data, status, whatever) {   // Creates a
     var el = $(html);
     el.modal();
 };
+
+/*=================================
+== Find the custom HTML tags and ==
+==   execute our code on them    ==
+=================================*/
+$(document).ready(function () {
+    $("[data-component=fillintheblank]").each(function (index) {    // FITB
+        if ($(this.parentNode).data("component") !== "timedAssessment") { // If this element exists within a timed component, don't render it here
+            FITBList[this.id] = new FITB({"orig": this});
+        }
+    });
+});

runestone/assess/js/fitb.js

@@ -1,8 +1,15 @@
-/*=======================================
-=========================================
-==== Begin Multiple Choice Component ====
-=========================================
-=======================================*/
+/*==========================================
+========      Master mchoice.js     =========
+============================================
+===  This file contains the JS for the   ===
+=== Runestone multiple choice component. ===
+============================================
+===              Created By              ===
+===           Isaiah Mayerchak           ===
+===                 and                  ===
+===             Kirby Olson              ===
+===                6/4/15                ===
+==========================================*/
 
 var feedBack = function (elem, correct, feedbackText) {        // Displays feedback on page--miscellaneous function that can be used by multple objects
     // elem is the Element in which to put the feedback
@@ -527,3 +534,16 @@ MultipleChoice.prototype.compareAnswers = function () {
     data.course = eBookConfig.course;
     jQuery.get(eBookConfig.ajaxURL + "getaggregateresults", data, this.compareModal);
 };
+
+/*=================================
+== Find the custom HTML tags and ==
+==   execute our code on them    ==
+=================================*/
+$(document).ready(function () {
+    $("[data-component=multiplechoice]").each(function (index) {    // MC
+        if ($(this.parentNode).data("component") !== "timedAssessment") { // If this element exists within a timed component, don't render it here
+            mcList[this.id] = new MultipleChoice({"orig": this});
+        }
+    });
+
+});

runestone/assess/js/mchoice.js

@@ -1,8 +1,13 @@
-/*===================================
-=====================================
-==== Begin Timed Assessment Code ====
-=====================================
-===================================*/
+/*==========================================
+========      Master timed.js     =========
+============================================
+===     This file contains the JS for    ===
+===     the Runestone timed component.   ===
+============================================
+===              Created By              ===
+===             Kirby Olson              ===
+===               6/11/15                ===
+==========================================*/
 
 var TimedList = {};    // Timed dictionary
 
@@ -257,6 +262,10 @@ Timed.prototype.createRenderedQuestionArray = function () {
         } else if ($(tmpChild).is("[data-component=fillintheblank]")) {
             var newFITB = new TimedFITB({"orig": tmpChild});
             this.renderedQuestionArray.push(newFITB);
+        } else if ($(tmpChild).is("[data-component=dragndrop]")) {
+            this.renderedQuestionArray.push(new TimedDragNDrop({"orig": tmpChild}));
+        } else if ($(tmpChild).is("[data-component=clickablearea]")) {
+            this.renderedQuestionArray.push(new TimedClickableArea({"orig":tmpChild}));
         }
     }
     if (this.random) {
@@ -472,20 +481,7 @@ Timed.prototype.submitTimedProblems = function () {
 
 Timed.prototype.hideTimedFeedback = function () {
     for (var i = 0; i < this.renderedQuestionArray.length; i++) {
-        var blanks = this.renderedQuestionArray[i].blankArray;
-        if (blanks !== undefined) {
-            for (var j = 0; j < blanks.length; j++) {
-                $(blanks[j]).removeClass("input-validation-error");
-            }
-            this.renderedQuestionArray[i].feedBackDiv.style.display = "none";
-        }
-        var feedbacks = this.renderedQuestionArray[i].feedBackEachArray;
-        if (feedbacks !== undefined) {
-            for (var j = 0; j < feedbacks.length; j++) {
-                $(feedbacks[j]).hide();
-            }
-        }
-
+        this.renderedQuestionArray[i].hideFeedback();   // Defined in each timed class
     }
 };
 
@@ -550,22 +546,4 @@ $(document).ready(function () {
     $("[data-component=timedAssessment]").each(function (index) {
         TimedList[this.id] = new Timed({"orig": this});
     });
-    for (var key in TimedList) {
-        if (TimedList.hasOwnProperty(key)) {
-            var TimedChildren = TimedList[key].origElem.childNodes;
-        }
-    }
-
-    $("[data-component=fillintheblank]").each(function (index) {    // FITB
-        if ($.inArray(this.id, TimedChildren) < 0) { // If the fillintheblank element exists within a timed component, don"t render it here
-            FITBList[this.id] = new FITB({"orig": this});
-        }
-    });
-
-    $("[data-component=multiplechoice]").each(function (index) {    // MC
-        if ($.inArray(this.id, TimedChildren) < 0) { // If the MC element exists within a timed component, don"t render it here
-            mcList[this.id] = new MultipleChoice({"orig": this});
-        }
-    });
-
 });

runestone/assess/js/timed.js

@@ -1,4 +1,3 @@
-// FITB constructor
 function TimedFITB (opts) {
     if (opts) {
         this.timedInit(opts);
@@ -39,6 +38,16 @@ TimedFITB.prototype.checkCorrectTimed = function () {
     return this.correct;
 };
 
+TimedFITB.prototype.hideFeedback = function () {
+    for (var i = 0; i < this.blankArray.length; i++) {
+        $(this.blankArray[i]).removeClass("input-validation-error");
+    }
+    this.feedBackDiv.style.display = "none";
+};
+
 TimedFITB.prototype.processTimedSubmission = function () {
+    for (var i = 0; i < this.blankArray.length; i++) {
+        this.blankArray[i].disabled = true;
+    }
     this.checkFITBStorage();
 };

runestone/assess/js/timedfitb.js

@@ -127,7 +127,16 @@ TimedMC.prototype.checkCorrectTimed = function () {
     }
 };
 
+TimedMC.prototype.hideFeedback = function () {
+    for (var i = 0; i < this.feedBackEachArray.length; i++) {
+        $(this.feedBackEachArray[i]).hide();
+    }
+};
+
 TimedMC.prototype.processTimedSubmission = function () {
+    for (var i = 0; i < this.optionArray.length; i++) {
+        this.optionArray[i]["input"].disabled = true;
+    }
     if (this.multipleanswers) {
         this.processMCMASubmission();
     } else {

runestone/assess/js/timedmc.js

@@ -23,6 +23,7 @@
 def setup(app):
     app.add_directive('clickablearea',ClickableArea)
     app.add_javascript('clickable.js')
+    app.add_javascript('timedclickable.js')
     app.add_stylesheet('clickable.css')
 
     app.add_node(ClickableAreaNode, html=(visit_ca_node, depart_ca_node))

runestone/clickableArea/__init__.py

@@ -23,6 +23,7 @@
 def setup(app):
     app.add_directive('dragndrop',DragNDrop)
     app.add_javascript('dragndrop.js')
+    app.add_javascript('timeddnd.js')
     app.add_stylesheet('dragndrop.css')
 
     app.add_node(DragNDropNode, html=(visit_dnd_node, depart_dnd_node))