pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move "pending financial verification" alert

Browse Source
This commit is contained in:
richard-dds 2018-09-14 10:43:42 -04:00
parent bd0cf00a40
commit 6cd627f820
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/routes/requests/financial_verification.py
View File

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

13
templates/requests/financial_verification.html
View File

@ -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">

6
templates/requests/index.html
View File

@ -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") }}