From c9e62e22e9742b908ba5d6aeee0cdb43a9ed2fd7 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 17 Jan 2020 10:37:29 -0500 Subject: [PATCH 01/15] update TO builder copy --- translations.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations.yaml b/translations.yaml index 4a3f001d..688b9f8c 100644 --- a/translations.yaml +++ b/translations.yaml @@ -276,7 +276,7 @@ forms: upload_error: There was an error uploading your file. Please try again. If you encounter repeated problems uploading this file, please contact CCPO. size_error: The file you have selected is too large. Please choose a file no larger than 64MB. filename_error: File names can only contain the characters A-Z, 0-9, space, hyphen, underscore, and period. - number_description: Task order number (13 digits) + number_description: 13-Digit Task Order Number pop_errors: date_order: PoP start date must be before end date. range: Date must be between {start} and {end}. @@ -481,8 +481,8 @@ task_orders: expended_funds: All funds spend from the Task Order so far. form: add_clin: Add another CLIN - add_to_header: Add your task order - add_to_description: Now, refer to your document to find the 13-digit task order number. It should be located at lorem ipsum dolar. From now on we'll refer to this portion of funding by the recorded task order number. + add_to_header: Enter the Task Order number + add_to_description: Please input your 13-digit Task Order number. This number may be listed under "Order Number" if your Contracting Officer used form 1149, or "Delivery Order/Call No." if form 1155 was used. Moving forward, this portion of funding will be referenced by the recorded Task Order number. clin_title: Enter Contract Line Items clin_description: "Refer to your task order to locate your Contract Line Item Numbers (CLINs)." clin_details: CLIN Details From 4ed75caf2ad5efcb8cf067662058bf8836a931c4 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 17 Jan 2020 16:37:57 -0500 Subject: [PATCH 02/15] Replace Lorem on Reports page --- templates/portfolios/reports/portfolio_summary.html | 12 ++++++------ translations.yaml | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/templates/portfolios/reports/portfolio_summary.html b/templates/portfolios/reports/portfolio_summary.html index 432ad28e..3395a205 100644 --- a/templates/portfolios/reports/portfolio_summary.html +++ b/templates/portfolios/reports/portfolio_summary.html @@ -5,15 +5,15 @@
- Total Portfolio Value - {{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}} + {{ "portfolios.reports.total_value.header" | translate }} + {{Tooltip(("portfolios.reports.total_value.tooltip" | translate), title="", classes="summary-item__header-icon")}}

{{ total_portfolio_value | dollars }}

- Funding Duration - {{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}} + {{ "portfolios.reports.duration.header" | translate }} + {{Tooltip(("portfolios.reports.duration.tooltip" | translate), title="", classes="summary-item__header-icon")}}
{% set earliest_pop_start_date, latest_pop_end_date = portfolio.funding_duration %} {% if earliest_pop_start_date and latest_pop_end_date %} @@ -28,8 +28,8 @@
- Days Remaining - {{Tooltip(("common.lorem" | translate), title="", classes="summary-item__header-icon")}} + {{ "portfolios.reports.days_remaining.header" | translate }} + {{Tooltip(("portfolios.reports.days_remaining.toolip" | translate), title="", classes="summary-item__header-icon")}}

{{ portfolio.days_to_funding_expiration }} days

diff --git a/translations.yaml b/translations.yaml index 688b9f8c..87009c92 100644 --- a/translations.yaml +++ b/translations.yaml @@ -453,6 +453,12 @@ portfolios: members: archive_button: Delete member reports: + days_remaining: + header: Days Remaining + toolip: Days remaining are the days of funding remaining in the portfolio. + duration: + header: Funding Duration + tooltip: Funding duration is the period of time that there is a valid task order funding the portfolio. estimate_warning: Reports displayed in JEDI are estimates and not a system of record. empty_state: message: Nothing to report. @@ -460,6 +466,9 @@ portfolios: can_create_applications: This portfolio has no cloud environments set up, so there is no spending data to report. Create an application with some cloud environments to get started. cannot_create_applications: This portfolio has no cloud environments set up, so there is no spending data to report. Contact the portfolio owner to set up some cloud environments. action_label: 'Add a new application' + total_value: + header: Total Portfolio Value + tooltip: Total portfolio value is all obligated and projected funds for all task orders in this portfolio. task_orders: add_new_button: Add New Task Order review: From 0893ec18ce622d18eec62b3a190421426c07fe8c Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 17 Jan 2020 16:48:10 -0500 Subject: [PATCH 03/15] Update copy on error page --- translations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations.yaml b/translations.yaml index 87009c92..5b54d702 100644 --- a/translations.yaml +++ b/translations.yaml @@ -78,7 +78,7 @@ components: errors: default_sub: An error has occured! not_found: Page Not Found - not_found_sub: Looks like that page does not exist! + not_found_sub: This page does not exist. email: application_invite: "{inviter_name} has invited you to a JEDI cloud application" portfolio_invite: "{inviter_name} has invited you to a JEDI cloud portfolio" From 7c78e59624a13f4c45b31569f84610de85c1d134 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sun, 19 Jan 2020 07:09:25 -0500 Subject: [PATCH 04/15] Update copy on new portfolio form. Style cancel link as a button. --- atst/forms/portfolio.py | 1 + templates/portfolios/new/step_1.html | 9 ++++----- translations.yaml | 6 ++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/atst/forms/portfolio.py b/atst/forms/portfolio.py index 069659bb..591cc080 100644 --- a/atst/forms/portfolio.py +++ b/atst/forms/portfolio.py @@ -28,6 +28,7 @@ class PortfolioForm(BaseForm): class PortfolioCreationForm(PortfolioForm): defense_component = SelectMultipleField( + translate("forms.portfolio.defense_component.title"), choices=SERVICE_BRANCHES, widget=ListWidget(prefix_label=False), option_widget=CheckboxInput(), diff --git a/templates/portfolios/new/step_1.html b/templates/portfolios/new/step_1.html index 4a499821..d3d34a10 100644 --- a/templates/portfolios/new/step_1.html +++ b/templates/portfolios/new/step_1.html @@ -12,9 +12,9 @@ {% include "fragments/flash.html" %}

{{ "portfolios.header" | translate }}

-

{{ "New Portfolio" }}

+

{{ "portfolios.new.title" | translate }}

- {{ StickyCTA(text="Create New Portfolio") }} + {{ StickyCTA(text="portfolios.new.cta_step_1"|translate, context=("portfolios.new.sticky_header_context"|translate({"step": "1"}) )) }}
@@ -39,9 +39,9 @@
{% block next_button %} - {{ SaveButton(text=('common.save' | translate), form="portfolio-create", element="input") }} + {{ SaveButton(text=('portfolios.new.save' | translate), form="portfolio-create", element="input") }} {% endblock %} - + Cancel @@ -49,4 +49,3 @@ {% endblock %} - diff --git a/translations.yaml b/translations.yaml index 5b54d702..7153c77a 100644 --- a/translations.yaml +++ b/translations.yaml @@ -260,6 +260,7 @@ forms: marine_corps: Marine Corps navy: Navy other: Other + title: Select DoD component(s) funding your Portfolio validation_message: You must select at least one defense component. help_text: |

@@ -450,6 +451,11 @@ portfolios: 'False': "" 'True': Delete Application header: PORTFOLIO + new: + title: New Portfolio + cta_step_1: Name and Describe Portfolio + sticky_header_context: 'Step {step} of 1' + save: Save Portfolio members: archive_button: Delete member reports: From c946bc74dbe7e60a0b6f038d2681c50da66e1e28 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sun, 19 Jan 2020 07:11:35 -0500 Subject: [PATCH 05/15] Remove button from TO index page sticy cta when there are no TOs --- templates/task_orders/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/task_orders/index.html b/templates/task_orders/index.html index 5926ff60..a720c789 100644 --- a/templates/task_orders/index.html +++ b/templates/task_orders/index.html @@ -66,7 +66,7 @@ {% call StickyCTA(text="common.task_orders"|translate) %} - {% if user_can(permissions.CREATE_TASK_ORDER) and task_orders %} + {% if user_can(permissions.CREATE_TASK_ORDER) and to_count > 0 %} {{ "task_orders.add_new_button" | translate }} From 961717e0e7dd7a5111dfedeef174be6286469638 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sun, 19 Jan 2020 07:37:15 -0500 Subject: [PATCH 06/15] Update copy in TO builder --- js/components/clin_fields.js | 2 +- templates/components/clin_fields.html | 2 +- .../fragments/task_order_view.html | 10 +++++----- templates/task_orders/step_1.html | 4 ++-- templates/task_orders/step_5.html | 2 +- translations.yaml | 19 ++++++++++++++----- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/js/components/clin_fields.js b/js/components/clin_fields.js index 327bedf0..a43d321f 100644 --- a/js/components/clin_fields.js +++ b/js/components/clin_fields.js @@ -101,7 +101,7 @@ export default { if (!!this.clinNumber) { return `CLIN ${this.clinNumber}` } else { - return `CLIN` + return `New CLIN` } }, percentObligated: function() { diff --git a/templates/components/clin_fields.html b/templates/components/clin_fields.html index 64dbb86c..81e31f9a 100644 --- a/templates/components/clin_fields.html +++ b/templates/components/clin_fields.html @@ -118,7 +118,7 @@ {{ CLINDollarAmount("obligated", funding_validation=True) }} {% endif %} -

Percent Obligated
+
{{ "task_orders.form.step_3.percent_obligated" | translate }}

diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index 31e95519..7c9ad8b3 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -11,7 +11,7 @@

- Total obligated funds + {{ 'task_orders.form.step_4.obligated' | translate }} {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }}

@@ -20,7 +20,7 @@

- Total Task Order value + {{ 'task_orders.form.step_4.total' | translate }} {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}

@@ -29,7 +29,7 @@

- Total expended funds + {{ 'task_orders.form.step_4.expended' | translate }} {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="summary-item__header-icon") }}

@@ -39,7 +39,7 @@

-

Documents

+

{{ 'task_orders.form.step_4.documents' | translate }}

{% if builder_mode %} {{ Icon('ok', classes="icon--green icon--medium") }} @@ -52,7 +52,7 @@
-

CLIN summary

+

{{ 'task_orders.form.step_4.clins' | translate }}

diff --git a/templates/task_orders/step_1.html b/templates/task_orders/step_1.html index 59c0df70..177a41a8 100644 --- a/templates/task_orders/step_1.html +++ b/templates/task_orders/step_1.html @@ -16,8 +16,8 @@ {% block to_builder_form_field %} {{ TOFormStepHeader( - title='task_orders.form.supporting_docs_header' | translate, - description='task_orders.form.supporting_docs_text' | translate, + title='task_orders.form.step_1.title' | translate, + description='task_orders.form.step_1.description' | translate, ) }} {{ UploadInput(form.pdf, portfolio.id) }} {% endblock %} diff --git a/templates/task_orders/step_5.html b/templates/task_orders/step_5.html index ac40993a..a091ab32 100644 --- a/templates/task_orders/step_5.html +++ b/templates/task_orders/step_5.html @@ -8,7 +8,7 @@ {% set next_button_text = 'task_orders.form.step_5.next_button' | translate %} {% set previous_button_link = url_for("task_orders.form_step_four_review", task_order_id=task_order_id) %} {% set step = "5" %} -{% set sticky_cta_text = 'task_orders.form.sticky_header_text' | translate %} +{% set sticky_cta_text = 'task_orders.form.step_5.cta_text' | translate %} {% block to_builder_form_field %} {{ TOFormStepHeader( diff --git a/translations.yaml b/translations.yaml index 7153c77a..a553c622 100644 --- a/translations.yaml +++ b/translations.yaml @@ -495,7 +495,7 @@ task_orders: total_value: All obligated and projected funds for the Task Order’s Base and Option CLINs. expended_funds: All funds spend from the Task Order so far. form: - add_clin: Add another CLIN + add_clin: Add Another CLIN add_to_header: Enter the Task Order number add_to_description: Please input your 13-digit Task Order number. This number may be listed under "Order Number" if your Contracting Officer used form 1149, or "Delivery Order/Call No." if form 1155 was used. Moving forward, this portion of funding will be referenced by the recorded Task Order number. clin_title: Enter Contract Line Items @@ -511,19 +511,28 @@ task_orders: draft_alert_message: You can return to the Task Order Builder to enter missing information. Once you are finished, you’ll be ready to submit this request. total_funds_label: Total CLIN Value obligated_funds_label: Obligated Funds - pop: Period of Performance + pop: Period of Performance (PoP) pop_end: End Date pop_end_alert: "A CLIN's period of performance must end before {end_date}." pop_example: "For example: 07 04 1776" pop_start: Start Date - supporting_docs_header: Upload your supporting documentation supporting_docs_size_limit: Your file may not exceed 64MB - supporting_docs_text: Upload a single PDF containing all relevant information. + step_1: + title: Upload your approved Task Order (TO) + description: Upload your approved Task Order here. You are required to confirm you have the appropriate signature. You will have the ability to add additional approved Task Orders with more funding to this Portfolio in the future. step_3: next_button: 'Next: Review Task Order' + percent_obligated: '% of Funds Obligated' + step_4: + obligated: Total Obligated + total: Total Value + expended: Total Expended + documents: Documents + clins: CLIN Summary step_5: + cta_text: Verify Your Information description: Prior to submitting the Task Order, you must acknowledge, by marking the appropriate box below, that the uploaded Task Order is signed by an appropriate, duly warranted Contracting Officer who has the authority to execute the uploaded Task Order on your Agency’s behalf and has authorized you to upload the Task Order in accordance with Agency policy and procedures. You must further acknowledge, by marking the appropriate box below, that all information entered herein matches that of the submitted Task Order. - next_button: 'Confirm & Submit' + next_button: 'Submit Task Order' sticky_header_text: 'Add a Task Order' sticky_header_review_text: Review Changes sticky_header_context: 'Step {step} of 5' From d38b5f70123f5713e125918174eee64decaae1fd Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sun, 19 Jan 2020 07:54:38 -0500 Subject: [PATCH 07/15] Update copy on TO view page --- .../task_orders/fragments/task_order_view.html | 16 +++++++++++++--- translations.yaml | 4 ++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index 7c9ad8b3..32fb4644 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -7,11 +7,21 @@ {% set contract_amount = task_order.total_contract_amount %} {% set expended_funds = task_order.invoiced_funds %} + {% if builder_mode -%} + {% set obligated = 'task_orders.form.step_4.obligated' %} + {% set total = 'task_orders.form.step_4.total' %} + {% set expended = 'task_orders.form.step_4.expended' %} + {% else %} + {% set obligated = 'task_orders.review.summary.obligated' %} + {% set total = 'task_orders.review.summary.total' %} + {% set expended = 'task_orders.review.summary.expended' %} + {%- endif %} +

- {{ 'task_orders.form.step_4.obligated' | translate }} + {{ obligated | translate }} {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }}

@@ -20,7 +30,7 @@

- {{ 'task_orders.form.step_4.total' | translate }} + {{ total | translate }} {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}

@@ -29,7 +39,7 @@

- {{ 'task_orders.form.step_4.expended' | translate }} + {{ expended | translate }} {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="summary-item__header-icon") }}

diff --git a/translations.yaml b/translations.yaml index a553c622..65071fc3 100644 --- a/translations.yaml +++ b/translations.yaml @@ -490,6 +490,10 @@ task_orders: JEDI_CLIN_2: 'Classified IaaS and PaaS (IDIQ CLIN 0002)' JEDI_CLIN_3: 'Unclassified Cloud Support Package (IDIQ CLIN 0003)' JEDI_CLIN_4: 'Classified Cloud Support Package (IDIQ CLIN 0004)' + summary: + obligated: Total obligated funds + total: Total Task Order value + expended: Total expended funds tooltip: obligated_funds: Funds committed to fund your portfolio. This may represent 100% of your total Task Order value, or a portion of it. total_value: All obligated and projected funds for the Task Order’s Base and Option CLINs. From 88d57a414bf59f1629822e5e113e931a0092a837 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sun, 19 Jan 2020 08:14:13 -0500 Subject: [PATCH 08/15] Update copy in new application form. --- .../applications/fragments/member_form_fields.html | 2 +- templates/applications/fragments/members.html | 2 +- templates/applications/new/step_3.html | 6 +++--- templates/portfolios/fragments/member_form_fields.html | 2 +- translations.yaml | 10 ++++++---- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html index 707653fa..388f0be4 100644 --- a/templates/applications/fragments/member_form_fields.html +++ b/templates/applications/fragments/member_form_fields.html @@ -124,6 +124,6 @@ {{ TextInput(member_form.email, validation='email', optional=False) }} {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}} {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }} - How do I find the DoD ID? + {{ "forms.new_member.dod_help" | translate }}

{% endmacro %} diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html index 9bd80dd0..8d721e83 100644 --- a/templates/applications/fragments/members.html +++ b/templates/applications/fragments/members.html @@ -179,7 +179,7 @@ member_form.SubmitStep( name=new_member_modal_name, form=member_fields.PermsFields(form=new_member_form, new=True), - submit_text="portfolios.applications.members.form.add_member"|translate, + submit_text="common.save_changes"|translate, modal=new_member_modal_name, ) ], diff --git a/templates/applications/new/step_3.html b/templates/applications/new/step_3.html index a4e1aa53..d88a704c 100644 --- a/templates/applications/new/step_3.html +++ b/templates/applications/new/step_3.html @@ -27,13 +27,13 @@ - Return to Application Settings + {{ "portfolios.applications.new.step_3_button_text" | translate }} - Previous + {{ "common.previous" | translate }} - Cancel + {{ "common.cancel" | translate }} diff --git a/templates/portfolios/fragments/member_form_fields.html b/templates/portfolios/fragments/member_form_fields.html index 7bfccc37..3d7b1eb5 100644 --- a/templates/portfolios/fragments/member_form_fields.html +++ b/templates/portfolios/fragments/member_form_fields.html @@ -32,6 +32,6 @@ {{ TextInput(member_form.email, validation='email', optional=False) }} {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}} {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }} - How do I find the DoD ID? + {{ "forms.new_member.dod_help" | translate }}
{% endmacro %} diff --git a/translations.yaml b/translations.yaml index 65071fc3..61c723a6 100644 --- a/translations.yaml +++ b/translations.yaml @@ -210,6 +210,7 @@ forms: label: Edit Applications description: Add, remove and edit applications in this Portfolio. dod_id_label: DoD ID + dod_help: How do I find out the DoD ID? email_label: Email address first_name_label: First name funding: @@ -358,7 +359,7 @@ portfolios: 'True': Edit Reporting applications: add_environment: Create an Environment - add_member: Add New Member + add_member: Add New Application Member add_another_environment: Add another environment create_button: Create Application empty_state: @@ -385,7 +386,7 @@ portfolios: description: |

- Add a brief one to two sentence description of your application. You should be able to reference your TO Description of Work. + Add a brief one to two sentence description of your Application. You should be able to reference your TO Description of Work.

Writer's Block? A description example includes: @@ -395,10 +396,11 @@ portfolios:

step_2_header: Add Environments to {application_name} - step_2_description: Development, Testing, Staging, and Production environments are included by default. However, you can add, edit, and delete environments based on the needs of your Application. + step_2_description: Production, Staging, Testing, and Development environments are included by default. However, you can add, edit, and delete environments based on the needs of your Application. step_2_button_text: "Next: Add Members" step_3_header: Add Members to {application_name} step_3_description: "To proceed, you will need each member's email address and DOD ID. Within this section, you will also assign Application-level permissions and environment-level roles for each member." + step_3_button_text: Save Application create_new_env: Create a new environment. create_new_env_info: Creating an environment gives you access to the Cloud Service Provider. This environment will function within the constraints of the task order, and any costs will be billed against the portfolio. csp_link: Cloud Service Provider Link @@ -430,7 +432,7 @@ portfolios: description: Additional role controls are available in the CSP console. Learn More revoke_warning: Save changes to revoke access, this can not be undone. suspended: Suspended access cannot be modified. - next_button: "Next: Permissions" + next_button: "Next: Roles and Permissions" app_perms: title: Application Permissions description: Application permissions allow users to provision and modify applications and teams. Learn More From d0ae04193b8cf616e560d88da69d8b8a3ff1f852 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Sun, 19 Jan 2020 08:35:21 -0500 Subject: [PATCH 09/15] Update copy on app settings page --- templates/applications/fragments/environments.html | 2 +- templates/applications/fragments/member_form_fields.html | 2 +- templates/applications/fragments/members.html | 2 +- translations.yaml | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/templates/applications/fragments/environments.html b/templates/applications/fragments/environments.html index 9e9a3ef8..09da6e53 100644 --- a/templates/applications/fragments/environments.html +++ b/templates/applications/fragments/environments.html @@ -84,7 +84,7 @@ {{ TextInput(edit_form.name, validation='requiredField', optional=False) }} {{ SaveButton( - text=("common.save" | translate) + text=("common.save_changes" | translate) ) }} diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html index 388f0be4..03efa474 100644 --- a/templates/applications/fragments/member_form_fields.html +++ b/templates/applications/fragments/member_form_fields.html @@ -21,7 +21,7 @@ {{ sub_form.environment_name.data }}
- {{ role }} + {{ "portfolios.applications.members.roles.{}".format(role) | translate }}
diff --git a/templates/applications/fragments/members.html b/templates/applications/fragments/members.html index 8d721e83..5cae077f 100644 --- a/templates/applications/fragments/members.html +++ b/templates/applications/fragments/members.html @@ -46,7 +46,7 @@ {{ member_form.SubmitStep( name=modal_name, form=member_fields.PermsFields(form=member.form, member_role_id=member.role_id), - submit_text="Update", + submit_text="common.save_changes"|translate, previous=False, modal=modal_name, ) }} diff --git a/translations.yaml b/translations.yaml index 61c723a6..820078eb 100644 --- a/translations.yaml +++ b/translations.yaml @@ -358,7 +358,7 @@ portfolios: 'False': View Reporting 'True': Edit Reporting applications: - add_environment: Create an Environment + add_environment: Add an Environment add_member: Add New Application Member add_another_environment: Add another environment create_button: Create Application @@ -452,6 +452,10 @@ portfolios: perms_del_env: 'False': "" 'True': Delete Application + roles: + ADMIN: Admin + BILLING_READ: Billing Read-only + CONTRIBUTOR: Contributor header: PORTFOLIO new: title: New Portfolio From 6f85f6de970a0c0e4b1885d42f07ef2a8ea32453 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 20 Jan 2020 15:45:59 -0500 Subject: [PATCH 10/15] Update copy for invite alert messages, CLIN error message, and use translations in flash file --- atst/routes/applications/settings.py | 6 +----- atst/utils/flash.py | 6 +++--- translations.yaml | 7 +++---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index 91676cfb..ed45fe2e 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -509,11 +509,7 @@ def resend_invite(application_id, application_role_id): token=new_invite.token, ) - flash( - "application_invite_resent", - user_name=new_invite.user_name, - application_name=app_role.application.name, - ) + flash("application_invite_resent", email=new_invite.email) else: flash( "application_invite_error", diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 7a1cf4ce..fab79939 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -29,7 +29,7 @@ MESSAGES = { "category": "error", }, "application_invite_resent": { - "title": "flash.application_invite.resent.title", + "title": "", "message": "flash.application_invite.resent.message", "category": "success", }, @@ -90,7 +90,7 @@ MESSAGES = { }, "insufficient_funds": { "title": "flash.task_order.insufficient_funds.title", - "message": "", + "message": "flash.task_order.insufficient_funds.message", "category": "warning", }, "logged_out": { @@ -104,7 +104,7 @@ MESSAGES = { "category": "warning", }, "new_application_member": { - "title": "flash.new_application_member.title", + "title": None, "message": "flash.new_application_member.message", "category": "success", }, diff --git a/translations.yaml b/translations.yaml index 820078eb..350aa566 100644 --- a/translations.yaml +++ b/translations.yaml @@ -98,8 +98,7 @@ flash: title: Application invitation error message: There was an error processing the invitation for {user_name} from {application_name} resent: - title: Application invitation resent - message: You have successfully resent the invite for {user_name} from {application_name} + message: "{email} has been sent an invitation to access this Application" revoked: title: Application invitation revoked message: You have successfully revoked the invite for {user_name} from {application_name} @@ -166,11 +165,11 @@ flash: task_order: insufficient_funds: title: Insufficient Funds + message: "" submitted: title: Your Task Order has been uploaded successfully. message: Your task order form for {task_order.portfolio_name} has been submitted. new_application_member: - title: "{user_name}'s invitation has been sent" message: "{user_name}'s access to this Application is pending until they sign in for the first time." updated_application_team_settings: 'You have updated the {application_name} team settings.' user: @@ -287,7 +286,7 @@ forms: start_past_contract: PoP start date must be before or on {date}. start_pre_contract: PoP start date must be on or after {date}. clin_funding_errors: - obligated_amount_error: Obligated amount must be less than or equal to total amount + obligated_amount_error: Obligated funds can not exceed total CLIN value funding_range_error: Dollar amount must be from $0.00 to $1,000,000,000.00 validators: is_number_message: Please enter a valid number. From ce70e44590bccd3db7b79647ddf9c119bfe8900d Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 21 Jan 2020 10:59:38 -0500 Subject: [PATCH 11/15] Update flash messages for portfolio invites to match application invite messages. Use None instead of an empty string for titles and messages in flash alerts. --- atst/routes/portfolios/invitations.py | 2 +- atst/utils/flash.py | 12 ++++++------ translations.yaml | 9 +++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/atst/routes/portfolios/invitations.py b/atst/routes/portfolios/invitations.py index 7c48593f..9ec56aa3 100644 --- a/atst/routes/portfolios/invitations.py +++ b/atst/routes/portfolios/invitations.py @@ -65,7 +65,7 @@ def resend_invitation(portfolio_id, portfolio_token): inviter_name=g.current_user.full_name, token=invite.token, ) - flash("resend_portfolio_invitation", user_name=invite.user_name) + flash("resend_portfolio_invitation", email=invite.email) else: user_name = f"{form['user_data']['first_name'].data} {form['user_data']['last_name'].data}" flash("resend_portfolio_invitation_error", user_name=user_name) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index fab79939..02a74cb2 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -29,7 +29,7 @@ MESSAGES = { "category": "error", }, "application_invite_resent": { - "title": "", + "title": None, "message": "flash.application_invite.resent.message", "category": "success", }, @@ -90,7 +90,7 @@ MESSAGES = { }, "insufficient_funds": { "title": "flash.task_order.insufficient_funds.title", - "message": "flash.task_order.insufficient_funds.message", + "message": None, "category": "warning", }, "logged_out": { @@ -104,13 +104,13 @@ MESSAGES = { "category": "warning", }, "new_application_member": { - "title": None, + "title": "flash.new_application_member.title", "message": "flash.new_application_member.message", "category": "success", }, "new_portfolio_member": { - "title": "flash.success", - "message": "flash.new_portfolio_member", + "title": "flash.new_portfolio_member.title", + "message": "flash.new_portfolio_member.message", "category": "success", }, "portfolio_member_removed": { @@ -124,7 +124,7 @@ MESSAGES = { "category": "success", }, "resend_portfolio_invitation": { - "title": "flash.portfolio_invite.resent.title", + "title": None, "message": "flash.portfolio_invite.resent.message", "category": "success", }, diff --git a/translations.yaml b/translations.yaml index 350aa566..2601da37 100644 --- a/translations.yaml +++ b/translations.yaml @@ -136,7 +136,9 @@ flash: logged_out: title: Logged out message: You've been logged out. - new_portfolio_member: 'You have successfully invited {user_name} to the portfolio.' + new_portfolio_member: + title: "{user_name}'s invitation has been sent" + message: "{user_name}'s access to this Portfolio is pending until they sign in for the first time." new_ppoc_message: 'You have successfully added {ppoc_name} as the primary point of contact. You are no longer the PPoC.' new_ppoc_title: Primary point of contact updated portfolio_member: @@ -151,8 +153,7 @@ flash: message: An unexpected problem occurred with your request, please try again. If the problem persists, contact an administrator. portfolio_invite: resent: - title: Invitation resent - message: Successfully sent a new invitation to {user_name}. + message: "{email} has been sent an invitation to access this Application" error: title: Portfolio invitation error message: There was an error processing the invitation for {user_name}. @@ -165,11 +166,11 @@ flash: task_order: insufficient_funds: title: Insufficient Funds - message: "" submitted: title: Your Task Order has been uploaded successfully. message: Your task order form for {task_order.portfolio_name} has been submitted. new_application_member: + title: "{user_name}'s invitation has been sent" message: "{user_name}'s access to this Application is pending until they sign in for the first time." updated_application_team_settings: 'You have updated the {application_name} team settings.' user: From 2d32e9c79bb6ca1bb471cb8d0e60783932117a32 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 21 Jan 2020 11:33:18 -0500 Subject: [PATCH 12/15] Remove lorem paragraph and link from 404 page --- templates/error.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/templates/error.html b/templates/error.html index ca5e19d8..449c9a88 100644 --- a/templates/error.html +++ b/templates/error.html @@ -17,15 +17,6 @@ {%- endif %}

-
-
-

- {{ "common.lorem" | translate }} -

-

- More lorem -

-
{% endblock %} From d2b9577e3b48c580f082bab7949ae7ca64b68aba Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 21 Jan 2020 11:40:41 -0500 Subject: [PATCH 13/15] Standardize copy in TO builder and TO view page --- .../fragments/task_order_view.html | 32 +++++++------------ translations.yaml | 11 +++---- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index 32fb4644..2ec2a738 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -7,30 +7,11 @@ {% set contract_amount = task_order.total_contract_amount %} {% set expended_funds = task_order.invoiced_funds %} - {% if builder_mode -%} - {% set obligated = 'task_orders.form.step_4.obligated' %} - {% set total = 'task_orders.form.step_4.total' %} - {% set expended = 'task_orders.form.step_4.expended' %} - {% else %} - {% set obligated = 'task_orders.review.summary.obligated' %} - {% set total = 'task_orders.review.summary.total' %} - {% set expended = 'task_orders.review.summary.expended' %} - {%- endif %} -

- {{ obligated | translate }} - {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }} -

-

- {{ obligated_funds | dollars }} -

-
-
-

- {{ total | translate }} + {{ 'task_orders.summary.total' | translate }} {{ Tooltip(("task_orders.review.tooltip.total_value" | translate), title="", classes="summary-item__header-icon") }}

@@ -39,7 +20,16 @@

- {{ expended | translate }} + {{ 'task_orders.summary.obligated' | translate }} + {{ Tooltip(("task_orders.review.tooltip.obligated_funds" | translate), title="", classes="summary-item__header-icon") }} +

+

+ {{ obligated_funds | dollars }} +

+
+
+

+ {{ 'task_orders.summary.expended' | translate }} {{ Tooltip(("task_orders.review.tooltip.expended_funds" | translate), title="", classes="summary-item__header-icon") }}

diff --git a/translations.yaml b/translations.yaml index 2601da37..87c584e2 100644 --- a/translations.yaml +++ b/translations.yaml @@ -496,10 +496,6 @@ task_orders: JEDI_CLIN_2: 'Classified IaaS and PaaS (IDIQ CLIN 0002)' JEDI_CLIN_3: 'Unclassified Cloud Support Package (IDIQ CLIN 0003)' JEDI_CLIN_4: 'Classified Cloud Support Package (IDIQ CLIN 0004)' - summary: - obligated: Total obligated funds - total: Total Task Order value - expended: Total expended funds tooltip: obligated_funds: Funds committed to fund your portfolio. This may represent 100% of your total Task Order value, or a portion of it. total_value: All obligated and projected funds for the Task Order’s Base and Option CLINs. @@ -534,9 +530,6 @@ task_orders: next_button: 'Next: Review Task Order' percent_obligated: '% of Funds Obligated' step_4: - obligated: Total Obligated - total: Total Value - expended: Total Expended documents: Documents clins: CLIN Summary step_5: @@ -559,6 +552,10 @@ task_orders: text: I acknowledge, by executing the confirmation above and submitting this verification, that I am subject to potential penalties that may include fines, imprisonment, or both, under the U.S. law and regulations for any false statement or misrepresentation in association with this Task Order submission or on any accompanying documentation. status_empty_state: 'This Portfolio has no {status} Task Orders.' status_list_title: '{status} Task Orders' + summary: + obligated: Total Obligated + total: Total Value + expended: Total Expended JEDICLINType: JEDI_CLIN_1: 'IDIQ CLIN 0001 Unclassified IaaS/PaaS' JEDI_CLIN_2: 'IDIQ CLIN 0002 Classified IaaS/PaaS' From d0cb4ce33998f6efbffe30f8c2691335de66924e Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 21 Jan 2020 11:41:45 -0500 Subject: [PATCH 14/15] Update button text for adding new application member --- translations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations.yaml b/translations.yaml index 87c584e2..c323254a 100644 --- a/translations.yaml +++ b/translations.yaml @@ -359,7 +359,7 @@ portfolios: 'True': Edit Reporting applications: add_environment: Add an Environment - add_member: Add New Application Member + add_member: Add Team Member add_another_environment: Add another environment create_button: Create Application empty_state: From 04de3d040475df661d4c5d603e7312d7fed93b36 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Wed, 22 Jan 2020 14:58:08 -0500 Subject: [PATCH 15/15] Correct portfolio invite resent alert --- translations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations.yaml b/translations.yaml index c323254a..360fc984 100644 --- a/translations.yaml +++ b/translations.yaml @@ -153,7 +153,7 @@ flash: message: An unexpected problem occurred with your request, please try again. If the problem persists, contact an administrator. portfolio_invite: resent: - message: "{email} has been sent an invitation to access this Application" + message: "{email} has been sent an invitation to access this Portfolio" error: title: Portfolio invitation error message: There was an error processing the invitation for {user_name}.