Upload casl_analysis.py

casl_analysis.py

@@ -1611,37 +1611,6 @@ def create_interface():
                         status_msg
                     )
                 
-                # Function to load patient record into the report generator tab
-                def load_patient_record_to_report(record_id):
-                    if not record_id:
-                        return gr.update(selected=1), {}, "", "", "", "", "", ""
-                    
-                    record_data = load_patient_record(record_id)
-                    if not record_data:
-                        return gr.update(selected=1), "", "", "", "male", "", "", ""
-                    
-                    # Extract data
-                    patient_info = record_data.get("patient_info", {})
-                    analysis_results = record_data.get("analysis_results", {})
-                    
-                    # Get the raw analysis results as a string
-                    raw_response = analysis_results.get("raw_response", "")
-                    
-                    # Create status message for the record loading
-                    status_msg = f"✅ Record loaded successfully: {patient_info.get('name', 'Unknown')} ({record_id})"
-                    
-                    return (
-                        gr.update(selected=2),  # Switch to Report Generator tab
-                        patient_info.get("name", ""),
-                        patient_info.get("record_id", ""),
-                        patient_info.get("age", ""),
-                        patient_info.get("gender", "male"),
-                        patient_info.get("assessment_date", ""),
-                        patient_info.get("clinician", ""),
-                        raw_response,
-                        status_msg
-                    )
-                
                 load_record_btn.click(
                     load_patient_record_to_analysis,
                     inputs=[selected_record_id],
@@ -1652,17 +1621,6 @@ def create_interface():
                         records_status
                     ]
                 )
-                
-                load_to_report_btn.click(
-                    load_patient_record_to_report,
-                    inputs=[selected_record_id],
-                    outputs=[
-                        main_tabs,
-                        report_patient_name, report_record_id, report_age, report_gender, 
-                        report_date, report_clinician, report_results,
-                        records_status
-                    ]
-                )
             
             # ===============================
             # Report Generator Tab
@@ -2340,6 +2298,49 @@ def create_interface():
         q3_btn.click(lambda: "What activities help with word finding difficulties?", outputs=[question_input])
         q4_btn.click(lambda: "When should I reassess a patient?", outputs=[question_input])
         
+        # Function to load patient record into the report generator tab
+        def load_patient_record_to_report(record_id):
+            if not record_id:
+                return gr.update(selected=1), "", "", "", "male", "", "", ""
+            
+            record_data = load_patient_record(record_id)
+            if not record_data:
+                return gr.update(selected=1), "", "", "", "male", "", "", ""
+            
+            # Extract data
+            patient_info = record_data.get("patient_info", {})
+            analysis_results = record_data.get("analysis_results", {})
+            
+            # Get the raw analysis results as a string
+            raw_response = analysis_results.get("raw_response", "")
+            
+            # Create status message for the record loading
+            status_msg = f"✅ Record loaded successfully: {patient_info.get('name', 'Unknown')} ({record_id})"
+            
+            return (
+                gr.update(selected=2),  # Switch to Report Generator tab
+                patient_info.get("name", ""),
+                patient_info.get("record_id", ""),
+                patient_info.get("age", ""),
+                patient_info.get("gender", "male"),
+                patient_info.get("assessment_date", ""),
+                patient_info.get("clinician", ""),
+                raw_response,
+                status_msg
+            )
+        
+        # Connect the load_to_report_btn to its handler
+        load_to_report_btn.click(
+            load_patient_record_to_report,
+            inputs=[selected_record_id],
+            outputs=[
+                main_tabs,
+                report_patient_name, report_record_id, report_age, report_gender, 
+                report_date, report_clinician, report_results,
+                records_status
+            ]
+        )
+        
     return app
 
 # ===============================