Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cashdash/dashes/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ def _setup_dash(self, dash: Dash, data: BookData) -> None:
transactions_of_account = splits_of_account.merge(
transactions, left_on=TRANSACTION, right_index=True
)

transactions_of_account = transactions_of_account.groupby(
DATE
).sum() # aggregate for one day, use date as index
).agg({VALUE:"sum"}) # aggregate for one day, use date as index

asset_account_transactions.append(transactions_of_account[VALUE])
asset_account_names.append(accounts.at[account_guid, NAME])
Expand Down
2 changes: 1 addition & 1 deletion cashdash/dashes/cashflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ def update_figure(
# combine splits of asset accounts into one by summing up their value in each transaction
asset_splits_folded = asset_splits.groupby(TRANSACTION, as_index=False)[
[VALUE]
].sum()
].agg({VALUE:"sum"})
asset_splits_folded[ACCOUNT] = "00000000000000000000000000000001"
dummy_account = pd.Series(
{TYPE: ASSET, NAME: "Assets", DESCRIPTION: "Dummy Asset Account"},
Expand Down
2 changes: 1 addition & 1 deletion cashdash/dashes/expenses.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def update(date_aggregation, selected_accounts) -> go.Figure:

# Aggregate by day per default, doesn't make much sense to go any more fine-grained because the
# finest that sample_books goes are days
transactions_per_day = subtree_transactions.groupby(DATE).sum()
transactions_per_day = subtree_transactions.groupby(DATE).agg({VALUE:"sum"})
# Apply aggregation to weeks, months, etc.
transactions_resampled = (
transactions_per_day[VALUE].resample(rule).sum()
Expand Down
22 changes: 11 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
anytree==2.7.3
black==19.10b0
cvxpy==1.0.25
dash==1.7.0
deprecation==2.0.7
minizinc==0.2.2
numpy==1.18.1
pandas==0.25.3
plotly==4.4.1
tabulate==0.8.6
anytree>=2.7.3
black>=19.10b0
cvxpy>=1.0.25
dash>=1.7.0
deprecation>=2.0.7
minizinc>=0.2.2
numpy>=1.18.1
pandas>=0.25.3
plotly>=4.4.1
tabulate>=0.8.6

# must be installed manually, see README.md:
# gnucashxml==1.0
# gnucashxml==1.0