From 9f7284070ed0a01adb72fae063ee36f2ba40120d Mon Sep 17 00:00:00 2001 From: dandds Date: Thu, 20 Sep 2018 10:38:29 -0400 Subject: [PATCH] month selector for total spend per month section in reports --- atst/filters.py | 6 ++++++ templates/workspaces/reports/index.html | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/atst/filters.py b/atst/filters.py index 0ee5f1cd..217b9e2f 100644 --- a/atst/filters.py +++ b/atst/filters.py @@ -1,4 +1,5 @@ import re +import datetime from flask import current_app as app from werkzeug.datastructures import FileStorage @@ -72,6 +73,10 @@ def formattedDate(value, formatter="%m/%d/%Y"): return "-" +def dateFromString(value, formatter="%m/%Y"): + return datetime.datetime.strptime(value, formatter) + + def register_filters(app): app.jinja_env.filters["iconSvg"] = iconSvg app.jinja_env.filters["dollars"] = dollars @@ -82,3 +87,4 @@ def register_filters(app): app.jinja_env.filters["findFilter"] = findFilter app.jinja_env.filters["renderList"] = renderList app.jinja_env.filters["formattedDate"] = formattedDate + app.jinja_env.filters["dateFromString"] = dateFromString diff --git a/templates/workspaces/reports/index.html b/templates/workspaces/reports/index.html index 172d5e07..563a7838 100644 --- a/templates/workspaces/reports/index.html +++ b/templates/workspaces/reports/index.html @@ -301,8 +301,21 @@

Total spend per month

- + {% for m in cumulative_budget["months"] %} + {% set month = m | dateFromString %} + + {% endfor %}