Merge branch 'master' into login-fix

Author: bnmnetp

runestone/fitb/fitb.py

@@ -144,7 +144,6 @@ class FillInTheBlank(RunestoneIdDirective):
     option_spec = RunestoneIdDirective.option_spec.copy()
     option_spec.update(
         {
-            "blankid": directives.unchanged,
             "casei": directives.flag,  # case insensitive matching
         }
     )

runestone/timed/js/timed.js

@@ -147,27 +147,27 @@ export default class Timed extends RunestoneBase {
         this.renderContainer();
         this.renderTimer();
         await this.renderControlButtons();
-        this.assessDiv.appendChild(this.timedDiv); // This can't be appended in renderContainer because then it renders above the timer and control buttons.
+        this.containerDiv.appendChild(this.timedDiv); // This can't be appended in renderContainer because then it renders above the timer and control buttons.
         if (this.renderedQuestionArray.length > 1) this.renderNavControls();
         this.renderSubmitButton();
         this.renderFeedbackContainer();
         this.useRunestoneServices = eBookConfig.useRunestoneServices;
         // Replace intermediate HTML with rendered HTML
-        $(this.origElem).replaceWith(this.assessDiv);
+        $(this.origElem).replaceWith(this.containerDiv);
         // check if already taken and if so show results
         this.styleExamElements(); // rename to renderPossibleResults
-        this.checkServer("timedExam");
+        this.checkServer("timedExam", true);
     }
 
     renderContainer() {
-        this.assessDiv = document.createElement("div"); // container for the entire Timed Component
+        this.containerDiv = document.createElement("div"); // container for the entire Timed Component
         if (this.fullwidth) {
             // allow the container to fill the width - barb
-            $(this.assessDiv).attr({
+            $(this.containerDiv).attr({
                 style: "max-width:none",
             });
         }
-        this.assessDiv.id = this.divid;
+        this.containerDiv.id = this.divid;
         this.timedDiv = document.createElement("div"); // div that will hold the questions for the timed assessment
         this.navDiv = document.createElement("div"); // For navigation control
         $(this.navDiv).attr({
@@ -244,8 +244,8 @@ export default class Timed extends RunestoneBase {
         if (!this.nopause) {
             this.controlDiv.appendChild(this.pauseBtn);
         }
-        this.assessDiv.appendChild(this.wrapperDiv);
-        this.assessDiv.appendChild(this.controlDiv);
+        this.containerDiv.appendChild(this.wrapperDiv);
+        this.containerDiv.appendChild(this.controlDiv);
     }
 
     renderNavControls() {
@@ -471,7 +471,7 @@ export default class Timed extends RunestoneBase {
         this.scoreDiv = document.createElement("P");
         this.scoreDiv.id = this.divid + "results";
         this.scoreDiv.style.display = "none";
-        this.assessDiv.appendChild(this.scoreDiv);
+        this.containerDiv.appendChild(this.scoreDiv);
     }
 
     createRenderedQuestionArray() {
@@ -906,8 +906,8 @@ export default class Timed extends RunestoneBase {
         }
     }
 
-    // restoreAnswerdQuestions
-    // -----------------------
+    // restoreAnsweredQuestions
+    // ------------------------
     restoreAnsweredQuestions() {
         for (var i = 0; i < this.renderedQuestionArray.length; i++) {
             var currentQuestion = this.renderedQuestionArray[i];

runestone/timed/test/_sources/multiquestion.rst

@@ -1,10 +1,10 @@
 A Multi Question Exam
 =====================
 
-.. timed:: timed1
+.. timed:: test_timed_1
    :timelimit: 10
 
-   .. mchoice:: questiontimed1_1
+   .. mchoice:: test_timed_mchoice_1
        :answer_a: The value you are searching for is the first element in the array.
        :answer_b: The value you are searching for is the last element in the array
        :answer_c: The value you are searching for is in the middle of the array.
@@ -19,7 +19,7 @@ A Multi Question Exam
 
        Under which of these conditions will a sequential search be faster than a binary search?
 
-   .. clickablearea:: clicktimed1
+   .. clickablearea:: test_timed_clickablearea_1
        :question: Click on the correct cells.
        :feedback: Remember, the operator '=' is used for assignment.
        :table:
@@ -34,15 +34,15 @@ A Multi Question Exam
        | This row is incorrect  |   ...      |   ...    |   ...    |
        +------------------------+------------+----------+----------+
 
-   .. dragndrop:: dnd2
+   .. dragndrop:: test_timed_dnd_1
        :feedback: This is feedback.
-       :match_1: Drag to Answer A|||Answer A
-       :match_2: Drag me Answer B|||Answer B
-       :match_3: Drag to Answer C|||Answer C
+       :match_1: Drag to A|||Answer A
+       :match_2: Drag to B|||Answer B
+       :match_3: Drag to C|||Answer C
 
        This is a drag n drop question.
 
-   .. fillintheblank:: fill1412
+   .. fillintheblank:: test_timed_fitb_1
 
        Fill in the blanks to make the following sentence: "The red car drove away" The |blank| car drove |blank|.
 
@@ -52,28 +52,28 @@ A Multi Question Exam
           :.*: where did we say the red car was going?
 
 
-   .. activecode:: units2
+   .. activecode:: test_timed_activecode_1
        :nocodelens:
-    
+
        Fix the following code so that it always correctly adds two numbers.
        ~~~~
        def add(a,b):
           return 4
-    
+
        ====
        from unittest.gui import TestCaseGui
-    
+
        class myTests(TestCaseGui):
-    
+
            def testOne(self):
                self.assertEqual(add(2,2),4,"A feedback string when the test fails")
                self.assertAlmostEqual(add(2.0,3.0), 5.0, 5, "Try adding your parameters")
-    
+
        myTests().main()
 
 
-   .. parsonsprob:: morning
-   
+   .. parsonsprob:: test_timed_parsons_1
+
       Put the blocks in order to describe a morning routine.
       -----
       get up
@@ -83,11 +83,9 @@ A Multi Question Exam
       brush your teeth
 
 
-   .. shortanswer:: question2
+   .. shortanswer:: test_timed_shortanswer_1
        :optional:
        :mathjax:
-    
+
        What are the colors in the rainbow?
        What is meaning of :math:`\pi r^2`
-   
-