Merge pull request #640 from dod-ccpo/update-task-order-show

Update view task order page

atst/filters.py

@@ -30,6 +30,8 @@ def justCents(value):
 
 
 def usPhone(number):
+    if not number:
+        return ""
     phone = re.sub(r"\D", "", number)
     return "+1 ({}) {} - {}".format(phone[0:3], phone[3:6], phone[6:])
 

atst/models/task_order.py

@@ -21,6 +21,7 @@ from atst.models import Attachment, Base, types, mixins
 
 
 class Status(Enum):
+    STARTED = "Started"
     PENDING = "Pending"
     ACTIVE = "Active"
     EXPIRED = "Expired"
@@ -142,7 +143,7 @@ class TaskOrder(Base, mixins.TimestampsMixin):
                 return Status.EXPIRED
             return Status.ACTIVE
         else:
-            return Status.PENDING
+            return Status.STARTED
 
     @property
     def display_status(self):

atst/routes/portfolios/task_orders.py

@@ -45,7 +45,10 @@ def portfolio_funding(portfolio_id):
     return render_template(
         "portfolios/task_orders/index.html",
         portfolio=portfolio,
-        pending_task_orders=task_orders_by_status.get(TaskOrderStatus.PENDING, []),
+        pending_task_orders=(
+            task_orders_by_status.get(TaskOrderStatus.STARTED, [])
+            + task_orders_by_status.get(TaskOrderStatus.PENDING, [])
+        ),
         active_task_orders=active_task_orders,
         expired_task_orders=task_orders_by_status.get(TaskOrderStatus.EXPIRED, []),
         total_balance=total_balance,

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/<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
-                )
-            },
-        )
-
+        return send_file(task_order.csp_estimate)
     else:
         raise NotFoundError("task_order CSP estimate")
+
+
+@task_orders_bp.route("/task_orders/pdf/<task_order_id>")
+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")