Update details of use fields

atst/forms/request.py

@@ -1,5 +1,5 @@
 from wtforms.fields.html5 import IntegerField
-from wtforms.fields import RadioField, StringField, TextAreaField, SelectField
+from wtforms.fields import RadioField, StringField, TextAreaField, SelectField, BooleanField, SelectMultipleField
 from wtforms.validators import NumberRange, InputRequired
 from .fields import DateField
 from .forms import ValidatedForm
@@ -49,9 +49,12 @@ class RequestForm(ValidatedForm):
         choices=[("yes", "Yes"), ("no", "No")],
     )
 
-    organization_providing_assistance = RadioField(
+    organization_providing_assistance = RadioField(  # this needs to be updated to use checkboxes instead of radio
         "If you are receiving migration assistance, indicate the type of organization providing assistance below:",
-        choices=[("yes", "Yes"), ("no", "No")],
+        choices=[
+            ("in_house_staff","In-house staff"),
+            ("contractor","Contractor"),
+            ("other_dod_organization","Other DoD organization")],
     )
 
     engineering_assessment = RadioField(
@@ -59,12 +62,23 @@ class RequestForm(ValidatedForm):
         choices=[("yes", "Yes"), ("no", "No"), ("in_progress","In Progress")],
     )
 
-    data_transfers = StringField(
+    data_transfers = SelectField(
-        "How much data is being transferred to the cloud?",
+        description="How much data is being transferred to the cloud?",
+        choices=[
+          ("null","Select an option"),
+          ("less_than_100gb","Less than 100GB"),
+          ("...","- more options -"),
+          ("above_10pb","Above 10PB")],
     )
 
-    expected_completion_date = StringField(
+    expected_completion_date = SelectField(
-        "When do you expect to complete your migration to the JEDI Cloud?",
+        description="When do you expect to complete your migration to the JEDI Cloud?",
+        choices=[
+          ("null","Select an option"),
+          ("less_than_1_month","< 1 month"),
+          ("1_to_3_months","1-3 months"),
+          ("3_to_6_months","3-6 months"),
+          ("more_than_12_months","12+ months")],
     )
 
     cloud_native = RadioField(
@@ -79,19 +93,19 @@ class RequestForm(ValidatedForm):
     )
 
     total_spend = IntegerField(
-        "What is your total expected budget for this JEDI Cloud Request?",
+        description="What is your total expected budget for this JEDI Cloud Request?",
     )
 
     number_user_sessions = IntegerField(
-        "How many user sessions do you expect on these systems each day?",
+        description="How many user sessions do you expect on these systems each day?",
     )
 
     average_daily_traffic = IntegerField(
-        "What is the average daily traffic you expect the systems under this cloud contract to use?",
+        description="What is the average daily traffic you expect the systems under this cloud contract to use?",
     )
 
-    start_date = StringField(
+    start_date = DateField(
-        "When do you expect to start using the JEDI Cloud (not for billing purposes)?",
+        description="When do you expect to start using the JEDI Cloud (not for billing purposes)?",
     )
 
 

scss/elements/_inputs.scss

@@ -98,6 +98,7 @@
     legend {
       padding: 0 0 $gap 0;
       @include h4;
+      font-weight: normal;
 
       .icon {
         vertical-align: middle;

templates/components/options_input.html.to

@@ -1,4 +1,5 @@
 <div class='usa-input {% if errors %}usa-input--error{% end %}'>
+
   <fieldset class="usa-input__choices {% if inline %}usa-input__choices--inline{% end %}">
     <legend>
       {{ label }}

templates/requests/screen-1.html.to

@@ -15,11 +15,11 @@
 <p class="usa-font-lead">We’d like to know a little about how you plan to use JEDI Cloud services to process your request. Please answer the following questions to the best of your ability. Note that the CCPO does not directly help with migrating systems to JEDI Cloud. These questions are for learning about your cloud readiness and financial usage of the JEDI Cloud; your estimates will not be used for any department level reporting.</p>
 <p><em>All fields are required, unless specified optional.</em></p>
 
-<h3>General</h3>
+<h2>General</h2>
 {% module TextInput(f.dod_component) %}
 {% module TextInput(f.jedi_usage) %}
 
-<h3>Cloud Readiness</h3>
+<h2>Cloud Readiness</h2>
 {% module TextInput(f.num_software_systems) %}
 {% module OptionsInput(f.jedi_migration) %}
 {% module OptionsInput(f.rationalization_software_systems) %}
@@ -30,7 +30,7 @@
 {% module TextInput(f.expected_completion_date) %}
 {% module OptionsInput(f.cloud_native) %}
 
-<h3>Financial Usage</h3>
+<h2>Financial Usage</h2>
 {% module TextInput(f.estimated_monthly_spend) %}
 <p>So this means you are spending approximately <b>$X</b> annually</p>
 {% module TextInput(f.total_spend) %}