Display all task orders in the same list

This commit is contained in:
richard-dds
2019-06-05 11:12:38 -04:00
parent cefa4f9099
commit c9674255d1
3 changed files with 10 additions and 34 deletions

View File

@@ -82,10 +82,6 @@ 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
@@ -99,7 +95,6 @@ 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

@@ -1,5 +1,6 @@
from enum import Enum
from datetime import date
import random
from sqlalchemy import Column, DateTime, ForeignKey, String
from sqlalchemy.ext.hybrid import hybrid_property
@@ -66,7 +67,7 @@ class TaskOrder(Base, mixins.TimestampsMixin):
def status(self):
# TODO: fix task order -- implement correctly using CLINs
# Faked for display purposes
return Status.ACTIVE
return random.choice(list(Status.__members__.values()))
@property
def start_date(self):