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

Fix extended FV form

Browse Source
This commit is contained in:
richard-dds 2018-09-14 13:22:57 -04:00
parent 812da9fe5b
commit 7b2f897c9d
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ def update_financial_verification(request_id):
existing_request = Requests.get(g.current_user, request_id) existing_request = Requests.get(g.current_user, request_id)
form = financial_form(existing_request, post_data) form = financial_form(existing_request, post_data)
rerender_args = dict( 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(): if form.validate():

20
templates/requests/financial_verification.html
View File

@ -6,16 +6,17 @@
{% block content %} {% block content %}
{% if request.is_pending_financial_verification %}
{{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
{% endif %}
{% include 'requests/review_menu.html' %} {% include 'requests/review_menu.html' %}
<financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'> <financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'>
<div class="col"> <div class="col">
{% if request.is_pending_financial_verification %}
{{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
{% endif %}
{% if extended %} {% if extended %}
{{ Alert('Task Order not found in EDA', {{ 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.", 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 %} {% 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', {% call Alert('Task Order not found in EDA', level='warning') %}
message="We could not find your Task Order in our system of record, EDA. We could not find your Task Order in our system of record, EDA. Please confirm that you have entered it correctly.<br>
Please confirm that you have entered it correctly.<br> <a class="usa-button" href="{{ extended_url }}">Enter Task Order information manually</a>
<a class=\"usa-button\" href=\"%s\">Enter Task Order information manually</a> {% endcall %}
"|format(extended_url),
level='warning'
) }}
{% endif %} {% endif %}
{% block form_action %} {% block form_action %}