diff --git a/app/app_db/app.db b/app/app_db/app.db index 51b0afe..87d9f11 100644 Binary files a/app/app_db/app.db and b/app/app_db/app.db differ diff --git a/app/data/parquet_store.py b/app/data/parquet_store.py new file mode 100644 index 0000000..e69de29 diff --git a/app/pages/costobjects.py b/app/pages/costobjects.py index 6c8f40a..624e950 100644 --- a/app/pages/costobjects.py +++ b/app/pages/costobjects.py @@ -1,11 +1,13 @@ import streamlit as st import pandas as pd -from data.scriptloader import get_sql +#from data.scriptloader import get_sql from data.db import load_data from auth_runtime import require_login -from ui.sidebar import build_sidebar, hide_sidebar_if_logged_out -from auth import get_fullname_for_user +#from ui.sidebar import build_sidebar, hide_sidebar_if_logged_out +#from auth import get_fullname_for_user import numpy as np +from tools.excel_export import df_to_excel_bytes +from tools.help_text import get_help st.set_page_config(page_title="Co-App Home", page_icon="🏠", layout="wide") @@ -13,7 +15,17 @@ st.set_page_config(page_title="Co-App Home", page_icon="🏠", layout="wide") authenticator = require_login() st.session_state["authenticator"] = authenticator +st.markdown(""" + +""", unsafe_allow_html=True) +description = get_help("costobjects") +with st.expander(label="ℹ️ Hilfe / Hinweise", expanded=False): # ❓ + st.markdown(description) @st.cache_data def cache_data() -> pd.DataFrame: @@ -38,19 +50,32 @@ def sidebar_filters(df) -> dict: This function should contain UI concerns only (widgets, layout), and not data filtering logic, to keep the code maintainable. """ + + st.markdown(""" + + """, unsafe_allow_html=True) + st.sidebar.header("Filter") if st.sidebar.button("Refresh (Global)"): cache_data.clear() st.rerun() - year = st.sidebar.selectbox(label="Jahr", options=(2025, 2026), index=1) filter_text = st.sidebar.text_input(label="Textsuche", placeholder="Suche Objekt, Text, Verantwortlicher") col_s1, col_s2 = st.sidebar.columns(2) with col_s1: - typ = st.sidebar.selectbox(label="Typ", options=sorted(df["typ"].dropna().unique()), index=1) + year = st.selectbox(label="Jahr", options=(2025, 2026), index=1) with col_s2: - obj = st.sidebar.multiselect("obj", sorted(df["obj"].dropna().unique())) + typ = st.selectbox(label="Typ", options=sorted(df["typ"].dropna().unique()), index=1) + obj = st.sidebar.multiselect("obj", sorted(df["obj"].dropna().unique())) zgrp1 = st.sidebar.multiselect("ZGrp1", sorted(df["zgrp1"].dropna().unique())) zgrp2 = st.sidebar.multiselect("ZGrp2", sorted(df["zgrp2"].dropna().unique())) zgrp3 = st.sidebar.multiselect("ZGrp3", sorted(df["zgrp3"].dropna().unique())) @@ -100,9 +125,14 @@ def render_table(df): Keep this function presentation-only: it should not modify data. """ + st.markdown("### Übersicht Kostenobjekte") st.dataframe(df, hide_index=True, width="stretch", height="stretch") +def download_data(df): + df.to_excel(path) + + def page(): """ Page entry point: orchestrates data loading, UI, filtering, and rendering. @@ -129,10 +159,9 @@ def page(): # ----------------------------- # Presentation # ----------------------------- - - df = df.sort_values(by="obj", key=lambda s: pd.to_numeric(s, errors="coerce")) df_clean = df[df.columns[:-1]] # letzte Spalten entfernen (sysdate) df_display = df_clean.loc[mask] + df_display = df_display.sort_values(by="obj", key=lambda s: pd.to_numeric(s, errors="coerce")) render_table(df_display) col1, col2 = st.columns(2) @@ -141,11 +170,15 @@ def page(): with col1: st.text(f"Datenstand: {data_as_of}") - st.text("Datenquelle: Oracle (PENTA)") with col2: st.markdown(f"
Anzahl Zeilen: {row_count}
", unsafe_allow_html=True) - + st.download_button( + "📊 Excel-Datei herunterladen", + data=df_to_excel_bytes(df_display), + file_name="kostenobjekte", + mime="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + ) diff --git a/app/tools/excel_export.py b/app/tools/excel_export.py new file mode 100644 index 0000000..394e7eb --- /dev/null +++ b/app/tools/excel_export.py @@ -0,0 +1,16 @@ +import pandas as pd +import io + +def df_to_excel_bytes(df): + + """ + Convert a DataFrame to an in-memory XLSX file. + + Returns a BytesIO object suitable for st.download_button(data=...). + """ + + buffer = io.BytesIO() + with pd.ExcelWriter(buffer, engine="openpyxl") as writer: + df.to_excel(writer, index=False, sheet_name="Daten") + buffer.seek(0) + return buffer \ No newline at end of file diff --git a/app/tools/help_text.py b/app/tools/help_text.py new file mode 100644 index 0000000..8f9f51d --- /dev/null +++ b/app/tools/help_text.py @@ -0,0 +1,5 @@ +from app_db.app_db import get_value + +def get_help(dashboard :str): + helptext = get_value(f"select dash_description from dashboards where dash_name = '{dashboard}.py'") + return helptext diff --git a/config/settings.py b/config/settings.py new file mode 100644 index 0000000..6d42114 --- /dev/null +++ b/config/settings.py @@ -0,0 +1,11 @@ +from pathlib import Path + +BASE_DIR = Path(__file__).resolve().parents[1] + +STORAGE_DIR = BASE_DIR / "storage" +DB_DIR = STORAGE_DIR / "app_db" +DB_PATH = DB_DIR / "app.db" +DWH_DIR = STORAGE_DIR / "dwh" + + +print(BASE_DIR, DB_DIR) \ No newline at end of file diff --git a/migrations/20260226_095800_add_col_dashname_dashboards.sql b/migrations/20260226_095800_add_col_dashname_dashboards.sql new file mode 100644 index 0000000..d5b86cb --- /dev/null +++ b/migrations/20260226_095800_add_col_dashname_dashboards.sql @@ -0,0 +1,8 @@ +begin; + +alter table dashboards +add column dash_name text not null default ""; + +INSERT INTO schema_version (version) VALUES ('20260226_095800_add_col_dashname_dashboards'); + +COMMIT; \ No newline at end of file