Merge pull request barbarer#179 from xinyinghou/master

Resolved issues identified during pilot testing

Author: barbarer

.DS_Store

@@ -78,7 +78,7 @@ Practice
             +------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------+     
 
         ~~~~
-        def get_average_score(dict_category_item, lst_quantity):
+        def get_average_score(student_information):
 
 
 
@@ -102,6 +102,7 @@ Practice
 
 
 
+
 .. activecode:: w3-mooc_nested
         :autograde: unittest
         :nocodelens:

_sources/.DS_Store

@@ -1,7 +1,7 @@
 Thank you!
 ===========
 
-That's it! You have completed the practice problems and the post-survey. Your feedback is valuable to us, and we appreciate your time and effort in participating in this study.
+That's it! You have completed the practice problems and the post-survey (if applicable). Your feedback is valuable to us, and we appreciate your time and effort in participating in this study.
 
 We hope you found the practice problems helpful in improving your understanding of nested dictionaries in Python. 
 

_sources/_hidden/mc_nested-nt.rst

@@ -76,7 +76,6 @@ Please answer the following questions.
 
 
 .. activecode:: posttest-2-mooc_nested
-    :language: python3
     :autograde: unittest
     :nocodelens:
 
@@ -117,23 +116,21 @@ Please answer the following questions.
 
 
     ====
-    from unittest.gui import TestCaseGui
-
-        class myTests(TestCaseGui):
 
-            def testOne(self):
-
-                self.assertEqual(happy_hour_specials([("Classic", "Burger", True, 12), ("Veggie", "Burger", True, 14), ("Fish", "Burger", True, 16), ("Cheese", "Pizza", False, 20)]), {"Burger": {"Classic": 12, "Veggie": 14}})
-                self.assertEqual(happy_hour_specials([("Mango", "Smoothie", True, 8), ("Green", "Smoothie", True, 12), ("Chocolate", "Milkshake", False, 15), ("Vanilla", "Milkshake", False, 18)]), {"Smoothie": {"Mango": 8, "Green": 12}})
-                self.assertEqual(happy_hour_specials([("Spaghetti", "Pasta", True, 10), ("Alfredo", "Pasta", True, 12), ("Bolognese", "Pasta", False, 14), ("Seafood", "Pasta", True, 18)]), {"Pasta": {"Spaghetti": 10, "Alfredo": 12}})
-                self.assertEqual(happy_hour_specials([("Margherita", "Pizza", True, 15), ("Pepperoni", "Pizza", False, 22), ("Hawaiian", "Pizza", True, 10), ("Caesar", "Salad", True, 10)]), {"Pizza": {"Margherita": 15, "Hawaiian": 10}, "Salad": {"Caesar": 10}})
+    from unittest.gui import TestCaseGui
+    
+    class myTests(TestCaseGui):
+        def testOne(self):
+            self.assertEqual(happy_hour_specials([("Classic", "Burger", True, 12), ("Veggie", "Burger", True, 14), ("Fish", "Burger", True, 16), ("Cheese", "Pizza", False, 20)]), {"Burger": {"Classic": 12, "Veggie": 14}})
+            self.assertEqual(happy_hour_specials([("Mango", "Smoothie", True, 8), ("Green", "Smoothie", True, 12), ("Chocolate", "Milkshake", False, 15), ("Vanilla", "Milkshake", False, 18)]), {"Smoothie": {"Mango": 8, "Green": 12}})
+            self.assertEqual(happy_hour_specials([("Spaghetti", "Pasta", True, 10), ("Alfredo", "Pasta", True, 12), ("Bolognese", "Pasta", False, 14), ("Seafood", "Pasta", True, 18)]), {"Pasta": {"Spaghetti": 10, "Alfredo": 12}})
+            self.assertEqual(happy_hour_specials([("Margherita", "Pizza", True, 15), ("Pepperoni", "Pizza", False, 22), ("Hawaiian", "Pizza", True, 10), ("Caesar", "Salad", True, 10)]), {"Pizza": {"Margherita": 15, "Hawaiian": 10}, "Salad": {"Caesar": 10}})
 
-        myTests().main()
+    myTests().main()
 
 
 
 .. activecode:: posttest-3-mooc_nested 
-    :language: python3
     :autograde: unittest
     :nocodelens:
 

_sources/_hidden/mc_post_survey.rst

@@ -90,11 +90,8 @@
     :adaptive:
     :practice: T
 
-    Finish the function ``get_vegetarian_menu(menu_items):`` below:
-        - It takes a list of tuples ``menu_items`` as input, each tuple contains ``(name, category, price, is_vegetarian)``.
-        - It returns a new nested dictionary that only contains the items from  ``menu_items`` where ``is_vegetarian`` is ``True``.
-            - The outer dictionary keys are ``category`` such as "Soup", "Pizza", "Pasta", "Salad".
-            - The inner dictionary keys are ``name`` and values are ``price`` for each vegetarian item of that ``category``.
+    Finish the function ``get_order_totals()``, that takes a list of tuples and returns a nested dictionary with the same information. Each tuple includes 3 values; the first is the person's name, the second is item name, and the third is the quantity.
+        - Note that there may be more than one tuple for the same person and item - your dictionary should total all the quantities for the same person and item.
     -----
     def get_order_totals(orders):
     =====

_sources/_hidden/mc_posttest.rst

@@ -74,9 +74,9 @@ What to do next
          reviewLink.href = "#"; // Prevent default navigation for now
 
          reviewLink.onclick = function(event) {
-            const consent = document.getElementById('consent');
+            const consent_sent = document.getElementById('consent_sent');
 
-            if (!consent) {
+            if (!consent_sent) {
             alert('Please check the consent form before moving to the next.');
             event.preventDefault();
             return false;