Upload app.py

app.py

@@ -172,21 +172,21 @@ def build_cleaned_from_indices(df: pd.DataFrame,
     for c in cleaned.columns:
         if c not in ("NAME", "ID"):
             cleaned[c] = cleaned[c].apply(parse_rank).astype("Int64")
-    ordered = ["NAME", "ID"] + [c for c in cleaned.columns if c not in ("NAME", "ID")]
-    cleaned = cleaned[ordered]
-
-    # ✅ เพิ่มการ sort ตาม ID
-    try:
-        # ถ้า ID เป็นตัวเลข
-        cleaned = cleaned.sort_values(by="ID", key=lambda x: pd.to_numeric(x, errors="coerce"))
-    except Exception:
-        # ถ้า ID เป็น string ก็จะ sort แบบ lexicographic
-        cleaned = cleaned.sort_values(by="ID")
+    # Sort โดยใช้เฉพาะตัวเลขจาก ID
+    digits = cleaned["ID"].astype(str).str.extract(r"(\d+)", expand=False)
+    num_id = pd.to_numeric(digits, errors="coerce")
+
+    cleaned = (
+        cleaned.assign(_num_id=num_id)
+               .sort_values(by="_num_id", kind="mergesort", na_position="last")
+               .drop(columns="_num_id")
+               .reset_index(drop=True)
+    )
 
-    cleaned = cleaned.reset_index(drop=True)
     return cleaned
 
 
+
 def max_rank_in(cleaned: pd.DataFrame) -> int:
     wards = [w for w in cleaned.columns if w not in ("NAME", "ID")]
     mr = 0