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(
+        elif Requests.is_pending_ccpo_action(request):
-            request
+            return url_for("requests.view_request_details", request_id=request.id)
-        ) or Requests.is_pending_ccpo_approval(request):
-            return url_for("requests.view_pending_request", 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"])
+@requests_bp.route("/requests/details/<string:request_id>", methods=["GET"])
-def view_pending_request(request_id=None):
+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)
+    )

templates/requests/financial_verification.html

@@ -6,6 +6,10 @@
 
 {% block content %}
 
+{% with complete=False %}
+  {% include 'requests/review_menu.html' %}
+{% endwith %}
+
 <financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'>
 <div class="col">
 

templates/requests/review_menu.html

@@ -0,0 +1,23 @@
+{% set pending_url=url_for('requests.view_request_details', request_id=request_id) %}
+{% set financial_url=url_for('requests.financial_verification', request_id=request_id) %}
+<div class="progress-menu progress-menu--four">
+  <ul>
+    <li class="progress-menu__item progress-menu__item--complete">
+      <a href="{{ pending_url }}">
+        Request Information
+      </a>
+    </li>
+    {% if complete %}
+      {% set financial_status="complete" %}
+    {% elif g.matchesPath(financial_url) %}
+      {% set financial_status="active" %}
+    {% else %}
+      {% set financial_status="incomplete" %}
+    {% endif %}
+    <li class="progress-menu__item progress-menu__item--{{ financial_status }}">
+      <a href="{{ financial_url }}">
+        Financial Verification Information
+      </a>
+    </li>
+  </ul>
+</div>

templates/requests/view_pending.html

@@ -4,10 +4,17 @@
 
 {% block content %}
 <div class="col">
+
+  {% with complete=False %}
+    {% include 'requests/review_menu.html' %}
+  {% endwith %}
+
+  {% if pending_review %}
     {{ Alert('Your request is being reviewed',
       message="<p>You cannot edit your submitted request while it is under review. Your request will be reviewed within 3 business days.</p>",
       level='warning'
     ) }}
+  {% endif %}
 
   <div class="panel">
     <div class="panel__heading">