From ba3000dcccfb25c830e4607ab70ad542ed210903 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 21:27:53 -0500 Subject: [PATCH] Add started status to task order model --- atst/models/task_order.py | 3 ++- styles/sections/_task_order.scss | 2 +- tests/models/test_task_order.py | 9 ++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/atst/models/task_order.py b/atst/models/task_order.py index 4e338735..0e58ed60 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -21,6 +21,7 @@ from atst.models import Attachment, Base, types, mixins class Status(Enum): + STARTED = "Started" PENDING = "Pending" ACTIVE = "Active" EXPIRED = "Expired" @@ -142,7 +143,7 @@ class TaskOrder(Base, mixins.TimestampsMixin): return Status.EXPIRED return Status.ACTIVE else: - return Status.PENDING + return Status.STARTED @property def display_status(self): diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 5d8e27fb..3c056572 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -75,7 +75,7 @@ width: 100%; } - .label--pending { + .label--pending, .label--started { background-color: $color-gold; } diff --git a/tests/models/test_task_order.py b/tests/models/test_task_order.py index 908daec2..fdb7e327 100644 --- a/tests/models/test_task_order.py +++ b/tests/models/test_task_order.py @@ -9,11 +9,14 @@ from tests.mocks import PDF_FILENAME class TestTaskOrderStatus: - def test_pending_status(self): + def test_started_status(self): to = TaskOrder() - assert to.status == Status.PENDING + assert to.status == Status.STARTED - to = TaskOrder(number="42", start_date=random_future_date()) + def test_pending_status(self): + to = TaskOrder( + number="42", start_date=random_future_date(), end_date=random_future_date() + ) assert to.status == Status.PENDING def test_active_status(self):