display financial verification review info for ccpo

atst/filters.py

@@ -30,6 +30,8 @@ def readableInteger(value):
 
 
 def getOptionLabel(value, options):
+    if hasattr(value, "value"):
+        value = value.value
     try:
         return next(tup[1] for tup in options if tup[0] == value)
     except StopIteration:
@@ -59,6 +61,10 @@ def findFilter(value, filter_name, filter_args=[]):
         raise ValueError("filter name {} not found".format(filter_name))
 
 
+def renderList(value):
+    return app.jinja_env.filters["safe"]("<br>".join(value))
+
+
 def register_filters(app):
     app.jinja_env.filters["iconSvg"] = iconSvg
     app.jinja_env.filters["dollars"] = dollars
@@ -67,3 +73,4 @@ def register_filters(app):
     app.jinja_env.filters["getOptionLabel"] = getOptionLabel
     app.jinja_env.filters["mixedContentToJson"] = mixedContentToJson
     app.jinja_env.filters["findFilter"] = findFilter
+    app.jinja_env.filters["renderList"] = renderList

atst/forms/data.py

@@ -140,3 +140,11 @@ WORKSPACE_ROLES = [
         },
     ),
 ]
+
+FUNDING_TYPES = [
+    ("", "- Select -"),
+    ("RDTE", "Research, Development, Testing & Evaluation (RDT&E)"),
+    ("OM", "Operations & Maintenance (O&M)"),
+    ("PROC", "Procurement (PROC)"),
+    ("OTHER", "Other"),
+]

atst/forms/financial.py

@@ -10,6 +10,7 @@ from atst.domain.task_orders import TaskOrders
 
 from .fields import NewlineListField, SelectField
 from .forms import ValidatedForm
+from .data import FUNDING_TYPES
 
 
 PE_REGEX = re.compile(
@@ -161,13 +162,7 @@ class ExtendedFinancialForm(BaseFinancialForm):
 
     funding_type = SelectField(
         description="What is the source of funding?",
-        choices=[
-            ("", "- Select -"),
-            ("RDTE", "Research, Development, Testing & Evaluation (RDT&E)"),
-            ("OM", "Operations & Maintenance (O&M)"),
-            ("PROC", "Procurement (PROC)"),
-            ("OTHER", "Other"),
-        ],
+        choices=FUNDING_TYPES,
         validators=[Required()],
         render_kw={"required": False},
     )

atst/routes/requests/approval.py

@@ -1,11 +1,22 @@
 from flask import render_template, g
 
 from . import requests_bp
-from atst.forms.data import SERVICE_BRANCHES
 from atst.domain.requests import Requests
 
 
+def task_order_dictionary(task_order):
+    return {
+        c.name: getattr(task_order, c.name)
+        for c in task_order.__table__.columns
+        if c.name not in ["id", "attachment_id"]
+    }
+
+
 @requests_bp.route("/requests/approval/<string:request_id>", methods=["GET"])
 def approval(request_id):
     request = Requests.get(g.current_user, request_id)
-    return render_template("requests/approval.html", data=request.body, service_branches=SERVICE_BRANCHES)
+    data = request.body
+    if request.task_order:
+        data["task_order"] = task_order_dictionary(request.task_order)
+
+    return render_template("requests/approval.html", data=data, financial_review=True)

atst/routes/requests/requests_form.py

@@ -9,6 +9,7 @@ from atst.forms.data import (
     ASSISTANCE_ORG_TYPES,
     DATA_TRANSFER_AMOUNTS,
     COMPLETION_DATE_RANGES,
+    FUNDING_TYPES,
 )
 
 
@@ -19,6 +20,7 @@ def option_data():
         "assistance_org_types": ASSISTANCE_ORG_TYPES,
         "data_transfer_amounts": DATA_TRANSFER_AMOUNTS,
         "completion_date_ranges": COMPLETION_DATE_RANGES,
+        "funding_types": FUNDING_TYPES,
     }