No enough data from {{ start|date:"d.m.y" }} til {{ end|date:"d.m.y" }} to show a graph.
- {% endif %} -diff --git a/financeplanner/admin.py b/financeplanner/admin.py index fa5972a..93a2a41 100644 --- a/financeplanner/admin.py +++ b/financeplanner/admin.py @@ -6,7 +6,7 @@ from financeplanner.utils import format_price class AdminSite(admin.AdminSite): - index_title = "FloPlanner" + index_title = "FinancePlanner" site_title = "Admin Panel" site_header = "Admin Panel" site_url = reverse_lazy("finance:index") diff --git a/financeplanner/templates/financeplanner/base.html b/financeplanner/templates/financeplanner/base.html index 2762d2a..229f872 100644 --- a/financeplanner/templates/financeplanner/base.html +++ b/financeplanner/templates/financeplanner/base.html @@ -9,7 +9,7 @@
-{% block navi %}{% endblock %} diff --git a/financeplanner/templates/financeplanner/index.html b/financeplanner/templates/financeplanner/index.html index 63e5a78..a5c3403 100644 --- a/financeplanner/templates/financeplanner/index.html +++ b/financeplanner/templates/financeplanner/index.html @@ -1,209 +1,198 @@ -{% load static %} +{% extends "financeplanner/base.html" %} + {% load custom_tags %} - - -
- -+{% block navi %} Admin Panel - Logout -
+{% endblock %} -No enough data from {{ start|date:"d.m.y" }} til {{ end|date:"d.m.y" }} to show a graph.
- {% endif %} -No enough data from {{ start|date:"d.m.y" }} til {{ end|date:"d.m.y" }} to show a graph.
+ {% endif %} +current average amounts per month:
-| income | -{{ avg_monthly_income|euro }} | -
| expenses | -{{ avg_monthly_expenses|euro }} | -
| result | -{{ avg_monthly_result|euro }} | -
average irregular expenses based on the last half-a-year:
-| monthly | -{{ avg_monthly_irregular_expenses|euro }} | -
| weekly | -{{ avg_weekly_irregular_expenses|euro }} | -
| daily | -{{ avg_daily_irregular_expenses|euro }} | -
monthly result after irregular expenses: {{ avg_monthly_result_complete|euro }}
-current average amounts per month:
| date | -amount | -
| {{ balance.date|date:"d.m.y" }} | -{{ balance.amount|euro }} | -
| income | +{{ avg_monthly_income|euro }} | +
| expenses | +{{ avg_monthly_expenses|euro }} | +
| result | +{{ avg_monthly_result|euro }} | +
-
- {% endif %} -average irregular expenses based on the last half-a-year:
| subject | -amount | -booking date | -recurring months | -not recurring after | -
| {{ transaction.subject }} | -{{ transaction.amount|euro }} | -{{ transaction.booking_date|date:"d.m.y" }} | -{{ transaction.recurring_months }} | -{{ transaction.not_recurring_after|date:"d.m.y" }} | -
| monthly | +{{ avg_monthly_irregular_expenses|euro }} | +|||
| weekly | +{{ avg_weekly_irregular_expenses|euro }} | +|||
| daily | +{{ avg_daily_irregular_expenses|euro }} | +
-
- {% endif %} -| date | -subject | -amount | -
| {{ trans.date|date:"d.m.y" }} | -{{ trans.subject }} | -{{ trans.amount|euro }} | +date | +amount |
-
- {% endif %} --
+ {% endif %} +