Remove unused imports and formatting, fake TaskOrder.invoiced_funds with hard coded percentage instead of random number
This commit is contained in:
parent
e772a4b84b
commit
b49208ca57
@ -1,12 +1,9 @@
|
|||||||
from datetime import timedelta
|
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
import random
|
|
||||||
|
|
||||||
from sqlalchemy import Column, DateTime, ForeignKey, String
|
from sqlalchemy import Column, DateTime, ForeignKey, String
|
||||||
from sqlalchemy.ext.hybrid import hybrid_property
|
from sqlalchemy.ext.hybrid import hybrid_property
|
||||||
from sqlalchemy.orm import relationship
|
from sqlalchemy.orm import relationship
|
||||||
|
|
||||||
from atst.domain.csp.reports import MockReportingProvider
|
|
||||||
from atst.models.base import Base
|
from atst.models.base import Base
|
||||||
import atst.models.types as types
|
import atst.models.types as types
|
||||||
import atst.models.mixins as mixins
|
import atst.models.mixins as mixins
|
||||||
@ -175,8 +172,7 @@ class TaskOrder(Base, mixins.TimestampsMixin):
|
|||||||
@property
|
@property
|
||||||
def invoiced_funds(self):
|
def invoiced_funds(self):
|
||||||
# TODO: implement this using reporting data from the CSP
|
# TODO: implement this using reporting data from the CSP
|
||||||
percentage_spent = random.randrange(50, 100)
|
return self.total_obligated_funds * 0.75
|
||||||
return (self.total_obligated_funds * percentage_spent) / 100
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def display_status(self):
|
def display_status(self):
|
||||||
|
@ -6,7 +6,6 @@ from atst.domain.portfolios import Portfolios
|
|||||||
from atst.domain.task_orders import TaskOrders
|
from atst.domain.task_orders import TaskOrders
|
||||||
from atst.forms.task_order import SignatureForm
|
from atst.forms.task_order import SignatureForm
|
||||||
from atst.models import Permissions
|
from atst.models import Permissions
|
||||||
from atst.models.task_order import Status as TaskOrderStatus
|
|
||||||
|
|
||||||
|
|
||||||
@task_orders_bp.route("/task_orders/<task_order_id>/review")
|
@task_orders_bp.route("/task_orders/<task_order_id>/review")
|
||||||
|
@ -15,6 +15,6 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
collapse: function() {
|
collapse: function() {
|
||||||
this.isVisible = false
|
this.isVisible = false
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
@ -4,13 +4,13 @@ export default {
|
|||||||
name: 'accordion-list',
|
name: 'accordion-list',
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
Accordion
|
Accordion,
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
handleClick: function(e) {
|
handleClick: function(e) {
|
||||||
e.preventDefault()
|
e.preventDefault()
|
||||||
this.$children.forEach(el => el.collapse())
|
this.$children.forEach(el => el.collapse())
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user