From 5adb2d016e35fbf75d8c680056963c893a008ef0 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 2 Aug 2019 15:39:08 -0400
Subject: [PATCH 1/4] Fix route in TO sign button to direct to the form review
 page and remove modal call

---
 templates/portfolios/task_orders/index.html | 22 ++++++++-------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html
index 8f8dd2a5..f9c10e31 100644
--- a/templates/portfolios/task_orders/index.html
+++ b/templates/portfolios/task_orders/index.html
@@ -6,16 +6,10 @@
 
 {% block portfolio_content %}
 
-{% macro TaskOrderReviewButton(task_order, text="Edit", secondary=False, modal=None) %}
-  <a href="{{ url_for('task_orders.review_task_order', task_order_id=task_order.id, modal=modal) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
-    {{ text }}
-  </a>
-{% endmacro %}
-
-{% macro TaskOrderEditButton(task_order, text="Edit", secondary=False) %}
-  <a href="{{ url_for('task_orders.edit', task_order_id=task_order.id) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
-    {{ text }}
-  </a>
+{% macro TaskOrderButton(task_order, route, text="Edit", secondary=False) %}
+<a href="{{ url_for(route, task_order_id=task_order.id) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
+  {{ text }}
+</a>
 {% endmacro %}
 
 {% macro TaskOrderDateTime(dt, className="") %}
@@ -60,14 +54,14 @@
 {% macro TaskOrderActions(task_order) %}
   <div class="task-order-card__buttons">
     {% if task_order.is_draft and user_can(permissions.EDIT_TASK_ORDER_DETAILS) %}
-      {{ TaskOrderEditButton(task_order, text="Edit") }}
+      {{ TaskOrderButton(task_order, "task_orders.edit")}}
     {% elif task_order.is_expired %}
-      {{ TaskOrderReviewButton(task_order, text="View") }}
+      {{ TaskOrderButton(task_order, "task_orders.review_task_order", text="View") }}
     {% elif task_order.is_unsigned %}
       {% if user_can(permissions.EDIT_TASK_ORDER_DETAILS) %}
-        {{ TaskOrderReviewButton(task_order, text="Sign", secondary=True, modal="submit-to-1") }}
+        {{ TaskOrderButton(task_order, "task_orders.form_step_four_review", text="Sign", secondary=True) }}
       {% endif %}
-      {{ TaskOrderReviewButton(task_order, text="View") }}
+      {{ TaskOrderButton(task_order, "task_orders.review_task_order", text="View") }}
     {% endif %}
   </div>
 {% endmacro %}

From 46a7702f4fabbae8c7cf1ea4e7e87f5c09f5ef72 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 2 Aug 2019 15:44:09 -0400
Subject: [PATCH 2/4] Add containing div around to review fragment

---
 templates/portfolios/task_orders/review.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html
index b162e572..98512d53 100644
--- a/templates/portfolios/task_orders/review.html
+++ b/templates/portfolios/task_orders/review.html
@@ -8,5 +8,7 @@
       <a href="{{ url_for('task_orders.edit', task_order_id=task_order.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
   {% endcall %}
 
-  {% include "fragments/task_order_review.html" %}
+  <div class="task-order">
+    {% include "fragments/task_order_review.html" %}
+  </div>
 {% endblock %}

From 4e71b6dcef01e772b6dc74cf3d492536fc1a1e28 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 2 Aug 2019 15:50:24 -0400
Subject: [PATCH 3/4] Do not show edit TO button if user does not have perms or
 if TO is expired

---
 templates/portfolios/task_orders/review.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html
index 98512d53..293d29ea 100644
--- a/templates/portfolios/task_orders/review.html
+++ b/templates/portfolios/task_orders/review.html
@@ -5,7 +5,9 @@
 {% block portfolio_content %}
 
   {% call StickyCTA(text="Task order details") %}
+    {% if user_can(permissions.EDIT_TASK_ORDER_DETAILS) and not task_order.is_expired %}
       <a href="{{ url_for('task_orders.edit', task_order_id=task_order.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
+    {% endif %}
   {% endcall %}
 
   <div class="task-order">

From 12dc80546587d7e145bddc8e531fafda2de5f0f6 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 2 Aug 2019 16:19:42 -0400
Subject: [PATCH 4/4] Use dollar formatting

---
 templates/portfolios/task_orders/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html
index f9c10e31..5371c95d 100644
--- a/templates/portfolios/task_orders/index.html
+++ b/templates/portfolios/task_orders/index.html
@@ -82,7 +82,7 @@
           <h3>Task Order #{{ task_order.number }}</h3>
         </div>
         <div class="card__body">
-          <b>Obligated amount: </b>${{ task_order.total_obligated_funds }}
+          <b>Obligated amount: </b>{{ task_order.total_obligated_funds | dollars }}
         </div>
       </div>
     {% endfor %}