Upload 2 files
Browse files- requirements.txt +2 -0
- streamlit_app (2).py +171 -0
requirements.txt
ADDED
|
@@ -0,0 +1,2 @@
|
|
|
|
|
|
|
|
|
|
| 1 |
+
streamlit
|
| 2 |
+
pandas
|
streamlit_app (2).py
ADDED
|
@@ -0,0 +1,171 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
import streamlit as st
|
| 2 |
+
import pandas as pd
|
| 3 |
+
import datetime
|
| 4 |
+
|
| 5 |
+
# 1. 設置頁面配置
|
| 6 |
+
st.set_page_config(page_title="TNYP DUPR 專業驗證錄入", page_icon="🏓", layout="wide")
|
| 7 |
+
|
| 8 |
+
# ==========================================
|
| 9 |
+
# 賽程邏輯定義 (落地得分 21場 vs 發球得分 14場)
|
| 10 |
+
# ==========================================
|
| 11 |
+
|
| 12 |
+
# --- 8 人制雙打 ---
|
| 13 |
+
# 落地得分 (Rally) - 21 場 (基於原本 19 場新增 2 場)
|
| 14 |
+
SCHEDULE_8_RALLY = [
|
| 15 |
+
("A", "G", "D", "C"),("E", "H", "F", "B"),("C", "F", "D", "H"),("A", "E", "G", "B"),
|
| 16 |
+
("G", "D", "E", "F"),("C", "A", "H", "B"),("G", "F", "D", "A"),("E", "B", "C", "H"),
|
| 17 |
+
("G", "F", "B", "C"),("A", "H", "D", "E"),("B", "C", "D", "F"),("G", "E", "H", "A"),
|
| 18 |
+
("H", "E", "D", "B"),("C", "G", "F", "A"),("G", "H", "E", "C"),("B", "A", "D", "F"),
|
| 19 |
+
("H", "B", "G", "A"),("C", "F", "E", "D"),("B", "G", "F", "H"),("A", "E", "C", "D"),
|
| 20 |
+
("E", "C", "B", "D")
|
| 21 |
+
]
|
| 22 |
+
|
| 23 |
+
# 發球得分 (Sideout) - 14 場 (擷取前 14 場)
|
| 24 |
+
SCHEDULE_8_SIDEOUT = [
|
| 25 |
+
("H", "A", "B", "D"), ("C", "G", "E", "F"), ("E", "B", "G", "A"), ("H", "C", "D", "F"),
|
| 26 |
+
("B", "F", "D", "E"), ("H", "G", "A", "C"), ("H", "D", "E", "G"), ("F", "C", "A", "B"),
|
| 27 |
+
("H", "B", "C", "E"), ("D", "A", "F", "G"), ("A", "E", "C", "D"), ("H", "F", "G", "B"),
|
| 28 |
+
("G", "D", "B", "C"), ("H", "E", "F", "A")
|
| 29 |
+
]
|
| 30 |
+
|
| 31 |
+
# --- 7 人制雙打 ---
|
| 32 |
+
# 落地得分 (Rally) - 21 場
|
| 33 |
+
SCHEDULE_7_RALLY = [
|
| 34 |
+
("F", "D", "B", "E"),("C", "G", "A", "B"),("A", "F", "E", "D"),("G", "F", "C", "E"),
|
| 35 |
+
("B", "D", "A", "C"),("G", "A", "F", "E"),("C", "B", "D", "G"),("E", "A", "D", "C"),
|
| 36 |
+
("F", "A", "B", "G"),("E", "C", "B", "F"),("D", "A", "G", "E"),("C", "F", "D", "B"),
|
| 37 |
+
("G", "C", "A", "E"),("F", "B", "G", "D"),("A", "C", "E", "B"),("D", "C", "G", "F"),
|
| 38 |
+
("B", "A", "E", "G"),("F", "C", "D", "A"),("E", "F", "G", "B"),("D", "E", "B", "C"),
|
| 39 |
+
("A", "G", "F", "D")
|
| 40 |
+
]
|
| 41 |
+
# 發球得分 (Sideout) - 14 場
|
| 42 |
+
SCHEDULE_7_SIDEOUT = [
|
| 43 |
+
("E", "G", "A", "C"), ("B", "F", "D", "C"), ("D", "E", "F", "G"), ("A", "G", "B", "C"),
|
| 44 |
+
("A", "E", "D", "B"), ("F", "D", "C", "E"), ("G", "B", "A", "F"), ("C", "G", "B", "D"),
|
| 45 |
+
("E", "A", "F", "C"), ("B", "E", "G", "D"), ("F", "C", "A", "D"), ("B", "G", "F", "E"),
|
| 46 |
+
("A", "B", "E", "D"), ("C", "A", "G", "F")
|
| 47 |
+
]
|
| 48 |
+
|
| 49 |
+
# 6 人與 5 人維持原本邏輯 (可視需求調整)
|
| 50 |
+
SCHEDULE_6_DBL = [("A", "B", "C", "D"), ("E", "F", "A", "C"), ("B", "E", "D", "F"), ("A", "D", "B", "F"), ("C", "E", "A", "B"), ("D", "F", "C", "E"), ("A", "F", "B", "D"), ("C", "D", "A", "E"), ("B", "C", "E", "F"), ("A", "D", "B", "E"), ("C", "F", "A", "B"), ("B", "D", "E", "F"), ("A", "F", "C", "D"), ("B", "E", "A", "D"), ("C", "E", "B", "F")]
|
| 51 |
+
SCHEDULE_5_SGL = [("A", None, "B", None), ("C", None, "D", None), ("E", None, "A", None), ("B", None, "C", None), ("D", None, "E", None), ("A", None, "C", None), ("B", None, "D", None), ("C", None, "E", None), ("A", None, "D", None), ("B", None, "E", None), ("B", None, "A", None), ("D", None, "C", None), ("A", None, "E", None), ("C", None, "B", None), ("E", None, "D", None), ("C", None, "A", None), ("D", None, "B", None), ("E", None, "C", None), ("D", None, "A", None), ("E", None, "B", None)]
|
| 52 |
+
|
| 53 |
+
# 更新:完全對齊 single-match-import.csv 的所有欄位與順序
|
| 54 |
+
DUPR_COLS = [
|
| 55 |
+
'matchType', 'event', 'date',
|
| 56 |
+
'playerA1', 'playerA1DuprId', 'playerA1ExternalId',
|
| 57 |
+
'playerA2', 'playerA2DuprId', 'playerA2ExternalId',
|
| 58 |
+
'playerB1', 'playerB1DuprId', 'playerB1ExternalId',
|
| 59 |
+
'playerB2', 'playerB2DuprId', 'playerB2ExternalId',
|
| 60 |
+
'teamAGame1', 'teamBGame1', 'teamAGame2', 'teamBGame2',
|
| 61 |
+
'teamAGame3', 'teamBGame3', 'teamAGame4', 'teamBGame4',
|
| 62 |
+
'teamAGame5', 'teamBGame5', 'location', 'scoreType'
|
| 63 |
+
]
|
| 64 |
+
|
| 65 |
+
st.title("🏓 TNYP DUPR 專業驗證錄入系統")
|
| 66 |
+
|
| 67 |
+
with st.sidebar:
|
| 68 |
+
st.header("⚙️ 全域設定")
|
| 69 |
+
event_main = st.text_input("活動名稱", value="TNYP Match")
|
| 70 |
+
global_date = st.date_input("日期", datetime.date.today())
|
| 71 |
+
|
| 72 |
+
# 新增:設定全域的比賽地址 Location
|
| 73 |
+
global_location = st.text_input("比賽地址 (Location)", value="", placeholder="例如: 台北市某某球館")
|
| 74 |
+
|
| 75 |
+
# 決定核心邏輯的計分方式
|
| 76 |
+
global_score_type = st.selectbox("計分方式", ["RALLY (落地得分 - 21場)", "SIDEOUT (發球得分 - 14場)"])
|
| 77 |
+
score_type_val = "RALLY" if "RALLY" in global_score_type else "SIDEOUT"
|
| 78 |
+
court_count = st.number_input("場地數量", min_value=1, max_value=6, value=2)
|
| 79 |
+
|
| 80 |
+
tab_list = st.tabs([f"🏟️ 場地 {i+1}" for i in range(court_count)])
|
| 81 |
+
all_matches_combined = []
|
| 82 |
+
|
| 83 |
+
for i in range(court_count):
|
| 84 |
+
cid = i + 1
|
| 85 |
+
with tab_list[i]:
|
| 86 |
+
mode = st.selectbox(f"場地 {cid} 賽制",
|
| 87 |
+
["雙打 - 8人制", "雙打 - 7人制", "雙打 - 6人制", "單打 - 5人制 (20場)"],
|
| 88 |
+
key=f"mode_sel_{cid}")
|
| 89 |
+
|
| 90 |
+
# 根據選擇的人數與計分方式,決定最終的賽程表
|
| 91 |
+
if "8人制" in mode:
|
| 92 |
+
p_labels, m_type = ['A','B','C','D','E','F','G','H'], "D"
|
| 93 |
+
sch = SCHEDULE_8_RALLY if score_type_val == "RALLY" else SCHEDULE_8_SIDEOUT
|
| 94 |
+
elif "7人制" in mode:
|
| 95 |
+
p_labels, m_type = ['A','B','C','D','E','F','G'], "D"
|
| 96 |
+
sch = SCHEDULE_7_RALLY if score_type_val == "RALLY" else SCHEDULE_7_SIDEOUT
|
| 97 |
+
elif "6人制" in mode:
|
| 98 |
+
p_labels, sch, m_type = ['A','B','C','D','E','F'], SCHEDULE_6_DBL, "D"
|
| 99 |
+
else:
|
| 100 |
+
p_labels, sch, m_type = ['A','B','C','D','E'], SCHEDULE_5_SGL, "S"
|
| 101 |
+
|
| 102 |
+
# 球員名單
|
| 103 |
+
with st.expander(f"👤 名單驗證 (場地 {cid})", expanded=True):
|
| 104 |
+
p_map = {}
|
| 105 |
+
col1, col2 = st.columns(2)
|
| 106 |
+
temp_ids = set()
|
| 107 |
+
for idx, l in enumerate(p_labels):
|
| 108 |
+
target_col = col1 if idx % 2 == 0 else col2
|
| 109 |
+
n = target_col.text_input(f"姓名 {l}", key=f"n_{cid}_{l}")
|
| 110 |
+
did = target_col.text_input(f"ID {l}", key=f"id_{cid}_{l}").strip().upper()
|
| 111 |
+
if did and did in temp_ids: st.error(f"ID 重複: {did}")
|
| 112 |
+
temp_ids.add(did)
|
| 113 |
+
p_map[l] = {"n": n, "id": did}
|
| 114 |
+
|
| 115 |
+
# 比分錄入
|
| 116 |
+
st.subheader(f"🎯 比分錄入 (共 {len(sch)} 場)")
|
| 117 |
+
court_data = []
|
| 118 |
+
c_error = False
|
| 119 |
+
|
| 120 |
+
for g_idx, (a1, a2, b1, b2) in enumerate(sch, 1):
|
| 121 |
+
with st.container(border=True):
|
| 122 |
+
idx_col, c1, c2, mid, c3, c4 = st.columns([0.6, 2, 1, 0.5, 1, 2])
|
| 123 |
+
idx_col.markdown(f"### {g_idx:02d}")
|
| 124 |
+
c1.markdown(f"**{a1}:** {p_map[a1]['n'] or '?'}")
|
| 125 |
+
if a2: c1.markdown(f"**{a2}:** {p_map[a2]['n'] or '?'}")
|
| 126 |
+
sa = c2.text_input("A", key=f"sA_{cid}_{g_idx}", label_visibility="collapsed")
|
| 127 |
+
mid.write("-")
|
| 128 |
+
sb = c3.text_input("B", key=f"sB_{cid}_{g_idx}", label_visibility="collapsed")
|
| 129 |
+
c4.markdown(f"**{b1}:** {p_map[b1]['n'] or '?'}")
|
| 130 |
+
if b2: c4.markdown(f"**{b2}:** {p_map[b2]['n'] or '?'}")
|
| 131 |
+
|
| 132 |
+
if sa.strip() and sb.strip():
|
| 133 |
+
try:
|
| 134 |
+
s1, s2 = int(sa), int(sb)
|
| 135 |
+
if s1 == s2:
|
| 136 |
+
st.error(f"第 {g_idx} 場平分")
|
| 137 |
+
c_error = True
|
| 138 |
+
|
| 139 |
+
# 更新:包含新增的 location 與各球員的 ExternalId
|
| 140 |
+
entry = {
|
| 141 |
+
'matchType': m_type, 'scoreType': score_type_val,
|
| 142 |
+
'event': f"{event_main}-C{cid}", 'date': global_date.strftime("%Y-%m-%d"),
|
| 143 |
+
'location': global_location,
|
| 144 |
+
'playerA1': p_map[a1]['n'], 'playerA1DuprId': p_map[a1]['id'], 'playerA1ExternalId': '',
|
| 145 |
+
'playerA2': p_map[a2]['n'] if a2 else '', 'playerA2DuprId': p_map[a2]['id'] if a2 else '', 'playerA2ExternalId': '',
|
| 146 |
+
'playerB1': p_map[b1]['n'], 'playerB1DuprId': p_map[b1]['id'], 'playerB1ExternalId': '',
|
| 147 |
+
'playerB2': p_map[b2]['n'] if b2 else '', 'playerB2DuprId': p_map[b2]['id'] if b2 else '', 'playerB2ExternalId': '',
|
| 148 |
+
'teamAGame1': s1, 'teamBGame1': s2,
|
| 149 |
+
'teamAGame2': '', 'teamBGame2': '', 'teamAGame3': '', 'teamBGame3': '',
|
| 150 |
+
'teamAGame4': '', 'teamBGame4': '', 'teamAGame5': '', 'teamBGame5': ''
|
| 151 |
+
}
|
| 152 |
+
court_data.append(entry)
|
| 153 |
+
all_matches_combined.append(entry)
|
| 154 |
+
except: st.error("請輸入整數數字")
|
| 155 |
+
|
| 156 |
+
# 個別場地下載
|
| 157 |
+
if court_data:
|
| 158 |
+
st.divider()
|
| 159 |
+
if not c_error:
|
| 160 |
+
df_c = pd.DataFrame(court_data).reindex(columns=DUPR_COLS).fillna('')
|
| 161 |
+
st.download_button(f"📥 下載場地 {cid} CSV", df_c.to_csv(index=False).encode('utf-8'),
|
| 162 |
+
f"Court_{cid}.csv", "text/csv", key=f"btn_{cid}")
|
| 163 |
+
else:
|
| 164 |
+
st.warning("請修正平分錯誤後下載")
|
| 165 |
+
|
| 166 |
+
# 總下載
|
| 167 |
+
if all_matches_combined:
|
| 168 |
+
st.divider()
|
| 169 |
+
df_all = pd.DataFrame(all_matches_combined).reindex(columns=DUPR_COLS).fillna('')
|
| 170 |
+
st.download_button("🚀 下載所有場地合併 CSV", df_all.to_csv(index=False).encode('utf-8'),
|
| 171 |
+
"TNYP_Total.csv", "text/csv", type="primary", use_container_width=True)
|