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

Merge pull request #573 from dod-ccpo/i-am-cor

Browse Source 
Show COR as invited if am_cor is checked
This commit is contained in:
montana-mil 2019-01-24 09:19:15 -05:00 committed by GitHub
commit 859df01b80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
atst/routes/task_orders/new.py
View File

@ -158,6 +158,7 @@ class UpdateTaskOrderWorkflow(ShowTaskOrderWorkflow):
"cor_email": self.user.email, "cor_email": self.user.email,
"cor_phone_number": self.user.phone_number, "cor_phone_number": self.user.phone_number,
"cor_dod_id": self.user.dod_id, "cor_dod_id": self.user.dod_id,
"cor_id": self.user.id,
} }
to_data = {**to_data, **cor_data} to_data = {**to_data, **cor_data}

10
templates/task_orders/new/review.html
View File

@ -32,7 +32,7 @@
</div> </div>
{% endmacro %} {% 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) %}
<div class="col col--grow"> <div class="col col--grow">
<h4 class='task-order-form__heading'>{{ heading | translate }}</h4> <h4 class='task-order-form__heading'>{{ heading | translate }}</h4>
{{ first_name }} {{ last_name }}<br> {{ first_name }} {{ last_name }}<br>
@ -44,7 +44,7 @@
{% endif %} {% endif %}
<br> <br>
{{ "task_orders.new.review.dod_id" | translate }} {{ dod_id}}<br> {{ "task_orders.new.review.dod_id" | translate }} {{ dod_id}}<br>
{% if invite %} {% if officer %}
{{ Icon('ok', classes='icon--green') }} <span class="task-order-invite-message sent">{{ "task_orders.new.review.invited"| translate }}</<span> {{ Icon('ok', classes='icon--green') }} <span class="task-order-invite-message sent">{{ "task_orders.new.review.invited"| translate }}</<span>
{% else %} {% else %}
{{ Icon('alert', classes='icon--red') }} <span class="task-order-invite-message not-sent">{{ "task_orders.new.review.not_invited"| translate }}</span> {{ Icon('alert', classes='icon--red') }} <span class="task-order-invite-message not-sent">{{ "task_orders.new.review.not_invited"| translate }}</span>
@ -190,11 +190,11 @@
<h3 class="subheading">{{ "task_orders.new.review.oversight"| translate }} {{ TOEditLink(screen=3) }}</h3> <h3 class="subheading">{{ "task_orders.new.review.oversight"| translate }} {{ TOEditLink(screen=3) }}</h3>
<div class="row"> <div class="row">
{{ 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.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.cor_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.contracting_officer_representative) }}
</div> </div>
<div class="row"> <div class="row">
{{ 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) }}
</div> </div>
{% endblock %} {% endblock %}