Merge pull request #289 from dod-ccpo/move-request-notifications

Move request notifications

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),
     )
 
@@ -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():

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,10 +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_review=request.is_pending_ccpo_action,
-        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,
     )