From ffa1163083e3412eb9f2810c50713cf06a663814 Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 31 May 2019 10:50:41 -0400 Subject: [PATCH 1/7] Initial route and template - faked out text - names of pretty much everything need to be changed --- styles/sections/_task_order.scss | 25 +++++++++ .../task_orders/task_order_review.html | 52 +++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 templates/portfolios/task_orders/task_order_review.html diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 6fcff154..1f3ea81c 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -67,6 +67,31 @@ } .task-order-summary { + margin: $gap * 4; + + hr { + border: 0; + border-bottom: 1px solid $color-gray-light; + margin-top: $gap * 4; + } + + .col { + margin: $gap * 4 0; + flex-grow: 1; + } + + .h4 { + margin-top: $gap * 2; + } + + .to-sidebar { + padding: $gap * 4; + flex-grow: unset; + margin-left: $gap * 6; + width: 33.77%; + background-color: $color-gray-lightest; + } + .panel { @include shadow-panel; } diff --git a/templates/portfolios/task_orders/task_order_review.html b/templates/portfolios/task_orders/task_order_review.html new file mode 100644 index 00000000..83fcb9c6 --- /dev/null +++ b/templates/portfolios/task_orders/task_order_review.html @@ -0,0 +1,52 @@ +{% extends 'portfolios/base.html' %} + +{% from "components/icon.html" import Icon %} +{% from "components/text_input.html" import TextInput %} +{% from "components/multi_checkbox_input.html" import MultiCheckboxInput %} +{% from 'components/save_button.html' import SaveButton %} + +{% block content %} + +{% include "fragments/flash.html" %} +
+
Portfolio Name
+ +
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +
+ +
+ +
+
+
Review your task order
+
Task order number - 10 digit found in your system of record
+
0123456789
+ +
+ +
Funding summary
+
CLIN 1
+
CLIN 2
+ +
+ +
Supporting document
+
{{ Icon('ok',classes="icon-validation") }}document
+
+ +
+
Total obligated funds
+
$500,000
+
reprehenderit in voluptate velit
+ +
+ +
Total contract amount
+
$800,000
+ +
+
+ +
+{% endblock %} From 14a179a23911758278ea01c5da61d5f6e6f61330 Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 3 Jun 2019 10:32:36 -0400 Subject: [PATCH 2/7] Add collapsible text component --- js/components/semi_collapsible_text.js | 15 +++++++++++++++ js/index.js | 2 ++ styles/sections/_task_order.scss | 5 +++++ .../portfolios/task_orders/task_order_review.html | 12 +++++++++--- 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 js/components/semi_collapsible_text.js diff --git a/js/components/semi_collapsible_text.js b/js/components/semi_collapsible_text.js new file mode 100644 index 00000000..c9a54e09 --- /dev/null +++ b/js/components/semi_collapsible_text.js @@ -0,0 +1,15 @@ +export default { + name: 'semi-collapsible-text', + + data: function() { + return { + open: false, + } + }, + + methods: { + toggle: function() { + this.open = !this.open + }, + }, +} diff --git a/js/index.js b/js/index.js index 520dea03..98385810 100644 --- a/js/index.js +++ b/js/index.js @@ -40,6 +40,7 @@ import BaseForm from './components/forms/base_form' import DeleteConfirmation from './components/delete_confirmation' import NewEnvironment from './components/forms/new_environment' import EnvironmentRole from './components/environment_role' +import SemiCollapsibleText from './components/semi_collapsible_text' Vue.config.productionTip = false @@ -82,6 +83,7 @@ const app = new Vue({ nestedcheckboxinput, NewEnvironment, EnvironmentRole, + SemiCollapsibleText, }, mounted: function() { diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 1f3ea81c..8b096323 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -92,6 +92,11 @@ background-color: $color-gray-lightest; } + .semi-collapsed { + overflow: hidden; + height: $gap * 5.5; + } + .panel { @include shadow-panel; } diff --git a/templates/portfolios/task_orders/task_order_review.html b/templates/portfolios/task_orders/task_order_review.html index 83fcb9c6..26c95902 100644 --- a/templates/portfolios/task_orders/task_order_review.html +++ b/templates/portfolios/task_orders/task_order_review.html @@ -11,9 +11,15 @@
Portfolio Name
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -
+ +
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +
+ More{{ Icon('caret_down') }} + Less{{ Icon('caret_up') }} +
+
From 67be7d99a4cf8256c19c4c266f5727e812cf7467 Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 3 Jun 2019 13:41:06 -0400 Subject: [PATCH 3/7] Replace ko_review template with new task order review - deletes ko_review vue component --- atst/routes/task_orders/index.py | 7 + js/components/forms/ko_review.js | 52 ------- js/index.js | 2 - templates/portfolios/task_orders/review.html | 141 +++++------------- .../task_orders/task_order_review.html | 58 ------- 5 files changed, 48 insertions(+), 212 deletions(-) delete mode 100644 js/components/forms/ko_review.js delete mode 100644 templates/portfolios/task_orders/task_order_review.html diff --git a/atst/routes/task_orders/index.py b/atst/routes/task_orders/index.py index a1a07c59..db42109d 100644 --- a/atst/routes/task_orders/index.py +++ b/atst/routes/task_orders/index.py @@ -23,6 +23,13 @@ def view_task_order(task_order_id): ) +@task_orders_bp.route("/task_orders//review") +@user_can(Permissions.VIEW_TASK_ORDER_DETAILS, message="review task order details") +def review_task_order(task_order_id): + task_order = TaskOrders.get(task_order_id) + return render_template("portfolios/task_orders/review.html", task_order=task_order) + + def serialize_task_order(task_order): return { key: getattr(task_order, key) diff --git a/js/components/forms/ko_review.js b/js/components/forms/ko_review.js deleted file mode 100644 index c48ecd8f..00000000 --- a/js/components/forms/ko_review.js +++ /dev/null @@ -1,52 +0,0 @@ -import textinput from '../text_input' -import DateSelector from '../date_selector' -import uploadinput from '../upload_input' -import inputValidations from '../../lib/input_validations' -import FormMixin from '../../mixins/form' - -const createLOA = number => ({ number }) - -export default { - name: 'ko-review', - - mixins: [FormMixin], - - components: { - textinput, - DateSelector, - uploadinput, - }, - - props: { - initialData: { - type: Object, - default: () => ({}), - }, - modalName: String, - }, - - data: function() { - const loa_list = this.initialData['loas'] - const loas = (loa_list.length > 0 ? loa_list : ['']).map(createLOA) - - return { - loas, - } - }, - - mounted: function() { - this.$root.$on('onLOAAdded', this.addLOA) - }, - - methods: { - addLOA: function(event) { - this.loas.push(createLOA('')) - }, - - removeLOA: function(index) { - if (this.loas.length > 1) { - this.loas.splice(index, 1) - } - }, - }, -} diff --git a/js/index.js b/js/index.js index 98385810..8e581db1 100644 --- a/js/index.js +++ b/js/index.js @@ -35,7 +35,6 @@ import ConfirmationPopover from './components/confirmation_popover' import { isNotInVerticalViewport } from './lib/viewport' import DateSelector from './components/date_selector' import SidenavToggler from './components/sidenav_toggler' -import KoReview from './components/forms/ko_review' import BaseForm from './components/forms/base_form' import DeleteConfirmation from './components/delete_confirmation' import NewEnvironment from './components/forms/new_environment' @@ -77,7 +76,6 @@ const app = new Vue({ DateSelector, EditOfficerForm, SidenavToggler, - KoReview, BaseForm, DeleteConfirmation, nestedcheckboxinput, diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index f07f9b55..dc54d0a2 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -1,113 +1,54 @@ -{% extends "base.html" %} +{% extends 'portfolios/base.html' %} -{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.funding" | translate %} - -{% from "components/edit_link.html" import EditLink %} -{% from "components/required_label.html" import RequiredLabel %} {% from "components/icon.html" import Icon %} -{% from "components/date_picker.html" import DatePicker %} -{% from "components/text_input.html" import TextInput %} -{% from "components/alert.html" import Alert %} -{% from "components/review_field.html" import ReviewField %} -{% from "components/upload_input.html" import UploadInput %} -{% from 'components/save_button.html' import SaveButton %} {% block content %} - -
- {% include "fragments/flash.html" %} - - {% block form_action %} -
- {% endblock %} - - {{ form.csrf_token }} - - {% block form %} - -
-

- {{ "task_orders.ko_review.title" | translate }} -

- {% include "fragments/ko_review_message.html" %} -
- -
-
- -
- {{ "task_orders.new.review.app_info"| translate }} -
- {% include "fragments/task_order_review/app_info.html" %} -
- -
- {{ "task_orders.new.review.reporting"| translate }} - {{ EditLink(url_for("task_orders.new", screen=1, task_order_id=task_order.id, _anchor="reporting", ko_edit=True)) }} -
- {% include "fragments/task_order_review/reporting.html" %} -
- -
- {{ "task_orders.new.review.funding"| translate }} - {{ EditLink(url_for("task_orders.new", screen=2, task_order_id=task_order.id, ko_edit=True)) }} -
- {% include "fragments/task_order_review/funding.html" %} - -
- {{ DatePicker(form.start_date) }} - {{ DatePicker(form.end_date) }} -
-
- -
- {{ "task_orders.new.review.oversight"| translate }} - {{ EditLink(url_for("task_orders.new", screen=3, task_order_id=task_order.id, ko_edit=True)) }} -
- {% include "fragments/task_order_review/oversight.html" %} -
- -
{{ "task_orders.ko_review.task_order_information"| translate }}
- -
- {{ UploadInput(form.pdf, show_label=True) }} - {{ TextInput(form.number, placeholder='1234567890') }} - -
-
    -
  • -
    - - - -
    - -
    • -
-
- -
-
- - {{ TextInput(form.custom_clauses, paragraph=True) }} -
+
+
Portfolio Name
+ +
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+ More{{ Icon('caret_down') }} + Less{{ Icon('caret_up') }}
- {% endblock %} + -
- {{ SaveButton(text="Continue", element="input") }} -
+
- +
+
+
Review your task order
+
Task order number - 10 digit found in your system of record
+
{{task_order.number}}
+ +
+ +
Funding summary
+
CLIN 1
+
CLIN 2
+ +
+ +
Supporting document
+
{{ Icon('ok',classes="icon-validation") }}document
+
+ +
+
Total obligated funds
+
$500,000
+
reprehenderit in voluptate velit
+ +
+ +
Total contract amount
+
$800,000
+ +
+
- {% endblock %} diff --git a/templates/portfolios/task_orders/task_order_review.html b/templates/portfolios/task_orders/task_order_review.html deleted file mode 100644 index 26c95902..00000000 --- a/templates/portfolios/task_orders/task_order_review.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends 'portfolios/base.html' %} - -{% from "components/icon.html" import Icon %} -{% from "components/text_input.html" import TextInput %} -{% from "components/multi_checkbox_input.html" import MultiCheckboxInput %} -{% from 'components/save_button.html' import SaveButton %} - -{% block content %} - -{% include "fragments/flash.html" %} -
-
Portfolio Name
- - -
-
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -
- More{{ Icon('caret_down') }} - Less{{ Icon('caret_up') }} -
- - -
- -
-
-
Review your task order
-
Task order number - 10 digit found in your system of record
-
0123456789
- -
- -
Funding summary
-
CLIN 1
-
CLIN 2
- -
- -
Supporting document
-
{{ Icon('ok',classes="icon-validation") }}document
-
- -
-
Total obligated funds
-
$500,000
-
reprehenderit in voluptate velit
- -
- -
Total contract amount
-
$800,000
- -
-
- -
-{% endblock %} From 2644133b765e125a91f376f9b17f5db9a35f47ba Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 3 Jun 2019 14:48:44 -0400 Subject: [PATCH 4/7] More styling and content --- styles/sections/_task_order.scss | 18 +++++- templates/portfolios/task_orders/review.html | 62 ++++++++++++++++++-- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 8b096323..6a274784 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -73,22 +73,34 @@ border: 0; border-bottom: 1px solid $color-gray-light; margin-top: $gap * 4; + margin-bottom: $gap * 4; + } + + table { + margin-top: 1rem; } .col { - margin: $gap * 4 0; flex-grow: 1; } + .h1, + .h3 { + margin-bottom: $gap * 2; + } + .h4 { margin-top: $gap * 2; } .to-sidebar { padding: $gap * 4; + padding-top: $gap * 2; flex-grow: unset; margin-left: $gap * 6; + margin-top: $gap * 3; width: 33.77%; + max-height: 45rem; background-color: $color-gray-lightest; } @@ -97,6 +109,10 @@ height: $gap * 5.5; } + .more { + margin-top: -2.5rem; + } + .panel { @include shadow-panel; } diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index dc54d0a2..f344a34d 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -12,24 +12,73 @@
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
- More{{ Icon('caret_down') }} - Less{{ Icon('caret_up') }} + More{{ Icon('caret_down') }} + Less{{ Icon('caret_up') }}
+ +
Review your task order
+
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.
-
Review your task order
Task order number - 10 digit found in your system of record
{{task_order.number}}
Funding summary
-
CLIN 1
-
CLIN 2
+
CLIN 1: Unclassified Cloud Services 001
+
+ + + + + + + + + + + + + + + + + + + + +
AmountObligatedPoP StartPoP EndLOA
$500,000Yes9/07/199/07/2034820394
+
+ +
CLIN 2: Unclassified Cloud Services 002
+
+ + + + + + + + + + + + + + + + + + + + +
AmountObligatedPoP StartPoP EndLOA
$300,000No9/08/209/08/21q9384751934
+
@@ -40,12 +89,13 @@
Total obligated funds
$500,000
-
reprehenderit in voluptate velit
+
This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.
Total contract amount
$800,000
+
This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.
From 5fb44b39b08fa6ce2038c67266baf2406c6348db Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 4 Jun 2019 09:38:20 -0400 Subject: [PATCH 5/7] Use default table styling for CLIN tables --- styles/elements/_tables.scss | 2 +- .../fragments/admin/portfolio_members.html | 2 +- .../fragments/task_order_review/funding.html | 2 +- .../portfolios/applications/members.html | 2 +- templates/portfolios/index.html | 2 +- templates/portfolios/reports/index.html | 2 +- templates/portfolios/task_orders/index.html | 2 +- templates/portfolios/task_orders/review.html | 44 +++++++++---------- 8 files changed, 27 insertions(+), 31 deletions(-) diff --git a/styles/elements/_tables.scss b/styles/elements/_tables.scss index b18b1884..2a76b1c3 100644 --- a/styles/elements/_tables.scss +++ b/styles/elements/_tables.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_table.scss */ -table { +table.atat-table { @include panel-margin; min-width: 100%; diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html index 7f167092..4ab00357 100644 --- a/templates/fragments/admin/portfolio_members.html +++ b/templates/fragments/admin/portfolio_members.html @@ -32,7 +32,7 @@ {% if not portfolio.members %}

{{ "portfolios.admin.no_members" | translate }}

{% else %} - +
diff --git a/templates/fragments/task_order_review/funding.html b/templates/fragments/task_order_review/funding.html index 2ff92dbd..182f3e16 100644 --- a/templates/fragments/task_order_review/funding.html +++ b/templates/fragments/task_order_review/funding.html @@ -14,7 +14,7 @@ {% endcall %}
-
+
diff --git a/templates/portfolios/applications/members.html b/templates/portfolios/applications/members.html index 52753a9e..44ff537b 100644 --- a/templates/portfolios/applications/members.html +++ b/templates/portfolios/applications/members.html @@ -32,7 +32,7 @@ class='member-list' v-bind:members='{{ members | tojson}}'>
-

{{ "task_orders.new.review.to_value"| translate }}

+
diff --git a/templates/portfolios/index.html b/templates/portfolios/index.html index 610658b7..22b85419 100644 --- a/templates/portfolios/index.html +++ b/templates/portfolios/index.html @@ -2,7 +2,7 @@ {% block content %}
- +
diff --git a/templates/portfolios/reports/index.html b/templates/portfolios/reports/index.html index fb48c781..b67ce156 100644 --- a/templates/portfolios/reports/index.html +++ b/templates/portfolios/reports/index.html @@ -379,7 +379,7 @@ prev-month-index='{{ prev_month_index }}' two-months-ago-index='{{ two_months_ago_index }}' inline-template> -
Portfolio Name
+
diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index 4fa70009..ff27cba7 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -23,7 +23,7 @@ v-cloak >
-
Spending scope {{ two_months_ago.strftime('%B %Y') }}
+
diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index f344a34d..72117959 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -31,54 +31,50 @@
Funding summary
CLIN 1: Unclassified Cloud Services 001
-
- - - - - + + + + + - - - - - + + + + +
AmountObligatedPoP StartPoP EndLOAAmountObligatedPoP StartPoP EndLOA
$500,000Yes9/07/199/07/2034820394$500,000Yes9/07/199/07/2034820394
-
CLIN 2: Unclassified Cloud Services 002
-
- - - - - + + + + + - - - - - + + + + +
AmountObligatedPoP StartPoP EndLOAAmountObligatedPoP StartPoP EndLOA
$300,000No9/08/209/08/21q9384751934$300,000No9/08/209/08/21q9384751934
-
From 7beb51c85f3be29a21868aa352ad3eed941be1c8 Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 4 Jun 2019 09:45:36 -0400 Subject: [PATCH 6/7] Move semi-collapsed text styling to utils --- styles/core/_util.scss | 9 +++++++++ styles/sections/_task_order.scss | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/styles/core/_util.scss b/styles/core/_util.scss index ccb0c15e..c90e0d1c 100644 --- a/styles/core/_util.scss +++ b/styles/core/_util.scss @@ -47,6 +47,15 @@ } } +.semi-collapsed { + overflow: hidden; + height: $gap * 5.5; +} + +.more { + margin-top: -2.5rem; +} + .green { color: $color-green; } diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 6a274784..0b887352 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -104,15 +104,6 @@ background-color: $color-gray-lightest; } - .semi-collapsed { - overflow: hidden; - height: $gap * 5.5; - } - - .more { - margin-top: -2.5rem; - } - .panel { @include shadow-panel; } From 582ddb865d91b8468b2cf6317b5dd9c4e94cf4aa Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 4 Jun 2019 09:56:17 -0400 Subject: [PATCH 7/7] Move to-sidebar into a macro --- templates/components/to_sidebar.html | 16 ++++++++++++++++ templates/portfolios/task_orders/review.html | 13 ++----------- 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 templates/components/to_sidebar.html diff --git a/templates/components/to_sidebar.html b/templates/components/to_sidebar.html new file mode 100644 index 00000000..1b495b7b --- /dev/null +++ b/templates/components/to_sidebar.html @@ -0,0 +1,16 @@ +{% macro TOSidebar() -%} + +
+
Total obligated funds
+
$500,000
+
This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.
+ +
+ +
Total contract amount
+
$800,000
+
This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.
+ +
+ +{%- endmacro %} diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index 72117959..58d2767a 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -1,6 +1,7 @@ {% extends 'portfolios/base.html' %} {% from "components/icon.html" import Icon %} +{% from "components/to_sidebar.html" import TOSidebar %} {% block content %} @@ -82,18 +83,8 @@
{{ Icon('ok',classes="icon-validation") }}document
-
-
Total obligated funds
-
$500,000
-
This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.
+ {{ TOSidebar() }} -
- -
Total contract amount
-
$800,000
-
This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.
- -