Update src/ui_components_original.py

src/ui_components_original.py

@@ -376,18 +376,87 @@ button.gr-button:hover, button.gr-button-primary:hover {
 """
 
     def create_interface(self):
-        """Create the main Gradio interface with View Details + Search Specific Patient."""
-        import html
+        """
+        SmartHeal UI – aligned with current DB + history manager:
+          • Login (practitioner / organization)
+          • Practitioner: Wound Analysis (existing vs new patient), Patient History, View Details
+          • Images from disk are shown via data URLs for reliable rendering
+        """
         import gradio as gr
-        import os
-        import logging
-        from datetime import datetime
+        from PIL import Image
     
-        with gr.Blocks(css=self.get_custom_css(), title="SmartHeal - SmartHeal AI Wound Care Assistant") as app:
+        # ----------------------- helpers (inner) -----------------------
     
-            # -------------------------- HEADER --------------------------
-            logo_url = "https://scontent.fccu31-2.fna.fbcdn.net/v/t39.30808-6/275933824_102121829111657_3325198727201325354_n.jpg?_nc_cat=104&ccb=1-7&_nc_sid=6ee11a&_nc_ohc=45krrEUpcSUQ7kNvwGVdiMW&_nc_oc=AdkTdxEC_TkYGiyDkEtTJZ_DFZELW17XKFmWpswmFqGB7JSdvTyWtnrQyLS0USngEiY&_nc_zt=23&_nc_ht=scontent.fccu31-2.fna&_nc_gid=ufAA4Hj5gTRwON5POYzz0Q&oh=00_AfW1-jLEN5RGeggqOvGgEaK_gdg0EDgxf_VhKbZwFLUO0Q&oe=6897A98B"
+        self._patient_choices = []      # list[str] rendered in dropdown
+        self._patient_map = {}          # label -> patient_id (int)
+    
+        def _to_data_url_if_local(path_or_url: str) -> str:
+            if not path_or_url:
+                return ""
+            try:
+                if os.path.exists(path_or_url):
+                    return self.image_to_base64(path_or_url) or ""
+                return path_or_url  # already a URL
+            except Exception:
+                return ""
+    
+        def _refresh_patient_dropdown(user_id: int):
+            """Query patient's list and prepare dropdown choices."""
+            self._patient_choices = []
+            self._patient_map = {}
+            try:
+                rows = self.patient_history_manager.get_patient_list(user_id) or []
+                # label starts with id -> stable parse
+                for r in rows:
+                    pid = int(r.get("id") or 0)
+                    nm = r.get("patient_name") or "Unknown"
+                    age = r.get("patient_age") or ""
+                    gen = r.get("patient_gender") or ""
+                    v = int(r.get("total_visits") or 0)
+                    label = f"{pid} • {nm} ({age}y {gen}) — visits: {v}"
+                    self._patient_choices.append(label)
+                    self._patient_map[label] = pid
+            except Exception as e:
+                logging.error(f"refresh dropdown error: {e}")
+    
+        def _label_to_id(label: str) -> Optional[int]:
+            if not label: return None
+            try:
+                return int(str(label).split("•", 1)[0].strip())
+            except Exception:
+                return None
     
+        def _fetch_patient_core(pid: int):
+            """Get name/age/gender for an existing patient id."""
+            row = self.database_manager.execute_query_one(
+                "SELECT id, name, age, gender FROM patients WHERE id=%s LIMIT 1", (pid,)
+            )
+            return row or {}
+    
+        def _response_to_patient_id(resp_id: int) -> Optional[int]:
+            row = self.database_manager.execute_query_one(
+                "SELECT patient_id FROM questionnaire_responses WHERE id=%s LIMIT 1", (resp_id,)
+            )
+            try:
+                return int(row["patient_id"]) if row and "patient_id" in row else None
+            except Exception:
+                return None
+    
+        def _rows_with_inline_images(rows: list[dict]) -> list[dict]:
+            """Convert local file paths to data URLs so HTML displays them anywhere."""
+            out = []
+            for r in rows or []:
+                r = dict(r)
+                if r.get("image_url"):
+                    r["image_url"] = _to_data_url_if_local(r["image_url"])
+                out.append(r)
+            return out
+    
+        # ----------------------- Blocks UI -----------------------
+    
+        with gr.Blocks(css=self.get_custom_css(), title="SmartHeal - AI Wound Care Assistant") as app:
+            # Header
+            logo_url = "https://scontent.fccu31-2.fna.fbcdn.net/v/t39.30808-6/275933824_102121829111657_3325198727201325354_n.jpg?_nc_cat=104&ccb=1-7&_nc_sid=6ee11a&_nc_ohc=45krrEUpcSUQ7kNvwGVdiMW&_nc_oc=AdkTdxEC_TkYGiyDkEtTJZ_DFZELW17XKFmWpswmFqGB7JSdvTyWtnrQyLS0USngEiY&_nc_zt=23&_nc_ht=scontent.fccu31-2.fna&_nc_gid=ufAA4Hj5gTRwON5POYzz0Q&oh=00_AfW1-jLEN5RGeggqOvGgEaK_gdg0EDgxf_VhKbZwFLUO0Q&oe=6897A98B"
             gr.HTML(f"""
             <div class="medical-header">
                 <img src="{logo_url}" class="logo" alt="SmartHeal Logo">
@@ -400,403 +469,344 @@ button.gr-button:hover, button.gr-button-primary:hover {
     
             # Disclaimer
             gr.HTML("""
-            <div style="border: 2px solid #FF6B6B; background-color: #FFE5E5; padding: 15px; border-radius: 12px; margin: 10px 0;">
-                <h3 style="color: #D63031; margin-top: 0;">⚠️ IMPORTANT DISCLAIMER</h3>
-                <p><strong>This model is for testing and educational purposes only and is NOT a replacement for professional medical advice.</strong></p>
-                <p>Information generated may be inaccurate. Always consult a qualified healthcare provider for medical concerns.</p>
+            <div style="border:2px solid #FF6B6B;background:#FFE5E5;padding:15px;border-radius:12px;margin:10px 0;">
+                <h3 style="color:#D63031;margin:0 0 8px 0;">⚠️ IMPORTANT DISCLAIMER</h3>
+                <p><strong>This system is for testing/education and not a substitute for clinical judgment.</strong></p>
             </div>
             """)
     
-            # -------------------------- LAYOUT --------------------------
+            # Panels: auth vs practitioner vs organization
             with gr.Row():
-                # ---------------------- AUTH PANEL -----------------------
                 with gr.Column(visible=True) as auth_panel:
-                    gr.HTML("""
-                    <div style="text-align: center; margin: 40px 0;">
-                        <div style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); padding: 40px; border-radius: 20px; box-shadow: 0 20px 40px rgba(0,0,0,0.1); max-width: 500px; margin: 0 auto;">
-                            <h2 style="color: white; font-size: 2.2rem; margin-bottom: 10px; font-weight: 700;">🏥 SmartHeal Access</h2>
-                            <p style="color: rgba(255,255,255,0.95); font-size: 1rem; margin-bottom: 0;">Secure Healthcare Professional Portal</p>
-                        </div>
-                    </div>
-                    """)
-    
                     with gr.Tabs():
                         with gr.Tab("🔐 Professional Login"):
-                            login_username = gr.Textbox(label="👤 Username", placeholder="Enter your username")
-                            login_password = gr.Textbox(label="🔒 Password", type="password", placeholder="Enter your secure password")
-                            login_btn = gr.Button("🚀 Sign In to Dashboard", variant="primary")
-                            login_status = gr.HTML("<div style='text-align:center;color:#718096;font-size:0.9rem;margin-top:8px;'>Enter your credentials to access the system</div>")
+                            login_username = gr.Textbox(label="👤 Username")
+                            login_password = gr.Textbox(label="🔒 Password", type="password")
+                            login_btn = gr.Button("🚀 Sign In", variant="primary")
+                            login_status = gr.HTML("<div class='status-warning'>Please sign in.</div>")
     
                         with gr.Tab("📝 New Registration"):
-                            signup_username = gr.Textbox(label="👤 Username", placeholder="Choose a unique username")
-                            signup_email = gr.Textbox(label="📧 Email Address", placeholder="Enter your professional email")
-                            signup_password = gr.Textbox(label="🔒 Password", type="password", placeholder="Create a strong password")
-                            signup_name = gr.Textbox(label="👨‍⚕️ Full Name", placeholder="Enter your full professional name")
-                            signup_role = gr.Radio(["practitioner", "organization"], label="🏥 Account Type", value="practitioner")
+                            signup_username = gr.Textbox(label="👤 Username")
+                            signup_email = gr.Textbox(label="📧 Email")
+                            signup_password = gr.Textbox(label="🔒 Password", type="password")
+                            signup_name = gr.Textbox(label="👨‍⚕️ Full Name")
+                            signup_role = gr.Radio(["practitioner", "organization"], label="Account Type", value="practitioner")
     
                             with gr.Group(visible=False) as org_fields:
-                                gr.HTML("<h4 style='color:#2d3748;margin: 12px 0 8px 0;'>🏢 Organization Details</h4>")
-                                org_name = gr.Textbox(label="Organization Name", placeholder="Enter organization name")
-                                phone = gr.Textbox(label="Phone Number", placeholder="Enter contact number")
-                                country_code = gr.Textbox(label="Country Code", placeholder="e.g., +1, +44")
-                                department = gr.Textbox(label="Department", placeholder="e.g., Emergency, Surgery")
-                                location = gr.Textbox(label="Location", placeholder="City, State/Province, Country")
+                                org_name = gr.Textbox(label="Organization Name")
+                                phone = gr.Textbox(label="Phone")
+                                country_code = gr.Textbox(label="Country Code")
+                                department = gr.Textbox(label="Department")
+                                location = gr.Textbox(label="Location")
     
                             with gr.Group(visible=True) as prac_fields:
-                                gr.HTML("<h4 style='color:#2d3748;margin: 12px 0 8px 0;'>🏥 Affiliation</h4>")
-                                organization_dropdown = gr.Dropdown(choices=self.get_organizations_dropdown(), label="Select Your Organization")
+                                organization_dropdown = gr.Dropdown(choices=self.get_organizations_dropdown(), label="Select Organization")
     
-                            signup_btn = gr.Button("✨ Create Professional Account", variant="primary")
-                            signup_status = gr.HTML("<div style='text-align:center;color:#718096;font-size:0.9rem;margin-top:8px;'>Fill in your details to create an account</div>")
+                            signup_btn = gr.Button("✨ Create Account", variant="primary")
+                            signup_status = gr.HTML()
     
-                # ------------------- PRACTITIONER PANEL -------------------
                 with gr.Column(visible=False) as practitioner_panel:
-                    gr.HTML('<div class="medical-card-title" style="font-weight:800;font-size:20px;">👩‍⚕️ Practitioner Dashboard</div>')
                     user_info = gr.HTML("")
                     logout_btn_prac = gr.Button("🚪 Logout", variant="secondary")
     
                     with gr.Tabs():
-                        # ------------- WOUND ANALYSIS TAB -------------
+                        # ------------------- WOUND ANALYSIS -------------------
                         with gr.Tab("🔬 Wound Analysis"):
                             with gr.Row():
                                 with gr.Column(scale=1):
-                                    gr.HTML("<h3>📋 Patient Information</h3>")
-                                    patient_name = gr.Textbox(label="Patient Name", placeholder="Enter patient's full name")
-                                    patient_age = gr.Number(label="Age", value=30, minimum=0, maximum=120)
-                                    patient_gender = gr.Dropdown(choices=["Male", "Female", "Other"], label="Gender", value="Male")
+                                    gr.HTML("<h3>📋 Patient Selection</h3>")
+                                    patient_mode = gr.Radio(
+                                        ["Existing patient", "New patient"],
+                                        label="Patient mode",
+                                        value="Existing patient"
+                                    )
+                                    existing_patient_dd = gr.Dropdown(
+                                        choices=[],
+                                        label="Select existing patient (ID • Name)",
+                                        interactive=True
+                                    )
+                                    with gr.Group(visible=False) as new_patient_group:
+                                        new_patient_name = gr.Textbox(label="Patient Name")
+                                        new_patient_age = gr.Number(label="Age", value=30, minimum=0, maximum=120)
+                                        new_patient_gender = gr.Dropdown(choices=["Male", "Female", "Other"], value="Male", label="Gender")
     
                                     gr.HTML("<h3>🩹 Wound Information</h3>")
-                                    wound_location = gr.Textbox(label="Wound Location", placeholder="e.g., Left ankle, Right arm")
-                                    wound_duration = gr.Textbox(label="Wound Duration", placeholder="e.g., 2 weeks, 1 month")
-                                    pain_level = gr.Slider(minimum=0, maximum=10, value=5, step=1, label="Pain Level (0-10)")
+                                    wound_location = gr.Textbox(label="Wound Location", placeholder="e.g., Left ankle")
+                                    wound_duration = gr.Textbox(label="Wound Duration", placeholder="e.g., 2 weeks")
+                                    pain_level = gr.Slider(0, 10, value=5, step=1, label="Pain Level (0-10)")
     
                                     gr.HTML("<h3>⚕️ Clinical Assessment</h3>")
-                                    moisture_level = gr.Dropdown(choices=["Dry", "Moist", "Wet", "Saturated"], label="Moisture Level", value="Moist")
-                                    infection_signs = gr.Dropdown(choices=["None", "Mild", "Moderate", "Severe"], label="Signs of Infection", value="None")
-                                    diabetic_status = gr.Dropdown(choices=["Non-diabetic", "Type 1", "Type 2", "Gestational"], label="Diabetic Status", value="Non-diabetic")
+                                    moisture_level = gr.Dropdown(["Dry", "Moist", "Wet", "Saturated"], value="Moist", label="Moisture Level")
+                                    infection_signs = gr.Dropdown(["None", "Mild", "Moderate", "Severe"], value="None", label="Signs of Infection")
+                                    diabetic_status = gr.Dropdown(["Non-diabetic", "Type 1", "Type 2", "Gestational"], value="Non-diabetic", label="Diabetic Status")
     
                                 with gr.Column(scale=1):
-                                    gr.HTML("<h3>📸 Wound Image Upload</h3>")
+                                    gr.HTML("<h3>📸 Wound Image</h3>")
                                     wound_image = gr.Image(label="Upload Wound Image", type="filepath")
-    
                                     gr.HTML("<h3>📝 Medical History</h3>")
-                                    previous_treatment = gr.Textbox(label="Previous Treatment", placeholder="Describe any previous treatments...", lines=3)
-                                    medical_history = gr.Textbox(label="Medical History", placeholder="Relevant medical conditions, surgeries, etc...", lines=3)
-                                    medications = gr.Textbox(label="Current Medications", placeholder="List current medications...", lines=2)
-                                    allergies = gr.Textbox(label="Known Allergies", placeholder="List any known allergies...", lines=2)
-                                    additional_notes = gr.Textbox(label="Additional Notes", placeholder="Any additional clinical observations...", lines=3)
+                                    previous_treatment = gr.Textbox(label="Previous Treatment", lines=3)
+                                    medical_history = gr.Textbox(label="Medical History", lines=3)
+                                    medications = gr.Textbox(label="Current Medications", lines=2)
+                                    allergies = gr.Textbox(label="Known Allergies", lines=2)
+                                    additional_notes = gr.Textbox(label="Additional Notes", lines=3)
     
-                            analyze_btn = gr.Button("🔬 Analyze Wound", variant="primary", size="lg", elem_id="analyze-btn")
+                            analyze_btn = gr.Button("🔬 Analyze Wound", variant="primary", elem_id="analyze-btn")
                             analysis_output = gr.HTML("")
     
-                        # ------------- PATIENT HISTORY TAB -------------
+                        # ------------------- PATIENT HISTORY -------------------
                         with gr.Tab("📋 Patient History"):
                             with gr.Row():
                                 with gr.Column(scale=2):
-                                    gr.HTML("<h3>📊 Patient History Dashboard</h3>")
-                                    history_btn = gr.Button("📋 Load Patient History", variant="primary")
+                                    history_btn = gr.Button("📄 Load Patient History", variant="primary")
                                     patient_history_output = gr.HTML("")
-    
                                 with gr.Column(scale=1):
-                                    # View Details (dropdown)
-                                    gr.HTML("<h3>🔎 View Details</h3>")
-                                    patient_selector = gr.Dropdown(
-                                        choices=[],
-                                        label="Select Patient",
-                                        interactive=True,
-                                        allow_custom_value=False,
-                                        info="Pick a patient to view wound progression"
-                                    )
-                                    reload_patients_btn = gr.Button("🔄 Refresh Patient List", variant="secondary")
-                                    view_details_btn = gr.Button("🔍 View Details", variant="primary")
-                                    patient_details_output = gr.HTML("")
-    
-                                    # Search Specific Patient (restored)
-                                    gr.HTML("<h3 style='margin-top:20px;'>🔍 Search Specific Patient</h3>")
-                                    search_patient_name = gr.Textbox(label="Patient Name", placeholder="Enter patient name to search…")
-                                    search_patient_btn = gr.Button("🔎 Search Patient History", variant="secondary")
+                                    search_patient_name = gr.Textbox(label="Search patient by name")
+                                    search_patient_btn = gr.Button("🔍 Search", variant="secondary")
                                     specific_patient_output = gr.HTML("")
     
-            # --------------------- HELPERS & HANDLERS ---------------------
-    
-            def _risk_chip_ui(level: str) -> str:
-                rl = (level or "Unknown").strip().lower()
-                bg, fg = "#f0f0f0", "#333333"
-                if rl.startswith("low"):
-                    bg, fg = "#d4edda", "#155724"
-                elif rl.startswith("moderate"):
-                    bg, fg = "#fff3cd", "#856404"
-                elif rl.startswith("high"):
-                    bg, fg = "#f8d7da", "#721c24"
-                return f"<span style='background:{bg};color:{fg};padding:6px 10px;border-radius:999px;font-weight:700;font-size:12px;letter-spacing:.4px;text-transform:uppercase;'>{html.escape(level or 'Unknown')}</span>"
-    
-            def _render_progression_timeline(rows):
-                if not rows:
-                    return "<div class='status-warning'>No wound progression data found for this patient.</div>"
-    
-                head = """
-                <div style="border:1px solid #e2e8f0;border-radius:16px;overflow:hidden;background:white;box-shadow:0 8px 24px rgba(0,0,0,.06);">
-                    <div style="background:linear-gradient(135deg,#2563eb 0%,#1e3a8a 100%);color:white;padding:24px 28px;">
-                        <h2 style="margin:0;font-size:22px;font-weight:800;letter-spacing:.2px;">🩺 Wound Progression</h2>
-                        <p style="margin:6px 0 0 0;opacity:.95;">Chronological clinical snapshots with AI risk assessment</p>
-                    </div>
-                    <div style="padding:22px 22px 6px 22px">
-                """
-                items = []
-                for i, r in enumerate(rows, start=1):
-                    dt = r.get("visit_date")
-                    try:
-                        dt_str = dt.strftime('%b %d, %Y • %I:%M %p') if hasattr(dt, "strftime") else str(dt)
-                    except Exception:
-                        dt_str = str(dt)
-    
-                    risk = _risk_chip_ui(r.get("risk_level"))
-                    wound_loc = r.get("wound_location") or "N/A"
-                    moisture = r.get("moisture") or "—"
-                    infection = r.get("infection") or "—"
-                    pain = r.get("pain_level", "N/A")
-                    summary = r.get("summary")
-                    img = r.get("image_url")
-    
-                    summary_block = (
-                        f"<div style='margin-top:12px;color:#0f172a;background:white;border:1px solid #e2e8f0;border-radius:10px;padding:12px;'><strong>Summary:</strong> {html.escape(str(summary))}</div>"
-                        if summary else ""
-                    )
-                    img_block = (
-                        f"<div style='margin-top:12px;'><img src='{html.escape(str(img))}' style='max-width:360px;border-radius:12px;border:1px solid #e2e8f0;box-shadow:0 6px 18px rgba(0,0,0,.06)'></div>"
-                        if img else ""
-                    )
+                            gr.HTML("<hr style='margin:10px 0 6px 0;border:none;border-top:1px solid #e2e8f0'>")
+                            with gr.Row():
+                                view_details_dd = gr.Dropdown(choices=[], label="Select patient to view details")
+                                view_details_btn = gr.Button("📈 View Details (Timeline)", variant="primary")
+                            view_details_output = gr.HTML("")
     
-                    card = f"""
-                    <div style="display:grid;grid-template-columns:32px 1fr;gap:16px;position:relative;margin-bottom:22px;">
-                        <div style="display:flex;align-items:center;justify-content:center;">
-                            <div style="width:12px;height:12px;background:#2563eb;border:2px solid white;border-radius:999px;box-shadow:0 0 0 3px rgba(37,99,235,.15)"></div>
-                            <div style="position:absolute;left:6px;top:24px;bottom:-10px;width:2px;background:linear-gradient(180deg, rgba(203,213,225,1), rgba(203,213,225,0));"></div>
-                        </div>
-                        <div style="border:1px solid #e2e8f0;border-radius:12px;padding:16px;background:#f9fafb;">
-                            <div style="display:flex;flex-wrap:wrap;align-items:center;gap:10px;justify-content:space-between;">
-                                <div style="font-weight:800;color:#0f172a;letter-spacing:.2px;">Visit #{i}</div>
-                                <div style="color:#475569;font-weight:600;">{html.escape(dt_str)}</div>
-                            </div>
-                            <div style="margin-top:10px;display:grid;grid-template-columns:repeat(auto-fit,minmax(220px,1fr));gap:12px;">
-                                <div style="background:white;border:1px solid #e2e8f0;border-radius:10px;padding:12px;">
-                                    <div style="font-size:12px;color:#64748b;font-weight:700;letter-spacing:.4px;text-transform:uppercase;">Location</div>
-                                    <div style="font-weight:700;color:#0f172a;">{html.escape(str(wound_loc))}</div>
-                                </div>
-                                <div style="background:white;border:1px solid #e2e8f0;border-radius:10px;padding:12px;">
-                                    <div style="font-size:12px;color:#64748b;font-weight:700;letter-spacing:.4px;text-transform:uppercase;">Pain</div>
-                                    <div style="font-weight:700;color:#0f172a;">{html.escape(str(pain))} / 10</div>
-                                </div>
-                                <div style="background:white;border:1px solid #e2e8f0;border-radius:10px;padding:12px;">
-                                    <div style="font-size:12px;color:#64748b;font-weight:700;letter-spacing:.4px;text-transform:uppercase;">Moisture</div>
-                                    <div style="font-weight:700;color:#0f172a;">{html.escape(str(moisture))}</div>
-                                </div>
-                                <div style="background:white;border:1px solid #e2e8f0;border-radius:10px;padding:12px;">
-                                    <div style="font-size:12px;color:#64748b;font-weight:700;letter-spacing:.4px;text-transform:uppercase;">Infection</div>
-                                    <div style="font-weight:700;color:#0f172a;">{html.escape(str(infection))}</div>
-                                </div>
-                                <div style="background:white;border:1px solid #e2e8f0;border-radius:10px;padding:12px;">
-                                    <div style="font-size:12px;color:#64748b;font-weight:700;letter-spacing:.4px;text-transform:uppercase;">AI Risk</div>
-                                    <div>{risk}</div>
-                                </div>
-                            </div>
-                            {summary_block}
-                            {img_block}
-                        </div>
-                    </div>
-                    """
-                    items.append(card)
+                with gr.Column(visible=False) as organization_panel:
+                    gr.HTML("<div class='status-warning'>Organization dashboard coming soon.</div>")
+                    logout_btn_org = gr.Button("🚪 Logout", variant="secondary")
     
-                tail = "</div></div>"
-                return head + "".join(items) + tail
+            # ----------------------- handlers -----------------------
     
-            # ---------- AUTH HANDLERS ----------
-            def handle_login(username, password):
-                user_data = self.auth_manager.authenticate_user(username, password)
-                if user_data:
-                    self.current_user = user_data
-                    patient_update = _load_patient_names()
-                    return {
-                        auth_panel: gr.update(visible=False),
-                        practitioner_panel: gr.update(visible=True),
-                        login_status: "<div class='status-success'>✅ Login successful! Welcome to SmartHeal</div>",
-                        patient_selector: patient_update
-                    }
-                else:
-                    return {login_status: "<div class='status-error'>❌ Invalid credentials. Please try again.</div>"}
+            def toggle_role_fields(role):
+                return {
+                    org_fields: gr.update(visible=(role == "organization")),
+                    prac_fields: gr.update(visible=(role != "organization"))
+                }
     
-            def handle_signup(username, email, password, name, role, org_name_val, phone_val, cc_val, dept_val, loc_val, org_dropdown_val):
+            def handle_signup(username, email, password, name, role, org_name_v, phone_v, cc_v, dept_v, loc_v, org_dropdown):
                 try:
                     if role == "organization":
                         org_data = {
-                            'org_name': org_name_val,
+                            'org_name': org_name_v,
                             'email': email,
-                            'phone': phone_val,
-                            'country_code': cc_val,
-                            'department': dept_val,
-                            'location': loc_val
+                            'phone': phone_v,
+                            'country_code': cc_v,
+                            'department': dept_v,
+                            'location': loc_v
                         }
                         org_id = self.database_manager.create_organization(org_data)
-                        user_data = {'username': username, 'email': email, 'password': password, 'name': name, 'role': role, 'org_id': org_id}
                     else:
+                        # For now pick first org (or default)
                         org_id = 1
-                        user_data = {'username': username, 'email': email, 'password': password, 'name': name, 'role': role, 'org_id': org_id}
     
-                    if self.auth_manager.create_user(user_data):
-                        return {signup_status: "<div class='status-success'>✅ Account created successfully! Please login.</div>"}
-                    else:
-                        return {signup_status: "<div class='status-error'>❌ Failed to create account. Username or email may already exist.</div>"}
+                    user_data = {
+                        'username': username, 'email': email, 'password': password,
+                        'name': name, 'role': role, 'org_id': org_id
+                    }
+                    ok = self.auth_manager.create_user(user_data)
+                    if ok:
+                        return "<div class='status-success'>✅ Account created. Please log in.</div>"
+                    return "<div class='status-error'>❌ Could not create account. Username/email may exist.</div>"
                 except Exception as e:
-                    return {signup_status: f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"}
+                    return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
     
-            def toggle_role_fields(role):
-                if role == "organization":
-                    return {org_fields: gr.update(visible=True), prac_fields: gr.update(visible=False)}
-                return {org_fields: gr.update(visible=False), prac_fields: gr.update(visible=True)}
+            def handle_login(username, password):
+                user = self.auth_manager.authenticate_user(username, password)
+                if not user:
+                    return {
+                        login_status: "<div class='status-error'>❌ Invalid credentials.</div>"
+                    }
+                self.current_user = user
+                uid = int(user.get("id"))
+                role = user.get("role")
+    
+                # Preload patient dropdowns for practitioners
+                if role == "practitioner":
+                    _refresh_patient_dropdown(uid)
+    
+                info = f"<div class='status-success'>Welcome, <strong>{html.escape(user.get('name','User'))}</strong> — {html.escape(role)}</div>"
+                updates = {login_status: info}
+    
+                if role == "practitioner":
+                    updates.update({
+                        auth_panel: gr.update(visible=False),
+                        practitioner_panel: gr.update(visible=True),
+                        user_info: info,
+                        existing_patient_dd: gr.update(choices=self._patient_choices),
+                        view_details_dd: gr.update(choices=self._patient_choices),
+                    })
+                else:
+                    updates.update({
+                        auth_panel: gr.update(visible=False),
+                        organization_panel: gr.update(visible=True),
+                    })
+                return updates
     
             def handle_logout():
                 self.current_user = {}
-                return {auth_panel: gr.update(visible=True), practitioner_panel: gr.update(visible=False)}
-    
-            # ---------- ANALYSIS HANDLER ----------
-            def handle_analysis(
-                _patient_name, _patient_age, _patient_gender, _wound_location, _wound_duration,
-                _pain_level, _moisture_level, _infection_signs, _diabetic_status, _previous_treatment,
-                _medical_history, _medications, _allergies, _additional_notes, _wound_image
-            ):
+                return {
+                    auth_panel: gr.update(visible=True),
+                    practitioner_panel: gr.update(visible=False),
+                    organization_panel: gr.update(visible=False)
+                }
+    
+            def on_patient_mode_change(mode):
+                return {
+                    new_patient_group: gr.update(visible=(mode == "New patient")),
+                    existing_patient_dd: gr.update(interactive=(mode == "Existing patient"))
+                }
+    
+            def run_analysis(mode, existing_label,
+                             np_name, np_age, np_gender,
+                             w_loc, w_dur, pain, moist, infect, diabetic,
+                             prev_tx, med_hist, meds, alls, notes, img_path):
                 try:
-                    if not _wound_image:
-                        return "<div class='status-error'>❌ Please upload a wound image for analysis.</div>"
-    
-                    questionnaire_data_for_db = {
-                        'user_id': self.current_user.get('id', 1),
-                        'patient_name': _patient_name,
-                        'patient_age': _patient_age,
-                        'patient_gender': _patient_gender,
-                        'wound_location': _wound_location,
-                        'wound_duration': _wound_duration,
-                        'pain_level': _pain_level,
-                        'moisture_level': _moisture_level,
-                        'infection_signs': _infection_signs,
-                        'diabetic_status': _diabetic_status,
-                        'previous_treatment': _previous_treatment,
-                        'medical_history': _medical_history,
-                        'medications': _medications,
-                        'allergies': _allergies,
-                        'additional_notes': _additional_notes
+                    if not img_path:
+                        return "<div class='status-error'>❌ Please upload a wound image.</div>"
+    
+                    user_id = int(self.current_user.get("id", 0) or 0)
+                    if not user_id:
+                        return "<div class='status-error'>❌ Please login first.</div>"
+    
+                    # Determine patient core fields (ensures same patient_id for existing)
+                    if mode == "Existing patient":
+                        pid = _label_to_id(existing_label)
+                        if not pid:
+                            return "<div class='status-warning'>⚠️ Select an existing patient.</div>"
+                        pcore = _fetch_patient_core(pid)
+                        patient_name_v = pcore.get("name")
+                        patient_age_v = pcore.get("age")
+                        patient_gender_v = pcore.get("gender")
+                    else:
+                        patient_name_v = np_name
+                        patient_age_v = np_age
+                        patient_gender_v = np_gender
+    
+                    # Build questionnaire payload
+                    q_payload = {
+                        'user_id': user_id,
+                        'patient_name': patient_name_v,
+                        'patient_age': patient_age_v,
+                        'patient_gender': patient_gender_v,
+                        'wound_location': w_loc,
+                        'wound_duration': w_dur,
+                        'pain_level': pain,
+                        'moisture_level': moist,
+                        'infection_signs': infect,
+                        'diabetic_status': diabetic,
+                        'previous_treatment': prev_tx,
+                        'medical_history': med_hist,
+                        'medications': meds,
+                        'allergies': alls,
+                        'additional_notes': notes
                     }
     
-                    response_id = self.database_manager.save_questionnaire(questionnaire_data_for_db)
+                    # Save questionnaire -> response_id
+                    response_id = self.database_manager.save_questionnaire(q_payload)
                     if not response_id:
-                        return "<div class='status-error'>❌ Could not save questionnaire (patient/profile). Check logs.</div>"
+                        return "<div class='status-error'>❌ Could not save questionnaire.</div>"
+    
+                    # Resolve patient_id from response (works for new or existing)
+                    patient_id = _response_to_patient_id(response_id)
+                    if not patient_id:
+                        return "<div class='status-error'>❌ Could not resolve patient ID.</div>"
     
-                    questionnaire_data_for_ai = {
-                        'age': _patient_age,
-                        'diabetic': 'Yes' if _diabetic_status != 'Non-diabetic' else 'No',
-                        'allergies': _allergies,
+                    # Save wound image to DB
+                    try:
+                        with Image.open(img_path) as pil:
+                            pil = pil.convert("RGB")
+                            img_meta = self.database_manager.save_wound_image(patient_id, pil)
+                            image_db_id = img_meta["id"] if img_meta else None
+                    except Exception as e:
+                        logging.error(f"save_wound_image error: {e}")
+                        image_db_id = None
+    
+                    # Prepare AI analyzer questionnaire dict
+                    q_for_ai = {
+                        'age': patient_age_v,
+                        'diabetic': 'Yes' if diabetic != 'Non-diabetic' else 'No',
+                        'allergies': alls,
                         'date_of_injury': 'Unknown',
                         'professional_care': 'Yes',
-                        'oozing_bleeding': 'Minor Oozing' if _infection_signs != 'None' else 'None',
-                        'infection': 'Yes' if _infection_signs != 'None' else 'No',
-                        'moisture': _moisture_level,
-                        'patient_name': _patient_name,
-                        'patient_gender': _patient_gender,
-                        'wound_location': _wound_location,
-                        'wound_duration': _wound_duration,
-                        'pain_level': _pain_level,
-                        'previous_treatment': _previous_treatment,
-                        'medical_history': _medical_history,
-                        'medications': _medications,
-                        'additional_notes': _additional_notes
+                        'oozing_bleeding': 'Minor Oozing' if infect != 'None' else 'None',
+                        'infection': 'Yes' if infect != 'None' else 'No',
+                        'moisture': moist,
+                        'patient_name': patient_name_v,
+                        'patient_gender': patient_gender_v,
+                        'wound_location': w_loc,
+                        'wound_duration': w_dur,
+                        'pain_level': pain,
+                        'previous_treatment': prev_tx,
+                        'medical_history': med_hist,
+                        'medications': meds,
+                        'additional_notes': notes
                     }
     
-                    analysis_result = self.wound_analyzer.analyze_wound(_wound_image, questionnaire_data_for_ai)
-                    if not analysis_result.get('success'):
-                        err = analysis_result.get('error', 'Analysis failed')
-                        return f"<div class='status-error'>❌ AI Analysis Error: {html.escape(str(err))}</div>"
+                    # Run AI
+                    analysis_result = self.wound_analyzer.analyze_wound(img_path, q_for_ai)
+                    if not analysis_result or not analysis_result.get("success"):
+                        err = (analysis_result or {}).get("error", "Unknown analysis error")
+                        return f"<div class='status-error'>❌ AI Analysis failed: {html.escape(str(err))}</div>"
     
+                    # Persist AI analysis (ties back to template via response->questionnaire_id)
                     try:
-                        self.database_manager.save_analysis_result(response_id, analysis_result)
-                    except Exception as db_error:
-                        logging.error(f"DB save (analysis_result) error: {db_error}")
+                        self.database_manager.save_analysis(response_id, image_db_id, analysis_result)
+                    except Exception as e:
+                        logging.error(f"save_analysis error: {e}")
     
-                    formatted = self._format_comprehensive_analysis_results(analysis_result, _wound_image, questionnaire_data_for_ai)
-                    return formatted
+                    # If a new patient was created, refresh dropdowns
+                    if mode == "New patient":
+                        _refresh_patient_dropdown(user_id)
     
+                    # Render fancy results (this method already converts file paths to data URLs)
+                    return self._format_comprehensive_analysis_results(
+                        analysis_result, img_path, q_for_ai
+                    )
                 except Exception as e:
-                    logging.error(f"❌ Analysis handler error: {e}", exc_info=True)
-                    return f"<div class='status-error'>❌ System Error: {html.escape(str(e))}</div>"
+                    logging.exception("run_analysis exception")
+                    return f"<div class='status-error'>❌ System error: {html.escape(str(e))}</div>"
     
-            # ---------- HISTORY HELPERS ----------
-            def load_patient_history():
+            def load_history():
                 try:
-                    user_id = self.current_user.get('id', 1)
-                    if not user_id:
+                    uid = int(self.current_user.get("id", 0) or 0)
+                    if not uid:
                         return "<div class='status-error'>❌ Please login first.</div>"
-                    history_data = self.patient_history_manager.get_user_patient_history(user_id)
-                    formatted = self.patient_history_manager.format_history_for_display(history_data)
-                    return formatted
-                except Exception as e:
-                    logging.error(f"Error loading patient history: {e}")
-                    return f"<div class='status-error'>❌ Error loading history: {html.escape(str(e))}</div>"
-    
-            def _load_patient_names():
-                try:
-                    uid = self.current_user.get('id', 1)
-                    plist = self.patient_history_manager.get_patient_list(uid) or []
-                    names, seen = [], set()
-                    for row in plist:
-                        nm = row.get("patient_name")
-                        if nm and nm not in seen:
-                            names.append(nm); seen.add(nm)
-                    if not names:
-                        names = ["— No patients yet —"]
-                    return gr.update(choices=names, value=(names[0] if names else None))
+                    rows = self.patient_history_manager.get_user_patient_history(uid) or []
+                    rows = _rows_with_inline_images(rows)
+                    return self.patient_history_manager.format_history_for_display(rows)
                 except Exception as e:
-                    logging.error(f"load patients error: {e}")
-                    return gr.update(choices=["— Error loading —"], value=None)
+                    logging.error(f"load_history error: {e}")
+                    return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
     
-            def view_details_action(selected_name):
+            def do_search(name):
                 try:
-                    uid = self.current_user.get('id', 1)
-                    if not selected_name or selected_name.startswith("—"):
-                        return "<div class='status-warning'>Please select a valid patient.</div>"
-                    rows = self.patient_history_manager.get_wound_progression(uid, selected_name)
-                    return _render_progression_timeline(rows)
+                    uid = int(self.current_user.get("id", 0) or 0)
+                    if not uid:
+                        return "<div class='status-error'>❌ Please login first.</div>"
+                    if not (name or "").strip():
+                        return "<div class='status-warning'>⚠️ Enter a name to search.</div>"
+                    rows = self.patient_history_manager.search_patient_by_name(uid, name.strip()) or []
+                    rows = _rows_with_inline_images(rows)
+                    return self.patient_history_manager.format_patient_data_for_display(rows)
                 except Exception as e:
-                    logging.error(f"view details error: {e}")
-                    return f"<div class='status-error'>Error loading details: {html.escape(str(e))}</div>"
+                    logging.error(f"search error: {e}")
+                    return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
     
-            def search_specific_patient_action(name_text):
+            def view_details(existing_label):
                 try:
-                    uid = self.current_user.get('id', 1)
+                    uid = int(self.current_user.get("id", 0) or 0)
                     if not uid:
                         return "<div class='status-error'>❌ Please login first.</div>"
-                    if not name_text or not name_text.strip():
-                        return "<div class='status-warning'>⚠️ Please enter a patient name to search.</div>"
-                    rows = self.patient_history_manager.search_patient_by_name(uid, name_text.strip())
-                    if not rows:
-                        return f"<div class='status-warning'>⚠️ No records found for patient: {html.escape(name_text.strip())}</div>"
-                    return self.patient_history_manager.format_patient_data_for_display(rows)
+                    pid = _label_to_id(existing_label)
+                    if not pid:
+                        return "<div class='status-warning'>⚠️ Select a patient.</div>"
+                    rows = self.patient_history_manager.get_wound_progression_by_id(uid, pid) or []
+                    rows = _rows_with_inline_images(rows)
+                    return self.patient_history_manager.format_patient_progress_for_display(rows)
                 except Exception as e:
-                    logging.error(f"Error searching patient: {e}")
-                    return f"<div class='status-error'>❌ Error searching patient: {html.escape(str(e))}</div>"
+                    logging.error(f"view_details error: {e}")
+                    return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
     
-            # --------------------------- BINDINGS ---------------------------
-            login_btn.click(
-                handle_login,
-                inputs=[login_username, login_password],
-                outputs=[auth_panel, practitioner_panel, login_status, patient_selector]
-            )
-    
-            signup_btn.click(
-                handle_signup,
-                inputs=[
-                    signup_username, signup_email, signup_password, signup_name, signup_role,
-                    org_name, phone, country_code, department, location, organization_dropdown
-                ],
-                outputs=[signup_status]
-            )
+            # ----------------------- wiring -----------------------
     
             signup_role.change(
                 toggle_role_fields,
@@ -804,42 +814,43 @@ button.gr-button:hover, button.gr-button-primary:hover {
                 outputs=[org_fields, prac_fields]
             )
     
-            analyze_btn.click(
-                handle_analysis,
-                inputs=[
-                    patient_name, patient_age, patient_gender, wound_location, wound_duration,
-                    pain_level, moisture_level, infection_signs, diabetic_status, previous_treatment,
-                    medical_history, medications, allergies, additional_notes, wound_image
-                ],
-                outputs=[analysis_output]
+            signup_btn.click(
+                handle_signup,
+                inputs=[signup_username, signup_email, signup_password, signup_name, signup_role,
+                        org_name, phone, country_code, department, location, organization_dropdown],
+                outputs=[signup_status]
             )
     
-            logout_btn_prac.click(
-                handle_logout,
-                outputs=[auth_panel, practitioner_panel]
+            login_btn.click(
+                handle_login,
+                inputs=[login_username, login_password],
+                outputs=[login_status, auth_panel, practitioner_panel, organization_panel,
+                         user_info, existing_patient_dd, view_details_dd]
             )
     
-            history_btn.click(
-                load_patient_history,
-                outputs=[patient_history_output]
-            )
+            logout_btn_prac.click(handle_logout, outputs=[auth_panel, practitioner_panel, organization_panel])
+            logout_btn_org.click(handle_logout, outputs=[auth_panel, practitioner_panel, organization_panel])
     
-            reload_patients_btn.click(
-                _load_patient_names,
-                outputs=[patient_selector]
+            patient_mode.change(
+                on_patient_mode_change,
+                inputs=[patient_mode],
+                outputs=[new_patient_group, existing_patient_dd]
             )
     
-            view_details_btn.click(
-                view_details_action,
-                inputs=[patient_selector],
-                outputs=[patient_details_output]
+            analyze_btn.click(
+                run_analysis,
+                inputs=[
+                    patient_mode, existing_patient_dd,
+                    new_patient_name, new_patient_age, new_patient_gender,
+                    wound_location, wound_duration, pain_level, moisture_level, infection_signs, diabetic_status,
+                    previous_treatment, medical_history, medications, allergies, additional_notes, wound_image
+                ],
+                outputs=[analysis_output]
             )
     
-            search_patient_btn.click(
-                search_specific_patient_action,
-                inputs=[search_patient_name],
-                outputs=[specific_patient_output]
-            )
+            history_btn.click(load_history, outputs=[patient_history_output])
+            search_patient_btn.click(do_search, inputs=[search_patient_name], outputs=[specific_patient_output])
+            view_details_btn.click(view_details, inputs=[view_details_dd], outputs=[view_details_output])
     
         return app