diff --git a/financeplanner/calc.py b/financeplanner/calc.py index 44a7689..21c4a7f 100644 --- a/financeplanner/calc.py +++ b/financeplanner/calc.py @@ -225,5 +225,7 @@ class Statistics: self.avg_weekly_irregular_expenses = self.avg_daily_irregular_expenses * days_per_week self.avg_monthly_irregular_expenses = self.avg_daily_irregular_expenses * days_per_month + self.avg_monthly_result_complete = self.avg_monthly_result + self.avg_monthly_irregular_expenses + def get_daily_stats_in_range(self): return [s for s in self.daily_stats if self.display_start <= s.date <= self.display_end] diff --git a/financeplanner/templates/financeplanner/index.html b/financeplanner/templates/financeplanner/index.html index f8c1044..63e5a78 100644 --- a/financeplanner/templates/financeplanner/index.html +++ b/financeplanner/templates/financeplanner/index.html @@ -79,6 +79,8 @@ + +

monthly result after irregular expenses: {{ avg_monthly_result_complete|euro }}

diff --git a/financeplanner/views.py b/financeplanner/views.py index 59f884f..5635b31 100644 --- a/financeplanner/views.py +++ b/financeplanner/views.py @@ -21,5 +21,6 @@ def index(request): "avg_daily_irregular_expenses": statistics.avg_daily_irregular_expenses, "avg_weekly_irregular_expenses": statistics.avg_weekly_irregular_expenses, "avg_monthly_irregular_expenses": statistics.avg_monthly_irregular_expenses, + "avg_monthly_result_complete": statistics.avg_monthly_result_complete, } return render(request, "financeplanner/index.html", context)