Update analytics_tab.py

analytics_tab.py

@@ -188,17 +188,15 @@ class AnalyticsTab:
         """Clear analytics display"""
         return None, None, ""
     
-    def get_daily_transactions(self, selected_date, farmer_name=None):
-        """Get day-wise transaction details"""
+    def get_daily_transactions(self, selected_date):
+        """Get day-wise transaction details for all farmers"""
         try:
             if not selected_date:
                 return None, "❌ Please select a date"
             
-            df = self.get_all_transactions(farmer_name)
+            df = self.get_all_transactions()  # Remove farmer_name parameter
             
             if df.empty:
-                if farmer_name and farmer_name.strip():
-                    return None, f"❌ No transactions found for farmer '{farmer_name}'"
                 return None, "❌ No transactions found"
             
             # Convert selected date to datetime
@@ -234,12 +232,10 @@ class AnalyticsTab:
                     'Amount': row['Amount']
                 })
             
-            farmer_text = f" - {farmer_name}" if farmer_name and farmer_name.strip() else ""
-            
             # Create compact HTML summary with black text
             summary_html = f"""
             <div style="background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%); padding: 20px; border-radius: 10px; margin: 10px 0;">
-                <h3 style="color: white; text-align: center; margin: 0 0 15px 0; font-size: 20px;">📅 Daily Summary: {selected_date}{farmer_text}</h3>
+                <h3 style="color: white; text-align: center; margin: 0 0 15px 0; font-size: 20px;">📅 Daily Summary: {selected_date}</h3>
                 
                 <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 15px; margin-bottom: 15px;">
                     <div style="background-color: white; border-radius: 8px; padding: 15px; text-align: center;">
@@ -306,7 +302,7 @@ class AnalyticsTab:
         
         except Exception as e:
             return None, f"❌ Error getting daily transactions: {str(e)}"
-    
+            
     def clear_daily(self):
         """Clear daily transactions display"""
         return None, ""
@@ -317,13 +313,14 @@ class AnalyticsTab:
             gr.Markdown("## Transaction Analytics Dashboard")
             
             # Section 1: All Transactions
-            with gr.Accordion("📋 All Transactions (Without Interest)", open=True):
+            with gr.Accordion("📋 All Transactions (Without Interest)", open=False):
                 gr.Markdown("*View complete transaction history for a specific farmer*")
                 
                 trans_farmer = gr.Dropdown(
                     label="Select Farmer (Optional - leave empty for all)",
                     choices=self.get_farmers(),
-                    allow_custom_value=True
+                    allow_custom_value=True,
+                    value=None
                 )
                 
                 with gr.Row():
@@ -340,13 +337,14 @@ class AnalyticsTab:
             gr.Markdown("---")
             
             # Section 2: Bank-wise Analytics
-            with gr.Accordion("🏦 Bank-wise Analytics", open=True):
+            with gr.Accordion("🏦 Bank-wise Analytics", open=False):
                 gr.Markdown("*Analyze incoming and outgoing transactions by bank account*")
                 
                 analytics_farmer = gr.Dropdown(
                     label="Select Farmer (Optional - leave empty for all)",
                     choices=self.get_farmers(),
-                    allow_custom_value=True
+                    allow_custom_value=True,
+                    value=None
                 )
                 
                 with gr.Row():
@@ -372,14 +370,8 @@ class AnalyticsTab:
             gr.Markdown("---")
             
             # Section 3: Daily Transaction Details
-            with gr.Accordion("📅 Daily Transaction Details", open=True):
-                gr.Markdown("*View all transactions for a specific date*")
-                
-                daily_farmer = gr.Dropdown(
-                    label="Select Farmer (Optional - leave empty for all)",
-                    choices=self.get_farmers(),
-                    allow_custom_value=True
-                )
+            with gr.Accordion("📅 Daily Transaction Details", open=False):
+                gr.Markdown("*View all transactions for a specific date across all farmers*")
                 
                 daily_date = gr.Textbox(
                     label="Date (YYYY-MM-DD)",
@@ -406,6 +398,13 @@ class AnalyticsTab:
                 outputs=[all_trans_df, trans_status]
             )
             
+            # Refresh farmer list when Load Transactions is clicked
+            load_trans_btn.click(
+                fn=lambda: gr.Dropdown(choices=self.get_farmers()),
+                inputs=[],
+                outputs=[trans_farmer]
+            )
+            
             generate_analytics_btn.click(
                 fn=lambda f, m, y: self.get_bank_analytics(
                     f if f else None,
@@ -422,9 +421,16 @@ class AnalyticsTab:
                 outputs=[analytics_chart, analytics_summary, analytics_status]
             )
             
+            # Refresh farmer list when Generate Analytics is clicked
+            generate_analytics_btn.click(
+                fn=lambda: gr.Dropdown(choices=self.get_farmers()),
+                inputs=[],
+                outputs=[analytics_farmer]
+            )
+            
             get_daily_btn.click(
-                fn=lambda d, f: self.get_daily_transactions(d, f if f else None),
-                inputs=[daily_date, daily_farmer],
+                fn=self.get_daily_transactions,
+                inputs=[daily_date],
                 outputs=[daily_summary, daily_status]
             )