From 67be7d99a4cf8256c19c4c266f5727e812cf7467 Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 3 Jun 2019 13:41:06 -0400 Subject: [PATCH] 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 %}