diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html index 6ae041d4..3a8b504c 100644 --- a/templates/portfolios/task_orders/show.html +++ b/templates/portfolios/task_orders/show.html @@ -6,6 +6,16 @@ {% block portfolio_content %} +{% macro officer_name(officer) -%} + {%- if not officer -%} + Not specified + {%- elif officer == g.current_user -%} + You + {%- else -%} + {{ officer.full_name }} + {%- endif -%} +{%- endmacro -%} + {% macro Step(description="", complete=True, button_text=None, button_url=None) %}
@@ -102,16 +112,23 @@

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

{% call Step( - description="task_orders.view.steps.draft" | translate | safe, + description="task_orders.view.steps.draft" | translate({ + "contact": officer_name(task_order.creator) + })| safe, button_url=url_for("task_orders.new", screen=1, task_order_id=task_order.id), button_text='Edit', complete=all_sections_complete) %} {% endcall %} {{ Step( - description="task_orders.view.steps.security" | translate | safe, + description="task_orders.view.steps.security" | translate({ + "security_officer": officer_name(task_order.security_officer) + }) | safe, complete=False) }} {% call Step( - description="task_orders.view.steps.record" | translate | safe, + description="task_orders.view.steps.record" | translate({ + "contracting_officer": officer_name(task_order.contracting_officer), + "contracting_officer_representative": officer_name(task_order.contracting_officer_representative) + }) | safe, complete=False) %}
@@ -123,7 +140,9 @@ {% endcall %} {% set is_ko = user == task_order.contracting_officer %} {{ Step( - description="task_orders.view.steps.sign" | translate | safe, + description="task_orders.view.steps.sign" | translate({ + "contracting_officer": officer_name(task_order.contracting_officer) + }) | 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) }} diff --git a/translations.yaml b/translations.yaml index 8dc81185..fb95f021 100644 --- a/translations.yaml +++ b/translations.yaml @@ -415,11 +415,11 @@ task_orders: 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' + draft: 'Primary Point of contact ({contact}) completes initial Task Order form.' + security: 'IA Security Officer ({security_officer}) completes a Security Requirements Document. Send a reminder' + record: 'Contracting Officer ({contracting_officer}) or Contracting Officer Representative ({contracting_officer_representative}) 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.' + sign: 'Contracting Officer ({contracting_officer}) verifies funding to unlock cloud services.' new: app_info: section_title: "What You're Making"