Update src/app.py

src/app.py

@@ -7,56 +7,42 @@ import sqlite3
 import os
 from database import init_db, load_full_project_example, backup_current_project, restore_database, list_backups, DB_PATH
 
-# 頁面初始化
-st.set_page_config(page_title="SPV 全方位財務監控", layout="wide")
 init_db()
+st.set_page_config(page_title="SPV 全方位財務監控", layout="wide")
 
-# Session State
 if "load_state" not in st.session_state:
     st.session_state.load_state = "idle"
 
-# --- 側邊欄：管理功能 ---
+# --- 側邊欄 ---
 with st.sidebar:
     st.header("⚙️ 系統管理")
     total_b = st.number_input("總工程預算 (萬)", value=50000, step=1000)
     project_start = st.date_input("計畫啟動日期", datetime.date(2026, 1, 20))
     
-    st.divider()
-    st.subheader("🔄 範例載入與還原")
     if st.session_state.load_state == "idle":
         if st.button("💡 載入全生命週期範例", use_container_width=True):
             st.session_state.load_state = "confirm"
             st.rerun()
     else:
-        st.warning("載入將覆蓋現有數據並自動備份。")
+        st.warning("⚠️ 載入將覆蓋數據並備份。")
         if st.button("✅ 確認載入", type="primary", use_container_width=True):
             backup_current_project()
             load_full_project_example(total_b)
             st.session_state.load_state = "idle"
-            st.success("數據載入成功！")
             st.rerun()
         if st.button("❌ 取消", use_container_width=True):
             st.session_state.load_state = "idle"
             st.rerun()
 
-    st.divider()
-    uploaded_file = st.file_uploader("📤 上傳 .db 還原", type="db")
+    uploaded_file = st.file_uploader("📤 上傳還原 (.db)", type="db")
     if uploaded_file and st.button("🚀 執行還原"):
         restore_database(uploaded_file)
-        st.success("還原成功！")
         st.rerun()
 
-    st.subheader("📥 歷史備份下載")
-    backups = list_backups()
-    if backups:
-        sel = st.selectbox("選擇檔案", backups)
-        with open(sel, "rb") as f:
-            st.download_button("下載備份", f, file_name=sel)
-
-# --- 主介面 Tabs ---
+# --- 主介面 ---
 tabs = st.tabs(["📊 損益與地主試算", "💰 現金流總表", "🏗️ 工程管理", "🏦 融資管理", "🏠 房屋銷售"])
 
-# --- Tab 1: 損益預測與地主試算 ---
+# --- Tab 1: 損益與地主分回瀑布圖 ---
 with tabs[0]:
     conn = sqlite3.connect(DB_PATH)
     inv = pd.read_sql_query("SELECT * FROM inventory", conn)
@@ -64,58 +50,54 @@ with tabs[0]:
     df_fin = pd.read_sql_query("SELECT * FROM finance_data WHERE 類型='實際'", conn)
     conn.close()
 
-    if not inv.empty and not df_fin.empty:
+    if not inv.empty:
         ratio = params[params['參數名稱']=='地主分回比例']['數值'].values[0] if not params.empty else 0.6
         total_val = (inv['預計售價'] * inv['總數量']).sum()
         landowner_val = total_val * ratio
         dev_val = total_val - landowner_val
-        
-        # 成本彙整
-        costs = df_fin[['工程款', '管銷費用', '利息支出', '代銷費用', '其他稅費']].sum()
-        total_cost = costs.sum()
-        net_profit = dev_val - total_cost
-
-        st.subheader("⚖️ 地主分回與實施者利潤分析")
-        c1, c2, c3 = st.columns(3)
-        c1.metric("全案總銷估值", f"{total_val:,.0f} 萬")
-        c2.metric("地主分回價值", f"{landowner_val:,.0f} 萬", f"{ratio*100:.0f}%")
-        c3.metric("實施者可售價值", f"{dev_val:,.0f} 萬")
+        costs = df_fin[['工程款', '利息支出', '代銷費用', '管銷費用']].sum()
+        net_profit = dev_val - costs.sum()
 
-        # 瀑布圖
+        st.subheader("⚖️ 實施者利潤瀑布分析")
         fig_w = go.Figure(go.Waterfall(
-            orientation = "v",
-            measure = ["absolute", "relative", "relative", "relative", "total"],
-            x = ["可售總額", "工程成本", "利息支出", "代銷與稅費", "剩餘毛利"],
-            y = [dev_val, -costs['工程款'], -costs['利息支出'], -(costs['代銷費用']+costs['其他稅費']), 0],
+            orientation = "v", measure = ["absolute", "relative", "relative", "relative", "total"],
+            x = ["可售總額", "工程成本", "利息支出", "代銷與管銷", "預計淨利"],
+            y = [dev_val, -costs['工程款'], -costs['利息支出'], -(costs['代銷費用']+costs['管銷費用']), 0],
             connector = {"line":{"color":"rgb(63, 63, 63)"}},
         ))
         st.plotly_chart(fig_w, use_container_width=True)
-    else:
-        st.info("請先載入範例數據以啟動損益分析。")
 
-# --- Tab 2: 現金流總表 (色系強化) ---
+# --- Tab 2: 現金流總表 (色系區分) ---
 with tabs[1]:
     conn = sqlite3.connect(DB_PATH)
     df_act = pd.read_sql_query("SELECT * FROM finance_data WHERE 類型='實際' ORDER BY 月份 ASC", conn)
     conn.close()
     if not df_act.empty:
-        num_cols = ['工程款', '貸款撥入', '利息支出', '貸款還本', '預售收入', '代銷費用', '其他稅費']
+        num_cols = ['工程款', '貸款撥入', '利息支出', '貸款還本', '預售收入', '代銷費用']
         st.subheader("📅 現金流明細 (🟢 流入 / 🔴 流出)")
         st.dataframe(df_act.style.format(subset=num_cols, formatter="{:,.0f}")
                      .applymap(lambda x: 'color: #228B22; font-weight: bold', subset=['貸款撥入', '預售收入'])
                      .applymap(lambda x: 'color: #DC143C', subset=['工程款', '利息支出', '貸款還本', '代銷費用']), 
                      use_container_width=True)
-    else:
-        st.info("尚無執行數據。")
 
-# --- Tab 3: 工程管理 ---
+# --- Tab 3, 4, 5: 修復空白分頁 ---
 with tabs[2]:
     conn = sqlite3.connect(DB_PATH)
     stages = pd.read_sql_query("SELECT * FROM project_stages", conn)
-    conn.close()
     if not stages.empty:
-        st.subheader("🏗️ 工程進度排程")
         df_g = [dict(Task=r['工項名稱'], Start=(project_start + datetime.timedelta(days=r['開始月份']*30.4)), 
                      Finish=(project_start + datetime.timedelta(days=(r['開始月份']+r['持續月份'])*30.4)), Resource='工程') for _, r in stages.iterrows()]
-        fig_g = ff.create_gantt(df_g, index_col='Resource', group_tasks=True)
-        st.plotly_chart(fig_g, use_container_width=True)
+        st.plotly_chart(ff.create_gantt(df_g, index_col='Resource', group_tasks=True), use_container_width=True)
+    conn.close()
+
+with tabs[3]:
+    st.subheader("🏦 融資合約清單")
+    conn = sqlite3.connect(DB_PATH)
+    st.dataframe(pd.read_sql_query("SELECT 貸款名稱, 授信額度, 年利率, 狀態 FROM loan_contracts", conn), use_container_width=True)
+    conn.close()
+
+with tabs[4]:
+    st.subheader("🏠 房屋銷售清單")
+    conn = sqlite3.connect(DB_PATH)
+    st.dataframe(pd.read_sql_query("SELECT 物件名稱, 預計售價, 總數量, 地主分回數量, 銷售狀態 FROM inventory", conn), use_container_width=True)
+    conn.close()