diff --git a/styles/elements/_tables.scss b/styles/elements/_tables.scss index f313756c..182b7770 100644 --- a/styles/elements/_tables.scss +++ b/styles/elements/_tables.scss @@ -53,7 +53,6 @@ table.atat-table { padding: $gap * 2; border: 1px solid $color-gray-lighter; display: table-cell; - white-space: nowrap; vertical-align: top; &:first-child { @@ -64,6 +63,12 @@ table.atat-table { border-right: none; } } + + &:last-child { + td { + border-bottom: none; + } + } } } diff --git a/styles/sections/_reports.scss b/styles/sections/_reports.scss index ee43ffa2..66cdb073 100644 --- a/styles/sections/_reports.scss +++ b/styles/sections/_reports.scss @@ -118,27 +118,6 @@ } } - .reporting-summary-item { - border-right: 1px solid $color-gray-light; - margin-right: $gap * 3; - padding-right: $gap * 3; - &:last-child { - border-right: none; - margin-right: 0; - padding-right: 0; - } - &__header { - margin: 0; - &-icon { - margin: 0; - padding: 0; - } - } - &__value { - font-size: $lead-font-size; - } - } - .reporting-expended-funding { &__header { margin: 0; @@ -167,3 +146,28 @@ } } } + +.reporting-summary-item { + border-right: 1px solid $color-gray-light; + margin-right: $gap * 3; + padding-right: $gap * 3; + &:last-child { + border-right: none; + margin-right: 0; + padding-right: 0; + } + &__header { + margin: 0; + &-icon { + margin: 0; + padding: 0; + } + } + &__value { + font-size: $lead-font-size; + &--large { + font-size: 3.4rem; + font-weight: $font-bold; + } + } +} diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index c09f49a7..62d0db08 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -36,22 +36,6 @@ margin-top: $gap * 2; } - .task-order__review { - .h2 { - margin-bottom: $gap * 4; - } - - .task-order__number { - text-align: right; - } - - .totals-box { - flex-grow: unset; - display: table; - min-width: 350px; - } - } - .card { padding: ($gap * 4) ($gap * 5) 0; diff --git a/templates/components/tooltip.html b/templates/components/tooltip.html index 08a6f92f..052299f6 100644 --- a/templates/components/tooltip.html +++ b/templates/components/tooltip.html @@ -3,7 +3,7 @@ {% macro Tooltip(message,title='Help', classes="") %} {%- endmacro %} diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index a97d8e09..70d4c385 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -1,82 +1,87 @@ {% from "components/icon.html" import Icon %} {% from "components/semi_collapsible_text.html" import SemiCollapsibleText %} +{% from "components/tooltip.html" import Tooltip %} -
{{ 'components.totals_box.obligated_text' | translate }}
-{{ 'components.totals_box.total_text' | translate }}
- -{{ "task_orders.review.clins.number" | translate }} | -{{ "task_orders.review.clins.type" | translate }} | -{{ "task_orders.review.clins.idiq_clin_description" | translate }} | -{{ "task_orders.review.clins.pop" | translate }} | -{{ "task_orders.review.clins.total_amount" | translate }} | -{{ "task_orders.review.clins.obligated" | translate }} | -
---|---|---|---|---|---|
{{ clin.number }} | -{{ clin.type }} | -{{ "{}".format(clin.jedi_clin_type) | translate}} | -- {{ clin.start_date | formattedDate }} - {{ clin.end_date | formattedDate }} - | - {# TODO: Swap in total CLIN amount #} -{{ clin.total_amount | dollars }} | -{{ clin.obligated_amount | dollars }} | -
+ {{ obligated_funds | dollars }} +
+ {{ contract_amount | dollars }} +
+ {% else %} +-
+ {% endif %} ++ {{ expended_funds | dollars }} +
+{{ "task_orders.review.clins.number" | translate }} | +{{ "task_orders.review.clins.type" | translate }} | +{{ "task_orders.review.clins.idiq_clin_description" | translate }} | +{{ "task_orders.review.clins.pop" | translate }} | +{{ "task_orders.review.clins.total_amount" | translate }} | +{{ "task_orders.review.clins.obligated" | translate }} | +
---|---|---|---|---|---|
{{ clin.number }} | +{{ clin.type }} | +{{ "{}".format(clin.jedi_clin_type) | translate}} | ++ {{ clin.start_date | formattedDate }} - {{ clin.end_date | formattedDate }} + | + {# TODO: Swap in total CLIN amount #} +{{ clin.total_amount | dollars }} | +{{ clin.obligated_amount | dollars }} | +