Merge pull request #566 from dod-ccpo/upload-csp-estimate

Upload proof of CSP estimate

atst/routes/task_orders/index.py

@@ -1,8 +1,9 @@
 from io import BytesIO
-from flask import g, Response
+from flask import g, Response, current_app as app
 
 from . import task_orders_bp
 from atst.domain.task_orders import TaskOrders
+from atst.domain.exceptions import NotFoundError
 from atst.utils.docx import Docx
 
 
@@ -17,3 +18,22 @@ def download_summary(task_order_id):
         headers={"Content-Disposition": "attachment; filename={}".format(filename)},
         mimetype="application/vnd.openxmlformats-officedocument.wordprocessingml.document",
     )
+
+
+@task_orders_bp.route("/task_orders/csp_estimate/<task_order_id>")
+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
+                )
+            },
+        )
+
+    else:
+        raise NotFoundError("task_order CSP estimate")

atst/routes/task_orders/new.py

@@ -272,8 +272,9 @@ def new(screen, task_order_id=None, portfolio_id=None):
     "/portfolios/<portfolio_id>/task_orders/new/<int:screen>", methods=["POST"]
 )
 def update(screen, task_order_id=None, portfolio_id=None):
+    form_data = {**http_request.form, **http_request.files}
     workflow = UpdateTaskOrderWorkflow(
-        g.current_user, http_request.form, screen, task_order_id, portfolio_id
+        g.current_user, form_data, screen, task_order_id, portfolio_id
     )
 
     if workflow.validate():