Update src/ui_components_original.py

src/ui_components_original.py

@@ -376,483 +376,519 @@ button.gr-button:hover, button.gr-button-primary:hover {
 """
 
     def create_interface(self):
+    """
+    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
+    from PIL import Image
+    import os, html, logging
+
+    # ----------------------- helpers (inner) -----------------------
+
+    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):
+        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_ref):
         """
-        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
+        Accepts either a response_id int or a dict like
+        {'response_id': 70, 'patient_id': 346, ...}.
+        Returns patient_id (int) by preferring any direct dict field,
+        otherwise queries by response id.
         """
-        import gradio as gr
-        from PIL import Image
-    
-        # ----------------------- helpers (inner) -----------------------
-    
-        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
+        # If the caller already gave us a dict, take the shortcut
+        if isinstance(resp_ref, dict):
+            pid = resp_ref.get("patient_id")
+            if pid is not None:
+                try:
+                    return int(pid)
+                except Exception:
+                    pass
+            resp_id = resp_ref.get("response_id") or resp_ref.get("id")
             try:
-                return int(str(label).split("•", 1)[0].strip())
+                resp_id = int(resp_id) if resp_id is not None else None
             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,)
-            )
+                resp_id = None
+        else:
             try:
-                return int(row["patient_id"]) if row and "patient_id" in row else None
+                resp_id = int(resp_ref) if resp_ref is not None 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">
-                <div>
-                    <h1>SmartHeal AI</h1>
-                    <p>Advanced Wound Care Analysis & Clinical Support System</p>
-                </div>
-            </div>
-            """)
-    
-            # Disclaimer
-            gr.HTML("""
-            <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>
+                resp_id = None
+
+        if not resp_id:
+            return None
+
+        row = self.database_manager.execute_query_one(
+            "SELECT patient_id FROM questionnaire_responses WHERE id=%s LIMIT 1",
+            (resp_id,)  # <-- ensure scalar param
+        )
+        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">
+            <div>
+                <h1>SmartHeal AI</h1>
+                <p>Advanced Wound Care Analysis & Clinical Support System</p>
             </div>
-            """)
-    
-            # Panels: auth vs practitioner vs organization
-            with gr.Row():
-                with gr.Column(visible=True) as auth_panel:
-                    with gr.Tabs():
-                        with gr.Tab("🔐 Professional Login"):
-                            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")
-                            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:
-                                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:
-                                organization_dropdown = gr.Dropdown(choices=self.get_organizations_dropdown(), label="Select Organization")
-    
-                            signup_btn = gr.Button("✨ Create Account", variant="primary")
-                            signup_status = gr.HTML()
-    
-                with gr.Column(visible=False) as practitioner_panel:
-                    user_info = gr.HTML("")
-                    logout_btn_prac = gr.Button("🚪 Logout", variant="secondary")
-    
-                    with gr.Tabs():
-                        # ------------------- WOUND ANALYSIS -------------------
-                        with gr.Tab("🔬 Wound Analysis"):
-                            with gr.Row():
-                                with gr.Column(scale=1):
-                                    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")
-                                    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(["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</h3>")
-                                    wound_image = gr.Image(label="Upload Wound Image", type="filepath")
-                                    gr.HTML("<h3>📝 Medical History</h3>")
-                                    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", elem_id="analyze-btn")
-                            analysis_output = gr.HTML("")
-    
-                        # ------------------- PATIENT HISTORY -------------------
-                        with gr.Tab("📋 Patient History"):
-                            with gr.Row():
-                                with gr.Column(scale=2):
-                                    history_btn = gr.Button("📄 Load Patient History", variant="primary")
-                                    patient_history_output = gr.HTML("")
-                                with gr.Column(scale=1):
-                                    search_patient_name = gr.Textbox(label="Search patient by name")
-                                    search_patient_btn = gr.Button("🔍 Search", variant="secondary")
-                                    specific_patient_output = gr.HTML("")
-    
-                            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("")
-    
-                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")
-    
-            # ----------------------- handlers -----------------------
-    
-            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_v, phone_v, cc_v, dept_v, loc_v, org_dropdown):
-                try:
-                    if role == "organization":
-                        org_data = {
-                            'org_name': org_name_v,
-                            'email': email,
-                            'phone': phone_v,
-                            'country_code': cc_v,
-                            'department': dept_v,
-                            'location': loc_v
-                        }
-                        org_id = self.database_manager.create_organization(org_data)
-                    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
-                    }
-                    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 f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
-    
-            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>"
+        </div>
+        """)
+
+        # Disclaimer
+        gr.HTML("""
+        <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>
+        """)
+
+        # Panels: auth vs practitioner vs organization
+        with gr.Row():
+            with gr.Column(visible=True) as auth_panel:
+                with gr.Tabs():
+                    with gr.Tab("🔐 Professional Login"):
+                        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")
+                        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:
+                            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:
+                            organization_dropdown = gr.Dropdown(choices=self.get_organizations_dropdown(), label="Select Organization")
+
+                        signup_btn = gr.Button("✨ Create Account", variant="primary")
+                        signup_status = gr.HTML()
+
+            with gr.Column(visible=False) as practitioner_panel:
+                user_info = gr.HTML("")
+                logout_btn_prac = gr.Button("🚪 Logout", variant="secondary")
+
+                with gr.Tabs():
+                    # ------------------- WOUND ANALYSIS -------------------
+                    with gr.Tab("🔬 Wound Analysis"):
+                        with gr.Row():
+                            with gr.Column(scale=1):
+                                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")
+                                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(["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</h3>")
+                                wound_image = gr.Image(label="Upload Wound Image", type="filepath")
+                                gr.HTML("<h3>📝 Medical History</h3>")
+                                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", elem_id="analyze-btn")
+                        analysis_output = gr.HTML("")
+
+                    # ------------------- PATIENT HISTORY -------------------
+                    with gr.Tab("📋 Patient History"):
+                        with gr.Row():
+                            with gr.Column(scale=2):
+                                history_btn = gr.Button("📄 Load Patient History", variant="primary")
+                                patient_history_output = gr.HTML("")
+                            with gr.Column(scale=1):
+                                search_patient_name = gr.Textbox(label="Search patient by name")
+                                search_patient_btn = gr.Button("🔍 Search", variant="secondary")
+                                specific_patient_output = gr.HTML("")
+
+                        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("")
+
+            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")
+
+        # ----------------------- handlers -----------------------
+
+        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_v, phone_v, cc_v, dept_v, loc_v, org_dropdown):
+            try:
+                if role == "organization":
+                    org_data = {
+                        'org_name': org_name_v,
+                        'email': email,
+                        'phone': phone_v,
+                        'country_code': cc_v,
+                        'department': dept_v,
+                        'location': loc_v
                     }
-                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),
-                    })
+                    org_id = self.database_manager.create_organization(org_data)
                 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),
-                    organization_panel: gr.update(visible=False)
+                    # 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
                 }
-    
-            def on_patient_mode_change(mode):
+                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 f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
+
+        def handle_login(username, password):
+            user = self.auth_manager.authenticate_user(username, password)
+            if not user:
                 return {
-                    new_patient_group: gr.update(visible=(mode == "New patient")),
-                    existing_patient_dd: gr.update(interactive=(mode == "Existing patient"))
+                    login_status: "<div class='status-error'>❌ Invalid credentials.</div>"
                 }
-    
-            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 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
-                    }
-    
-                    # 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.</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>"
-    
-                    # 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 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
-                    }
-    
-                    # 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(response_id, image_db_id, analysis_result)
-                    except Exception as e:
-                        logging.error(f"save_analysis error: {e}")
-    
-                    # 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.exception("run_analysis exception")
-                    return f"<div class='status-error'>❌ System error: {html.escape(str(e))}</div>"
-    
-            def load_history():
+            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),
+                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 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
+                }
+
+                # Save questionnaire -> response_id
+                response_id = self.database_manager.save_questionnaire(q_payload)
+
+                # 🔒 Normalize in case an older/alternate version returns a dict
+                if isinstance(response_id, dict):
+                    response_id = response_id.get("response_id") or response_id.get("id")
                 try:
-                    uid = int(self.current_user.get("id", 0) or 0)
-                    if not uid:
-                        return "<div class='status-error'>❌ Please login first.</div>"
-                    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_history error: {e}")
-                    return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
-    
-            def do_search(name):
+                    response_id = int(response_id)
+                except Exception:
+                    return "<div class='status-error'>❌ Could not resolve response ID.</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>"
+
+                # Save wound image to DB
                 try:
-                    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)
+                    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"search error: {e}")
-                    return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
-    
-            def view_details(existing_label):
+                    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 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
+                }
+
+                # 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:
-                    uid = int(self.current_user.get("id", 0) or 0)
-                    if not uid:
-                        return "<div class='status-error'>❌ Please login first.</div>"
-                    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)
+                    self.database_manager.save_analysis(response_id, image_db_id, analysis_result)
                 except Exception as e:
-                    logging.error(f"view_details error: {e}")
-                    return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
-    
-            # ----------------------- wiring -----------------------
-    
-            signup_role.change(
-                toggle_role_fields,
-                inputs=[signup_role],
-                outputs=[org_fields, prac_fields]
-            )
-    
-            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]
-            )
-    
-            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]
-            )
-    
-            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])
-    
-            patient_mode.change(
-                on_patient_mode_change,
-                inputs=[patient_mode],
-                outputs=[new_patient_group, existing_patient_dd]
-            )
-    
-            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]
-            )
-    
-            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
+                    logging.error(f"save_analysis error: {e}")
+
+                # If a new patient was created, refresh dropdowns
+                if mode == "New patient":
+                    _refresh_patient_dropdown(user_id)
+
+                # Render fancy results
+                return self._format_comprehensive_analysis_results(
+                    analysis_result, img_path, q_for_ai
+                )
+            except Exception as e:
+                logging.exception("run_analysis exception")
+                return f"<div class='status-error'>❌ System error: {html.escape(str(e))}</div>"
+
+        def load_history():
+            try:
+                uid = int(self.current_user.get("id", 0) or 0)
+                if not uid:
+                    return "<div class='status-error'>❌ Please login first.</div>"
+                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_history error: {e}")
+                return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
+
+        def do_search(name):
+            try:
+                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"search error: {e}")
+                return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
+
+        def view_details(existing_label):
+            try:
+                uid = int(self.current_user.get("id", 0) or 0)
+                if not uid:
+                    return "<div class='status-error'>❌ Please login first.</div>"
+                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"view_details error: {e}")
+                return f"<div class='status-error'>❌ Error: {html.escape(str(e))}</div>"
+
+        # ----------------------- wiring -----------------------
+
+        signup_role.change(
+            toggle_role_fields,
+            inputs=[signup_role],
+            outputs=[org_fields, prac_fields]
+        )
+
+        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]
+        )
+
+        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]
+        )
+
+        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])
+
+        patient_mode.change(
+            on_patient_mode_change,
+            inputs=[patient_mode],
+            outputs=[new_patient_group, existing_patient_dd]
+        )
+
+        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]
+        )
+
+        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
 
     
     def _format_comprehensive_analysis_results(self, analysis_result, image_url=None, questionnaire_data=None):