personal-finance/budget
2
1
Fork 0
Code Issues 11 Pull Requests Projects 6 Releases 2 Wiki Activity

Fix discrete graph

Browse Source 
Adds income line to discrete graph.
Keep pfbudget.categories dict import as is to remove name conflicts.
This commit is contained in:
Luís Murta 2021-07-07 20:09:56 +01:00
parent 85c0819a44
commit db4397877a
Signed by: satprog
GPG Key ID: DDF2EFC6179009DC
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pfbudget/graph.py
View File

@ -5,7 +5,8 @@ from typing import TYPE_CHECKING
import datetime as dt import datetime as dt
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import pfbudget.categories as categories import pfbudget.categories
if TYPE_CHECKING: if TYPE_CHECKING:
from pfbudget.database import DBManager from pfbudget.database import DBManager
@ -27,7 +28,7 @@ def monthly(db: DBManager, start: dt.date = dt.date.min, end: dt.date = dt.date.
<= month <= month
+ dt.timedelta(days=monthrange(month.year, month.month)[1] - 1) + dt.timedelta(days=monthrange(month.year, month.month)[1] - 1)
) )
for group, categories in categories.groups.items() for group, categories in pfbudget.categories.groups.items()
}, },
) )
for month in [ for month in [
@ -47,10 +48,10 @@ def monthly(db: DBManager, start: dt.date = dt.date.min, end: dt.date = dt.date.
list(rrule(MONTHLY, dtstart=start.replace(day=1), until=end.replace(day=1))), list(rrule(MONTHLY, dtstart=start.replace(day=1), until=end.replace(day=1))),
[ [
[-groups[group] for _, groups in monthly_transactions] [-groups[group] for _, groups in monthly_transactions]
for group in categories.groups.keys() for group in pfbudget.categories.groups
if group != "income" if group != "income"
], ],
labels=[group for group in categories.groups.keys() if group != "income"], labels=[group for group in pfbudget.categories.groups if group != "income"],
) )
plt.legend(loc="upper left") plt.legend(loc="upper left")
plt.tight_layout() plt.tight_layout()
@ -73,7 +74,7 @@ def discrete(db: DBManager, start: dt.date = dt.date.min, end: dt.date = dt.date
<= month <= month
+ dt.timedelta(days=monthrange(month.year, month.month)[1] - 1) + dt.timedelta(days=monthrange(month.year, month.month)[1] - 1)
) )
for category in categories.categories.keys() for category in pfbudget.categories.categories
}, },
) )
for month in [ for month in [
@ -85,13 +86,29 @@ def discrete(db: DBManager, start: dt.date = dt.date.min, end: dt.date = dt.date
) )
plt.figure(figsize=(30, 10)) plt.figure(figsize=(30, 10))
plt.plot(
list(rrule(MONTHLY, dtstart=start.replace(day=1), until=end.replace(day=1))),
[
sum(
value
for category, value in categories.items()
if category in pfbudget.categories.groups["income"]
)
for _, categories in monthly_transactions
],
)
plt.stackplot( plt.stackplot(
list(rrule(MONTHLY, dtstart=start.replace(day=1), until=end.replace(day=1))), list(rrule(MONTHLY, dtstart=start.replace(day=1), until=end.replace(day=1))),
[ [
[-categories[category] for _, categories in monthly_transactions] [-categories[category] for _, categories in monthly_transactions]
for category in categories.categories.keys() for category in pfbudget.categories.categories
if category not in pfbudget.categories.groups["income"]
],
labels=[
category
for category in pfbudget.categories.categories
if category not in pfbudget.categories.groups["income"]
], ],
labels=[category for category in categories.categories.keys()],
) )
plt.legend(loc="upper left") plt.legend(loc="upper left")
plt.tight_layout() plt.tight_layout()