From c9674255d1f70bd8c1898d644b88da2e2a0c4962 Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Wed, 5 Jun 2019 11:12:38 -0400
Subject: [PATCH] Display all task orders in the same list

---
 atst/filters.py                             |  5 ---
 atst/models/task_order.py                   |  3 +-
 templates/portfolios/task_orders/index.html | 36 +++++----------------
 3 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/atst/filters.py b/atst/filters.py
index e6104ea5..02d51c5c 100644
--- a/atst/filters.py
+++ b/atst/filters.py
@@ -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):
diff --git a/atst/models/task_order.py b/atst/models/task_order.py
index 049b7d85..bd53b219 100644
--- a/atst/models/task_order.py
+++ b/atst/models/task_order.py
@@ -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):
diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html
index f3e6470f..ab8637e0 100644
--- a/templates/portfolios/task_orders/index.html
+++ b/templates/portfolios/task_orders/index.html
@@ -25,12 +25,12 @@
   </span>
 {% endmacro %}
 
-{% macro TaskOrderList(task_orders) %}
+{% macro TaskOrderList(task_orders, label='success') %}
   <div>
     {% for task_order in task_orders %}
       <div class="card">
         <div class="card__status">
-          <span class='label label--{{ task_order.display_status|taskOrderStatusLabel }}'>{{ task_order.display_status }}</span>
+          <span class='label label--{{ label }}'>{{ task_order.display_status }}</span>
           {{ TaskOrderDate(task_order) }}
           <span class="card__button">
           </span>
@@ -54,30 +54,6 @@
     </div>
   {% endcall %}
 
-  {% for task_order in pending_task_orders %}
-    <div class='subheading'>
-      Pending
-    </div>
-    <div class='panel pending-task-order row'>
-      <span class='label label--warning'>Pending</span>
-      <div class="pending-task-order__started col">
-        <dt>Started</dt>
-        <dd>
-          <local-datetime
-            timestamp="{{ task_order.time_created }}"
-            format="M/D/YYYY">
-            </local-datetime>
-        </dd>
-      </div>
-      <div class="pending-task-order__value col">
-        <dt>Value</dt>
-        <dd>{{ task_order.budget | dollars }}</dd>
-      </div>
-      {{ ViewLink(task_order) }}
-    </div>
-  {% endfor %}
-
-
   {% if not active_task_orders and not pending_task_orders %}
     {{ EmptyState(
       'This portfolio doesn’t have any active or pending task orders.',
@@ -87,12 +63,16 @@
     ) }}
   {% endif %}
 
+  {% if pending_task_orders %}
+    {{ TaskOrderList(pending_task_orders, label='warning') }}
+  {% endif %}
+
   {% if active_task_orders %}
-    {{ TaskOrderList(active_task_orders) }}
+    {{ TaskOrderList(active_task_orders, label='success') }}
   {% endif %}
 
   {% if expired_task_orders %}
-    {{ TaskOrderList(expired_task_orders) }}
+    {{ TaskOrderList(expired_task_orders, label='error') }}
   {% endif %}
 </div>