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

Move request notifications
This commit is contained in:
richard-dds 2018-09-17 12:05:36 -04:00 committed by GitHub
commit 6facf746e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 38 additions and 42 deletions

View File

@ -38,7 +38,7 @@ def financial_verification(request_id=None):
return render_template( return render_template(
"requests/financial_verification.html", "requests/financial_verification.html",
f=form, f=form,
request_id=request_id, request=request,
extended=is_extended(request), extended=is_extended(request),
) )
@ -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():

View File

@ -132,6 +132,10 @@ def view_request_details(request_id=None):
or request.is_approved or request.is_approved
or request.is_pending_financial_verification_changes 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 data = request.body
if financial_review and request.task_order: if financial_review and request.task_order:
@ -140,10 +144,6 @@ def view_request_details(request_id=None):
return render_template( return render_template(
"requests/details.html", "requests/details.html",
data=data, data=data,
request_id=request.id, request=request,
status=request.status_displayname, requires_fv_action=requires_fv_action,
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,
) )

View File

@ -5,21 +5,28 @@
{% block content %} {% block content %}
<div class="col"> <div class="col">
{% if financial_verification %} {% if request.is_pending_ccpo_acceptance %}
{% include 'requests/review_menu.html' %}
{% endif %} {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_acceptance_alert.html") }}
{% 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' %}
{% 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 %} {% endif %}
<div class="panel"> <div class="panel">
<div class="panel__heading"> <div class="panel__heading">
<h1>Request Details</h1><br/> <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>
<div class="panel__content"> <div class="panel__content">

View File

@ -8,6 +8,10 @@
{% include 'requests/review_menu.html' %} {% include 'requests/review_menu.html' %}
{% if request.is_pending_financial_verification %}
{{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
{% endif %}
<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">
@ -19,21 +23,18 @@
{% endif %} {% endif %}
{% 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 %}
{% if extended %} {% 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 %} {% 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 %} {% endif %}
{% endblock %} {% endblock %}
@ -52,7 +53,7 @@
<div class="panel__heading"> <div class="panel__heading">
<h1>Financial Verification</h1> <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>
<div class="panel__content"> <div class="panel__content">

View File

@ -45,18 +45,6 @@
{% else %} {% 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") }}
{% endif %}
{% if extended_view %} {% if extended_view %}
<div class="row kpi"> <div class="row kpi">
<div class="kpi__item col col--grow"> <div class="kpi__item col col--grow">

View File

@ -1,5 +1,5 @@
{% set pending_url=url_for('requests.view_request_details', 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) %} {% set financial_url=url_for('requests.financial_verification', request_id=request.id) %}
<div class="progress-menu progress-menu--four"> <div class="progress-menu progress-menu--four">
<ul> <ul>
<li class="progress-menu__item progress-menu__item--complete"> <li class="progress-menu__item progress-menu__item--complete">