diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index f031d317..51bfd64a 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -53,19 +53,14 @@ margin-top: $gap * 2; } - .task-order__details { - max-width: 65%; - } - .totals-box { padding: $gap * 4; padding-top: $gap * 2; flex-grow: unset; margin-left: $gap * 6; - margin-top: $gap * 3; - width: 35%; display: table; background-color: $color-gray-lightest; + min-width: 350px; } &.task_order__form { diff --git a/templates/components/totals_box.html b/templates/components/totals_box.html index fc16884f..2766a447 100644 --- a/templates/components/totals_box.html +++ b/templates/components/totals_box.html @@ -1,6 +1,6 @@ {% macro TotalsBox(task_order=None, obligated_funds=0, contract_amount=0) -%} -
+
{% if task_order %} {% set obligated_funds = task_order.total_obligated_funds %} {% set contract_amount = task_order.total_contract_amount %} diff --git a/templates/fragments/task_order_review.html b/templates/fragments/task_order_review.html index c15935d2..d40cbae2 100644 --- a/templates/fragments/task_order_review.html +++ b/templates/fragments/task_order_review.html @@ -4,82 +4,79 @@
- {{ SemiCollapsibleText() }} - -
- -
- {{ "task_orders.review.review_your_task_order" | translate }} -
-

- {{ "task_orders.review.check_paragraph" | translate }} -

-
-
-
- {{ "task_orders.review.task_order_number" | translate }} -
-
{{task_order.number}}
- -
- -
- {{ "task_orders.review.funding_summary" | translate }} +
+
+
+ {{ "task_orders.review.review_your_task_order" | translate }}
- {% for clin in task_order.clins %} -
- {{ "{}".format(clin.jedi_clin_type) | translate}} +
+
+ {{ "task_orders.review.task_order_number" | translate }}
- - - - - - - - - - +
{{task_order.number}}
- - - - - - - - - -
{{ "task_orders.review.clins.amount" | translate }}{{ "task_orders.review.clins.obligated" | translate }}{{ "task_orders.review.clins.pop_start" | translate }}{{ "task_orders.review.clins.pop_end" | translate }}{{ "task_orders.review.clins.loa" | translate }}
{{ clin.obligated_amount | dollars }} - {% if clin.is_obligated() %} - {{ "common.yes" | translate }} - {% else %} - {{ "common.no" | translate }} - {% endif %} - {{ clin.start_date | formattedDate }}{{ clin.end_date | formattedDate }} - {% for loa in clin.loas %} - - {{ loa }} - -
- {% endfor %} -
- {% endfor %} +
-
+
+ {{ "task_orders.review.funding_summary" | translate }} +
-
- {{ "task_orders.review.supporting_document.title" | translate }} -
-
- - {{ Icon('check-circle-solid') }} - {{ task_order.pdf.filename }} - + {% for clin in task_order.clins %} +
+ {{ "{}".format(clin.jedi_clin_type) | translate}} +
+ + + + + + + + + + + + + + + + + + + + +
{{ "task_orders.review.clins.amount" | translate }}{{ "task_orders.review.clins.obligated" | translate }}{{ "task_orders.review.clins.pop_start" | translate }}{{ "task_orders.review.clins.pop_end" | translate }}{{ "task_orders.review.clins.loa" | translate }}
{{ clin.obligated_amount | dollars }} + {% if clin.is_obligated() %} + {{ "common.yes" | translate }} + {% else %} + {{ "common.no" | translate }} + {% endif %} + {{ clin.start_date | formattedDate }}{{ clin.end_date | formattedDate }} + {% for loa in clin.loas %} + + {{ loa }} + +
+ {% endfor %} +
+ {% endfor %} + +
+ +
+ {{ "task_orders.review.supporting_document.title" | translate }} +
+
- {{ TotalsBox(task_order=task_order) }} - +
+ {{ TotalsBox(task_order=task_order) }} +