pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #164 from dod-ccpo/ui/tooltips

Browse Source 
UI/tooltips
This commit is contained in:
andrewdds
2018-08-14 08:48:32 -04:00
committed by GitHub
parent 4d7067ae22 3a5f8694ba
commit c05e72d98f
16 changed files with 280 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
atst/forms/org.py
View File

@@ -18,9 +18,14 @@ class OrgForm(ValidatedForm):
description='Enter a 10-digit phone number',
validators=[Required(), PhoneNumber()])
service_branch = StringField("Service Branch or Agency", validators=[Required()])
service_branch = StringField(
"Service Branch or Agency",
description="Which services and organizations do you belong to within the DoD?",
validators=[Required()]
)
citizenship = RadioField(
description="What is your citizenship status?",
choices=[
("United States", "United States"),
("Foreign National", "Foreign National"),
@@ -31,6 +36,7 @@ class OrgForm(ValidatedForm):
designation = RadioField(
"Designation of Person",
description="What is your designation within the DoD?",
choices=[
("military", "Military"),
("civilian", "Civilian"),
@@ -41,6 +47,7 @@ class OrgForm(ValidatedForm):
date_latest_training = DateField(
"Latest Information Assurance (IA) Training completion date",
description="To complete the training, you can find it in <a class=\"icon-link\" href=\"https://iatraining.disa.mil/eta/disa_cac2018/launchPage.htm\" target=\"_blank\">Information Assurance Cyber Awareness Challange</a> website.",
validators=[
Required(),
DateRange(

28
atst/forms/request.py
View File

@@ -49,12 +49,10 @@ class RequestForm(ValidatedForm):
jedi_usage = TextAreaField(
"JEDI Usage",
description="Briefly describe how you are expecting to use the JEDI Cloud",
render_kw={
"placeholder": "e.g. We are migrating XYZ application to the cloud so that..."
},
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",
)
# Details of Use: Cloud Readiness
num_software_systems = IntegerField(
"Number of Software System",
@@ -62,35 +60,37 @@ class RequestForm(ValidatedForm):
)
jedi_migration = RadioField(
"Are you using the JEDI Cloud to migrate existing systems?",
"JEDI Migration",
description="Are you using the JEDI Cloud to migrate existing systems?",
choices=[("yes", "Yes"), ("no", "No")],
default="",
)
rationalization_software_systems = RadioField(
"Have you completed a “rationalization” of your software systems to move to the cloud?",
description="Have you completed a “rationalization” of your software systems to move to the cloud?",
choices=[("yes", "Yes"), ("no", "No"), ("in_progress", "In Progress")],
default="",
)
technical_support_team = RadioField(
"Are you working with a technical support team experienced in cloud migrations?",
description="Are you working with a technical support team experienced in cloud migrations?",
choices=[("yes", "Yes"), ("no", "No")],
default="",
)
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:",
description="If you are receiving migration assistance, what is the type of organization providing assistance?",
choices=[
("in_house_staff", "In-house staff"),
("contractor", "Contractor"),
("other_dod_organization", "Other DoD organization"),
("none", "None"),
],
default="",
)
engineering_assessment = RadioField(
"Have you completed an engineering assessment of your software systems for cloud readiness?",
description="Have you completed an engineering assessment of your systems for cloud readiness?",
choices=[("yes", "Yes"), ("no", "No"), ("in_progress", "In Progress")],
default="",
)
@@ -124,7 +124,7 @@ class RequestForm(ValidatedForm):
)
cloud_native = RadioField(
"Are your software systems being developed cloud native?",
description="Are your software systems being developed cloud native?",
choices=[("yes", "Yes"), ("no", "No")],
default="",
)
@@ -132,7 +132,7 @@ class RequestForm(ValidatedForm):
# Details of Use: Financial Usage
estimated_monthly_spend = IntegerField(
"Estimated monthly spend",
description='Use the <a href="#">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 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.',
)
dollar_value = IntegerField(
@@ -145,6 +145,12 @@ class RequestForm(ValidatedForm):
)
average_daily_traffic = IntegerField(
"Average Daily Traffic (Number of Requests)",
description="What is the average daily traffic you expect the systems under this cloud contract to use?"
)
average_daily_traffic_gb = IntegerField(
"Average Daily Traffic (GB)",
description="What is the average daily traffic you expect the systems under this cloud contract to use?"
)