Merge pull request #535 from dod-ccpo/update-to-form-per-design-#163066434
Update to form per design - Part 1 of 2
This commit is contained in:
leigh-mil
GitHub
@@ -6,6 +6,7 @@
|
||||
label=field.label | striptags,
|
||||
description=field.description,
|
||||
tooltip='',
|
||||
tooltip_title='Help',
|
||||
placeholder='',
|
||||
validation='anything',
|
||||
paragraph=False,
|
||||
@@ -30,7 +31,7 @@
|
||||
<label for={{field.name}}>
|
||||
<div class="usa-input__title">
|
||||
{{ label }}
|
||||
{% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}
|
||||
{% if tooltip %}{{ Tooltip(tooltip, tooltip_title) }}{% endif %}
|
||||
</div>
|
||||
|
||||
{% if field.description %}
|
||||
@@ -69,6 +70,7 @@
|
||||
type='text'
|
||||
{% if disabled %}
|
||||
disabled="disabled"
|
||||
readonly="readonly"
|
||||
{% endif %}
|
||||
ref='input'
|
||||
placeholder='{{ placeholder }}'>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% from "components/text_input.html" import TextInput %}
|
||||
|
||||
{% macro UserInfo(first_name, last_name, email, dod_id) -%}
|
||||
{% macro UserInfo(first_name, last_name, email, phone) -%}
|
||||
<div class='form-row'>
|
||||
<div class='form-col form-col--half'>
|
||||
{{ TextInput(first_name) }}
|
||||
@@ -17,7 +17,7 @@
|
||||
</div>
|
||||
|
||||
<div class='form-col form-col--half'>
|
||||
{{ TextInput(dod_id, placeholder='1234567890', validation='dodId') }}
|
||||
{{ TextInput(phone, placeholder='(123) 456-7890', validation='usPhone') }}
|
||||
</div>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
|
||||
<div class='action-group'>
|
||||
<input type='submit' class='usa-button usa-button-primary' value='Save & Continue' />
|
||||
<input class='usa-button usa-button-secondary' value='Save Draft' />
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -6,43 +6,34 @@
|
||||
{% from "components/multi_checkbox_input.html" import MultiCheckboxInput %}
|
||||
|
||||
{% block heading %}
|
||||
What You're Building
|
||||
{{ "task_orders.new.app_info.section_title"| translate }}
|
||||
{% endblock %}
|
||||
|
||||
{% block form %}
|
||||
|
||||
<h3>Basic Information</h3>
|
||||
<!-- App Info Section -->
|
||||
<h3>{{ "task_orders.new.app_info.basic_info_title"| translate }}</h3>
|
||||
{{ TextInput(form.portfolio_name, placeholder="The name of your office or organization") }}
|
||||
{{ TextInput(form.scope, paragraph=True) }}
|
||||
<p>
|
||||
<i>
|
||||
Not sure how to describe your scope? <a href="#">Read some Sample Scopes</a> to
|
||||
get an idea of what is appropriate.
|
||||
</i>
|
||||
</p>
|
||||
<p><i>{{ "task_orders.new.app_info.sample_scope" | translate | safe }}</i></p>
|
||||
{{ OptionsInput(form.defense_component) }}
|
||||
|
||||
<hr>
|
||||
|
||||
<h3>About Your Project</h3>
|
||||
<h3>{{ "task_orders.new.app_info.project_title" | translate }}</h3>
|
||||
{{ OptionsInput(form.app_migration) }}
|
||||
{{ OptionsInput(form.native_apps) }}
|
||||
{{ MultiCheckboxInput(form.complexity, form.complexity_other) }}
|
||||
|
||||
<hr>
|
||||
|
||||
<h3>About Your Team</h3>
|
||||
<h3>{{ "task_orders.new.app_info.team_title" | translate }}</h3>
|
||||
{{ MultiCheckboxInput(form.dev_team, form.dev_team_other) }}
|
||||
{{ OptionsInput(form.team_experience) }}
|
||||
|
||||
<hr>
|
||||
|
||||
<h3>Market Research</h3>
|
||||
<p>
|
||||
The JEDI Cloud Computing Program Office (CCPO) has completed the market
|
||||
research requirement for all related task orders. The Department of Defense CIO
|
||||
has approved this research. <a href="#">View JEDI Cloud Market Research</a>
|
||||
</p>
|
||||
|
||||
<h3>{{ "task_orders.new.app_info.market_research_title" | translate }}</h3>
|
||||
<p>{{ "task_orders.new.app_info.market_research_paragraph" | translate | safe }}</p>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -4,76 +4,51 @@
|
||||
{% from "components/options_input.html" import OptionsInput %}
|
||||
{% from "components/date_input.html" import DateInput %}
|
||||
|
||||
{% from "components/icon.html" import Icon %}
|
||||
|
||||
{% block heading %}
|
||||
Funding
|
||||
{{ "task_orders.new.funding.section_title" | translate }}
|
||||
{% endblock %}
|
||||
|
||||
{% block form %}
|
||||
|
||||
<funding inline-template v-bind:initial-data='{{ form.data|tojson }}'>
|
||||
<div>
|
||||
<!-- Get Funding Section -->
|
||||
<h3>Period of Performance</h3>
|
||||
<div>
|
||||
<!-- Get Funding Section -->
|
||||
<h3>{{ "task_orders.new.funding.performance_period_title" | translate }}</h3>
|
||||
<p>{{ "task_orders.new.funding.performance_period_description" | translate }}</p>
|
||||
<p>{{ "task_orders.new.funding.performance_period_paragraph" | translate }}</p>
|
||||
{{ OptionsInput(form.performance_length) }}
|
||||
|
||||
<p>Choose the dates your task order will cover.</p>
|
||||
<hr>
|
||||
|
||||
<p>
|
||||
Because your funds will be lost if you don’t use them, we strongly recommend
|
||||
submitting small, short-duration task orders, usually a three month period.
|
||||
We’ll notify you when your period of performance is nearing the end so you can
|
||||
request your next set of funds with a new task order.
|
||||
</p>
|
||||
<h3>{{ "task_orders.new.funding.estimate_usage_title" | translate }}</h3>
|
||||
<p>{{ "task_orders.new.funding.estimate_usage_description" | translate }}</p>
|
||||
<p><a class="icon-link" href="{{ url_for('atst.jedi_csp_calculator') }}">
|
||||
{{ Icon("link")}} Cloud Service Provider's estimate calculator
|
||||
</a></p>
|
||||
<p>{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}</p>
|
||||
<div class="usa-input">
|
||||
{{ form.pdf.label }}
|
||||
{{ form.pdf.description }}
|
||||
<input type="file" disabled="disabled" />
|
||||
</div>
|
||||
|
||||
{{ DateInput(form.start_date, placeholder='MM / DD / YYYY', validation='date') }}
|
||||
{{ DateInput(form.end_date, placeholder='MM / DD / YYYY', validation='date') }}
|
||||
<hr>
|
||||
|
||||
<hr>
|
||||
<h3>Cloud Usage Estimate</h3>
|
||||
<h3>{{ "task_orders.new.funding.cloud_calculations_title" | translate }}</h3>
|
||||
<p>{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}</p>
|
||||
|
||||
<p>
|
||||
Calculate how much your cloud usage will cost. A technical representative
|
||||
should help you complete this calculation.
|
||||
<a href="{{ url_for('atst.jedi_csp_calculator') }}">
|
||||
Cloud Service Provider's estimate calculator
|
||||
</a>
|
||||
</p>
|
||||
<h4>Upload a copy of your CSP Cost Estimate Research</h4>
|
||||
<h4>{{ "task_orders.new.funding.cloud_offerings_title" | translate }}</h4>
|
||||
<p>{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}</p>
|
||||
{{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }}
|
||||
{{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }}
|
||||
|
||||
<p>
|
||||
Upload your anticipated cloud usage from the CSP tool linked above. PDFs and
|
||||
screengrabs of the tool are sufficient.
|
||||
</p>
|
||||
<p>
|
||||
This is only an estimation tool to help you make and informed evaluation of
|
||||
what you expect to use. While you're tied to the dollar amount you specify in
|
||||
your task order, you're not obligated by the resources you indicate in the
|
||||
calculator.
|
||||
</p>
|
||||
<input type="file">
|
||||
|
||||
<hr>
|
||||
<h3>Cloud Usage Calculations</h3>
|
||||
<p>
|
||||
Enter the results of your cloud usage calculations. These will correspond with
|
||||
your task order's period of performance.
|
||||
</p>
|
||||
<h4>Cloud Offerings</h4>
|
||||
<p>
|
||||
Infrastructure as a Service (IaaS) and Platform as a Service (PaaS) offerings
|
||||
</p>
|
||||
|
||||
{{ TextInput(form.clin_01, validation='dollars') }}
|
||||
{{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }}
|
||||
|
||||
<h4>Cloud Support and Assistance</h4>
|
||||
<p>
|
||||
Technical guidance from the cloud service provider, including architecture,
|
||||
configuration of IaaS and PaaS, integration, troubleshooting assistance, and
|
||||
other services.
|
||||
</p>
|
||||
{{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.') }}
|
||||
{{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', disabled=(not config.CLASSIFIED)) }}
|
||||
</div>
|
||||
<h4>{{ "task_orders.new.funding.support_assistance_title" | translate }}</h4>
|
||||
<p>{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}</p>
|
||||
{{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }}
|
||||
{{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', disabled=(not config.CLASSIFIED)) }}
|
||||
</div>
|
||||
</funding>
|
||||
|
||||
{% endblock %}
|
||||
@@ -81,13 +56,10 @@
|
||||
{% block next %}
|
||||
<div class="row">
|
||||
<div class="col col--grow">
|
||||
<p>Total Task Order Value:<br><span id="to-target"></span></p>
|
||||
<p>{{ "task_orders.new.funding.total" | translate }}<br><span id="to-target"></span></p>
|
||||
</div>
|
||||
<div class="col col--grow">
|
||||
{{ super() }}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -2,24 +2,43 @@
|
||||
|
||||
{% from "components/user_info.html" import UserInfo %}
|
||||
{% from "components/checkbox_input.html" import CheckboxInput %}
|
||||
{% from "components/text_input.html" import TextInput %}
|
||||
|
||||
{% block heading %}
|
||||
Oversight
|
||||
{{ "task_orders.new.oversight.section_title" | translate }}
|
||||
{% endblock %}
|
||||
|
||||
{% block form %}
|
||||
|
||||
<!-- Oversight Section -->
|
||||
<h3>Contracting Officer (KO) Information</h3>
|
||||
{{ UserInfo(form.ko_first_name, form.ko_last_name, form.ko_email, form.ko_dod_id) }}
|
||||
<h3>{{ "task_orders.new.oversight.ko_info_title" | translate }}</h3>
|
||||
<p>{{ "task_orders.new.oversight.ko_info_paragraph" | translate }}</p>
|
||||
{{ UserInfo(form.ko_first_name, form.ko_last_name, form.ko_email, form.ko_phone_number) }}
|
||||
{{ CheckboxInput(form.ko_invite) }}
|
||||
{{ TextInput(form.ko_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}}
|
||||
|
||||
<h3>Contractive Officer Representative (COR) Information</h3>
|
||||
{{ UserInfo(form.cor_first_name, form.cor_last_name, form.cor_email, form.cor_dod_id) }}
|
||||
<hr />
|
||||
|
||||
<h3>{{ "task_orders.new.oversight.cor_info_title" | translate }}</h3>
|
||||
<p>{{ "task_orders.new.oversight.cor_info_paragraph" | translate }}</p>
|
||||
<div class='usa-input'>
|
||||
<fieldset class="usa-input__choices">
|
||||
<legend>
|
||||
<input type="checkbox" name="am_cor" id="am_cor" value="y" />
|
||||
<label for="am_cor">{{ "task_orders.new.oversight.am_cor_label" | translate }}</label>
|
||||
</legend>
|
||||
</fieldset>
|
||||
</div>
|
||||
{{ UserInfo(form.cor_first_name, form.cor_last_name, form.cor_email, form.cor_phone_number) }}
|
||||
{{ CheckboxInput(form.cor_invite) }}
|
||||
{{ TextInput(form.cor_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}}
|
||||
|
||||
<h3>Security Officer Information</h3>
|
||||
{{ UserInfo(form.so_first_name, form.so_last_name, form.so_email, form.so_dod_id) }}
|
||||
<hr />
|
||||
|
||||
<h3>{{ "task_orders.new.oversight.so_info_title" | translate }}</h3>
|
||||
<p>{{ "task_orders.new.oversight.so_info_paragraph" | translate }}</p>
|
||||
{{ UserInfo(form.so_first_name, form.so_last_name, form.so_email, form.so_phone_number) }}
|
||||
{{ CheckboxInput(form.so_invite) }}
|
||||
{{ TextInput(form.so_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<div class="row">
|
||||
<div class="col col--grow">
|
||||
<h3>Period of Performance length {{ TOEditLink(screen=2) }}</h3>
|
||||
{{ task_order.period or RequiredLabel() }}
|
||||
{{ task_order.performance_length or RequiredLabel() }}
|
||||
</div>
|
||||
|
||||
<div class="col col--grow">
|
||||
|
||||
Reference in New Issue
Block a user