Merge pull request #158 from dod-ccpo/over-one-mill-159007546

Over one mill 159007546

atst/routes/requests/index.py

@@ -9,8 +9,10 @@ def map_request(request):
     time_created = pendulum.instance(request.time_created)
     is_new = time_created.add(days=1) > pendulum.now()
     app_count = request.body.get("details_of_use", {}).get("num_software_systems", 0)
-    update_url = url_for('requests.requests_form_update', screen=1, request_id=request.id)
-    verify_url = url_for('requests.financial_verification', request_id=request.id)
+    update_url = url_for(
+        "requests.requests_form_update", screen=1, request_id=request.id
+    )
+    verify_url = url_for("requests.financial_verification", request_id=request.id)
 
     return {
         "order_id": request.id,
@@ -19,7 +21,9 @@ def map_request(request):
         "app_count": app_count,
         "date": time_created.format("M/DD/YYYY"),
         "full_name": request.creator.full_name,
-        "edit_link": verify_url if Requests.is_pending_financial_verification(request) else update_url
+        "edit_link": verify_url if Requests.is_pending_financial_verification(
+            request
+        ) else update_url,
     }
 
 
@@ -34,5 +38,11 @@ def requests_index():
     mapped_requests = [map_request(r) for r in requests]
 
     pending_fv = any(Requests.is_pending_financial_verification(r) for r in requests)
+    pending_ccpo = any(Requests.is_pending_ccpo_approval(r) for r in requests)
 
-    return render_template("requests.html", requests=mapped_requests, pending_financial_verification=pending_fv)
+    return render_template(
+        "requests.html",
+        requests=mapped_requests,
+        pending_financial_verification=pending_fv,
+        pending_ccpo_approval=pending_ccpo,
+    )

atst/routes/requests/requests_form.py

@@ -105,7 +105,7 @@ def requests_submit(request_id=None):
         return redirect("/requests?modal=pendingFinancialVerification")
 
     else:
-        return redirect("/requests")
+        return redirect("/requests?modal=pendingCCPOApproval")
 
 
 # TODO: generalize this, along with other authorizations, into a policy-pattern