diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 3c056572..965978a2 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -120,6 +120,11 @@ .task-order-next-steps { flex-grow: 1; + + .panel { + padding-bottom: 0; + } + @include media($xlarge-screen) { padding-right: $gap; } @@ -143,8 +148,17 @@ width: 100%; } + .alert { + margin-top: 3 * $gap; + margin-bottom: 0; + padding: 2 * $gap; + + .alert__message { + font-style: italic; + } + } + .task-order-next-steps__icon { - width: 8%; padding: $gap $gap 0 0; justify-content: center; .complete { @@ -155,27 +169,14 @@ } } - .task-order-next-steps__text { - width: 60%; - } - .task-order-next-steps__action { + min-width: 10 * $gap; padding: $gap 0 0 $gap; - width: 32%; a.usa-button { width: 100%; } } - .task-order-next-steps__heading { - - h4 { - @include ie-only { - width: 100%; - } - margin: $gap $gap 0 0; - } - } .task-order-next-steps__description { font-style: italic; } diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html index fb7d98eb..6ae041d4 100644 --- a/templates/portfolios/task_orders/show.html +++ b/templates/portfolios/task_orders/show.html @@ -6,19 +6,32 @@ {% block portfolio_content %} -{% macro Step(title="", description="", link_text=None, complete=True) %} -
-
- {{ Icon("ok", classes="complete" if complete else "incomplete") }} -
-
-
-

{{ title }}

+{% macro Step(description="", complete=True, button_text=None, button_url=None) %} +
+
+
+ {% if complete %} + Completed + {% else %} + Not Started + {% endif %}
-
- {{ description }} +
+
+ {{ description }} +
+
+
+ {% if button_text and button_url %} + + {{ button_text }} + + {% endif %}
+ {% if caller %} {{ caller() }} {% endif %} @@ -87,42 +100,33 @@
-

What's next?

+

{{ "task_orders.view.whats_next" | translate }}

{% call Step( - title="Submit draft Task Order", - description="Complete initial task order request form.", - link_text="edit", + description="task_orders.view.steps.draft" | translate | safe, + button_url=url_for("task_orders.new", screen=1, task_order_id=task_order.id), + button_text='Edit', complete=all_sections_complete) %} -
- {% if user == task_order.contracting_officer %} - {% set url=url_for("portfolios.ko_review", portfolio_id=portfolio.id, task_order_id=task_order.id) %} - {% else %} - {% set url = url_for("task_orders.new", screen=1, task_order_id=task_order.id) %} - {% endif %} - - Edit - -
{% endcall %} {{ Step( - title="Complete a Security Requirements Document", - description="The IA Security Official you specified received an email invitation to complete and sign a DD-254: Security Requirements document that's been customized for the JEDI program here.", + description="task_orders.view.steps.security" | translate | safe, complete=False) }} + {% call Step( + description="task_orders.view.steps.record" | translate | safe, + complete=False) %} +
+
+
+ {{ "task_orders.view.steps.record_description" | translate | safe }} +
+
+
+ {% endcall %} + {% set is_ko = user == task_order.contracting_officer %} {{ Step( - title="Prepare the Task Order Documents for your organization's contracting system", - description="You'll file your task order in your organization's contracting system. Change the formatting based on your office prefers.", + description="task_orders.view.steps.sign" | translate | safe, + button_url=is_ko and url_for("portfolios.ko_review", portfolio_id=portfolio.id, task_order_id=task_order.id), + button_text=is_ko and 'Sign', complete=False) }} - {{ Step( - title="Get a funding document", - description="User your organization's normal process to get a funding document, typically from your financial manager. Your Contracting Officer's Representative (COR) or Contracting Officer (KO) can help with this, too.", - complete=False) }} - {{ Step( - title="Have your KO submit your final task order", - description="Your KO will submit the final task order into your organization's contracting system and receive an official task order number. Your KO should enter your task order number in this system, along with a copy of the submitted task order.", - complete=False) }} -

Once your required information is submitted in this system, you're funded and ready to start using JEDI cloud services!

diff --git a/translations.yaml b/translations.yaml index 7c8ee7ed..8dc81185 100644 --- a/translations.yaml +++ b/translations.yaml @@ -412,6 +412,14 @@ task_orders: title: Sign Task Order unlimited_level_of_warrant_description: Unlimited Level of Warrant funds verify_warrant_level_paragraph: Verify your level of warrant and provide your digital signature to authorize this Task Order. + view: + whats_next: Here are the remaining tasks to get your Task Order approved. + steps: + draft: 'Primary Point of contact (you) completes initial Task Order form.' + security: 'IA Security Officer (Frank Fontaine) completes a Security Requirements Document. Send a reminder' + record: 'Contracting Officer (Steward Kayou) or Contracting Officer Representative (Not specified) records Task Order information. Send a reminder' + record_description: Obtain a funding document and file a Task Order in the appropriate system of record. Once this is complete, come back here and record the task order information. + sign: 'Contracting Officer (Steward Kayou) verifies funding to unlock cloud services.' new: app_info: section_title: "What You're Making"