From 1c21816810c363a6f876a5dc1543b618be8bb0c3 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Wed, 13 Feb 2019 09:31:04 -0500 Subject: [PATCH] Add link to download official TO pdf --- atst/routes/task_orders/index.py | 31 ++++++++++++++-------- templates/portfolios/task_orders/show.html | 15 ++++++++--- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/atst/routes/task_orders/index.py b/atst/routes/task_orders/index.py index 6abf34fd..86f25f91 100644 --- a/atst/routes/task_orders/index.py +++ b/atst/routes/task_orders/index.py @@ -20,20 +20,29 @@ def download_summary(task_order_id): ) +def send_file(attachment): + generator = app.csp.files.download(attachment.object_name) + return Response( + generator, + headers={ + "Content-Disposition": "attachment; filename={}".format(attachment.filename) + }, + ) + + @task_orders_bp.route("/task_orders/csp_estimate/") def download_csp_estimate(task_order_id): task_order = TaskOrders.get(g.current_user, task_order_id) if task_order.csp_estimate: - estimate = task_order.csp_estimate - generator = app.csp.files.download(estimate.object_name) - return Response( - generator, - headers={ - "Content-Disposition": "attachment; filename={}".format( - estimate.filename - ) - }, - ) - + return send_file(task_order.csp_estimate) else: raise NotFoundError("task_order CSP estimate") + + +@task_orders_bp.route("/task_orders/pdf/") +def download_task_order_pdf(task_order_id): + task_order = TaskOrders.get(g.current_user, task_order_id) + if task_order.pdf: + return send_file(task_order.pdf) + else: + raise NotFoundError("task_order pdf") diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html index 5f0f9419..ce0243ff 100644 --- a/templates/portfolios/task_orders/show.html +++ b/templates/portfolios/task_orders/show.html @@ -171,10 +171,17 @@ format="M/D/YYYY"> {%- endset %} - {{ DocumentLink( - title="Task Order Draft", - link_url=all_sections_complete and url_for('task_orders.download_summary', task_order_id=task_order.id), - description=description) }} + {% if task_order.pdf %} + {{ DocumentLink( + title="Task Order", + link_url=url_for('task_orders.download_task_order_pdf', task_order_id=task_order.id), + description=description) }} + {% else %} + {{ DocumentLink( + title="Task Order Draft", + link_url=all_sections_complete and url_for('task_orders.download_summary', task_order_id=task_order.id), + description=description) }} + {% endif %}