From 0b73d4e307a6c60dafaea6bfcc56955ab861c6d6 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 5 Feb 2019 08:45:17 -0500 Subject: [PATCH 1/2] Show gray checkmark for incomplete Task Orders --- atst/routes/portfolios/task_orders.py | 6 +++++- templates/portfolios/task_orders/show.html | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/atst/routes/portfolios/task_orders.py b/atst/routes/portfolios/task_orders.py index 61a6c9a7..f9428be2 100644 --- a/atst/routes/portfolios/task_orders.py +++ b/atst/routes/portfolios/task_orders.py @@ -60,8 +60,12 @@ def portfolio_funding(portfolio_id): def view_task_order(portfolio_id, task_order_id): portfolio = Portfolios.get(g.current_user, portfolio_id) task_order = TaskOrders.get(g.current_user, task_order_id) + completed = TaskOrders.all_sections_complete(task_order) return render_template( - "portfolios/task_orders/show.html", portfolio=portfolio, task_order=task_order + "portfolios/task_orders/show.html", + portfolio=portfolio, + task_order=task_order, + all_sections_complete=completed, ) diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html index 45cafdfa..2437052a 100644 --- a/templates/portfolios/task_orders/show.html +++ b/templates/portfolios/task_orders/show.html @@ -90,7 +90,7 @@ title="Submit draft Task Order", description="Complete initial task order request form.", link_text="edit", - complete=True) %} + complete=all_sections_complete) %}
Date: Tue, 5 Feb 2019 08:47:05 -0500 Subject: [PATCH 2/2] Don't allow downloading Task Order documents when TO not complete --- templates/portfolios/task_orders/show.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html index 2437052a..8c68c7f8 100644 --- a/templates/portfolios/task_orders/show.html +++ b/templates/portfolios/task_orders/show.html @@ -130,7 +130,7 @@ {%- endset %} {{ DocumentLink( title="Task Order Draft", - link_url=url_for('task_orders.download_summary', task_order_id=task_order.id), + link_url=all_sections_complete and url_for('task_orders.download_summary', task_order_id=task_order.id), description=description) }}