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 1/9] 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") }}

From 75344e2bf1f0410a3acdb7ee2ddba77ee24a5613 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 14 Sep 2018 11:17:29 -0400
Subject: [PATCH 2/9] Move "Approval pending" alert

---
 atst/routes/requests/requests_form.py | 1 +
 templates/requests/details.html       | 4 ++++
 templates/requests/index.html         | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py
index 80f76931..2fb4891a 100644
--- a/atst/routes/requests/requests_form.py
+++ b/atst/routes/requests/requests_form.py
@@ -143,6 +143,7 @@ def view_request_details(request_id=None):
         request_id=request.id,
         status=request.status_displayname,
         pending_review=request.is_pending_ccpo_action,
+        pending_ccpo_acceptance=request.is_pending_ccpo_acceptance,
         financial_verification=request.is_pending_financial_verification
         or request.is_pending_financial_verification_changes,
         financial_review=financial_review,
diff --git a/templates/requests/details.html b/templates/requests/details.html
index 07bd49a7..095f5cc6 100644
--- a/templates/requests/details.html
+++ b/templates/requests/details.html
@@ -9,6 +9,10 @@
     {% include 'requests/review_menu.html' %}
   {% endif %}
 
+  {% if pending_ccpo_acceptance %}
+    {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }}
+  {% endif %}
+
   {% 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>",
diff --git a/templates/requests/index.html b/templates/requests/index.html
index 2ef2fefa..06c56f00 100644
--- a/templates/requests/index.html
+++ b/templates/requests/index.html
@@ -45,9 +45,9 @@
 
 {% else %}
 
-  {% if pending_ccpo_approval %}
+  {% if pending_financial_verification %}
 
-    {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }}
+    {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
 
   {% endif %}
 

From 812da9fe5b2e29588cde20df28bb08256551b47d Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 14 Sep 2018 11:38:28 -0400
Subject: [PATCH 3/9] Remove financial verification alert from index

---
 templates/requests/index.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/templates/requests/index.html b/templates/requests/index.html
index 06c56f00..9411776d 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 extended_view %}
     <div class="row kpi">
       <div class="kpi__item col col--grow">

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 4/9] 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 %}

From 8355446965ee0449063aaea3201d565a7c676782 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 14 Sep 2018 13:32:50 -0400
Subject: [PATCH 5/9] Move pending CCPO approval status to request

---
 atst/routes/requests/requests_form.py                      | 1 +
 ...roval_alert.html => pending_ccpo_acceptance_alert.html} | 0
 templates/requests/details.html                            | 7 ++++++-
 3 files changed, 7 insertions(+), 1 deletion(-)
 rename templates/fragments/{pending_ccpo_approval_alert.html => pending_ccpo_acceptance_alert.html} (100%)

diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py
index 2fb4891a..221069c6 100644
--- a/atst/routes/requests/requests_form.py
+++ b/atst/routes/requests/requests_form.py
@@ -144,6 +144,7 @@ def view_request_details(request_id=None):
         status=request.status_displayname,
         pending_review=request.is_pending_ccpo_action,
         pending_ccpo_acceptance=request.is_pending_ccpo_acceptance,
+        pending_ccpo_approval=request.is_pending_ccpo_approval,
         financial_verification=request.is_pending_financial_verification
         or request.is_pending_financial_verification_changes,
         financial_review=financial_review,
diff --git a/templates/fragments/pending_ccpo_approval_alert.html b/templates/fragments/pending_ccpo_acceptance_alert.html
similarity index 100%
rename from templates/fragments/pending_ccpo_approval_alert.html
rename to templates/fragments/pending_ccpo_acceptance_alert.html
diff --git a/templates/requests/details.html b/templates/requests/details.html
index 095f5cc6..2b56398d 100644
--- a/templates/requests/details.html
+++ b/templates/requests/details.html
@@ -10,7 +10,12 @@
   {% endif %}
 
   {% if pending_ccpo_acceptance %}
-    {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }}
+    {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_acceptance_alert.html") }}
+  {% elif pending_ccpo_approval %}
+    {% call Alert('Pending CCPO Approval') %}
+      <p>The CCPO will review and respond to your Financial Verification submission in 3 business days. You will be notified via email or phone.</p>
+      <p>Once the financial verification is approved you will be invited to create your JEDI Workspace and set-up your projects. Click here for more details.</p>
+    {% endcall %}
   {% endif %}
 
   {% if pending_review %}

From 1c19d44c9bc6dceeefd78bd9fb0a3e00247c038e Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 14 Sep 2018 13:48:29 -0400
Subject: [PATCH 6/9] Remove "pending review" alert

---
 atst/routes/requests/requests_form.py | 1 -
 templates/requests/details.html       | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py
index 221069c6..79a1535d 100644
--- a/atst/routes/requests/requests_form.py
+++ b/atst/routes/requests/requests_form.py
@@ -142,7 +142,6 @@ def view_request_details(request_id=None):
         data=data,
         request_id=request.id,
         status=request.status_displayname,
-        pending_review=request.is_pending_ccpo_action,
         pending_ccpo_acceptance=request.is_pending_ccpo_acceptance,
         pending_ccpo_approval=request.is_pending_ccpo_approval,
         financial_verification=request.is_pending_financial_verification
diff --git a/templates/requests/details.html b/templates/requests/details.html
index 2b56398d..3b18d8c9 100644
--- a/templates/requests/details.html
+++ b/templates/requests/details.html
@@ -18,13 +18,6 @@
     {% endcall %}
   {% endif %}
 
-  {% 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">
       <h1>Request Details</h1><br/>

From 35a1ed5045a7e9f1ae9a4a86c6c0ea104c1ee69a Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 14 Sep 2018 13:48:45 -0400
Subject: [PATCH 7/9] Swap position of FV menu and alert

---
 templates/requests/financial_verification.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html
index 06de0770..1ef6b31f 100644
--- a/templates/requests/financial_verification.html
+++ b/templates/requests/financial_verification.html
@@ -6,17 +6,15 @@
 
 {% 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.",

From 96186e2d99d48512a233730d0f84acd44b344863 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Fri, 14 Sep 2018 14:03:48 -0400
Subject: [PATCH 8/9] Show FV alert on request review page

---
 atst/routes/requests/requests_form.py | 13 ++++++-------
 templates/requests/details.html       | 17 +++++++++++------
 templates/requests/review_menu.html   |  4 ++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py
index 79a1535d..8e14b0e2 100644
--- a/atst/routes/requests/requests_form.py
+++ b/atst/routes/requests/requests_form.py
@@ -132,6 +132,10 @@ def view_request_details(request_id=None):
         or request.is_approved
         or request.is_pending_financial_verification_changes
     )
+    requires_fv_action = (
+        request.is_pending_financial_verification
+        or request.is_pending_financial_verification_changes
+    )
 
     data = request.body
     if financial_review and request.task_order:
@@ -140,11 +144,6 @@ def view_request_details(request_id=None):
     return render_template(
         "requests/details.html",
         data=data,
-        request_id=request.id,
-        status=request.status_displayname,
-        pending_ccpo_acceptance=request.is_pending_ccpo_acceptance,
-        pending_ccpo_approval=request.is_pending_ccpo_approval,
-        financial_verification=request.is_pending_financial_verification
-        or request.is_pending_financial_verification_changes,
-        financial_review=financial_review,
+        request=request,
+        requires_fv_action=requires_fv_action,
     )
diff --git a/templates/requests/details.html b/templates/requests/details.html
index 3b18d8c9..89bdd105 100644
--- a/templates/requests/details.html
+++ b/templates/requests/details.html
@@ -5,23 +5,28 @@
 {% block content %}
 <div class="col">
 
-  {% if financial_verification %}
-    {% include 'requests/review_menu.html' %}
-  {% endif %}
+  {% if request.is_pending_ccpo_acceptance %}
 
-  {% if pending_ccpo_acceptance %}
     {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_acceptance_alert.html") }}
-  {% elif pending_ccpo_approval %}
+
+  {% elif request.is_pending_ccpo_approval %}
+
     {% call Alert('Pending CCPO Approval') %}
       <p>The CCPO will review and respond to your Financial Verification submission in 3 business days. You will be notified via email or phone.</p>
       <p>Once the financial verification is approved you will be invited to create your JEDI Workspace and set-up your projects. Click here for more details.</p>
     {% endcall %}
+
+  {% elif requires_fv_action %}
+
+    {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
+    {% include 'requests/review_menu.html' %}
+
   {% endif %}
 
   <div class="panel">
     <div class="panel__heading">
       <h1>Request Details</h1><br/>
-      <h2>#{{ request_id }} <span class="label label--info">{{ status }}</span></h2>
+      <h2>#{{ request.id }} <span class="label label--info">{{ request.status_displayname }}</span></h2>
     </div>
 
     <div class="panel__content">
diff --git a/templates/requests/review_menu.html b/templates/requests/review_menu.html
index b8546233..f6f36aa0 100644
--- a/templates/requests/review_menu.html
+++ b/templates/requests/review_menu.html
@@ -1,5 +1,5 @@
-{% 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) %}
+{% 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">

From a3e7310e07a3fdfdf72a2f4eee672ce1eea8c7b1 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Mon, 17 Sep 2018 11:35:03 -0400
Subject: [PATCH 9/9] Move alerts below nav menu

---
 templates/requests/financial_verification.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html
index 1ef6b31f..25a1c0b9 100644
--- a/templates/requests/financial_verification.html
+++ b/templates/requests/financial_verification.html
@@ -6,12 +6,12 @@
 
 {% block content %}
 
+{% include 'requests/review_menu.html' %}
+
 {% 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">