diff --git a/atst/domain/task_orders.py b/atst/domain/task_orders.py index 0ebbeff2..1c483e25 100644 --- a/atst/domain/task_orders.py +++ b/atst/domain/task_orders.py @@ -26,7 +26,7 @@ class TaskOrders(object): "funding": [ "performance_length", "start_date", - "csp_cost_estimate", + # "pdf", "end_date", "clin_01", "clin_02", diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py index 1433716e..dee92715 100644 --- a/atst/forms/task_order.py +++ b/atst/forms/task_order.py @@ -86,9 +86,9 @@ class FundingForm(CacheableForm): end_date = DateField( translate("forms.task_order.end_date_label"), format="%m/%d/%Y" ) - csp_cost_estimate = FileField( - translate("forms.task_order.csp_cost_est_label"), - description=translate("forms.task_order.csp_cost_est_description"), + pdf = FileField( + translate("forms.task_order.pdf_label"), + description=translate("forms.task_order.pdf_description"), ) clin_01 = IntegerField(translate("forms.task_order.clin_01_label")) clin_02 = IntegerField(translate("forms.task_order.clin_02_label")) diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index a94e8f1d..a04c801c 100644 --- a/atst/routes/task_orders/new.py +++ b/atst/routes/task_orders/new.py @@ -15,7 +15,6 @@ from atst.domain.workspaces import Workspaces from atst.domain.workspace_roles import WorkspaceRoles import atst.forms.task_order as task_order_form from atst.services.invitation import Invitation as InvitationService -from atst.utils.localization import translate TASK_ORDER_SECTIONS = [ diff --git a/js/components/forms/funding.js b/js/components/forms/funding.js index 73d7c077..d75ee74b 100644 --- a/js/components/forms/funding.js +++ b/js/components/forms/funding.js @@ -3,6 +3,7 @@ import { conformToMask } from 'vue-text-mask' import FormMixin from '../../mixins/form' import textinput from '../text_input' +import optionsinput from '../options_input' export default { name: 'funding', @@ -11,6 +12,7 @@ export default { components: { textinput, + optionsinput }, props: { diff --git a/templates/task_orders/new/app_info.html b/templates/task_orders/new/app_info.html index e32b69f6..99704939 100644 --- a/templates/task_orders/new/app_info.html +++ b/templates/task_orders/new/app_info.html @@ -11,15 +11,11 @@ {% block form %} +

{{ "task_orders.new.app_info.basic_info_title"| translate }}

{{ TextInput(form.portfolio_name, placeholder="The name of your office or organization") }} {{ TextInput(form.scope, paragraph=True) }} -

- - {{ "task_orders.new.app_info.sample_scope" | translate | safe }} - -

- +

{{ "task_orders.new.app_info.sample_scope" | translate | safe }}

{{ OptionsInput(form.defense_component) }}
@@ -38,9 +34,6 @@

{{ "task_orders.new.app_info.market_research_title" | translate }}

-

-{{ "task_orders.new.app_info.market_research_paragraph" | translate | safe }} -

- +

{{ "task_orders.new.app_info.market_research_paragraph" | translate | safe }}

{% endblock %} diff --git a/templates/task_orders/new/funding.html b/templates/task_orders/new/funding.html index 0515953c..56f8f968 100644 --- a/templates/task_orders/new/funding.html +++ b/templates/task_orders/new/funding.html @@ -4,6 +4,8 @@ {% from "components/options_input.html" import OptionsInput %} {% from "components/date_input.html" import DateInput %} +{% from "components/icon.html" import Icon %} + {% block heading %} {{ "task_orders.new.funding.section_title" | translate }} {% endblock %} @@ -11,46 +13,42 @@ {% block form %} -
- -

{{ "task_orders.new.funding.performance_period_title" | translate }}

+
+ +

{{ "task_orders.new.funding.performance_period_title" | translate }}

+

{{ "task_orders.new.funding.performance_period_description" | translate }}

+

{{ "task_orders.new.funding.performance_period_paragraph" | translate }}

+ {{ OptionsInput(form.performance_length) }} - {{ "task_orders.new.funding.performance_period_paragraph" | translate | safe }} +
- {{ OptionsInput(form.performance_length) }} +

{{ "task_orders.new.funding.estimate_usage_title" | translate }}

+

{{ "task_orders.new.funding.estimate_usage_description" | translate }}

+

+ {{ Icon("link")}} Cloud Service Provider's estimate calculator +

+

{{ "task_orders.new.funding.estimate_usage_paragraph" | translate }}

+
+ {{ form.pdf.label }} + {{ form.pdf.description }} + +
-
-

{{ "task_orders.new.funding.estimate_usage_title" | translate }}

+
- {{ "task_orders.new.funding.estimate_usage_paragraph" | translate | safe }} +

{{ "task_orders.new.funding.cloud_calculations_title" | translate }}

+

{{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }}

-
- {{ form.csp_cost_estimate.label }} - {{ form.csp_cost_estimate.description }} - {{ form.csp_cost_estimate }} +

{{ "task_orders.new.funding.cloud_offerings_title" | translate }}

+

{{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }}

+ {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }} + {{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }} + +

{{ "task_orders.new.funding.support_assistance_title" | translate }}

+

{{ "task_orders.new.funding.support_assistance_paragraph" | translate }}

+ {{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }} + {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', disabled=(not config.CLASSIFIED)) }}
- -
-

{{ "task_orders.new.funding.cloud_calculations_title" | translate }}

-

- {{ "task_orders.new.funding.cloud_calculations_paragraph" | translate }} -

- -

{{ "task_orders.new.funding.cloud_offerings_title" | translate }}

-

- {{ "task_orders.new.funding.cloud_offerings_paragraph" | translate }} -

- - {{ TextInput(form.clin_01, validation='dollars', placeholder="$0.00") }} - {{ TextInput(form.clin_02, validation='dollars', disabled=(not config.CLASSIFIED)) }} - -

{{ "task_orders.new.funding.support_assistance_title" | translate }}

-

- {{ "task_orders.new.funding.support_assistance_paragraph" | translate }} -

- {{ TextInput(form.clin_03, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', placeholder="$0.00") }} - {{ TextInput(form.clin_04, validation='dollars', tooltip='The cloud support and assistance packages cannot be used as a primary development resource.', disabled=(not config.CLASSIFIED)) }} -
{% endblock %} diff --git a/translations.yaml b/translations.yaml index 989cb7fe..87ce42ff 100644 --- a/translations.yaml +++ b/translations.yaml @@ -184,8 +184,8 @@ forms: performance_length_label: Period of Performance length start_date_label: Start Date end_date_label: End Date - csp_cost_est_label: Upload a copy of your CSP Cost Estimate Research - csp_cost_est_description: Upload a PDF or screenshot fo your usage estimate from the calculator. + pdf_label: Upload a copy of your CSP Cost Estimate Research + pdf_description: Upload a PDF or screenshot of your usage estimate from the calculator. clin_01_label: 'CLIN 01 : Unclassified' clin_02_label: 'CLIN 02: Classified' clin_03_label: 'CLIN 03: Unclassified' @@ -358,14 +358,11 @@ task_orders: funding: section_title: Funding performance_period_title: Period of Performance - performance_period_paragraph: | -

Choose the dates your task order will cover.

-

Because your funds will be lost if you don’t use them, we strongly recommend submitting small, short-duration task orders, usually a three month period. We’ll notify you when your period of performance is nearing the end so you can request your next set of funds with a new task order.

+ performance_period_description: Choose the dates your task order will cover. + performance_period_paragraph: Because your funds will be lost if you don’t use them, we strongly recommend submitting small, short-duration task orders, usually a three month period. We’ll notify you when your period of performance is nearing the end so you can request your next set of funds with a new task order. estimate_usage_title: Estimate Your Cloud Usage - estimate_usage_paragraph: | -

Calculate how much your cloud usage will cost. A technical representative should help you complete this calculation. These calculatiosnd will become your CLINs.

-

**link image** Cloud Service Provider's estimate calculator

-

This is only an estimation tool to help you make an informed evaluation of what you expect to use. While you're tied to the dollar amount you specify in your task order, you're not obligated by the resources you indicate in the calculator.

+ estimate_usage_description: Calculate how much your cloud usage will cost. A technical representative should help you complete this calculation. These calculatiosnd will become your CLINs. + estimate_usage_paragraph: This is only an estimation tool to help you make an informed evaluation of what you expect to use. While you're tied to the dollar amount you specify in your task order, you're not obligated by the resources you indicate in the calculator. cloud_calculations_title: Cloud Usage Calculations cloud_calculations_paragraph: Enter the results of your cloud usage calculations. cloud_offerings_title: Cloud Offerings