Update request form (#45)
* Implement OrganizationInfo form, add it to the template * Format request_new * Update "Details of Use" section * Refactor request_new * Added some new fields, but form is still WIP * Add details of use fields * Add org info fields * Add some comments * Add Financial Verification and more Details of Use fields * Update some textarea fields to single text field * WIP * Implement OrganizationInfo form, add it to the template * Format request_new * Update "Details of Use" section * Refactor request_new * Added some new fields, but form is still WIP * Add details of use fields * Add org info fields * Add some comments * Add Financial Verification and more Details of Use fields * Update some textarea fields to single text field * Format * Update fields with the correct fieldtypes * Begin updating sidenav changes * Split form into each section * adjust and skip some outdated form validation tests * break request form into multiple form objects * need to send user ID to requests-queue * use DateForm for start date in request * alter request_new handler to pass raw form data to template * change review form * Add KO and COR section titles * Update date input class name * Add a special case for the summary form. We should refactor this * Add read-only fields for review and submit section * Add minimum number validators to request form * Fix formatting * Use html5 datepicker for dates * Fix request form validators * Finish org info form * Finish POC form * Finish financial verification form * Move PE and UII to financial form * Un-skip form validation test
This commit is contained in:
luisgov
richard-dds
@@ -1,202 +1,176 @@
|
||||
{% extends '../requests_new.html.to' %}
|
||||
|
||||
{% block form %}
|
||||
<h2>Review & Submit</h2>
|
||||
<p class="usa-font-lead">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Beatae placeat maiores illo totam consequuntur ipsum quo animi earum voluptatem, velit minus, perferendis aperiam, tenetur alias nemo ratione accusantium, ullam at!</p>
|
||||
|
||||
|
||||
<h3>1. Details of Use <a href="" class="usa-button usa-button-secondary">Edit</a></h3>
|
||||
|
||||
|
||||
<h4>Applications & Environments (2)</h4>
|
||||
<table class="usa-table-borderless" width="100%">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Application Name</th>
|
||||
<th scope="col">Total Users</th>
|
||||
<th scope="col">Estimated Cost</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td><a href="#app-code-mil">Code.mil</a></td>
|
||||
<td>235</td>
|
||||
<td>$1,000,000,000</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><a href="#app-digital-dojo">Digital Dojo</a></td>
|
||||
<td>1,337</td>
|
||||
<td>$10,000</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<h5 id="app-code-mil">Code.mil</h5>
|
||||
|
||||
<h6>Application Details</h6>
|
||||
<label>Application description</label>
|
||||
<span>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolore tempora provident labore, deleniti facilis dolorum impedit repellat, et, quisquam modi eos libero nulla ut excepturi omnis. At magnam assumenda vero.</span>
|
||||
|
||||
<label>Estimated dollar value of use</label>
|
||||
<span>$1,000,000,000</span>
|
||||
|
||||
<label>How did you arrive at this estimate?</label>
|
||||
<span>CSP Calculator</span>
|
||||
|
||||
<label>Expected start date</label>
|
||||
<span>2020-03-02</span>
|
||||
|
||||
<label>Desired period of performance</label>
|
||||
<span>Lots of it</span>
|
||||
|
||||
<label>Classification level</label>
|
||||
<span>Secret</span>
|
||||
|
||||
<label>Primary service branch usage</label>
|
||||
<span>Army</span>
|
||||
|
||||
<label>Cloud model service</label>
|
||||
<span>IaaS and PaaS</span>
|
||||
|
||||
<h6>Computation</h6>
|
||||
<label>Number of cores</label>
|
||||
<span>32</span>
|
||||
|
||||
<label>Total RAM</label>
|
||||
<span>128GB</span>
|
||||
|
||||
<h6>Storage</h6>
|
||||
<label>Object storage</label>
|
||||
<span>10TB</span>
|
||||
|
||||
<label>Server storage</label>
|
||||
<span>100TB</span>
|
||||
|
||||
<h6>Estimated Application Storage</h6>
|
||||
<label>Expected active users</label>
|
||||
<span>300</span>
|
||||
|
||||
<label>Expected peak concurrent users</label>
|
||||
<span>1,000</span>
|
||||
|
||||
<label>Expected requests per minute</label>
|
||||
<span>1,000</span>
|
||||
|
||||
<label>Number of application environments</label>
|
||||
<span>3</span>
|
||||
|
||||
|
||||
<h5 id="app-digital-dojo">Digital Dojo</h5>
|
||||
|
||||
<h6>Application Details</h6>
|
||||
<label>Application description</label>
|
||||
<span>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolore tempora provident labore, deleniti facilis dolorum impedit repellat, et, quisquam modi eos libero nulla ut excepturi omnis. At magnam assumenda vero.</span>
|
||||
|
||||
<label>Estimated dollar value of use</label>
|
||||
<span>$10,000</span>
|
||||
|
||||
<label>How did you arrive at this estimate?</label>
|
||||
<span>CSP Calculator</span>
|
||||
|
||||
<label>Expected start date</label>
|
||||
<span>2020-03-02</span>
|
||||
|
||||
<label>Desired period of performance</label>
|
||||
<span>Lots of it</span>
|
||||
|
||||
<label>Classification level</label>
|
||||
<span>Secret</span>
|
||||
|
||||
<label>Primary service branch usage</label>
|
||||
<span>Army</span>
|
||||
|
||||
<label>Cloud model service</label>
|
||||
<span>IaaS and PaaS</span>
|
||||
|
||||
<h6>Computation</h6>
|
||||
<label>Number of cores</label>
|
||||
<span>32</span>
|
||||
|
||||
<label>Total RAM</label>
|
||||
<span>128GB</span>
|
||||
|
||||
<h6>Storage</h6>
|
||||
<label>Object storage</label>
|
||||
<span>10TB</span>
|
||||
|
||||
<label>Server storage</label>
|
||||
<span>100TB</span>
|
||||
|
||||
<h6>Estimated Application Storage</h6>
|
||||
<label>Expected active users</label>
|
||||
<span>300</span>
|
||||
|
||||
<label>Expected peak concurrent users</label>
|
||||
<span>1,000</span>
|
||||
|
||||
<label>Expected requests per minute</label>
|
||||
<span>1,000</span>
|
||||
|
||||
<label>Number of application environments</label>
|
||||
<span>3</span>
|
||||
|
||||
|
||||
<h3>2. Organizational Info <a href="" class="usa-button usa-button-secondary">Edit</a></h3>
|
||||
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sint qui rem molestiae officia vitae quas error ut, est commodi quo! Error itaque earum, facere quod dolore qui beatae repudiandae accusantium.</p>
|
||||
<h4>Information About Requester</h4>
|
||||
|
||||
|
||||
<label>Name</label>
|
||||
<span>Friedrich Straat</span>
|
||||
|
||||
<label>Email</label>
|
||||
<span>fstraat@mail.gov</span>
|
||||
|
||||
<label>Phone Number</label>
|
||||
<span>(123) 456-7890</span>
|
||||
|
||||
<label>Office Symbol / Department</label>
|
||||
<span>Army</span>
|
||||
|
||||
|
||||
<label>Citizenship</label>
|
||||
<span>United States</span>
|
||||
|
||||
|
||||
<label>Designation of Person</label>
|
||||
<span>Military</span>
|
||||
|
||||
|
||||
<label>Latest IA Training completion date</label>
|
||||
<span>2018-04-12</span>
|
||||
|
||||
|
||||
<h4>Information About Collaborators</h4>
|
||||
|
||||
<label>Name</label>
|
||||
<span>Pietro Quirinis</span>
|
||||
|
||||
<label>Email</label>
|
||||
<span>quirinis@mail.gov</span>
|
||||
|
||||
|
||||
|
||||
<h3>3. Funding & Contracting <a href="" class="usa-button usa-button-secondary">Edit</a></h3>
|
||||
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Esse inventore non illo quibusdam tempora vero temporibus reprehenderit sapiente cumque enim quaerat fuga praesentium nemo vel, expedita numquam sequi sed iusto!</p>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<br><br>
|
||||
{% autoescape None %}
|
||||
{% if f.errors %}
|
||||
<b class="usa-input-error-message">There were some errors, see below.</b>
|
||||
{% end %}
|
||||
|
||||
|
||||
<h2 id="financial-verification">Financial Verification</h2>
|
||||
<p>In order to get you access to the JEDI Cloud, we will need you to enter the details below that will help us verify and account for your Task Order.</p>
|
||||
|
||||
{{ f.task_order_id.label }}
|
||||
{{ f.task_order_id(placeholder="Example: 1234567899C0001") }}
|
||||
{% for e in f.task_order_id.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.uii_ids.label }}
|
||||
{{ f.uii_ids(placeholder="Example: \nDI 0CVA5786950 \nUN1945326361234786950") }}
|
||||
{% for e in f.uii_ids.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.pe_id.label }}
|
||||
{{ f.pe_id(placeholder="Example: 0203752A") }}
|
||||
{% for e in f.pe_id.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
|
||||
<h3>Contracting Officer (KO) Information</h3>
|
||||
|
||||
{{ f.fname_co.label }}
|
||||
{{ f.fname_co(placeholder="Contracting Officer first name") }}
|
||||
{% for e in f.fname_co.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.lname_co.label }}
|
||||
{{ f.lname_co(placeholder="Contracting Officer last name") }}
|
||||
{% for e in f.lname_co.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.email_co.label }}
|
||||
{{ f.email_co(placeholder="jane@mail.mil") }}
|
||||
{% for e in f.email_co.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.office_co.label }}
|
||||
{{ f.office_co(placeholder="Example: WHS") }}
|
||||
{% for e in f.office_co.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
<h3>Contracting Officer Representative (COR) Information</h3>
|
||||
|
||||
{{ f.fname_cor.label }}
|
||||
{{ f.fname_cor(placeholder="Contracting Officer Representative first name") }}
|
||||
{% for e in f.fname_cor.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.lname_cor.label }}
|
||||
{{ f.lname_cor(placeholder="Contracting Officer Representative last name") }}
|
||||
{% for e in f.lname_cor.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.email_cor.label }}
|
||||
{{ f.email_cor(placeholder="jane@mail.mil") }}
|
||||
{% for e in f.email_cor.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.office_cor.label }}
|
||||
{{ f.office_cor(placeholder="Example: WHS") }}
|
||||
{% for e in f.office_cor.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
<br><hr>
|
||||
<em>↓ FIELDS NEEDED FOR MANUAL ENTRY OF TASK ORDER INFORMATION (only necessary if EDA info not available)</em>
|
||||
|
||||
|
||||
{{ f.funding_type.label }}
|
||||
{{ f.funding_type }}
|
||||
{% for e in f.funding_type.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.funding_type_other.label }}
|
||||
{{ f.funding_type_other(placeholder="") }}
|
||||
{% for e in f.funding_type_other.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.clin_0001.label }}
|
||||
{{ f.clin_0001(placeholder="50,000") }}
|
||||
{% for e in f.clin_0001.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.clin_0003.label }}
|
||||
{{ f.clin_0003(placeholder="13,000") }}
|
||||
{% for e in f.clin_0003.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.clin_1001.label }}
|
||||
{{ f.clin_1001(placeholder="30,000") }}
|
||||
{% for e in f.clin_1001.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.clin_1003.label }}
|
||||
{{ f.clin_1003(placeholder="7,000") }}
|
||||
{% for e in f.clin_1003.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.clin_2001.label }}
|
||||
{{ f.clin_2001(placeholder="30,000") }}
|
||||
{% for e in f.clin_2001.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
{{ f.clin_2003.label }}
|
||||
{{ f.clin_2003(placeholder="7,000") }}
|
||||
{% for e in f.clin_2003.errors %}
|
||||
<div class="usa-input-error-message">
|
||||
{{ e }}
|
||||
</div>
|
||||
{% end %}
|
||||
|
||||
|
||||
{% end %}
|
||||
|
||||
{% block next %}
|
||||
<a class='usa-button'>Submit</a>
|
||||
{% end %}
|
||||
|
||||
Reference in New Issue
Block a user