Upload app.py

app.py

@@ -232,18 +232,26 @@ def update_capacity_table(selected_wards: List[str]) -> pd.DataFrame:
 def on_upload(file, selected_wards):
     df, msg = read_table(file)
     if df is None:
-        return gr.update(value=msg, visible=True), "", None, None, None
+        return gr.update(value=msg, visible=True), "", None, None, None, None, None, None, None, None, None, None
     # Show available columns
     avail = available_columns_text(df)
     # Auto-detect mapping (indices)
     auto_idx = auto_map_columns(df, selected_wards or [])
     # Prepare number inputs defaults
-    def idx_or_blank(key):
+    def idx_or_none(key):
         return int(auto_idx[key]) if key in auto_idx else None
-    name_num = idx_or_blank("NAME")
-    id_num = idx_or_blank("ID")
-    ward_nums = {w: idx_or_blank(w) for w, _ in WARD_CHOICES}
-    return gr.update(value="✓ อ่านไฟล์สำเร็จ", visible=True), avail, name_num, id_num, ward_nums
+    name_num = idx_or_none("NAME")
+    id_num = idx_or_none("ID")
+    med_num = idx_or_none("Medical")
+    med1_num = idx_or_none("Medical_1")
+    med2_num = idx_or_none("Medical_2")
+    surg_num = idx_or_none("Surgical")
+    ped_num = idx_or_none("Pediatric")
+    comm_num = idx_or_none("Community")
+    psy_num = idx_or_none("Psychiatric")
+    obs_num = idx_or_none("Obstetrics")
+    return (gr.update(value="✓ อ่านไฟล์สำเร็จ", visible=True), avail, name_num, id_num,
+            med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num)
 
 def collect_mapping_numbers(name_num, id_num, ward_nums, selected_wards, n_cols):
     """Validate numeric mapping and build mapping dict {Field: index}"""
@@ -401,11 +409,12 @@ with gr.Blocks(title=APP_TITLE) as demo:
             psy_num = gr.Number(label="หมายเลขคอลัมน์ Psychiatric", precision=0)
             obs_num = gr.Number(label="หมายเลขคอลัมน์ Obstetrics", precision=0)
 
-        auto_btn.click(fn=on_upload, inputs=[file, selected_wards],
-                       outputs=[status, available, name_num, id_num, 
-                                {"Medical": med_num, "Medical_1": med1_num, "Medical_2": med2_num,
-                                 "Surgical": surg_num, "Pediatric": ped_num, "Community": comm_num,
-                                 "Psychiatric": psy_num, "Obstetrics": obs_num}])
+        auto_btn.click(
+        fn=on_upload,
+        inputs=[file, selected_wards],
+        outputs=[status, available, name_num, id_num,
+                 med_num, med1_num, med2_num, surg_num, ped_num, comm_num, psy_num, obs_num]
+    )
 
     with gr.Row():
         clean_btn = gr.Button("Clean data (ดูพรีวิว)", variant="primary")