From aecab933b0ea152bcf590073bfb8cbf5619d5688 Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 11 Feb 2019 10:40:33 -0500 Subject: [PATCH 1/9] Add jinja filters for just dollars and just cents --- atst/filters.py | 9 +++++++++ templates/portfolios/header.html | 22 +++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/atst/filters.py b/atst/filters.py index 61c42f8c..f752c1b2 100644 --- a/atst/filters.py +++ b/atst/filters.py @@ -18,6 +18,13 @@ def dollars(value): numberValue = 0 return "${:,.2f}".format(numberValue) +def justDollars(value): + raw = dollars(value) + return raw[:-3] + +def justCents(value): + raw = dollars(value) + return raw[-3:] def usPhone(number): phone = re.sub(r"\D", "", number) @@ -99,6 +106,8 @@ def normalizeOrder(title): def register_filters(app): app.jinja_env.filters["iconSvg"] = iconSvg app.jinja_env.filters["dollars"] = dollars + app.jinja_env.filters["justDollars"] = justDollars + app.jinja_env.filters["justCents"] = justCents app.jinja_env.filters["usPhone"] = usPhone app.jinja_env.filters["readableInteger"] = readableInteger app.jinja_env.filters["getOptionLabel"] = getOptionLabel diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html index 1895ecac..63b1a546 100644 --- a/templates/portfolios/header.html +++ b/templates/portfolios/header.html @@ -20,9 +20,29 @@ {{ Icon('info') }} - {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | dollars }} + {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justDollars }} + + + {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justCents }} +
+ {% if funding_end_date and funded %} + {{ Icon('ok') }} + Funded through + + + {% elif funding_end_date and not funded %} + {{ Icon('alert') }} + Funded period ends + + + {% endif %} +
{% if user_can(permissions.VIEW_USAGE_DOLLARS) %} From 6a8d4964d464c14e6fd70bdf7af1e10c513d91c5 Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 11 Feb 2019 15:33:28 -0500 Subject: [PATCH 2/9] Funded Through on each portfolio screen --- atst/filters.py | 3 +++ atst/routes/portfolios/__init__.py | 19 ++++++++++++++++- styles/components/_portfolio_layout.scss | 26 ++++++++++++++++++++++++ templates/portfolios/header.html | 2 +- 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/atst/filters.py b/atst/filters.py index f752c1b2..34f02787 100644 --- a/atst/filters.py +++ b/atst/filters.py @@ -18,14 +18,17 @@ def dollars(value): numberValue = 0 return "${:,.2f}".format(numberValue) + def justDollars(value): raw = dollars(value) return raw[:-3] + def justCents(value): raw = dollars(value) return raw[-3:] + def usPhone(number): phone = re.sub(r"\D", "", number) return "+1 ({}) {} - {}".format(phone[0:3], phone[3:6], phone[6:]) diff --git a/atst/routes/portfolios/__init__.py b/atst/routes/portfolios/__init__.py index ad935378..4e65bce1 100644 --- a/atst/routes/portfolios/__init__.py +++ b/atst/routes/portfolios/__init__.py @@ -1,4 +1,5 @@ from flask import Blueprint, request as http_request, g, render_template +from operator import attrgetter portfolios_bp = Blueprint("portfolios", __name__) @@ -31,4 +32,20 @@ def portfolio(): ) return False - return {"portfolio": portfolio, "permissions": Permissions, "user_can": user_can} + active_task_orders = [ + task_order for task_order in portfolio.task_orders if task_order.is_active + ] + funding_end_date = ( + sorted(active_task_orders, key=attrgetter("end_date"))[-1].end_date + if active_task_orders + else None + ) + funded = len(active_task_orders) > 1 + + return { + "portfolio": portfolio, + "permissions": Permissions, + "user_can": user_can, + "funding_end_date": funding_end_date, + "funded": funded, + } diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index f5671413..3def404f 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -89,6 +89,32 @@ } } } + + .cents { + font-size: 2rem; + margin-top: .75rem; + font-weight: bold; + } + + .portfolio-funding__header--funded-through { + flex-grow: 1; + text-align: left; + font-weight: bold; + } + + .funded { + color: $color-blue; + .icon { + @include icon-color($color-blue); + } + } + + .unfunded { + color: $color-red; + .icon { + @include icon-color($color-red); + } + } } @mixin subheading { diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html index 63b1a546..fe8ced23 100644 --- a/templates/portfolios/header.html +++ b/templates/portfolios/header.html @@ -22,7 +22,7 @@ {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justDollars }} - + {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justCents }}
From be44d5f8db17f06de47c7e47c5ab879059c45acb Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 09:37:10 -0500 Subject: [PATCH 3/9] Styling --- styles/components/_portfolio_layout.scss | 10 ++++ templates/portfolios/header.html | 59 +++++++++++++----------- 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 3def404f..434ce066 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -90,9 +90,19 @@ } } + .column-left { + width: 12.5rem; + float: left; + } + + .column-right { + margin-left: -.4rem; + } + .cents { font-size: 2rem; margin-top: .75rem; + margin-left: -.7rem; font-weight: bold; } diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html index fe8ced23..8b22c289 100644 --- a/templates/portfolios/header.html +++ b/templates/portfolios/header.html @@ -15,33 +15,40 @@ {{ secondary_breadcrumb or portfolio.name }}
- Available budget - - - {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justDollars }} - - - {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justCents }} - +
+ Available budget + +
+
+ + {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justDollars }} + + + {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justCents }} + +
-
- {% if funding_end_date and funded %} - {{ Icon('ok') }} - Funded through - - - {% elif funding_end_date and not funded %} - {{ Icon('alert') }} - Funded period ends - - - {% endif %} +
+
+
+ {% if funding_end_date and funded %} + {{ Icon('ok') }} + Funded through + + + {% elif funding_end_date and not funded %} + {{ Icon('alert') }} + Funded period ends + + + {% endif %} +
From c2dbbc478450305be90f5f0c07aa14f38d654805 Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 09:53:48 -0500 Subject: [PATCH 4/9] Fix tests --- atst/routes/portfolios/__init__.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/atst/routes/portfolios/__init__.py b/atst/routes/portfolios/__init__.py index 4e65bce1..e735064f 100644 --- a/atst/routes/portfolios/__init__.py +++ b/atst/routes/portfolios/__init__.py @@ -32,15 +32,19 @@ def portfolio(): ) return False - active_task_orders = [ - task_order for task_order in portfolio.task_orders if task_order.is_active - ] - funding_end_date = ( - sorted(active_task_orders, key=attrgetter("end_date"))[-1].end_date - if active_task_orders - else None - ) - funded = len(active_task_orders) > 1 + if not portfolio is None: + active_task_orders = [ + task_order for task_order in portfolio.task_orders if task_order.is_active + ] + funding_end_date = ( + sorted(active_task_orders, key=attrgetter("end_date"))[-1].end_date + if active_task_orders + else None + ) + funded = len(active_task_orders) > 1 + else: + funding_end_date = None + funded = None return { "portfolio": portfolio, From ef4f39a53e8ca4f8e466815809f6f2d1c5047de1 Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 11:10:19 -0500 Subject: [PATCH 5/9] Fix indenting on css --- styles/components/_portfolio_layout.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 434ce066..9ee68a7c 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -121,10 +121,11 @@ .unfunded { color: $color-red; + .icon { - @include icon-color($color-red); - } - } + @include icon-color($color-red); + } + } } @mixin subheading { From ba7546655620741ec006ec0314d57673d68d4e6b Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 11:10:53 -0500 Subject: [PATCH 6/9] Delete information in route that is now given via context processor --- atst/routes/portfolios/task_orders.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/atst/routes/portfolios/task_orders.py b/atst/routes/portfolios/task_orders.py index 70c30a33..69c8768e 100644 --- a/atst/routes/portfolios/task_orders.py +++ b/atst/routes/portfolios/task_orders.py @@ -41,12 +41,6 @@ def portfolio_funding(portfolio_id): task_orders_by_status[task_order.status].append(serialized_task_order) active_task_orders = task_orders_by_status.get(TaskOrderStatus.ACTIVE, []) - funding_end_date = ( - sorted(active_task_orders, key=itemgetter("end_date"))[-1]["end_date"] - if active_task_orders - else None - ) - funded = len(active_task_orders) > 1 total_balance = sum([task_order["balance"] for task_order in active_task_orders]) return render_template( @@ -55,8 +49,6 @@ def portfolio_funding(portfolio_id): pending_task_orders=task_orders_by_status.get(TaskOrderStatus.PENDING, []), active_task_orders=active_task_orders, expired_task_orders=task_orders_by_status.get(TaskOrderStatus.EXPIRED, []), - funding_end_date=funding_end_date, - funded=funded, total_balance=total_balance, ) From cf13ff91043ef5f2d3142b430956de2994772be2 Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 11:23:51 -0500 Subject: [PATCH 7/9] Use split to get dollars and cents --- atst/filters.py | 4 ++-- templates/portfolios/header.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atst/filters.py b/atst/filters.py index 34f02787..2b54572e 100644 --- a/atst/filters.py +++ b/atst/filters.py @@ -21,12 +21,12 @@ def dollars(value): def justDollars(value): raw = dollars(value) - return raw[:-3] + return raw.split(".")[0] def justCents(value): raw = dollars(value) - return raw[-3:] + return raw.split(".")[1] def usPhone(number): diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html index 8b22c289..18674b5e 100644 --- a/templates/portfolios/header.html +++ b/templates/portfolios/header.html @@ -26,7 +26,7 @@ {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justDollars }} - {{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justCents }} + .{{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justCents }}
From 0f1571a21403090c315214b40b28af571a6ca5e2 Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 13:38:59 -0500 Subject: [PATCH 8/9] Removed unused import --- atst/routes/portfolios/task_orders.py | 1 - 1 file changed, 1 deletion(-) diff --git a/atst/routes/portfolios/task_orders.py b/atst/routes/portfolios/task_orders.py index 69c8768e..eba80695 100644 --- a/atst/routes/portfolios/task_orders.py +++ b/atst/routes/portfolios/task_orders.py @@ -1,5 +1,4 @@ from collections import defaultdict -from operator import itemgetter from flask import g, redirect, render_template, url_for, request as http_request From 4025974b926007dae3b31b2a40dc4de537e3a0fd Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 12 Feb 2019 13:40:31 -0500 Subject: [PATCH 9/9] Fix misaligned CSS --- styles/components/_portfolio_layout.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 9ee68a7c..265063c7 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -121,10 +121,9 @@ .unfunded { color: $color-red; - .icon { - @include icon-color($color-red); - } + @include icon-color($color-red); + } } }