correct views per request status

atst/domain/requests/requests.py

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

atst/filters.py

@@ -31,7 +31,7 @@ def readableInteger(value):
 
 def getOptionLabel(value, options):
     if hasattr(value, "value"):
-        value = value.value
+        value = value.name
     try:
         return next(tup[1] for tup in options if tup[0] == value)
     except StopIteration:

atst/routes/requests/approval.py

@@ -42,8 +42,7 @@ def render_approval(request, form=None):
         current_status=request.status.value,
         pending_review=pending_review,
         financial_review=pending_final_approval,
-        pdf_available=request.task_order and request.task_order.pdf,
+        f=form or CCPOReviewForm(),
-        f=form,
         internal_comment_form=internal_comment_form,
     )
 

atst/routes/requests/index.py

@@ -66,7 +66,7 @@ class RequestsIndex(object):
             return url_for(
                 "requests.financial_verification", request_id=request.id, extended=True
             )
-        elif Requests.is_pending_ccpo_action(request):
+        elif Requests.is_pending_ccpo_action(request) or Requests.is_approved(request):
             return url_for("requests.view_request_details", request_id=request.id)
         else:
             return url_for(

atst/routes/requests/requests_form.py

@@ -127,9 +127,18 @@ def requests_submit(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)
+    financial_review=Requests.is_pending_ccpo_approval(request) or Requests.is_approved(request)
+
+    data = request.body
+    if financial_review and request.task_order:
+        data["task_order"] = request.task_order.to_dictionary()
+
     return render_template(
             "requests/view_pending.html",
-            data=request.body,
+            data=data,
             request_id=request.id,
-            pending_review=Requests.is_pending_ccpo_action(request)
+            status=request.status_displayname,
+            pending_review=Requests.is_pending_ccpo_action(request),
+            financial_verification=Requests.is_pending_financial_verification(request),
+            financial_review=financial_review,
     )

templates/requests/_review.html

@@ -139,13 +139,11 @@
     Financial Verification
   </h2>
 
-  {% if pdf_available %}
+  <div>
-    <div>
+    <a href="{{ url_for("requests.task_order_pdf_download", request_id=request_id)}}" download>
-      <a href="{{ url_for("requests.task_order_pdf_download", request_id=request_id)}}" download>
+      Download the Task Order PDF
-        Download the Task Order PDF
+    </a>
-      </a>
+  </div>
-    </div>
-  {% endif %}
 
   <dl>
     {{ DefinitionReviewField("Task Order Information Source", "task_order", "source", filter="getOptionLabel", filter_args=[task_order_sources]) }}

templates/requests/view_pending.html

@@ -5,9 +5,11 @@
 {% block content %}
 <div class="col">
 
-  {% with complete=False %}
+  {% if financial_verification %}
-    {% include 'requests/review_menu.html' %}
+    {% with complete=False %}
-  {% endwith %}
+      {% include 'requests/review_menu.html' %}
+    {% endwith %}
+  {% endif %}
 
   {% if pending_review %}
     {{ Alert('Your request is being reviewed',
@@ -18,7 +20,8 @@
 
   <div class="panel">
     <div class="panel__heading">
-      <h1>View Pending Request</h1>
+      <h1>Request Details</h1><br/>
+      <h2>#{{ request_id }} <span class="label label--info">{{ status }}</span></h2>
     </div>
 
     <div class="panel__content">