Adding more validation

atst/forms/financial.py

@@ -71,9 +71,9 @@ class FinancialForm(ValidatedForm):
 
     pe_id = StringField("Program Element (PE) Number related to your request", validators=[Required()])
 
-    treasury_code = StringField("Program Treasury Code")
+    treasury_code = StringField("Program Treasury Code", validators=[Required()])
 
-    ba_code = StringField("Program BA Code")
+    ba_code = StringField("Program BA Code", validators=[Required()])
 
     fname_co = StringField("Contracting Officer First Name", validators=[Required()])
     lname_co = StringField("Contracting Officer Last Name", validators=[Required()])
@@ -107,6 +107,7 @@ class FinancialForm(ValidatedForm):
             ("PROC", "Procurement (PROC)"),
             ("OTHER", "Other"),
         ],
+        validators=[Required()]
     )
 
     funding_type_other = StringField(

atst/forms/poc.py

@@ -20,7 +20,7 @@ class POCForm(ValidatedForm):
 
 
     am_poc = BooleanField(
-        "I am the Workspace Owner.",
+        "I am the Workspace Owner",
         default=False,
         false_values=(False, "false", "False", "no", "")
     )

atst/forms/request.py

@@ -85,11 +85,13 @@ class RequestForm(ValidatedForm):
             ("US Transportation Command (USTRANSCOM)", "US Transportation Command (USTRANSCOM)"),
             ("Washington Headquarters Services", "Washington Headquarters Services"),
         ],
+        validators=[Required()]
     )
 
     jedi_usage = TextAreaField(
         "JEDI Usage",
         description="Your answer will help us provide tangible examples to DoD leadership how and why commercial cloud resources are accelerating the Department's missions",
+        validators=[Required()]
     )
 
 
@@ -195,5 +197,7 @@ class RequestForm(ValidatedForm):
     )
 
     start_date = DateField(
-        description="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)?",
+        validators=[
+            Required()]
     )

templates/requests/financial_verification.html

@@ -98,9 +98,12 @@
           f.office_cor,placeholder="e.g.: WHS"
           ) }}
 
+        <hr>
 
-        <br><hr>
-        <em>&darr; FIELDS NEEDED FOR MANUAL ENTRY OF TASK ORDER INFORMATION (only necessary if EDA info not available)</em>
+        {{ Alert('Task Order not found in EDA',
+          message="Since the Task Order (TO) number was not found in our system of record, EDA, please populate the additional fields in the form below.",
+          level='warning'
+        ) }}
 
         {{ OptionsInput(
           f.funding_type,

templates/requests/screen-1.html

@@ -25,7 +25,7 @@
 
     <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...") }}
+    {{ TextInput(f.jedi_usage, paragraph=True, placeholder="Briefly describe how you are expecting to use the JEDI Cloud. 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.",placeholder="0") }}
@@ -75,8 +75,8 @@
       </template>
     </transition>
 
-    {{ TextInput(f.dollar_value, validation='dollars', placeholder="$0") }}
-    {{ TextInput(f.start_date, validation='date', placeholder='MM / DD / YYYY') }}
+    {{ TextInput(f.dollar_value, validation='dollars', placeholder='$0') }}
+    {{ TextInput(f.start_date, placeholder='MM / DD / YYYY', validation='date') }}
 
   </div>
 </details-of-use>