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

Show FV alert on request review page

Browse Source
This commit is contained in:
richard-dds 2018-09-14 14:03:48 -04:00
parent 35a1ed5045
commit 96186e2d99
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
atst/routes/requests/requests_form.py
View File

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

17
templates/requests/details.html
View File

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

4
templates/requests/review_menu.html
View File

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