review tabs for financial verification

atst/domain/requests/requests.py

@@ -151,6 +151,10 @@ class Requests(object):
     def is_pending_ccpo_approval(cls, request):
         return request.status == RequestStatus.PENDING_CCPO_APPROVAL
 
+    @classmethod
+    def is_pending_ccpo_action(cls, request):
+        return Requests.is_pending_ccpo_acceptance(request) or Requests.is_pending_ccpo_approval(request)
+
     @classmethod
     def status_count(cls, status, creator=None):
         return RequestsQuery.status_count(status, creator)

atst/routes/requests/index.py

@@ -66,10 +66,8 @@ class RequestsIndex(object):
             return url_for(
                 "requests.financial_verification", request_id=request.id, extended=True
             )
-        elif Requests.is_pending_ccpo_acceptance(
-            request
-        ) or Requests.is_pending_ccpo_approval(request):
-            return url_for("requests.view_pending_request", request_id=request.id)
+        elif Requests.is_pending_ccpo_action(request):
+            return url_for("requests.view_request_details", request_id=request.id)
         else:
             return url_for(
                 "requests.requests_form_update", screen=1, request_id=request.id

atst/routes/requests/requests_form.py

@@ -124,7 +124,12 @@ def requests_submit(request_id=None):
         return redirect("/requests?modal=pendingCCPOApproval")
 
 
-@requests_bp.route("/requests/pending/<string:request_id>", methods=["GET"])
-def view_pending_request(request_id=None):
+@requests_bp.route("/requests/details/<string:request_id>", methods=["GET"])
+def view_request_details(request_id=None):
     request = Requests.get(g.current_user, request_id)
-    return render_template("requests/view_pending.html", data=request.body)
+    return render_template(
+            "requests/view_pending.html",
+            data=request.body,
+            request_id=request.id,
+            pending_review=Requests.is_pending_ccpo_action(request)
+    )