From 7b2f897c9d0235fc33a77e1a2846ee6de3244a1e Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 14 Sep 2018 13:22:57 -0400
Subject: [PATCH] Fix extended FV form

---
 .../routes/requests/financial_verification.py |  2 +-
 .../requests/financial_verification.html      | 20 +++++++++----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py
index 1aaf75e2..0be12e7b 100644
--- a/atst/routes/requests/financial_verification.py
+++ b/atst/routes/requests/financial_verification.py
@@ -49,7 +49,7 @@ def update_financial_verification(request_id):
     existing_request = Requests.get(g.current_user, request_id)
     form = financial_form(existing_request, post_data)
     rerender_args = dict(
-        request_id=request_id, f=form, extended=is_extended(existing_request)
+        request=existing_request, f=form, extended=is_extended(existing_request)
     )
 
     if form.validate():
diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html
index 2e03fa80..06de0770 100644
--- a/templates/requests/financial_verification.html
+++ b/templates/requests/financial_verification.html
@@ -6,16 +6,17 @@
 
 {% 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 }}'>
 <div class="col">
 
+  {% if request.is_pending_financial_verification %}
+    {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
+  {% endif %}
+
+
   {% if extended %}
     {{ Alert('Task Order not found in EDA',
       message="Since the Task Order (TO) number was not found in our system of record, EDA, please populate the additional fields in the form below.",
@@ -25,13 +26,10 @@
 
   {% if f.is_missing_task_order_number %}
     {% 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>
-                 <a class=\"usa-button\" href=\"%s\">Enter Task Order information manually</a>
-                "|format(extended_url),
-        level='warning'
-    ) }}
+    {% call Alert('Task Order not found in EDA', level='warning') %}
+        We could not find your Task Order in our system of record, EDA. Please confirm that you have entered it correctly.<br>
+        <a class="usa-button" href="{{ extended_url }}">Enter Task Order information manually</a>
+    {% endcall %}
   {% endif %}
 
   {% block form_action %}