From 6cd627f820a6f1995b3d92495ea88e5c8da2517f Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 14 Sep 2018 10:43:42 -0400
Subject: [PATCH] Move "pending financial verification" alert

---
 atst/routes/requests/financial_verification.py |  2 +-
 templates/requests/financial_verification.html | 13 +++++++++----
 templates/requests/index.html                  |  6 ------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py
index 728f7f39..1aaf75e2 100644
--- a/atst/routes/requests/financial_verification.py
+++ b/atst/routes/requests/financial_verification.py
@@ -38,7 +38,7 @@ def financial_verification(request_id=None):
     return render_template(
         "requests/financial_verification.html",
         f=form,
-        request_id=request_id,
+        request=request,
         extended=is_extended(request),
     )
 
diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html
index f3950f00..2e03fa80 100644
--- a/templates/requests/financial_verification.html
+++ b/templates/requests/financial_verification.html
@@ -6,6 +6,11 @@
 
 {% block content %}
 
+{% if request.is_pending_financial_verification %}
+  {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
+{% endif %}
+
+
 {% include 'requests/review_menu.html' %}
 
 <financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'>
@@ -19,7 +24,7 @@
   {% endif %}
 
   {% if f.is_missing_task_order_number %}
-    {% set extended_url = url_for('requests.financial_verification', request_id=request_id, extended=True) %}
+    {% set extended_url = url_for('requests.financial_verification', request_id=request.id, extended=True) %}
     {{ Alert('Task Order not found in EDA',
         message="We could not find your Task Order in our system of record, EDA.
                  Please confirm that you have entered it correctly.<br>
@@ -31,9 +36,9 @@
 
   {% block form_action %}
     {% if extended %}
-      <form method='POST' action="{{ url_for('requests.financial_verification', request_id=request_id, extended=True) }}" autocomplete="off" enctype="multipart/form-data">
+      <form method='POST' action="{{ url_for('requests.financial_verification', request_id=request.id, extended=True) }}" autocomplete="off" enctype="multipart/form-data">
     {% else %}
-      <form method='POST' action="{{ url_for('requests.financial_verification', request_id=request_id) }}" autocomplete="off">
+      <form method='POST' action="{{ url_for('requests.financial_verification', request_id=request.id) }}" autocomplete="off">
     {% endif %}
   {% endblock %}
 
@@ -52,7 +57,7 @@
 
     <div class="panel__heading">
       <h1>Financial Verification</h1>
-      <div class="subtitle" id="financial-verification"><h2>Order #{{ request_id }}</h2></div>
+      <div class="subtitle" id="financial-verification"><h2>Order #{{ request.id }}</h2></div>
     </div>
 
     <div class="panel__content">
diff --git a/templates/requests/index.html b/templates/requests/index.html
index dfee7184..2ef2fefa 100644
--- a/templates/requests/index.html
+++ b/templates/requests/index.html
@@ -45,12 +45,6 @@
 
 {% else %}
 
-  {% if pending_financial_verification %}
-
-    {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
-
-  {% endif %}
-
   {% if pending_ccpo_approval %}
 
     {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }}