Merge pull request #1407 from dod-ccpo/to-index-fixes

TO index page fixes
This commit is contained in:
leigh-mil 2020-02-11 10:31:01 -05:00 committed by GitHub
commit 935d44eaa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 8 deletions

View File

@ -25,7 +25,6 @@ SORT_ORDERING = [
Status.DRAFT, Status.DRAFT,
Status.UPCOMING, Status.UPCOMING,
Status.EXPIRED, Status.EXPIRED,
Status.UNSIGNED,
] ]
@ -148,6 +147,9 @@ class TaskOrder(Base, mixins.TimestampsMixin):
@property @property
def display_status(self): def display_status(self):
if self.status == Status.UNSIGNED:
return Status.DRAFT.value
else:
return self.status.value return self.status.value
@property @property

View File

@ -6,8 +6,12 @@
heading_tag="h2", heading_tag="h2",
heading_classes="", heading_classes="",
content_tag="div", content_tag="div",
content_classes="") %} content_classes="",
<accordion v-cloak inline-template> default_visible=False) %}
<accordion
v-cloak
inline-template
v-bind:default-visible='{{ default_visible | string | lower }}'>
<{{wrapper_tag}} class="{{ wrapper_classes }}"> <{{wrapper_tag}} class="{{ wrapper_classes }}">
<{{heading_tag}} class="accordion__button {{ heading_classes }}"> <{{heading_tag}} class="accordion__button {{ heading_classes }}">
<button <button

View File

@ -14,9 +14,15 @@
{% macro TaskOrderList(task_orders, status) %} {% macro TaskOrderList(task_orders, status) %}
{% set show_task_orders = task_orders|length > 0 %}
<div class="accordion"> <div class="accordion">
{% call Accordion(title=("task_orders.status_list_title"|translate({'status': status})), id=status, heading_tag="h4") %} {% call Accordion(
{% if task_orders|length > 0 %} 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 %} {% for task_order in task_orders %}
{% set to_number %} {% set to_number %}
{% if task_order.number != None %} {% if task_order.number != None %}

View File

@ -149,11 +149,12 @@ def test_task_order_sort_by_status():
] ]
sorted_by_status = TaskOrders.sort_by_status(initial_to_list) 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["Active"]) == 1
assert len(sorted_by_status["Upcoming"]) == 1 assert len(sorted_by_status["Upcoming"]) == 1
assert len(sorted_by_status["Expired"]) == 2 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] assert list(sorted_by_status.keys()) == [status.value for status in SORT_ORDERING]