diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index f0b90c23..77fa64e3 100644 --- a/atst/routes/task_orders/new.py +++ b/atst/routes/task_orders/new.py @@ -158,6 +158,7 @@ class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow): "cor_email": self.user.email, "cor_phone_number": self.user.phone_number, "cor_dod_id": self.user.dod_id, + "cor_id": self.user.id, } to_data = {**to_data, **cor_data} diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html index 840a5f10..988a9f65 100644 --- a/templates/task_orders/new/review.html +++ b/templates/task_orders/new/review.html @@ -32,7 +32,7 @@ {% endmacro %} -{% macro ReviewOfficerInfo(heading, first_name, last_name, email, phone_number, dod_id, invite) %} +{% macro ReviewOfficerInfo(heading, first_name, last_name, email, phone_number, dod_id, officer) %}

{{ heading | translate }}

{{ first_name }} {{ last_name }}
@@ -44,7 +44,7 @@ {% endif %}
{{ "task_orders.new.review.dod_id" | translate }} {{ dod_id}}
- {% if invite %} + {% if officer %} {{ Icon('ok', classes='icon--green') }} {{ "task_orders.new.review.invited"| translate }} {% else %} {{ Icon('alert', classes='icon--red') }} {{ "task_orders.new.review.not_invited"| translate }} @@ -190,11 +190,11 @@

{{ "task_orders.new.review.oversight"| translate }} {{ TOEditLink(screen=3) }}

- {{ ReviewOfficerInfo("task_orders.new.review.ko", task_order.ko_first_name, task_order.ko_last_name, task_order.ko_email, task_order.ko_phone_number, task_order.ko_dod_id, task_order.ko_invite) }} - {{ ReviewOfficerInfo("task_orders.new.review.cor", task_order.cor_first_name, task_order.cor_last_name, task_order.cor_email, task_order.cor_phone_number, task_order.cor_dod_id, task_order.cor_invite) }} + {{ ReviewOfficerInfo("task_orders.new.review.ko", task_order.ko_first_name, task_order.ko_last_name, task_order.ko_email, task_order.ko_phone_number, task_order.ko_dod_id, task_order.contracting_officer) }} + {{ ReviewOfficerInfo("task_orders.new.review.cor", task_order.cor_first_name, task_order.cor_last_name, task_order.cor_email, task_order.cor_phone_number, task_order.cor_dod_id, task_order.contracting_officer_representative) }}
- {{ ReviewOfficerInfo("task_orders.new.review.so", task_order.so_first_name, task_order.so_last_name, task_order.so_email, task_order.so_phone_number, task_order.so_dod_id, task_order.so_invite) }} + {{ ReviewOfficerInfo("task_orders.new.review.so", task_order.so_first_name, task_order.so_last_name, task_order.so_email, task_order.so_phone_number, task_order.so_dod_id, task_order.security_officer) }}
{% endblock %}