Update tooltips, placehoders, and field info

atst/forms/org.py

@@ -1,5 +1,5 @@
 from wtforms.fields.html5 import EmailField, TelField
-from wtforms.fields import RadioField, StringField
+from wtforms.fields import RadioField, StringField, SelectField
 from wtforms.validators import Required, Email
 import pendulum
 from .fields import DateField
@@ -18,10 +18,59 @@ class OrgForm(ValidatedForm):
         description='Enter a 10-digit phone number',
         validators=[Required(), PhoneNumber()])
 
-    service_branch = StringField(
+    service_branch = SelectField(
         "Service Branch or Agency",
         description="Which services and organizations do you belong to within the DoD?",
-        validators=[Required()]
+        choices=[
+            ("null", "Select an option"),
+            ("Air Force, Department of the", "Air Force, Department of the"),
+            ("Army and Air Force Exchange Service", "Army and Air Force Exchange Service"),
+            ("Army, Department of the", "Army, Department of the"),
+            ("Defense Advanced Research Projects Agency", "Defense Advanced Research Projects Agency"),
+            ("Defense Commissary Agency", "Defense Commissary Agency"),
+            ("Defense Contract Audit Agency", "Defense Contract Audit Agency"),
+            ("Defense Contract Management Agency", "Defense Contract Management Agency"),
+            ("Defense Finance & Accounting Service", "Defense Finance & Accounting Service"),
+            ("Defense Health Agency", "Defense Health Agency"),
+            ("Defense Information System Agency", "Defense Information System Agency"),
+            ("Defense Intelligence Agency", "Defense Intelligence Agency"),
+            ("Defense Legal Services Agency", "Defense Legal Services Agency"),
+            ("Defense Logistics Agency", "Defense Logistics Agency"),
+            ("Defense Media Activity", "Defense Media Activity"),
+            ("Defense Micro Electronics Activity", "Defense Micro Electronics Activity"),
+            ("Defense POW-MIA Accounting Agency", "Defense POW-MIA Accounting Agency"),
+            ("Defense Security Cooperation Agency", "Defense Security Cooperation Agency"),
+            ("Defense Security Service", "Defense Security Service"),
+            ("Defense Technical Information Center", "Defense Technical Information Center"),
+            ("Defense Technology Security Administration", "Defense Technology Security Administration"),
+            ("Defense Threat Reduction Agency", "Defense Threat Reduction Agency"),
+            ("DoD Education Activity", "DoD Education Activity"),
+            ("DoD Human Recourses Activity", "DoD Human Recourses Activity"),
+            ("DoD Inspector General", "DoD Inspector General"),
+            ("DoD Test Resource Management Center", "DoD Test Resource Management Center"),
+            ("Headquarters Defense Human Resource Activity ", "Headquarters Defense Human Resource Activity "),
+            ("Joint Staff", "Joint Staff"),
+            ("Missile Defense Agency", "Missile Defense Agency"),
+            ("National Defense University", "National Defense University"),
+            ("National Geospatial Intelligence Agency", "National Geospatial Intelligence Agency"),
+            ("National Geospatial Intelligence Agency (NGA)", "National Geospatial Intelligence Agency (NGA)"),
+            ("National Oceanic and Atmospheric Administration (NOAA)", "National Oceanic and Atmospheric Administration (NOAA)"),
+            ("National Reconnaissance Office", "National Reconnaissance Office"),
+            ("National Reconnaissance Office (NRO)", "National Reconnaissance Office (NRO)"),
+            ("National Security Agency (NSA)", "National Security Agency (NSA)"),
+            ("National Security Agency-Central Security Service", "National Security Agency-Central Security Service"),
+            ("Navy, Department of the", "Navy, Department of the"),
+            ("Office of Economic Adjustment", "Office of Economic Adjustment"),
+            ("Office of the Secretary of Defense", "Office of the Secretary of Defense"),
+            ("Pentagon Force Protection Agency", "Pentagon Force Protection Agency"),
+            ("TRANSCOM", "TRANSCOM"),
+            ("Uniform Services University of the Health Sciences", "Uniform Services University of the Health Sciences"),
+            ("US Cyber Command (USCYBERCOM)", "US Cyber Command (USCYBERCOM)"),
+            ("US Special Operations Command (USSOCOM)", "US Special Operations Command (USSOCOM)"),
+            ("US Strategic Command (USSTRATCOM)", "US Strategic Command (USSTRATCOM)"),
+            ("US Transportation Command (USTRANSCOM)", "US Transportation Command (USTRANSCOM)"),
+            ("Washington Headquarters Services", "Washington Headquarters Services"),
+        ],
     )
 
     citizenship = RadioField(

atst/forms/request.py

@@ -39,17 +39,59 @@ class RequestForm(ValidatedForm):
         description="Identify the DoD component that is requesting access to the JEDI Cloud",
         choices=[
             ("null", "Select an option"),
-            ("us_air_force", "US Air Force"),
+            ("Air Force, Department of the", "Air Force, Department of the"),
-            ("us_army", "US Army"),
+            ("Army and Air Force Exchange Service", "Army and Air Force Exchange Service"),
-            ("us_navy", "US Navy"),
+            ("Army, Department of the", "Army, Department of the"),
-            ("us_marine_corps", "US Marine Corps"),
+            ("Defense Advanced Research Projects Agency", "Defense Advanced Research Projects Agency"),
-            ("joint_chiefs_of_staff", "Joint Chiefs of Staff"),
+            ("Defense Commissary Agency", "Defense Commissary Agency"),
+            ("Defense Contract Audit Agency", "Defense Contract Audit Agency"),
+            ("Defense Contract Management Agency", "Defense Contract Management Agency"),
+            ("Defense Finance & Accounting Service", "Defense Finance & Accounting Service"),
+            ("Defense Health Agency", "Defense Health Agency"),
+            ("Defense Information System Agency", "Defense Information System Agency"),
+            ("Defense Intelligence Agency", "Defense Intelligence Agency"),
+            ("Defense Legal Services Agency", "Defense Legal Services Agency"),
+            ("Defense Logistics Agency", "Defense Logistics Agency"),
+            ("Defense Media Activity", "Defense Media Activity"),
+            ("Defense Micro Electronics Activity", "Defense Micro Electronics Activity"),
+            ("Defense POW-MIA Accounting Agency", "Defense POW-MIA Accounting Agency"),
+            ("Defense Security Cooperation Agency", "Defense Security Cooperation Agency"),
+            ("Defense Security Service", "Defense Security Service"),
+            ("Defense Technical Information Center", "Defense Technical Information Center"),
+            ("Defense Technology Security Administration", "Defense Technology Security Administration"),
+            ("Defense Threat Reduction Agency", "Defense Threat Reduction Agency"),
+            ("DoD Education Activity", "DoD Education Activity"),
+            ("DoD Human Recourses Activity", "DoD Human Recourses Activity"),
+            ("DoD Inspector General", "DoD Inspector General"),
+            ("DoD Test Resource Management Center", "DoD Test Resource Management Center"),
+            ("Headquarters Defense Human Resource Activity ", "Headquarters Defense Human Resource Activity "),
+            ("Joint Staff", "Joint Staff"),
+            ("Missile Defense Agency", "Missile Defense Agency"),
+            ("National Defense University", "National Defense University"),
+            ("National Geospatial Intelligence Agency", "National Geospatial Intelligence Agency"),
+            ("National Geospatial Intelligence Agency (NGA)", "National Geospatial Intelligence Agency (NGA)"),
+            ("National Oceanic and Atmospheric Administration (NOAA)", "National Oceanic and Atmospheric Administration (NOAA)"),
+            ("National Reconnaissance Office", "National Reconnaissance Office"),
+            ("National Reconnaissance Office (NRO)", "National Reconnaissance Office (NRO)"),
+            ("National Security Agency (NSA)", "National Security Agency (NSA)"),
+            ("National Security Agency-Central Security Service", "National Security Agency-Central Security Service"),
+            ("Navy, Department of the", "Navy, Department of the"),
+            ("Office of Economic Adjustment", "Office of Economic Adjustment"),
+            ("Office of the Secretary of Defense", "Office of the Secretary of Defense"),
+            ("Pentagon Force Protection Agency", "Pentagon Force Protection Agency"),
+            ("TRANSCOM", "TRANSCOM"),
+            ("Uniform Services University of the Health Sciences", "Uniform Services University of the Health Sciences"),
+            ("US Cyber Command (USCYBERCOM)", "US Cyber Command (USCYBERCOM)"),
+            ("US Special Operations Command (USSOCOM)", "US Special Operations Command (USSOCOM)"),
+            ("US Strategic Command (USSTRATCOM)", "US Strategic Command (USSTRATCOM)"),
+            ("US Transportation Command (USTRANSCOM)", "US Transportation Command (USTRANSCOM)"),
+            ("Washington Headquarters Services", "Washington Headquarters Services"),
         ],
     )
 
     jedi_usage = TextAreaField(
         "JEDI Usage",
-        description="Please tell us more about what the systems/applications you are working with and why the cloud is a good place to host these applications",
+        description="Your answer will help us provide tangible examples to DoD leadership how and why commercial cloud resources are accelerating the Department's missions",
     )
 
 
@@ -132,7 +174,7 @@ class RequestForm(ValidatedForm):
     # Details of Use: Financial Usage
     estimated_monthly_spend = IntegerField(
         "Estimated monthly spend",
-        description='Use the <a href="#" target="_blank" class="icon-link">JEDI CSP Calculator</a> to estimate your monthly cloud resource usage and enter the dollar amount below. Note these estimates are for initial approval only. After the request is approved, you will be asked to provide a valid Task Order number with specific CLIN amounts for cloud services.',
+        description='Use the <a href="#" target="_blank" class="icon-link">JEDI CSP Calculator</a> to estimate your <b>monthly</b> cloud resource usage and enter the dollar amount below. Note these estimates are for initial approval only. After the request is approved, you will be asked to provide a valid Task Order number with specific CLIN amounts for cloud services.',
     )
 
     dollar_value = IntegerField(

templates/requests/screen-1.html

@@ -25,10 +25,10 @@
 
     <h2>General</h2>
     {{ OptionsInput(f.dod_component) }}
-    {{ TextInput(f.jedi_usage, paragraph=True, placeholder="Briefly describe how you are expecting to use the JEDI Cloud. \n e.g. We are migrating XYZ application to the cloud so that...",tooltip="Your answer will help us provide tangible examples to DoD leadership how and why commercial cloud resources are accelerating the Department\\'s missions.") }}
+    {{ TextInput(f.jedi_usage, paragraph=True, placeholder="Briefly describe how you are expecting to use the JEDI Cloud. \n e.g. We are migrating XYZ application to the cloud so that...") }}
 
     <h2>Cloud Readiness</h2>
-    {{ TextInput(f.num_software_systems,validation="integer",tooltip="A software system can be any code that you plan to host on cloud infrastructure. For example, it could be a custom-developed web application, or a large ERP system.") }}
+    {{ TextInput(f.num_software_systems,validation="integer",tooltip="A software system can be any code that you plan to host on cloud infrastructure. For example, it could be a custom-developed web application, or a large ERP system.",placeholder="42") }}
     {{ OptionsInput(f.jedi_migration, tooltip="Cloud migration is the process of moving data, applications or other business elements from an organization\\'s onsite computers/data centers to the cloud, or moving them from one cloud environment to another.") }}
 
     <transition name='slide'>
@@ -54,7 +54,7 @@
     </transition>
 
     <h2>Financial Usage</h2>
-    {{ TextInput(f.estimated_monthly_spend, tooltip="Refer to financial verification step help docs", validation="dollars") }}
+    {{ TextInput(f.estimated_monthly_spend, tooltip="Refer to financial verification step help docs", validation="dollars", placeholder="$42,000") }}
 
     <div class='alert alert-info'>
       <div class='alert__content'>
@@ -68,14 +68,14 @@
       <template v-if="annualSpend > 1000000">
         <fieldset class='form__sub-fields'>
           <h3>Because the approximate annual spend is over $1,000,000, please answer a few additional questions.</h3>
-          {{ TextInput(f.number_user_sessions, validation='integer') }}
+          {{ TextInput(f.number_user_sessions, validation='integer', placeholder="42") }}
-          {{ TextInput(f.average_daily_traffic, tooltip="Requests are the client-to-server network traffic that is being transferred to your systems",validation="integer") }}
+          {{ TextInput(f.average_daily_traffic, tooltip="Requests are the client-to-server network traffic that is being transferred to your systems",validation="integer", placeholder="42") }}
-          {{ TextInput(f.average_daily_traffic_gb, tooltip="GB uploaded is the gigabyte amount of data traffic that is being transferred to your systems",validation="gigabytes") }}
+          {{ TextInput(f.average_daily_traffic_gb, tooltip="GB uploaded is the gigabyte amount of data traffic that is being transferred to your systems",validation="gigabytes", placeholder="42GB") }}
         </fieldset>
       </template>
     </transition>
 
-    {{ TextInput(f.dollar_value, validation='dollars') }}
+    {{ TextInput(f.dollar_value, validation='dollars', placeholder="$42,000") }}
     {{ TextInput(f.start_date, validation='date', placeholder='MM / DD / YYYY') }}
 
   </div>

templates/requests/screen-2.html

@@ -26,7 +26,7 @@
 
 <p>We want to collect the following information from you for security auditing and determining priviledged user access.</p>
 
-{{ TextInput(f.service_branch,placeholder='e.g. US Air Force, US Army, US Navy, Marine Corps, Defense Media Agency') }}
+{{ OptionsInput(f.service_branch) }}
 {{ OptionsInput(f.citizenship) }}
 {{ OptionsInput(f.designation) }}
 {{ TextInput(f.date_latest_training,tooltip="When was the last time you completed the IA training? <br> Information Assurance (IA) training is an important step in cyber awareness.",placeholder="MM / DD / YYYY", validation="date") }}