Change net income figure; Add table
This commit is contained in:
@@ -23,13 +23,24 @@ def _compute_total_balance(df: pd.DataFrame) -> pd.DataFrame:
|
||||
|
||||
|
||||
def _compute_net_income(df: pd.DataFrame) -> pd.DataFrame:
|
||||
stripped_df = pd.DataFrame({'t': df["t"], 'value': df["value"]})
|
||||
df.index = df['t']
|
||||
income_df = df.loc[df['value'] > 0]
|
||||
expenses_df = df.loc[df['value'] < 0]
|
||||
|
||||
stripped_df.index = stripped_df['t']
|
||||
gb = stripped_df.groupby(pd.Grouper(freq='M'))
|
||||
income_df = income_df.groupby(pd.Grouper(freq='M'))[
|
||||
'value'].sum().reset_index().round(decimals=2)
|
||||
expenses_df = expenses_df.groupby(pd.Grouper(freq='M'))[
|
||||
'value'].sum().reset_index().round(decimals=2)
|
||||
|
||||
result = gb["value"].sum().reset_index()
|
||||
return result
|
||||
t = income_df['t']
|
||||
income = income_df['value'].round(decimals=2)
|
||||
expenses = expenses_df['value'].round(decimals=2)
|
||||
net = (income + expenses).round(decimals=2)
|
||||
|
||||
result_df = pd.DataFrame(
|
||||
{'t': t, 'income': income, 'expenses': expenses, 'net': net})
|
||||
|
||||
return result_df
|
||||
|
||||
|
||||
def _compute_category_overview(df: pd.DataFrame) -> pd.DataFrame:
|
||||
@@ -46,11 +57,12 @@ def _compute_category_overview(df: pd.DataFrame) -> pd.DataFrame:
|
||||
|
||||
category_overview_df = category_overview_df.sort_values('value',
|
||||
ascending=False)
|
||||
|
||||
return category_overview_df
|
||||
|
||||
|
||||
def _compute_expenses_by_category(complete_df: pd.DataFrame) -> pd.DataFrame:
|
||||
complete_df = complete_df.loc[complete_df['value'] < 0]
|
||||
complete_df = complete_df.loc[complete_df['value'] < 0].copy()
|
||||
complete_df['value'] = -complete_df['value']
|
||||
complete_df.index = complete_df['t']
|
||||
|
||||
|
||||
Reference in New Issue
Block a user