diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 965978a2..262d8602 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -203,18 +203,33 @@ } } - .task-order-invitation-status { - .invited { - color: $color-green; - @include icon-color($color-green); - } - .uninvited { - color: $color-red; - @include icon-color($color-red); + .task-order-invitations { + .task-order-invitations__heading { + justify-content: space-between; } - .task-order-invitation-status__icon { - padding: 0 0.5rem; + .task-order-invitation-status { + margin-bottom: 3 * $gap; + .task-order-invitation-status__title { + font-weight: $font-bold; + } + + .invited { + color: $color-green; + @include icon-color($color-green); + } + .uninvited { + color: $color-red; + @include icon-color($color-red); + } + + .task-order-invitation-status__icon { + padding: 0 0.5rem; + } + } + + .task-order-invitation-details { + font-style: italic; } } } diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html index 9eb28a60..5f0f9419 100644 --- a/templates/portfolios/task_orders/show.html +++ b/templates/portfolios/task_orders/show.html @@ -69,14 +69,27 @@ {% endmacro %} -{% macro InvitationStatus(title, officer) %} +{% macro InvitationStatus(title, officer, officer_info) %} {% set class = "invited" if officer else "uninvited" %}
- {{ Icon("ok" if officer else "alert", classes=class) }} + {{ Icon("avatar" if officer else "alert", classes=class) }}
-
- {{ title }} +
+
+ {{ title }} +
+
+ {% if officer_info %} +
+
{{ officer_info.first_name }} {{ officer_info.last_name }}
+
{{ officer_info.email }}
+
{{ officer_info.phone_number | usPhone }}
+
+ {% else %} + Not specified + {% endif %} +
{% endmacro %} @@ -178,15 +191,16 @@
-

Invitations

- {{ InvitationStatus('Contracting Officer', task_order.contracting_officer) }} - {{ InvitationStatus('Contracting Officer Representative', task_order.contracting_officer_representative) }} - {{ InvitationStatus('IA Security Officer', officer=task_order.security_officer) }} - - - {{ Icon("edit") }} - manage invitations - + + {{ InvitationStatus('Contracting Officer', task_order.contracting_officer, officer_info=task_order.officer_dictionary('contracting_officer')) }} + {{ InvitationStatus('Contracting Officer Representative', task_order.contracting_officer_representative, officer_info=task_order.officer_dictionary('contracting_officer_representative')) }} + {{ InvitationStatus('IA Security Officer', officer=task_order.security_officer, officer_info=task_order.officer_dictionary('security_officer')) }}