Update app.py

app.py

@@ -130,14 +130,24 @@ ENGAGED_STR = 'Engaged (Respect, Responsibility, Effort)'
 PARTIALLY_ENGAGED_STR = 'Partially Engaged (about 50%)'
 NOT_ENGAGED_STR = 'Not Engaged (less than 50%)'
 
+# def safe_convert_to_time(series, format_str='%I:%M %p'):
+#     try:
+#         # Attempt to parse the time in 24-hour format
+#         converted = pd.to_datetime(series, format='%H:%M:%S', errors='coerce').dt.time
+        
+#         if format_str:
+#             # Format the time to the specified format (hours and minutes only, with AM/PM)
+#             return pd.Series([time.strftime(format_str) if time is not None else None for time in converted])
+#         return converted
+#     except Exception as e:
+#         print(f"Error converting series to time: {e}")
+#         return series
+
 def safe_convert_to_time(series, format_str='%I:%M %p'):
     try:
-        # Attempt to parse the time in 24-hour format
-        converted = pd.to_datetime(series, format='%H:%M:%S', errors='coerce').dt.time
-        
+        converted = pd.to_datetime(series, format='%H:%M:%S', errors='coerce')
         if format_str:
-            # Format the time to the specified format (hours and minutes only, with AM/PM)
-            return pd.Series([time.strftime(format_str) if time is not None else None for time in converted])
+            return converted.dt.strftime(format_str)
         return converted
     except Exception as e:
         print(f"Error converting series to time: {e}")
@@ -346,7 +356,7 @@ def compute_student_metrics(df):
 
         # Attendance (%)
         attendance_pct = (sessions_attended / intervention_sessions_held) * 100 if intervention_sessions_held > 0 else 0
-        attendance_pct = round(attendance_pct, 2)
+        attendance_pct = round(attendance_pct)  # Round to whole number
 
         # For engagement calculation, include only sessions where attendance is not 'Absent'
         valid_engagement_indices = attendance_values[attendance_values == 1].index
@@ -364,12 +374,18 @@ def compute_student_metrics(df):
 
         # Engagement (%)
         engagement_pct = (sum_engagement_values / number_sessions_attended) * 100 if number_sessions_attended > 0 else 0
-        engagement_pct = round(engagement_pct, 2)
+        engagement_pct = round(engagement_pct) # Round to whole number
+
+        # # Store metrics
+        # student_metrics[student_name] = {
+        #     'Attendance (%)': attendance_pct,
+        #     'Engagement (%)': engagement_pct
+        # }
 
-        # Store metrics
+        # Store metrics with percentage sign
         student_metrics[student_name] = {
-            'Attendance (%)': attendance_pct,
-            'Engagement (%)': engagement_pct
+            'Attendance (%)': f"{attendance_pct}%",  # Add percentage sign
+            'Engagement (%)': f"{engagement_pct}%"  # Add percentage sign
         }
 
     # Create a DataFrame from student_metrics
@@ -377,9 +393,45 @@ def compute_student_metrics(df):
     student_metrics_df.rename(columns={'index': 'Student'}, inplace=True)
     return student_metrics_df
 
-def plot_student_metrics(student_metrics_df):
+# def plot_student_metrics(student_metrics_df):
+#     # Create the figure and axis
+#     fig, ax = plt.subplots()
+
+#     # Width for the bars and offset for overlapping effect
+#     bar_width = 0.4
+#     index = range(len(student_metrics_df))
+
+#     # Plot Attendance and Engagement bars side by side with transparency
+#     attendance_bars = ax.bar([i - bar_width/2 for i in index], student_metrics_df['Attendance (%)'], 
+#                              width=bar_width, label='Attendance (%)', color='#005288', alpha=0.7)
+#     engagement_bars = ax.bar([i + bar_width/2 for i in index], student_metrics_df['Engagement (%)'], 
+#                              width=bar_width, label='Engagement (%)', color='#3AB0FF', alpha=0.7)
+
+#     # Add labels to each bar
+#     for bar in attendance_bars:
+#         height = bar.get_height()
+#         ax.text(bar.get_x() + bar.get_width() / 2, height, f'{height:.1f}%', 
+#                 ha='center', va='bottom', color='black')
+
+#     for bar in engagement_bars:
+#         height = bar.get_height()
+#         ax.text(bar.get_x() + bar.get_width() / 2, height, f'{height:.1f}%', 
+#                 ha='center', va='bottom', color='black')
+
+#     # Set labels, title, and legend
+#     ax.set_xlabel('Student')
+#     ax.set_ylabel('Percentage (%)')
+#     ax.set_title('Student Attendance and Engagement Metrics')
+#     ax.legend()
+#     ax.set_xticks(index)
+#     ax.set_xticklabels(student_metrics_df['Student'], rotation=45)
+
+#     # Display the plot
+#     st.pyplot(fig)
+
+    def plot_student_metrics(student_metrics_df):
     # Create the figure and axis
-    fig, ax = plt.subplots()
+    fig, ax = plt.subplots(figsize=(10, 6))  # Increased figure size for better readability
 
     # Width for the bars and offset for overlapping effect
     bar_width = 0.4
@@ -391,16 +443,17 @@ def plot_student_metrics(student_metrics_df):
     engagement_bars = ax.bar([i + bar_width/2 for i in index], student_metrics_df['Engagement (%)'], 
                              width=bar_width, label='Engagement (%)', color='#3AB0FF', alpha=0.7)
 
-    # Add labels to each bar
+    # Add labels to each bar with customized font size and color
+    font_size = 8  # Reduced font size for better fit
     for bar in attendance_bars:
         height = bar.get_height()
         ax.text(bar.get_x() + bar.get_width() / 2, height, f'{height:.1f}%', 
-                ha='center', va='bottom', color='black')
+                ha='center', va='bottom', color='white', fontsize=font_size)
 
     for bar in engagement_bars:
         height = bar.get_height()
         ax.text(bar.get_x() + bar.get_width() / 2, height, f'{height:.1f}%', 
-                ha='center', va='bottom', color='black')
+                ha='center', va='bottom', color='black', fontsize=font_size)
 
     # Set labels, title, and legend
     ax.set_xlabel('Student')
@@ -408,12 +461,16 @@ def plot_student_metrics(student_metrics_df):
     ax.set_title('Student Attendance and Engagement Metrics')
     ax.legend()
     ax.set_xticks(index)
-    ax.set_xticklabels(student_metrics_df['Student'], rotation=45)
+    ax.set_xticklabels(student_metrics_df['Student'], rotation=45, ha='right')  # Improved xticklabel alignment
+
+    # Tight layout to ensure all elements fit within the figure
+    fig.tight_layout()
 
     # Display the plot
     st.pyplot(fig)
 
     return fig
+    return fig
 
 # def plot_student_metrics(student_metrics_df):
 #     # Create the figure and axis