From ff82e39626f9abf87a45910723f74ee6ec4f94cc Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 10 Feb 2020 11:08:31 -0500
Subject: [PATCH 1/2] Remove unsigned from the display statuses, show unsigned
 TOs display status as DRAFT

---
 atst/models/task_order.py        | 6 ++++--
 tests/domain/test_task_orders.py | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/atst/models/task_order.py b/atst/models/task_order.py
index d6aa63f8..3ab493a9 100644
--- a/atst/models/task_order.py
+++ b/atst/models/task_order.py
@@ -25,7 +25,6 @@ SORT_ORDERING = [
     Status.DRAFT,
     Status.UPCOMING,
     Status.EXPIRED,
-    Status.UNSIGNED,
 ]
 
 
@@ -148,7 +147,10 @@ class TaskOrder(Base, mixins.TimestampsMixin):
 
     @property
     def display_status(self):
-        return self.status.value
+        if self.status == Status.UNSIGNED:
+            return Status.DRAFT.value
+        else:
+            return self.status.value
 
     @property
     def portfolio_name(self):
diff --git a/tests/domain/test_task_orders.py b/tests/domain/test_task_orders.py
index 2db84c5c..93182df0 100644
--- a/tests/domain/test_task_orders.py
+++ b/tests/domain/test_task_orders.py
@@ -149,11 +149,12 @@ def test_task_order_sort_by_status():
     ]
 
     sorted_by_status = TaskOrders.sort_by_status(initial_to_list)
-    assert len(sorted_by_status["Draft"]) == 3
+    assert len(sorted_by_status["Draft"]) == 4
     assert len(sorted_by_status["Active"]) == 1
     assert len(sorted_by_status["Upcoming"]) == 1
     assert len(sorted_by_status["Expired"]) == 2
-    assert len(sorted_by_status["Unsigned"]) == 1
+    with pytest.raises(KeyError):
+        sorted_by_status["Unsigned"]
     assert list(sorted_by_status.keys()) == [status.value for status in SORT_ORDERING]
 
 

From fbd4c890f3319ed0162ddae14a5c66e56e36e120 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 10 Feb 2020 11:22:38 -0500
Subject: [PATCH 2/2] Default to opening TO accordions with task orders on the
 TO index page

---
 templates/components/accordion.html |  8 ++++++--
 templates/task_orders/index.html    | 10 ++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/templates/components/accordion.html b/templates/components/accordion.html
index 9ec92099..cdf72901 100644
--- a/templates/components/accordion.html
+++ b/templates/components/accordion.html
@@ -6,8 +6,12 @@
   heading_tag="h2",
   heading_classes="",
   content_tag="div",
-  content_classes="") %}
-  <accordion v-cloak inline-template>
+  content_classes="",
+  default_visible=False) %}
+  <accordion
+    v-cloak
+    inline-template
+    v-bind:default-visible='{{ default_visible | string | lower }}'>
     <{{wrapper_tag}} class="{{ wrapper_classes }}">
       <{{heading_tag}} class="accordion__button {{ heading_classes }}">
         <button
diff --git a/templates/task_orders/index.html b/templates/task_orders/index.html
index 8caeeab2..db91fc22 100644
--- a/templates/task_orders/index.html
+++ b/templates/task_orders/index.html
@@ -14,9 +14,15 @@
 
 
 {% macro TaskOrderList(task_orders, status) %}
+  {% set show_task_orders = task_orders|length > 0 %}
   <div class="accordion">
-    {% call Accordion(title=("task_orders.status_list_title"|translate({'status': status})), id=status, heading_tag="h4") %}
-      {% if task_orders|length > 0 %}
+    {% call Accordion(
+      title=("task_orders.status_list_title"|translate({'status': status})),
+      id=status,
+      heading_tag="h4",
+      default_visible=show_task_orders
+    ) %}
+      {% if show_task_orders %}
         {% for task_order in task_orders %}
           {% set to_number %}
             {% if task_order.number != None %}