pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put correct officer names in TO next steps

Browse Source
This commit is contained in:
Patrick Smith 2019-02-13 08:03:33 -05:00
parent 64bff0f478
commit ff9628cff3
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
templates/portfolios/task_orders/show.html
View File

@ -6,6 +6,16 @@
{% block portfolio_content %} {% 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) %} {% macro Step(description="", complete=True, button_text=None, button_url=None) %}
<div class="task-order-next-steps__step panel__content"> <div class="task-order-next-steps__step panel__content">
<div class="row"> <div class="row">
@ -102,16 +112,23 @@
<div class="panel"> <div class="panel">
<h3 class="task-order-next-steps__panel-head panel__content">{{ "task_orders.view.whats_next" | translate }}</h3> <h3 class="task-order-next-steps__panel-head panel__content">{{ "task_orders.view.whats_next" | translate }}</h3>
{% call Step( {% 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_url=url_for("task_orders.new", screen=1, task_order_id=task_order.id),
button_text='Edit', button_text='Edit',
complete=all_sections_complete) %} complete=all_sections_complete) %}
{% endcall %} {% endcall %}
{{ Step( {{ 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) }} complete=False) }}
{% call Step( {% 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) %} complete=False) %}
<div class='alert alert--warning'> <div class='alert alert--warning'>
<div class='alert__content'> <div class='alert__content'>
@ -123,7 +140,9 @@
{% endcall %} {% endcall %}
{% set is_ko = user == task_order.contracting_officer %} {% set is_ko = user == task_order.contracting_officer %}
{{ Step( {{ 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_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', button_text=is_ko and 'Sign',
complete=False) }} complete=False) }}

8
translations.yaml
View File

@ -415,11 +415,11 @@ task_orders:
view: view:
whats_next: Here are the remaining tasks to get your Task Order approved. whats_next: Here are the remaining tasks to get your Task Order approved.
steps: steps:
draft: '<b>Primary Point of contact (you)</b> completes initial Task Order form.' draft: '<strong>Primary Point of contact ({contact})</strong> completes initial Task Order form.'
security: '<b>IA Security Officer (Frank Fontaine)</b> completes a Security Requirements Document. <a href="#">Send a reminder</a>' security: '<strong>IA Security Officer ({security_officer})</strong> completes a Security Requirements Document. <a href="#">Send a reminder</a>'
record: '<b>Contracting Officer (Steward Kayou) or Contracting Officer Representative (Not specified)</b> records Task Order information. <a href="#">Send a reminder</a>' record: '<strong>Contracting Officer ({contracting_officer}) or Contracting Officer Representative ({contracting_officer_representative})</strong> records Task Order information. <a href="#">Send a reminder</a>'
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. 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: '<b>Contracting Officer (Steward Kayou)</b> verifies funding to unlock cloud services.' sign: '<strong>Contracting Officer ({contracting_officer})</strong> verifies funding to unlock cloud services.'
new: new:
app_info: app_info:
section_title: "What You're Making" section_title: "What You're Making"