Update src/app.py

src/app.py

@@ -1,36 +1,39 @@
 import streamlit as st
 import pandas as pd
 import plotly.graph_objects as go
+import plotly.figure_factory as ff
 import sqlite3
 import datetime
 from database import init_db, load_full_project_example, clear_to_actual, backup_current_project, DB_PATH
 
-# 初始化
+# 系統初始化
 init_db()
-st.set_page_config(page_title="SPV 財務整合系統", layout="wide")
+st.set_page_config(page_title="SPV 都更財務動態系統", layout="wide")
+st.title("🏢 SPV 都更計畫：現金流整合管理系統")
 
-# --- 側邊欄 ---
+# --- 側邊欄：專案管理與自訂項目 ---
 with st.sidebar:
-    st.header("🏗️ 專案管理")
-    if st.button("🆕 切換至原實際專案 (空白)", use_container_width=True):
+    st.header("⚙️ 專案管理面板")
+    total_b = st.number_input("總工程預算 (萬)", value=100000, step=1000)
+    project_start = st.date_input("計畫啟動日期", datetime.date(2026, 1, 20))
+    
+    col_a, col_b = st.columns(2)
+    if col_a.button("🆕 切換至原專案", use_container_width=True):
         backup_current_project()
         clear_to_actual()
-        st.success("已重置為空白實際專案")
         st.rerun()
-    
-    if st.button("💡 載入全生命週期範例", use_container_width=True):
-        load_full_project_example(100000)
-        st.success("範例載入成功")
+    if col_b.button("💡 載入範例", type="primary", use_container_width=True):
+        load_full_project_example(total_b)
         st.rerun()
 
     st.divider()
-    st.subheader("➕ 手動增加自訂科目")
-    with st.form("add_custom_item"):
+    st.subheader("➕ 錄入自訂收支項目")
+    with st.form("custom_item_form"):
         f_month = st.number_input("月份", min_value=1, value=1)
-        f_name = st.text_input("項目名稱 (如：代銷費、增值稅)")
-        f_type = st.selectbox("性質", ["支出", "收入"])
+        f_name = st.text_input("項目名稱 (如：公關費、印花稅)")
+        f_type = st.selectbox("科目性質", ["支出", "收入"])
         f_amt = st.number_input("金額 (萬)", min_value=0.0)
-        if st.form_submit_button("確認新增項目"):
+        if st.form_submit_button("確認提交項目"):
             if f_name:
                 conn = sqlite3.connect(DB_PATH)
                 conn.execute("INSERT OR REPLACE INTO finance_transactions VALUES (?, '實際', ?, ?, ?)", 
@@ -39,63 +42,54 @@ with st.sidebar:
                 conn.close()
                 st.rerun()
 
-# --- 主介面 ---
-tabs = st.tabs(["📊 損益分析", "💰 現金流流水帳", "🏗️ 工程排程"])
+# --- 主介面 Tabs ---
+tabs = st.tabs(["📊 損益與利潤分析", "💰 現金流動態總表", "🏗️ 工程管理", "🏦 融資與銷售"])
 
-# --- Tab 2: 現金流總表 (修復 SQL 報錯) ---
-with tabs[1]:
-    st.subheader("📅 動態現金流流水帳")
+# --- Tab 1: 損益與瀑布圖 (自動整合自訂項目) ---
+with tabs[0]:
     conn = sqlite3.connect(DB_PATH)
-    # 修正：使用正確的資料表名稱 finance_transactions
-    df = pd.read_sql_query("SELECT * FROM finance_transactions WHERE 類型='實際' ORDER BY 月份 ASC", conn)
+    df = pd.read_sql_query("SELECT * FROM finance_transactions WHERE 類型='實際'", conn)
+    params = pd.read_sql_query("SELECT * FROM project_params", conn)
     conn.close()
-    
+
     if not df.empty:
-        # 動態轉置表格，列出所有自訂科目
-        pivot_df = df.pivot_table(index='月份', columns='科目名稱', values='金額', fill_value=0).reset_index()
-        
-        # 區分收支色彩
-        inc_list = df[df['科目性質']=='收入']['科目名稱'].unique()
-        exp_list = df[df['科目性質']=='支出']['科目名稱'].unique()
+        total_in = df[df['科目性質']=='收入']['金額'].sum()
+        total_out = df[df['科目性質']=='支出']['金額'].sum()
         
-        st.dataframe(pivot_df.style.format(precision=0)
-                     .applymap(lambda x: 'color: #228B22; font-weight: bold', subset=[c for c in inc_list if c in pivot_df.columns])
-                     .applymap(lambda x: 'color: #DC143C', subset=[c for c in exp_list if c in pivot_df.columns]),
-                     use_container_width=True)
+        st.subheader("⚖️ 專案獲利結構分析")
+        c1, c2, c3 = st.columns(3)
+        c1.metric("總流入金額", f"{total_in:,.0f} 萬")
+        c2.metric("總流出支出", f"{total_out:,.0f} 萬")
+        c3.metric("預計結餘毛利", f"{(total_in - total_out):,.0f} 萬")
+
+        # 瀑布圖：自動抓取所有支出科目
+        exp_df = df[df['科目性質']=='支出'].groupby('科目名稱')['金額'].sum().reset_index()
+        fig_w = go.Figure(go.Waterfall(
+            orientation = "v",
+            measure = ["absolute"] + ["relative"] * len(exp_df) + ["total"],
+            x = ["總收入預估"] + exp_df['科目名稱'].tolist() + ["最終淨利"],
+            y = [total_in] + (-exp_df['金額']).tolist() + [0],
+            connector = {"line":{"color":"rgb(63, 63, 63)"}},
+        ))
+        st.plotly_chart(fig_w, use_container_width=True)
     else:
-        st.info("目前尚無資料，請利用側邊欄新增項目。")
+        st.info("請利用左側選單載入數據。")
 
-# --- Tab 1: 損益分析 (自動汇总自訂科目) ---
-with tabs[0]:
+# --- Tab 2: 現金流總表 (色系與動態科目) ---
+with tabs[1]:
+    st.subheader("📅 動態現金流流水帳 (實際發生額)")
     if not df.empty:
-        total_inc = df[df['科目性質']=='收入']['金額'].sum()
-        total_exp = df[df['科目性質']=='支出']['金額'].sum()
-        
-        col1, col2, col3 = st.columns(3)
-        col1.metric("總流入金額", f"{total_inc:,.0f} 萬")
-        col2.metric("總流出金額", f"{total_exp:,.0f} 萬")
-        col3.metric("專案剩餘毛利", f"{(total_inc - total_exp):,.0f} 萬")
+        # 動態轉置表格
+        pivot_df = df.pivot_table(index='月份', columns='科目名稱', values='金額', fill_value=0).reset_index()
+        inc_cols = df[df['科目性質']=='收入']['科目名稱'].unique()
+        exp_cols = df[df['科目性質']=='支出']['科目名稱'].unique()
         
-        # 成本結構圖 (自動包含所有手動增加的支出項)
-        exp_summary = df[df['科目性質']=='支出'].groupby('科目名稱')['金額'].sum()
-        fig = go.Figure(data=[go.Pie(labels=exp_summary.index, values=exp_summary.values, hole=.4)])
-        fig.update_layout(title="自訂項目支出占比分析")
-        st.plotly_chart(fig, use_container_width=True)
-
-# --- 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 = ['工程款', '貸款撥入', '利息支出', '貸款還本', '預售收入', '代銷費用']
-        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=['工程款', '利息支出', '貸款還本', '代銷費用']), 
+        st.dataframe(pivot_df.style.format(precision=0)
+                     .applymap(lambda x: 'color: #228B22; font-weight: bold', subset=[c for c in inc_cols if c in pivot_df.columns])
+                     .applymap(lambda x: 'color: #DC143C', subset=[c for c in exp_cols if c in pivot_df.columns]),
                      use_container_width=True)
 
-# --- Tab 3, 4, 5: 修復空白分頁 ---
+# --- Tab 3: 工程排程 ---
 with tabs[2]:
     conn = sqlite3.connect(DB_PATH)
     stages = pd.read_sql_query("SELECT * FROM project_stages", conn)
@@ -105,14 +99,14 @@ with tabs[2]:
         st.plotly_chart(ff.create_gantt(df_g, index_col='Resource', group_tasks=True), use_container_width=True)
     conn.close()
 
+# --- Tab 4: 融資與銷售 ---
 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)
+    col_l, col_r = st.columns(2)
+    with col_l:
+        st.subheader("🏦 融資合約清單")
+        st.dataframe(pd.read_sql_query("SELECT * FROM loan_contracts", conn), use_container_width=True)
+    with col_r:
+        st.subheader("🏠 房屋銷售計畫")
+        st.dataframe(pd.read_sql_query("SELECT * FROM inventory", conn), use_container_width=True)
     conn.close()