From a2decf05091d190cd4138923963249268d4472e5 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 19 Jul 2019 11:31:32 -0400 Subject: [PATCH 1/3] Update page layout --- styles/sections/_task_order.scss | 7 +- templates/components/totals_box.html | 2 +- templates/fragments/task_order_review.html | 135 ++++++++++----------- 3 files changed, 68 insertions(+), 76 deletions(-) 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 }} +
+
+ + {{ Icon('check-circle-solid') }} + {{ task_order.pdf.filename }} + +
- {{ TotalsBox(task_order=task_order) }} - +
+ {{ TotalsBox(task_order=task_order) }} +
From fe5328b1af1fac4837de806a04bb590d9d1a126e Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 19 Jul 2019 11:55:01 -0400 Subject: [PATCH 2/3] Reorder content and fix styling --- styles/elements/_icon_link.scss | 4 +++- styles/sections/_task_order.scss | 24 ++++++++++++------- templates/fragments/task_order_review.html | 28 ++++++++++------------ translations.yaml | 6 ++--- 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/styles/elements/_icon_link.scss b/styles/elements/_icon_link.scss index f7d1b69e..1a66ebe2 100644 --- a/styles/elements/_icon_link.scss +++ b/styles/elements/_icon_link.scss @@ -83,7 +83,9 @@ } &.icon-link--download { - @include icon-link-color($color-black) .icon { + font-weight: $font-normal; + padding-left: 0; + .icon { @include icon-color($color-green); } } diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 51bfd64a..2c1413d0 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -24,7 +24,7 @@ hr { border: 0; - border-bottom: 1px solid $color-gray-light; + border-bottom: 1px solid $color-gray-lighter; margin-top: $gap * 4; margin-bottom: $gap * 4; } @@ -53,14 +53,20 @@ margin-top: $gap * 2; } - .totals-box { - padding: $gap * 4; - padding-top: $gap * 2; - flex-grow: unset; - margin-left: $gap * 6; - display: table; - background-color: $color-gray-lightest; - min-width: 350px; + .task-order__review { + .h2 { + margin-bottom: $gap * 4; + } + + .totals-box { + padding: $gap * 4; + padding-top: $gap * 2; + flex-grow: unset; + margin-left: $gap * 6; + display: table; + background-color: $color-gray-lightest; + min-width: 350px; + } } &.task_order__form { diff --git a/templates/fragments/task_order_review.html b/templates/fragments/task_order_review.html index d40cbae2..c517a6fa 100644 --- a/templates/fragments/task_order_review.html +++ b/templates/fragments/task_order_review.html @@ -3,15 +3,25 @@ {% from "components/totals_box.html" import TotalsBox %} -
+
-
+
{{ "task_orders.review.review_your_task_order" | translate }}
+
+ Approved Task Order +
+ + {{ Icon('check-circle-solid') }} + {{ task_order.pdf.filename }} + + +
+
-
+
{{ "task_orders.review.task_order_number" | translate }}
{{task_order.number}}
@@ -61,18 +71,6 @@ {% endfor %} - -
- -
- {{ "task_orders.review.supporting_document.title" | translate }} -
-
- - {{ Icon('check-circle-solid') }} - {{ task_order.pdf.filename }} - -
diff --git a/translations.yaml b/translations.yaml index 97e2816e..afcc721d 100644 --- a/translations.yaml +++ b/translations.yaml @@ -324,8 +324,8 @@ portfolios: task_orders: review: review_your_task_order: Review your task order - funding_summary: Funding summary - task_order_number: Task order number - 10 digit found in your system of record + funding_summary: Task Order Summary + task_order_number: Task Order Number check_paragraph: Check to make sure the information you entered is correct. After submission, you will confirm this task order was signed by a contracting officer. Thereafter, you will be informed as soon as CCPO completes their review. supporting_document: title: Supporting document @@ -365,7 +365,7 @@ task_orders: sign: digital_signature_description: 'I acknowledge that I have read and fully understand the DoD CCPO JEDI agreements and completed all the necessary steps, as detailed in the Federal Acquisition Regulation (FAR).' JEDICLINType: - JEDI_CLIN_1: 'CLIN 1:' + JEDI_CLIN_1: 'Base CLIN 0001: Unclassified IaaS and PaaS' JEDI_CLIN_2: 'CLIN 2: Classified Cloud Services - 0002' JEDI_CLIN_3: 'CLIN 3:' JEDI_CLIN_4: 'CLIN 4:' From 46ebcefc8b022d6738367f1be6d5631c1eece4ba Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 22 Jul 2019 11:04:05 -0400 Subject: [PATCH 3/3] Move text into translations --- templates/fragments/task_order_review.html | 2 +- translations.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/fragments/task_order_review.html b/templates/fragments/task_order_review.html index c517a6fa..fd6f4157 100644 --- a/templates/fragments/task_order_review.html +++ b/templates/fragments/task_order_review.html @@ -11,7 +11,7 @@
- Approved Task Order + {{ 'task_orders.review.pdf_title' | translate }}
{{ Icon('check-circle-solid') }} diff --git a/translations.yaml b/translations.yaml index afcc721d..a5365210 100644 --- a/translations.yaml +++ b/translations.yaml @@ -323,6 +323,7 @@ portfolios: reporting: Reporting task_orders: review: + pdf_title: Approved Task Order review_your_task_order: Review your task order funding_summary: Task Order Summary task_order_number: Task Order Number