Update data_processor.py

data_processor.py

@@ -308,15 +308,15 @@ class DataProcessor:
     
             # Store metrics in the required order
             student_metrics[student_name] = {
+                'Attended ≥ 90%': attended_90,
+                'Engagement ≥ 80%': engaged_80,
                 'Attendance (%)': attendance_pct,
-                'Attendance #': sessions_attended,
+                # 'Attendance #': sessions_attended,
                 'Engagement (%)': engagement_pct,
                 'Engaged (%)': engaged_pct,
                 'Partially Engaged (%)': partially_engaged_pct,
                 'Not Engaged (%)': not_engaged_pct,
-                'Absent (%)': absent_pct,
-                'Attended ≥ 90%': attended_90,
-                'Engagement ≥ 80%': engaged_80
+                'Absent (%)': absent_pct
             }
     
         # Create a DataFrame from student_metrics
@@ -342,16 +342,16 @@ class DataProcessor:
             return "Address Engagement"
         return "Consider addressing logistical barriers, improving fidelity, and/or collecting progress monitoring data"
 
-    def build_tree_diagram(self, row):
-        dot = Digraph()
-        dot.node("Q1", "Has the student attended ≥ 90% of interventions?")
-        dot.node("Q2", "Has the student been engaged ≥ 80% of intervention time?")
-        dot.node("A1", "Address Attendance", shape="box")
-        dot.node("A2", "Address Engagement", shape="box")
-        dot.node("A3", "Consider addressing logistical barriers", shape="box")
-        if row["Attended ≥ 90%"] == "No":
-            dot.edge("Q1", "A1", label="No")
-        else:
-            dot.edge("Q1", "Q2", label="Yes")
-            dot.edge("Q2", "A2" if row["Engagement ≥ 80%"] == "No" else "A3", label="Yes")
-        return dot
+    # def build_tree_diagram(self, row):
+    #     dot = Digraph()
+    #     dot.node("Q1", "Has the student attended ≥ 90% of interventions?")
+    #     dot.node("Q2", "Has the student been engaged ≥ 80% of intervention time?")
+    #     dot.node("A1", "Address Attendance", shape="box")
+    #     dot.node("A2", "Address Engagement", shape="box")
+    #     dot.node("A3", "Consider addressing logistical barriers", shape="box")
+    #     if row["Attended ≥ 90%"] == "No":
+    #         dot.edge("Q1", "A1", label="No")
+    #     else:
+    #         dot.edge("Q1", "Q2", label="Yes")
+    #         dot.edge("Q2", "A2" if row["Engagement ≥ 80%"] == "No" else "A3", label="Yes")
+    #     return dot