From ba1310f92b52754d3c7cfdc91e99179446172f96 Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 23 Jan 2019 15:14:08 -0500 Subject: [PATCH] Show COR as invited if am_cor is checked --- atst/routes/task_orders/new.py | 2 ++ templates/task_orders/new/review.html | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index 496657ca..d2dfb154 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} @@ -263,6 +264,7 @@ def new(screen, task_order_id=None, portfolio_id=None): screens=workflow.display_screens, form=workflow.form, complete=workflow.is_complete, + user=g.current_user, ) diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html index 440c58ad..0f86453f 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, invite, am_cor) %}

{{ heading | translate }}

{{ first_name }} {{ last_name }}
@@ -44,7 +44,7 @@ {% endif %}
{{ "task_orders.new.review.dod_id" | translate }} {{ dod_id}}
- {% if invite %} + {% if invite or am_cor %} {{ Icon('ok', classes='icon--green') }} {{ "task_orders.new.review.invited"| translate }} {% else %} {{ Icon('alert', classes='icon--red') }} {{ "task_orders.new.review.not_invited"| translate }} @@ -184,7 +184,10 @@
{{ 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) }} + {% if task_order.cor_dod_id == user.dod_id%} + {% set am_cor = True%} + {% endif %} + {{ 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, am_cor) }}
{{ 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) }}