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

Update modal content for approval/acceptance

Browse Source
This commit is contained in:
Patrick Smith 2018-09-27 17:51:32 -04:00
parent becfbed10a
commit 7d7afebede
6 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,9 +71,7 @@ def update_financial_verification(request_id):
) )
else: else:
return redirect( return redirect(
url_for( url_for("requests.requests_index", modal="pendingCCPOApproval")
"requests.requests_index", modal="pendingFinancialVerification"
)
) )
else: else:

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

@ -121,7 +121,7 @@ def requests_submit(request_id=None):
if request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION: if request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION:
modal = "pendingFinancialVerification" modal = "pendingFinancialVerification"
else: else:
modal = "pendingCCPOApproval" modal = "pendingCCPOAcceptance"
return redirect(url_for("requests.requests_index", modal=modal)) return redirect(url_for("requests.requests_index", modal=modal))

4
templates/fragments/pending_ccpo_acceptance_alert.html
View File

@ -1,11 +1,11 @@
{% from "components/icon.html" import Icon %} {% from "components/icon.html" import Icon %}
<p> <p>
We will review and respond to your request in 3 business days. You’ll be notified via email or phone. The CCPO will review and respond to your request in 3 business days. You’ll be notified via email or phone. Please note if your request is for over $1M of JEDI cloud resources it will require a manual review by the CCPO.
</p> </p>
<p> <p>
While your request is being reviewed, your next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step. While your request is being reviewed, your next step is to create a Task Order (TO) associated with the JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step.
</p> </p>
<div class='alert__actions'> <div class='alert__actions'>

36
templates/fragments/pending_ccpo_approval_modal.html
View File

@ -1,40 +1,8 @@
{% from "components/icon.html" import Icon %}
<h1>
Request submitted. Approval pending.
</h1>
<p> <p>
We will review and respond to your request in 3 business days. You’ll be notified via email or phone. 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>
<p>
Your request is being reviewed because:
<ul>
<li>
Your request includes over $1 million for cloud resources
</li>
<li>
We may need more information about your request
</li>
</ul>
</p>
<h2>
Next Steps
</h2>
<p> <p>
While your request is being reviewed, your next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step. 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> </p>
<p>
Once the Task Order has been created, you will be asked to provide details about the task order in the Financial Verification step.
</p>
<div class='alert__actions'>
<a href='/help' class='icon-link'>
{{ Icon('help') }}
Learn more about the JEDI Cloud Task Order and the Financial Verification process.
</a>
</div>

9
templates/requests/details.html
View File

@ -8,17 +8,10 @@
{% if request.is_pending_ccpo_acceptance %} {% if request.is_pending_ccpo_acceptance %}
{{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_acceptance_alert.html") }} {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_acceptance_alert.html") }}
{% elif request.is_pending_ccpo_approval %} {% elif request.is_pending_ccpo_approval %}
{{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_modal.html") }}
{% 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 %} {% elif requires_fv_action %}
{% include 'requests/review_menu.html' %} {% include 'requests/review_menu.html' %}
{{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }} {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
{% endif %} {% endif %}
<div class="panel"> <div class="panel">

2
tests/routes/test_request_submit.py
View File

@ -21,7 +21,7 @@ def test_submit_reviewed_request(monkeypatch, client, user_session):
follow_redirects=False, follow_redirects=False,
) )
assert "/requests" in response.headers["Location"] assert "/requests" in response.headers["Location"]
assert "modal=pendingCCPOApproval" in response.headers["Location"] assert "modal=pendingCCPOAcceptance" in response.headers["Location"]
def test_submit_autoapproved_reviewed_request(monkeypatch, client, user_session): def test_submit_autoapproved_reviewed_request(monkeypatch, client, user_session):