diff --git a/atst/models/task_order.py b/atst/models/task_order.py index aa925878..926824b9 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -1,12 +1,9 @@ -from datetime import timedelta from enum import Enum -import random from sqlalchemy import Column, DateTime, ForeignKey, String from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy.orm import relationship -from atst.domain.csp.reports import MockReportingProvider from atst.models.base import Base import atst.models.types as types import atst.models.mixins as mixins @@ -175,8 +172,7 @@ class TaskOrder(Base, mixins.TimestampsMixin): @property def invoiced_funds(self): # TODO: implement this using reporting data from the CSP - percentage_spent = random.randrange(50, 100) - return (self.total_obligated_funds * percentage_spent) / 100 + return self.total_obligated_funds * 0.75 @property def display_status(self): diff --git a/atst/routes/task_orders/index.py b/atst/routes/task_orders/index.py index 5e2a778e..a3d72cf7 100644 --- a/atst/routes/task_orders/index.py +++ b/atst/routes/task_orders/index.py @@ -6,7 +6,6 @@ from atst.domain.portfolios import Portfolios from atst.domain.task_orders import TaskOrders from atst.forms.task_order import SignatureForm from atst.models import Permissions -from atst.models.task_order import Status as TaskOrderStatus @task_orders_bp.route("/task_orders//review") diff --git a/js/components/accordion.js b/js/components/accordion.js index 2de9315d..b96e1b80 100644 --- a/js/components/accordion.js +++ b/js/components/accordion.js @@ -15,6 +15,6 @@ export default { methods: { collapse: function() { this.isVisible = false - } - } + }, + }, } diff --git a/js/components/accordion_list.js b/js/components/accordion_list.js index ae0042fa..41e11d33 100644 --- a/js/components/accordion_list.js +++ b/js/components/accordion_list.js @@ -4,13 +4,13 @@ export default { name: 'accordion-list', components: { - Accordion + Accordion, }, methods: { handleClick: function(e) { e.preventDefault() this.$children.forEach(el => el.collapse()) - } - } + }, + }, }