[CM-200] Sync CM with Fa24 HAID (#29)

* Sync CM config with Fa24 HAID and add SID of duplicate of Fa24 HAID

* Update parser to handle commas, colons, etc within node names + remove sp. character from wordle-lite node name

* Remove temporary comment

* Restore original formatting of student and class levels

* Update Berkeley_CS10.txt

* Allow all characters other than left bracket in node names

* Revert to old dev sheet ID

api/config/default.json

@@ -33,7 +33,8 @@
         "ddgarcia@berkeley.edu",
         "gandhi@berkeley.edu",
         "pai@berkeley.edu",
-        "eemonq@berkeley.edu"
+        "eemonq@berkeley.edu",
+        "naveen.nathan@berkeley.edu"
     ]
 }
 

progressReport/meta/Berkeley_CS10.txt

@@ -1,7 +1,7 @@
 name: CS10
-term: Spring 2024
+term: Fall 2024
 orientation: left to right
-start date: 2024 01 15
+start date: 2024 08 26
 styles:
     name: root, shape: ellipse, style: filled, fillcolor: #3A73A5
     name: blue1, shape: ellipse, style: filled, fillcolor: #74B3CE
@@ -25,33 +25,44 @@ nodes:
         Booleans [default, Week5]
         Functions [default, Week6]
         HOFs I [default, Week6]
-    Midterm No Code [blue2, Week8]
-        Algorithms [default, Week6]
-        Computers and Education [default, Week7]
-        Testing [default, Week7]
-        Programming Paradigms [default, Week8]
-        Computing [default, Week8]
+    Midterm [blue2, Week5]
+        Algorithms [default, Week5]
+        Computers and Education [default, Week5]
+        Testing + 2048 + Mutable/Immutable [default, Week5]
+        Programming Paradigms [default, Week5]
+        Saving the World with Computing [default, Week5]
         Debugging [default, Week5]
         Scope [default, Week5]
-        Iteration [default, Week5]
-        Recursion [default, Week8]
-        Complexity [default, Week7]
-        HOFs II [default, Week8]
-    Midterm Code [blue2, Week8]
-        Fractal [default, Week8]
-    Postterm No Code [blue2, Week15]
-        AI [default, Week14]
-        HCI [default, Week13]
-        Ethics [default, Week14]
-        GenAI [default, Week14]
-        Alumni [default, Week15]
-        Base Conversion [default, Week2]
-        Concurrency [default, Week14]
-        HOFs III [default, Week15]
-    Postterm Code [blue2, Week15]
-        Snap [default, Week8]
-        Data Stuctures [default, Week13]
-        Python HOFs [default, Week13]
-        Python OOP [default, Week13]
-        Tree Recursion [default, Week14]
+        Iteration and Randomness [default, Week5]
+        Recursion Tracing [default, Week5]
+        Algorithmic Complexity [default, Week5]
+        HOFs II [default, Week5]
+        Fractal [default, Week5]
+    Projects [blue2, Week5]
+        Project 1: Wordle™-lite [default, Week5]
+        Project 2: Spelling Bee [default, Week5]
+        Project 3: 2048 [default, Week5]
+        Project 4: Artifact + Documentation [default, Week5]
+        Project 4: Comments + Peer Feedback [default, Week5]
+        Project 5: Pyturis [default, Week5]
+        Project 6: Final Project Proposal [default, Week5]
+    Labs [blue2, Week5]
+        Lab 2: Build Your Own Blocks [default, Week2]
+        Lab 3: Conditionals, Reporters & Abstraction [default, Week3]
+        Lab 4: Lists + HOFs [default, Week3]
+        Lab 5: Algorithms [default, Week4]
+        Lab 6: Algorithmic Complexity [default, Week4]
+        Lab 7: Testing + 2048 [default, Week5]
+        Lab 8: Boards [default, Week6]
+        Lab 9: Trees and Fractals [default, Week6]
+        Lab 10: Recursive Reporters [default, Week7]
+        Lab 11: HOFs and Functions as Data [default, Week8]
+        Lab 12: Welcome to Python [default, Week9]
+        Lab 13: Data Structures in Python [default, Week9]
+        Lab 14: Linear Recursion in Python [default, Week10]
+        Lab 15: Tree Recursion [default, Week10]
+        Lab 16: Object-Oriented Programming [default, Week11]
+        Lab 17: Text Processing in Python [default, Week11]
+        Lab 18: Concurrency & Parallelism [default, Week12]
+        Lab 19: Data Science [default, Week13]
 end

progressReport/parser.py

@@ -77,7 +77,7 @@ def read_meta(f):
             level_match = re.search(r"\s*([A-Za-z-_\s]+): #([A-Za-z0-9]+)", line)
             student_levels.append({"name": level_match.group(1), "color": "#{}".format(level_match.group(2))})
         elif parse_mode == "NODE":
-            node_match = re.search(r"(\s+)([A-Za-z0-9\-\s\\/]+) \[([A-Za-z0-9]+), Week([0-9]+)]", line)
+            node_match = re.search(r"(\s+)([^\[]+) \[([A-Za-z0-9]+), Week([0-9]+)]", line)
             root.week = max(root.week, int(node_match.group(4)))
             if len(node_match.group(1)) // 4 == 1:
                 cur_node_parent = Node(node_match.group(2), node_match.group(3), node_match.group(4))