diff --git a/financeplanner/templates/financeplanner/index.html b/financeplanner/templates/financeplanner/index.html
index 0770d37..b74e075 100644
--- a/financeplanner/templates/financeplanner/index.html
+++ b/financeplanner/templates/financeplanner/index.html
@@ -24,20 +24,23 @@
{% for date, stat in graph_data.items %}
{% if stat.div_percentage is None %}
{% else %}
{% endif %}
{% endfor %}
{% else %}
- No enough data from {{ range_start }} til {{ range_end }} to show a graph.
+
+ No enough data from {{ range_start|date:"d.m.y" }} til
+ {{ range_end|date:"d.m.y" }} to show a graph.
+
{% endif %}
@@ -54,7 +57,7 @@
{% for balance in balance_list %}
- | {{ balance.date }} |
+ {{ balance.date|date:"d.m.y" }} |
{{ balance.amount }} |
{% endfor %}
@@ -83,9 +86,9 @@
| {{ transaction.subject }} |
{{ transaction.amount }} |
- {{ transaction.booking_date }} |
+ {{ transaction.booking_date|date:"d.m.y" }} |
{{ transaction.recurring_months }} |
- {{ transaction.not_recurring_after }} |
+ {{ transaction.not_recurring_after|date:"d.m.y" }} |
{% endfor %}
@@ -109,7 +112,7 @@
{% for date, subject, amount in actual_transactions %}
- | {{ date }} |
+ {{ date|date:"d.m.y" }} |
{{ subject }} |
{{ amount }} |
diff --git a/financeplanner/utils.py b/financeplanner/utils.py
index 2f4b0f4..d6e7606 100644
--- a/financeplanner/utils.py
+++ b/financeplanner/utils.py
@@ -8,10 +8,6 @@ def current_date():
return datetime.now().date()
-def format_date(d):
- return d.strftime("%d.%m.%Y")
-
-
def round_with_dec_places(number, places):
if number is None:
return None
diff --git a/financeplanner/views.py b/financeplanner/views.py
index 178e6be..6e635a9 100644
--- a/financeplanner/views.py
+++ b/financeplanner/views.py
@@ -7,8 +7,6 @@ from django.contrib.auth.decorators import login_required
from django.db.models import Q
from django.shortcuts import render
-from financeplanner.utils import format_date
-
def _get_relevant_balances(user, range_start, range_end):
balance_list = []
@@ -151,7 +149,6 @@ def _build_graph_data(range_start, range_end, calculation_start, balance_list, a
stats = _trim_stats(stats, range_start)
amount_limit = _calculate_scale(stats)
for date in stats.keys():
- stats[date]["date_string"] = format_date(date)
amount = stats[date]["amount"]
if amount is None:
stats[date]["div_percentage"] = None
@@ -194,8 +191,8 @@ def index(request):
else:
graph_data = None
context = {
- "range_start": format_date(range_start),
- "range_end": format_date(range_end),
+ "range_start": range_start,
+ "range_end": range_end,
"today": today,
"balance_list": balance_list,
"transaction_list": transaction_list,