Update seed script with TOs of various statuses

This commit is contained in:
richard-dds
2019-06-06 17:39:41 -04:00
parent fd159a2d80
commit e84e61bbad
5 changed files with 30 additions and 47 deletions

View File

@@ -1,5 +1,5 @@
from enum import Enum
from datetime import date, datetime
from datetime import date
from sqlalchemy import Column, DateTime, ForeignKey, String
from sqlalchemy.ext.hybrid import hybrid_property
@@ -11,12 +11,10 @@ from atst.models.clin import JEDICLINType
class Status(Enum):
STARTED = "Started"
PENDING = "Pending"
ACTIVE = "Active"
EXPIRED = "Expired"
DRAFT = "Draft"
ACTIVE = "Active"
UPCOMING = "Upcoming"
EXPIRED = "Expired"
UNSIGNED = "Unsigned"
@@ -90,7 +88,7 @@ class TaskOrder(Base, mixins.TimestampsMixin):
@property
def start_date(self):
return min((c.start_date for c in self.clins), default=None)
return min((c.start_date for c in self.clins), default=self.time_created.date())
@property
def end_date(self):

View File

@@ -34,19 +34,7 @@ def review_task_order(task_order_id):
@user_can(Permissions.VIEW_PORTFOLIO_FUNDING, message="view portfolio funding")
def portfolio_funding(portfolio_id):
portfolio = Portfolios.get(g.current_user, portfolio_id)
task_orders_by_status = defaultdict(list)
for task_order in portfolio.task_orders:
task_orders_by_status[task_order.status].append(task_order)
active_task_orders = task_orders_by_status.get(TaskOrderStatus.ACTIVE, [])
return render_template(
"portfolios/task_orders/index.html",
pending_task_orders=(
task_orders_by_status.get(TaskOrderStatus.STARTED, [])
+ task_orders_by_status.get(TaskOrderStatus.PENDING, [])
),
active_task_orders=active_task_orders,
expired_task_orders=task_orders_by_status.get(TaskOrderStatus.EXPIRED, []),
"portfolios/task_orders/index.html", task_orders=portfolio.task_orders
)