From 13eb277f4a51342d7b45a1312f0c08df3dcd78cb Mon Sep 17 00:00:00 2001 From: richard-dds Date: Tue, 11 Jun 2019 14:00:31 -0400 Subject: [PATCH 1/5] Fix CTAs for funding page --- atst/models/task_order.py | 16 ++++++++++++---- styles/sections/_task_order.scss | 4 ++++ templates/portfolios/task_orders/index.html | 20 ++++++++++++++------ 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/atst/models/task_order.py b/atst/models/task_order.py index 2ea5a614..1ed722f4 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -64,14 +64,26 @@ class TaskOrder(Base, mixins.TimestampsMixin): else: raise TypeError("Could not set attachment with invalid type") + @property + def is_draft(self): + return self.status == Status.DRAFT + @property def is_active(self): return self.status == Status.ACTIVE + @property + def is_upcoming(self): + return self.status == Status.UPCOMING + @property def is_expired(self): return self.status == Status.EXPIRED + @property + def is_unsigned(self): + return self.status == Status.UNSIGNED + @property def is_completed(self): return all([self.pdf, self.number, len(self.clins)]) @@ -146,10 +158,6 @@ class TaskOrder(Base, mixins.TimestampsMixin): def portfolio_name(self): return self.portfolio.name - @property - def is_pending(self): - return self.status == Status.PENDING - def to_dictionary(self): return { "portfolio_name": self.portfolio_name, diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index dc97dfc1..13d7e27b 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -82,6 +82,10 @@ min-width: 10rem; } +.task-order-card__buttons .usa-button-secondary { + min-width: 14rem; +} + .task-order-summary { margin-top: $gap * 4; diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index 9b561678..bb33234f 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -7,7 +7,13 @@ {% block portfolio_content %} {% macro ViewLink(task_order, text="Edit") %} - + + {{ text }} + +{% endmacro %} + +{% macro TaskOrderAction(task_order, text="Edit", route="review_task_order", secondary=False) %} + {{ text }} {% endmacro %} @@ -30,12 +36,14 @@ {% macro TaskOrderActions(task_order) %}
- {% if task_order.is_pending %} - {{ ViewLink(task_order, text="Edit") }} - {% elif task_order.is_active %} - {{ ViewLink(task_order, text="Modify") }} + {% if task_order.is_draft %} + {{ TaskOrderAction(task_order, text="Edit") }} + {% elif task_order.is_expired %} + {{ TaskOrderAction(task_order, text="View") }} + {% elif task_order.is_unsigned %} + {{ TaskOrderAction(task_order, text="Sign", secondary=True) }} + {{ TaskOrderAction(task_order, text="View") }} {% else %} - {{ ViewLink(task_order, text="View") }} {% endif %}
{% endmacro %} From 1de4fe7cc599f23895cb6a834e0f4e52220eb76c Mon Sep 17 00:00:00 2001 From: richard-dds Date: Tue, 11 Jun 2019 14:35:43 -0400 Subject: [PATCH 2/5] Fixed begins / ends time for TOs --- atst/models/task_order.py | 8 +++++ templates/portfolios/task_orders/index.html | 33 +++++++++++++++++---- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/atst/models/task_order.py b/atst/models/task_order.py index 1ed722f4..9c8a5569 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -84,6 +84,14 @@ class TaskOrder(Base, mixins.TimestampsMixin): def is_unsigned(self): return self.status == Status.UNSIGNED + @property + def has_begun(self): + return Clock.today() >= self.start_date + + @property + def has_ended(self): + return Clock.today() >= self.end_date + @property def is_completed(self): return all([self.pdf, self.number, len(self.clins)]) diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index bb33234f..4322d3aa 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -24,12 +24,35 @@ {% macro TaskOrderDate(task_order) %} - {% if task_order.is_active %} - Began {{ TaskOrderDateTime(task_order.start_date) }}   |   Ends {{ TaskOrderDateTime(task_order.end_date) }} - {% elif task_order.is_expired %} - Started {{ TaskOrderDateTime(task_order.start_date) }}   |   Ended {{ TaskOrderDateTime(task_order.end_date) }} + + + + {% if task_order.is_draft %} + {% if task_order.has_begun %} + Started on + {% else %} + Starts on + {% endif %} {% else %} - Started {{ TaskOrderDateTime(task_order.start_date) }} + {% if task_order.has_begun %} + Began + {% else %} + Begins + {% endif %} + {% endif %} + + {{ TaskOrderDateTime(task_order.start_date) }} + + {% if not task_order.is_draft %} +   |   + + {% if task_order.has_ended %} + Ended + {% else %} + Ends + {% endif %} + + {{ TaskOrderDateTime(task_order.end_date) }} {% endif %} {% endmacro %} From 6e17c55a96c999e4bed50d0fa9fad4a9185bfbf8 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Tue, 11 Jun 2019 15:07:21 -0400 Subject: [PATCH 3/5] Update "Sign" link --- templates/portfolios/task_orders/index.html | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index 4322d3aa..c138059c 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -6,14 +6,8 @@ {% block portfolio_content %} -{% macro ViewLink(task_order, text="Edit") %} - - {{ text }} - -{% endmacro %} - -{% macro TaskOrderAction(task_order, text="Edit", route="review_task_order", secondary=False) %} - +{% macro TaskOrderAction(task_order, text="Edit", route="review_task_order", secondary=False, modal=None) %} + {{ text }} {% endmacro %} @@ -64,7 +58,7 @@ {% elif task_order.is_expired %} {{ TaskOrderAction(task_order, text="View") }} {% elif task_order.is_unsigned %} - {{ TaskOrderAction(task_order, text="Sign", secondary=True) }} + {{ TaskOrderAction(task_order, text="Sign", secondary=True, modal="submit-to-1") }} {{ TaskOrderAction(task_order, text="View") }} {% else %} {% endif %} From 75d230faec4a55fab2ef00656dd3301104c642f2 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Tue, 11 Jun 2019 15:15:36 -0400 Subject: [PATCH 4/5] Use time_created for TO draft start date --- templates/portfolios/task_orders/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index c138059c..343afd44 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -27,16 +27,16 @@ {% else %} Starts on {% endif %} + {{ TaskOrderDateTime(task_order.time_created) }} {% else %} {% if task_order.has_begun %} Began {% else %} Begins {% endif %} + {{ TaskOrderDateTime(task_order.start_date) }} {% endif %} - {{ TaskOrderDateTime(task_order.start_date) }} - {% if not task_order.is_draft %}   |   From 1157e022f3d4f45c0f46377c8ec034b845609b36 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Wed, 12 Jun 2019 10:10:27 -0400 Subject: [PATCH 5/5] Make draft "edit" button lead to TO edit page --- templates/portfolios/task_orders/index.html | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index 343afd44..4829bfd2 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -6,8 +6,14 @@ {% block portfolio_content %} -{% macro TaskOrderAction(task_order, text="Edit", route="review_task_order", secondary=False, modal=None) %} - +{% macro TaskOrderReviewButton(task_order, text="Edit", secondary=False, modal=None) %} + + {{ text }} + +{% endmacro %} + +{% macro TaskOrderEditButton(task_order, text="Edit", secondary=False) %} + {{ text }} {% endmacro %} @@ -54,12 +60,12 @@ {% macro TaskOrderActions(task_order) %}
{% if task_order.is_draft %} - {{ TaskOrderAction(task_order, text="Edit") }} + {{ TaskOrderEditButton(task_order, text="Edit") }} {% elif task_order.is_expired %} - {{ TaskOrderAction(task_order, text="View") }} + {{ TaskOrderReviewButton(task_order, text="View") }} {% elif task_order.is_unsigned %} - {{ TaskOrderAction(task_order, text="Sign", secondary=True, modal="submit-to-1") }} - {{ TaskOrderAction(task_order, text="View") }} + {{ TaskOrderReviewButton(task_order, text="Sign", secondary=True, modal="submit-to-1") }} + {{ TaskOrderReviewButton(task_order, text="View") }} {% else %} {% endif %}