diff --git a/alembic/versions/4536f50b25bc_add_columns_to_task_order.py b/alembic/versions/4536f50b25bc_add_columns_to_task_order.py index 0ba10257..ee51a8fe 100644 --- a/alembic/versions/4536f50b25bc_add_columns_to_task_order.py +++ b/alembic/versions/4536f50b25bc_add_columns_to_task_order.py @@ -20,13 +20,13 @@ def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.add_column('task_orders', sa.Column('attachment_id', postgresql.UUID(as_uuid=True), nullable=True)) op.add_column('task_orders', sa.Column('performance_length', sa.Integer(), nullable=True)) - op.create_foreign_key(None, 'task_orders', 'attachments', ['attachment_id'], ['id']) + op.create_foreign_key('task_orders_attachments_attachment_id', 'task_orders', 'attachments', ['attachment_id'], ['id']) # ### end Alembic commands ### def downgrade(): # ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint(None, 'task_orders', type_='foreignkey') + op.drop_constraint('task_orders_attachments_attachment_id', 'task_orders', type_='foreignkey') op.drop_column('task_orders', 'performance_length') op.drop_column('task_orders', 'attachment_id') # ### end Alembic commands ### diff --git a/atst/domain/task_orders.py b/atst/domain/task_orders.py index 1c483e25..e0e76573 100644 --- a/atst/domain/task_orders.py +++ b/atst/domain/task_orders.py @@ -25,9 +25,7 @@ class TaskOrders(object): ], "funding": [ "performance_length", - "start_date", # "pdf", - "end_date", "clin_01", "clin_02", "clin_03", diff --git a/atst/forms/data.py b/atst/forms/data.py index 205424fc..202664fd 100644 --- a/atst/forms/data.py +++ b/atst/forms/data.py @@ -189,7 +189,7 @@ APP_MIGRATION = [ PROJECT_COMPLEXITY = [ ("storage", "Storage "), ("data_analytics", "Data Analytics "), - ("conus", "CONUS Only Access "), + ("conus", "CONUS Access "), ("oconus", "OCONUS Access "), ("tactical_edge", "Tactical Edge Access "), ("not_sure", "Not Sure "), diff --git a/templates/task_orders/new/oversight.html b/templates/task_orders/new/oversight.html index c21b666a..01117536 100644 --- a/templates/task_orders/new/oversight.html +++ b/templates/task_orders/new/oversight.html @@ -13,17 +13,9 @@

{{ "task_orders.new.oversight.ko_info_title" | translate }}

{{ "task_orders.new.oversight.ko_info_paragraph" | translate }}

-
-
- - - - -
-
{{ UserInfo(form.ko_first_name, form.ko_last_name, form.ko_email, form.ko_phone_number) }} {{ CheckboxInput(form.ko_invite) }} -{{ TextInput(form.ko_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why')}} +{{ TextInput(form.ko_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}}
@@ -39,7 +31,7 @@ {{ UserInfo(form.cor_first_name, form.cor_last_name, form.cor_email, form.cor_phone_number) }} {{ CheckboxInput(form.cor_invite) }} -{{ TextInput(form.cor_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why')}} +{{ TextInput(form.cor_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}}
@@ -47,6 +39,6 @@

{{ "task_orders.new.oversight.so_info_paragraph" | translate }}

{{ UserInfo(form.so_first_name, form.so_last_name, form.so_email, form.so_phone_number) }} {{ CheckboxInput(form.so_invite) }} -{{ TextInput(form.so_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why')}} +{{ TextInput(form.so_dod_id, placeholder="1234567890", tooltip="Why", tooltip_title='Why', validation='dodId')}} {% endblock %} diff --git a/tests/factories.py b/tests/factories.py index 82cd3bcb..3ddc10b6 100644 --- a/tests/factories.py +++ b/tests/factories.py @@ -37,6 +37,10 @@ def random_dod_id(): return "".join(random.choices(string.digits, k=10)) +def random_phone_number(): + return "".join(random.choices(string.digits, k=10)) + + def random_future_date(year_min=1, year_max=5): if year_min == year_max: inc = year_min @@ -71,9 +75,7 @@ class UserFactory(Base): last_name = factory.Faker("last_name") atat_role = factory.LazyFunction(lambda: Roles.get("default")) dod_id = factory.LazyFunction(random_dod_id) - phone_number = factory.LazyFunction( - lambda: "".join(random.choices(string.digits, k=10)) - ) + phone_number = factory.LazyFunction(random_phone_number) service_branch = factory.LazyFunction(random_service_branch) citizenship = "United States" designation = "military" @@ -388,21 +390,15 @@ class TaskOrderFactory(Base): ko_first_name = factory.Faker("first_name") ko_last_name = factory.Faker("last_name") ko_email = factory.Faker("email") - ko_phone_number = factory.LazyFunction( - lambda: "".join(random.choices(string.digits, k=10)) - ) + ko_phone_number = factory.LazyFunction(random_phone_number) ko_dod_id = factory.LazyFunction(random_dod_id) cor_first_name = factory.Faker("first_name") cor_last_name = factory.Faker("last_name") cor_email = factory.Faker("email") - cor_phone_number = factory.LazyFunction( - lambda: "".join(random.choices(string.digits, k=10)) - ) + cor_phone_number = factory.LazyFunction(random_phone_number) cor_dod_id = factory.LazyFunction(random_dod_id) so_first_name = factory.Faker("first_name") so_last_name = factory.Faker("last_name") so_email = factory.Faker("email") - so_phone_number = factory.LazyFunction( - lambda: "".join(random.choices(string.digits, k=10)) - ) + so_phone_number = factory.LazyFunction(random_phone_number) so_dod_id = factory.LazyFunction(random_dod_id) diff --git a/translations.yaml b/translations.yaml index 87ce42ff..860fa292 100644 --- a/translations.yaml +++ b/translations.yaml @@ -358,10 +358,10 @@ task_orders: funding: section_title: Funding performance_period_title: Period of Performance - performance_period_description: Choose the dates your task order will cover. + performance_period_description: Choose the length of time 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_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_description: Calculate how much your cloud usage will cost. A technical representative should help you complete this calculation. These calculations 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. @@ -373,7 +373,7 @@ task_orders: oversight: section_title: Oversight ko_info_title: Contracting Officer (KO) Information - ko_info_paragraph: Your KO will need to approve funding for this Task Order by loggin into the JEDI Cloud Portal, submitting the Task Order documents within their official system of record, and electronically signing. You might want to work with your program Financial Manager to get your TO documents moving in the right dirction. + ko_info_paragraph: Your KO will need to approve funding for this Task Order by logging into the JEDI Cloud Portal, submitting the Task Order documents within their official system of record, and electronically signing. You might want to work with your program Financial Manager to get your TO documents moving in the right dirction. skip_ko_label: "Skip for now (We'll remind you to enter one later)" cor_info_title: Contractive Officer Representative (COR) Information cor_info_paragraph: Your COR may assist in submitting the Task Order documents within thier official system of record. They may also be invited to log in an manage the Task Order entry within the JEDI Cloud portal.