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

Merge branch 'master' into ui/review-and-submit

Browse Source
This commit is contained in:
andrewdds
2018-08-20 13:02:47 -04:00
committed by GitHub
parent 66295a1e5d a574734a8b
commit ef0dc75107
6 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/requests/screen-4.html
View File

@@ -38,7 +38,7 @@
<p>Before you can submit your request, please take a moment to review the information entered in the form. You may make changes by clicking the edit link on each section. When all information looks right, go ahead and submit.</p>
{% if f.errors or not can_submit%}
{% if f.errors or not can_submit %}
{{ Alert('Please complete all sections',
message="<p>In order to submit your JEDI Cloud request, you'll need to complete all required sections of this form without error. Missing or invalid fields are noted below.</p>",
level='error'
@@ -160,17 +160,7 @@
</dd>
</div>
{% if (data['details_of_use']['estimated_monthly_spend'] and ((data['details_of_use']['estimated_monthly_spend'] * 12) > 1000000)) %}
<div>
<dt>Total Spend</dt>
<dd>
{% if data['details_of_use']['dollar_value'] %}
{{ data['details_of_use']['dollar_value'] | dollars }}
{% else %}
{{ RequiredLabel() }}
{% endif %}
</dd>
</div>
{% if jedi_request and jedi_request.annual_spend > 1000000 %}
<div>
<dt>Number of User Sessions</dt>
@@ -205,6 +195,17 @@
</dd>
</div>
{% endif %}
<div>
<dt>Total Spend</dt>
<dd>
{% if data['details_of_use']['dollar_value'] %}
{{ data['details_of_use']['dollar_value'] | dollars }}
{% else %}
{{ RequiredLabel() }}
{% endif %}
</dd>
</div>
<div>
<dt>Start Date</dt>