Try using new styles in the task orders page

This commit is contained in:
richard-dds
2019-06-04 16:52:54 -04:00
parent 804855d4bc
commit d7346d5a32
3 changed files with 39 additions and 122 deletions

View File

@@ -82,6 +82,10 @@ def normalizeOrder(title):
return " ".join(reordered_text)
def task_order_status_label(status):
return {"Pending": "warning", "Active": "success", "Expired": "error"}.get(status, "info")
def register_filters(app):
app.jinja_env.filters["iconSvg"] = iconSvg
app.jinja_env.filters["dollars"] = dollars
@@ -95,6 +99,7 @@ def register_filters(app):
app.jinja_env.filters["renderAuditEvent"] = renderAuditEvent
app.jinja_env.filters["normalizeOrder"] = normalizeOrder
app.jinja_env.filters["translateDuration"] = translate_duration
app.jinja_env.filters["taskOrderStatusLabel"] = task_order_status_label
@contextfilter
def translateWithoutCache(context, *kwargs):

View File

@@ -30,22 +30,6 @@ def review_task_order(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)
for key in [
"id",
"budget",
"time_created",
"start_date",
"end_date",
"display_status",
"days_to_expiration",
"balance",
]
}
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders")
@user_can(Permissions.VIEW_PORTFOLIO_FUNDING, message="view portfolio funding")
def portfolio_funding(portfolio_id):
@@ -53,14 +37,9 @@ def portfolio_funding(portfolio_id):
task_orders_by_status = defaultdict(list)
for task_order in portfolio.task_orders:
serialized_task_order = serialize_task_order(task_order)
serialized_task_order["url"] = url_for(
"task_orders.view_task_order", task_order_id=task_order.id
)
task_orders_by_status[task_order.status].append(serialized_task_order)
task_orders_by_status[task_order.status].append(task_order)
active_task_orders = task_orders_by_status.get(TaskOrderStatus.ACTIVE, [])
total_balance = sum([task_order["balance"] for task_order in active_task_orders])
return render_template(
"portfolios/task_orders/index.html",
@@ -69,6 +48,5 @@ def portfolio_funding(portfolio_id):
+ task_orders_by_status.get(TaskOrderStatus.PENDING, [])
),
active_task_orders=active_task_orders,
expired_task_orders=task_orders_by_status.get(TaskOrderStatus.EXPIRED, []),
total_balance=total_balance,
expired_task_orders=task_orders_by_status.get(TaskOrderStatus.EXPIRED, [])
)