Update app.py

app.py

@@ -3,86 +3,84 @@ import pandas as pd
 import matplotlib.pyplot as plt
 
 def process_data(df):
-    # Clean data and handle missing values
+    # Clean and prepare data
     df = df[['Project Category', 'Logged']].copy()
-    df = df.dropna(subset=['Project Category'])  # Remove rows with missing categories
+    df = df.dropna(subset=['Project Category'])
     
-    # Convert to string and consolidate categories
-    df['Category'] = df['Project Category'].apply(
+    # Consolidate categories
+    df['Main Category'] = df['Project Category'].apply(
         lambda x: 'Billable' if 'Billable' in str(x) else str(x).strip()
     )
     
-    # Aggregate data
-    summary = df.groupby('Category')['Logged'].sum().reset_index()
-    total = summary['Logged'].sum()
-    summary['Percentage'] = (summary['Logged'] / total * 100).round(1)
+    # Group by main categories
+    main_categories = df.groupby('Main Category')['Logged'].sum().reset_index()
+    total_hours = main_categories['Logged'].sum()
+    main_categories['Percentage'] = (main_categories['Logged'] / total_hours * 100).round(1)
     
-    return summary
+    # Prepare non-billable breakdown
+    non_billable = df[df['Main Category'] == 'Non-Billable']
+    non_billable_breakdown = non_billable.groupby('Project Category')['Logged'].sum().reset_index()
+    
+    return main_categories, non_billable_breakdown
 
 def create_pie_chart(data):
     fig, ax = plt.subplots(figsize=(6, 6))
     wedges, texts, autotexts = ax.pie(
         data['Logged'],
-        labels=data['Category'],
+        labels=data['Main Category'],
         autopct='%1.1f%%',
         colors=['#4CAF50', '#FFC107', '#9E9E9E'],
         startangle=90
     )
     plt.setp(autotexts, size=10, weight="bold", color='white')
-    ax.set_title('Overall Utilization', pad=20)
+    ax.set_title('Overall Utilization Distribution', pad=20)
     return fig
 
-def create_bar_chart(df):
-    # Filter and prepare non-billable data
-    non_billable = df[df['Category'] == 'Non-Billable']
-    non_billable = non_billable.groupby('Project Category')['Logged'].sum().reset_index()
-    
-    fig, ax = plt.subplots(figsize=(10, 4))
-    non_billable.plot(
-        kind='bar',
-        x='Project Category',
-        y='Logged',
-        ax=ax,
-        legend=False
-    )
-    ax.set_title('Non-Billable Details')
+def create_bar_chart(data):
+    fig, ax = plt.subplots(figsize=(10, 5))
+    data.plot(kind='bar', x='Project Category', y='Logged', ax=ax, legend=False)
+    ax.set_title('Non-Billable Time Breakdown')
     ax.set_ylabel('Hours')
-    plt.xticks(rotation=45)
+    ax.set_xlabel('')
+    plt.xticks(rotation=45, ha='right')
+    plt.tight_layout()
     return fig
 
 def main():
-    st.title('QA Utilization Dashboard')
+    st.title('QA Team Utilization Dashboard')
     
-    uploaded_file = st.file_uploader("Upload Timesheet", type=['xls', 'xlsx'])
+    uploaded_file = st.file_uploader("Upload Timesheet Excel File", type=['xls', 'xlsx'])
     
     if uploaded_file:
         try:
             df = pd.read_excel(uploaded_file, sheet_name='Report')
-            processed_data = process_data(df)
+            main_cats, non_billable = process_data(df)
             
-            # Show main visualization
+            # Main utilization section
             st.header("Overall Utilization")
             col1, col2 = st.columns([2, 1])
             
             with col1:
-                if not processed_data.empty:
-                    st.pyplot(create_pie_chart(processed_data))
-                else:
-                    st.warning("No data available for visualization")
+                st.pyplot(create_pie_chart(main_cats))
             
             with col2:
                 st.dataframe(
-                    processed_data[['Category', 'Logged', 'Percentage']],
+                    main_cats[['Main Category', 'Logged', 'Percentage']],
                     hide_index=True,
                     column_config={
-                        'Logged': 'Hours',
+                        'Main Category': 'Category',
+                        'Logged': st.column_config.NumberColumn('Hours', format="%.2f"),
                         'Percentage': st.column_config.NumberColumn(format="%.1f%%")
                     }
                 )
             
-            # Show non-billable details
-            st.header("Non-Billable Breakdown")
-            st.pyplot(create_bar_chart(processed_data))
+            # Non-billable breakdown
+            st.header("Non-Billable Detailed Breakdown")
+            st.pyplot(create_bar_chart(non_billable))
+            
+            # Raw data preview
+            st.subheader("Raw Data Preview")
+            st.dataframe(df.head(10), hide_index=True)
             
         except Exception as e:
             st.error(f"Error processing file: {str(e)}")