Update app.py

app.py

@@ -26,43 +26,44 @@ def page1_upload_and_merge(group_attendance_file, customer_attendance_file, leav
     except Exception as e:
         return f"❌ Error loading files: {str(e)}", None, None
 
-    # Clean columns
+    # Clean column names
     df_group = clean_columns(df_group)
     df_segments = clean_columns(df_segments)
     df_customer = clean_columns(df_customer)
     df_visits = clean_columns(df_visits)
     df_leaves = clean_columns(df_leaves)
 
+    # Normalize ID fields
     try:
         df_group['employee_code'] = pd.to_numeric(df_group['employee_code'], errors='coerce').astype('Int64')
         df_segments['employee_code'] = pd.to_numeric(df_segments['employee_code'], errors='coerce').astype('Int64')
         df_customer['erp_number'] = pd.to_numeric(df_customer['erp_number'], errors='coerce').astype('Int64')
         df_visits['erp_no'] = pd.to_numeric(df_visits['erp_no'], errors='coerce').astype('Int64')
         df_leaves['erp_number'] = pd.to_numeric(df_leaves['erp_number'], errors='coerce').astype('Int64')
-    
-        print("Qr Attendance",df_customer)
-
-        
     except Exception as e:
         return f"❌ Error normalizing IDs: {str(e)}", None, None
 
-    df_group = df_group.merge(
-        df_segments[['employee_code', 'segment']],
-        on='employee_code',
-        how='left',
-        suffixes=('', '_seg')
-    )
-    df_group['segment'] = df_group['segment_seg'].combine_first(df_group['segment'])
-    df_group.drop(columns=['segment_seg'], inplace=True)
+    # Merge segments into group attendance
+    try:
+        df_group = df_group.merge(
+            df_segments[['employee_code', 'segment']],
+            on='employee_code',
+            how='left',
+            suffixes=('', '_seg')
+        )
+        df_group['segment'] = df_group['segment_seg'].combine_first(df_group['segment'])
+        df_group.drop(columns=['segment_seg'], inplace=True)
+    except Exception as e:
+        return f"❌ Error merging segment info: {str(e)}", None, None
 
-    # Store in state
+    # Store for next step
     state['df_group'] = df_group
     state['df_customer'] = df_customer
 
-    return "✅ Page 1: Files processed and segment merged", df_group, df_customer
+    return "✅ Page 1: Upload complete and segment merged", df_group, df_customer
 
 
-def page2_qr_based_attendance():
+def page2_qr_summary():
     df_group = state.get('df_group')
     df_customer = state.get('df_customer')
 
@@ -79,42 +80,48 @@ def page2_qr_based_attendance():
     df_group = convert_dates(df_group)
     df_customer = convert_dates(df_customer)
 
-    # Match QR-based attendance
-    present_ids = set(df_customer['erp_number'].dropna().astype('Int64'))
+    # Match employee IDs
+    group_ids = set(df_group['employee_code'].dropna().astype('Int64'))
+    qr_ids = set(df_customer['erp_number'].dropna().astype('Int64'))
+    matched_ids = group_ids & qr_ids
+
+    # Debug samples
+    debug_text = f"""
+👥 Group Attendance Unique IDs: {len(group_ids)}
+📱 Customer Attendance Unique IDs (ERP): {len(qr_ids)}
+✅ Matched IDs: {len(matched_ids)}
+🔍 Sample Group IDs: {list(group_ids)[:10]}
+🔍 Sample ERP IDs: {list(qr_ids)[:10]}
+"""
+
+    # Mark QR-based attendance
     df_group['qr_based_attendance'] = df_group['employee_code'].apply(
-        lambda x: "Present" if x in present_ids else "Absent"
+        lambda x: "Present" if x in matched_ids else "Absent"
     )
 
-    # Segment Summary
+    # Generate summary
     seg_group = df_group.groupby('segment')['employee_code'].nunique().reset_index()
     seg_group.columns = ['segment', 'employee_count']
 
-    seg_qr = df_customer.groupby('segment')['erp_number'].nunique().reset_index()
+    seg_qr = df_group[df_group['qr_based_attendance'] == 'Present'].groupby('segment')['employee_code'].nunique().reset_index()
     seg_qr.columns = ['segment', 'qr_based_attendance']
 
     summary = seg_group.merge(seg_qr, on='segment', how='left')
     summary['qr_based_attendance'] = summary['qr_based_attendance'].fillna(0).astype(int)
     summary.columns = ['Segment', 'Employee Count', 'QR-based Attendance']
-    print(summary['QR-based Attendance'])
-
-    # Debug log
-    debug_log = f"""🧪 **Debug Info**
-- `employee_code` in Group Attendance (unique): {df_group['employee_code'].nunique()}
-- `erp_number` in Customer Attendance (unique): {df_customer['erp_number'].nunique()}
-- Matching Employee Codes: {df_group['employee_code'].isin(present_ids).sum()} / {len(df_group)}
-"""
 
-    # Save to Excel
+    # Export to Excel
     temp_file = tempfile.NamedTemporaryFile(delete=False, suffix=".xlsx")
     with pd.ExcelWriter(temp_file.name, engine='xlsxwriter') as writer:
         df_group.to_excel(writer, index=False, sheet_name='Group_Attendance')
         summary.to_excel(writer, index=False, sheet_name='Segment_Summary')
 
-    return "✅ Page 2: QR attendance matched.", df_group, summary, temp_file.name, debug_log
+    return "✅ Page 2: QR attendance summary generated.", df_group, summary, temp_file.name, debug_text
 
 
+# Gradio App
 with gr.Blocks() as demo:
-    gr.Markdown("## 📊 AI Attendance App — Multi-step")
+    gr.Markdown("## 📊 AI Attendance App (Step 1: QR Matching with Summary)")
 
     with gr.Tab("📥 Page 1: Upload & Normalize"):
         group_file = gr.File(label="1. Group Attendance (.xlsx)")
@@ -123,7 +130,7 @@ with gr.Blocks() as demo:
         visits_file = gr.File(label="4. Official Visits (.xlsx)")
         segment_file = gr.File(label="5. Management Segregation (.xlsx)")
 
-        upload_btn = gr.Button("✅ Process & Merge Segments")
+        upload_btn = gr.Button("✅ Process & Merge")
         page1_status = gr.Textbox(label="Status")
         df1 = gr.Dataframe(label="Group Attendance")
         df2 = gr.Dataframe(label="Customer Attendance")
@@ -134,16 +141,16 @@ with gr.Blocks() as demo:
             outputs=[page1_status, df1, df2]
         )
 
-    with gr.Tab("📲 Page 2: QR Attendance Summary"):
+    with gr.Tab("📲 Page 2: QR Summary"):
         qr_btn = gr.Button("📌 Generate QR Summary")
         qr_status = gr.Textbox(label="Status")
         qr_df = gr.Dataframe(label="Updated Group Attendance")
         summary_df = gr.Dataframe(label="Segment Summary")
         download = gr.File(label="📥 Download Excel Report")
-        debug = gr.Textbox(label="🛠 Debug Info", lines=6)
+        debug = gr.Textbox(label="🛠 Debug Info", lines=8)
 
         qr_btn.click(
-            fn=page2_qr_based_attendance,
+            fn=page2_qr_summary,
             inputs=[],
             outputs=[qr_status, qr_df, summary_df, download, debug]
         )