Update src/ui_components_original.py

src/ui_components_original.py

@@ -403,8 +403,8 @@ button.gr-button:hover, button.gr-button-primary:hover {
     
         def _refresh_patient_dropdown(user_id: int):
             """Query patient's list and prepare dropdown choices."""
-            self._patient_choices = []
-            self._patient_map = {}
+            self._patient_choices.clear()
+            self._patient_map.clear()
             try:
                 rows = self.patient_history_manager.get_patient_list(user_id) or []
                 # label starts with id -> stable parse
@@ -482,6 +482,34 @@ button.gr-button:hover, button.gr-button-primary:hover {
                 out.append(r)
             return out
     
+        def _resolve_org_id_from_dropdown(label: str) -> Optional[int]:
+            """
+            Dropdown items look like: 'Org Name - Location'.
+            Try to resolve to organizations.id.
+            """
+            if not label:
+                return None
+            try:
+                if " - " in label:
+                    org_name, location = label.split(" - ", 1)
+                    row = self.database_manager.execute_query_one(
+                        "SELECT id FROM organizations WHERE name=%s AND location=%s ORDER BY id DESC LIMIT 1",
+                        (org_name.strip(), location.strip())
+                    )
+                    if row and "id" in row:
+                        return int(row["id"])
+                else:
+                    # fallback: match by name only
+                    row = self.database_manager.execute_query_one(
+                        "SELECT id FROM organizations WHERE name=%s ORDER BY id DESC LIMIT 1",
+                        (label.strip(),)
+                    )
+                    if row and "id" in row:
+                        return int(row["id"])
+            except Exception as e:
+                logging.error(f"resolve org id error: {e}")
+            return None
+    
         # ----------------------- Blocks UI -----------------------
     
         with gr.Blocks(css=self.get_custom_css(), title="SmartHeal - AI Wound Care Assistant") as app:
@@ -614,25 +642,26 @@ button.gr-button:hover, button.gr-button-primary:hover {
     
             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
+                    # Resolve org_id for practitioner (based on dropdown selection)
+                    organization_id = None
+                    if role == "practitioner":
+                        organization_id = _resolve_org_id_from_dropdown(org_dropdown)
+    
+                    # Create user using AuthManager's signature (it will handle org creation if role=='organization')
+                    ok = self.auth_manager.create_user(
+                        username=username,
+                        email=email,
+                        password=password,
+                        name=name,
+                        role=role,
+                        org_name=(org_name_v or name) if role == "organization" else "",
+                        phone=phone_v if role == "organization" else "",
+                        country_code=cc_v if role == "organization" else "",
+                        department=dept_v if role == "organization" else "",
+                        location=loc_v if role == "organization" else "",
+                        organization_id=organization_id
+                    )
     
-                    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>"
@@ -890,6 +919,7 @@ button.gr-button:hover, button.gr-button-primary:hover {
     
         return app
 
+
     
     def _format_comprehensive_analysis_results(self, analysis_result, image_url=None, questionnaire_data=None):
         """Format comprehensive analysis results with all visualization images from AIProcessor."""