From 1116da8251f7d9537f47cdd813e2cfb0d11a73ac Mon Sep 17 00:00:00 2001 From: Andreas Tsouchlos Date: Tue, 2 Jan 2024 01:40:41 +0100 Subject: [PATCH] Buchungstag -> Valutadatum --- banking_breakdown/statement_parser.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/banking_breakdown/statement_parser.py b/banking_breakdown/statement_parser.py index 175c5da..8b7b69e 100644 --- a/banking_breakdown/statement_parser.py +++ b/banking_breakdown/statement_parser.py @@ -19,23 +19,23 @@ def _tag_with_category(df: pd.DataFrame) -> pd.DataFrame: def _compute_total_balance(df: pd.DataFrame) -> pd.DataFrame: stripped_df = pd.DataFrame( - {'t': df["Buchungstag"], 'value': df["Saldo nach Buchung"]}) + {'t': df["Valutadatum"], 'value': df["Saldo nach Buchung"]}) stripped_df.index = stripped_df['t'] gb = stripped_df.groupby(pd.Grouper(freq='M')) result = gb.tail(1)['value'].reset_index() - #result['t'] = result['t'].apply(lambda dt: dt.replace(day=1)) return result def _compute_net_income(df: pd.DataFrame) -> pd.DataFrame: - stripped_df = pd.DataFrame({'t': df["Buchungstag"], 'value': df["Betrag"]}) + stripped_df = pd.DataFrame({'t': df["Valutadatum"], 'value': df["Betrag"]}) - result = stripped_df.resample(rule='M', on="t").sum().reset_index() - #result['t'] = result['t'].apply(lambda dt: dt.replace(day=1)) + stripped_df.index = stripped_df['t'] + gb = stripped_df.groupby(pd.Grouper(freq='M')) + result = gb["value"].sum().reset_index() return result @@ -53,13 +53,13 @@ def _compute_category_overview(df: pd.DataFrame) -> pd.DataFrame: def _compute_detailed_balance(df: pd.DataFrame) -> pd.DataFrame: - return pd.DataFrame({'t': df["Buchungstag"], + return pd.DataFrame({'t': df["Valutadatum"], 'value': df["Saldo nach Buchung"]}) def parse_statement(filename: str) -> types.ReportData: df = pd.read_csv(filename, delimiter=';', decimal=",") - df["Buchungstag"] = pd.to_datetime(df["Buchungstag"], format='%d.%m.%Y') + df["Valutadatum"] = pd.to_datetime(df["Valutadatum"], format='%d.%m.%Y') category_overview_df = _compute_category_overview(df) total_balance_df = _compute_total_balance(df)