diff --git a/atst/forms/request.py b/atst/forms/request.py
index f6330ecf..2482458e 100644
--- a/atst/forms/request.py
+++ b/atst/forms/request.py
@@ -10,7 +10,6 @@ import pendulum
class RequestForm(ValidatedForm):
# Details of Use: General
-
dod_component = StringField(
"DoD Component",
description="Identify the DoD component that is requesting access to the JEDI Cloud",
@@ -21,87 +20,42 @@ class RequestForm(ValidatedForm):
description="Briefly describe how you are expecting to use the JEDI Cloud",
)
-
# Details of Use: Cloud Readiness
-
-
-
-
-
-
-
-
-
-
-
- # Details of Use: Overall Request Details
- dollar_value = IntegerField(
- "What is the total estimated dollar value of the cloud resources you are requesting using the JEDI CSP Calculator?",
- validators=[InputRequired(), NumberRange(min=1)],
+ num_software_systems = IntegerField(
+ "Number of Software System",
+ description="Estimate the number of software systems that will be supported by this JEDI Cloud access request",
)
- num_applications = IntegerField(
- "Estimate the number of applications that might be supported by this request",
- validators=[InputRequired(), NumberRange(min=1)],
- )
-
- date_start = DateField(
- "Date you expect to start accessing this cloud resource.",
- validators=[
- InputRequired(),
- DateRange(
- lower_bound=pendulum.duration(days=0),
- message="Must be no earlier than today.",
- ),
- ],
- )
-
- app_description = TextAreaField(
- "Describe how your team is expecting to use the JEDI Cloud"
- )
-
- supported_organizations = StringField(
- "What organizations are supported by these applications?",
- validators=[InputRequired()],
- )
-
- # Details of Use: Cloud Resources
- total_cores = IntegerField(
- "Total Number of vCPU cores", validators=[InputRequired(), NumberRange(min=0)]
- )
- total_ram = IntegerField(
- "Total RAM", validators=[InputRequired(), NumberRange(min=0)]
- )
- total_object_storage = IntegerField(
- "Total object storage", validators=[InputRequired(), NumberRange(min=0)]
- )
- total_database_storage = IntegerField(
- "Total database storage", validators=[InputRequired(), NumberRange(min=0)]
- )
- total_server_storage = IntegerField(
- "Total server storage", validators=[InputRequired(), NumberRange(min=0)]
- )
-
- # Details of Use: Support Staff
- has_contractor_advisor = RadioField(
- "Do you have a contractor to advise and assist you with using cloud services?",
+ jedi_migration = RadioField(
+ "Are you using the JEDI Cloud to migrate existing systems?",
choices=[("yes", "Yes"), ("no", "No")],
- validators=[InputRequired()],
)
- is_migrating_application = RadioField(
- "Are you using the JEDI Cloud to migrate existing applications?",
+ rationalization_software_systems = RadioField(
+ "Have you completed a “rationalization” of your software systems to move to the cloud?",
+ choices=[("yes", "Yes"), ("no", "No"), ("in_progress","In Progress")],
+ )
+
+ technical_support_team = RadioField(
+ "Are you working with a technical support team experienced in cloud migrations?",
choices=[("yes", "Yes"), ("no", "No")],
- validators=[InputRequired()],
)
- has_migration_office = RadioField(
- "Do you have a migration office that you're working with to migrate to the cloud?",
+ organization_providing_assistance = RadioField(
+ "If you are receiving migration assistance, indicate the type of organization providing assistance below:",
choices=[("yes", "Yes"), ("no", "No")],
- validators=[InputRequired()],
)
- supporting_organization = StringField(
- "Describe the organizations that are supporting you, include both government and contractor resources",
- validators=[InputRequired()],
- )
+
+
+ # Organization Providing Assistance
+
+ # # Engineering Assessment
+
+ # # Data Transfers
+
+ # # Expected Completion Date
+
+ # # Cloud Native
+
+
diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to
index 0e9dd51a..e9c56ec0 100644
--- a/templates/requests/screen-1.html.to
+++ b/templates/requests/screen-1.html.to
@@ -1,169 +1,30 @@
{% extends '../requests_new.html.to' %}
{% block subtitle %}
-
Details of Use
+
Details of Use
{% end %}
{% block form %}
{% autoescape None %}
{% if f.errors %}
- There were some errors, see below.
+There were some errors, see below.
{% end %}
+
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.
+
All fields are required, unless specified optional.
Please help us understand the size and scope of your resource request.
-
-{{ f.dollar_value.label }}
-{{ f.dollar_value(placeholder="Total dollar amount to be associated with the Task Order")}}
-{% for e in f.dollar_value.errors %}
-
- {{ e }}
-
-{% end %}
-
-
-
-{{ f.num_applications.label }}
-{{ f.num_applications(placeholder="Estimated number of applications") }}
-{% for e in f.num_applications.errors %}
-
- {{ e }}
-
-{% end %}
-
-{{ f.date_start.label }}
-{{ f.date_start }}
-{% for e in f.date_start.errors %}
-
- {{ e }}
-
-{% end %}
-
-{{ f.app_description.label }}
-{{ f.app_description(placeholder="Example: My organization is supporting the migration of XYZ system to the cloud due to XX policy memo. I am planning to use a sandbox environment to do testing.") }}
-{% for e in f.app_description.errors %}
-
- {{ e }}
-
-{% end %}
-
-{{ f.supported_organizations.label }}
-{{ f.supported_organizations(placeholder="Add tags associated with DoD components or other entities") }}
-{% for e in f.supported_organizations.errors %}
-
- {{ e }}
-
-{% end %}
-
-
-
-
-
Cloud Resources
-
Please tell us about your expected cloud resource usage as best as you can. Refer to the Cloud Service Provider as necessary.
-
-{{ f.total_cores.label }}
-{{ f.total_cores(placeholder="Expected total cores", min="1", max="32") }}
-{% for e in f.total_cores.errors %}
-
- {{ e }}
-
-{% end %}
-
-{{ f.total_ram.label }}
-{{ f.total_ram(placeholder="Expected amount of RAM", min="1", max="32") }}
-{% for e in f.total_ram.errors %}
-
- {{ e }}
-
-{% end %}
-
-{{ f.total_object_storage.label }}
-{{ f.total_object_storage(placeholder="Expected total object storage") }}
-{% for e in f.total_object_storage.errors %}
-
- {{ e }}
-
-{% end %}
-
-{{ f.total_database_storage.label }}
-{{ f.total_database_storage(placeholder="Expected total database storage") }}
-{% for e in f.total_database_storage.errors %}
-
- {{ e }}
-
-{% end %}
-
-{{ f.total_server_storage.label }}
-{{ f.total_server_storage(placeholder="Expected total server storage") }}
-{% for e in f.total_server_storage.errors %}
-
- {{ e }}
-
-{% end %}
-
-
-
-
-
Support Staff
-
We want to learn more about the people helping you with the cloud.