From db58c64a89c642dcf79a3dc8f46882075b9b0a3f Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Wed, 12 Jun 2019 13:37:12 -0400
Subject: [PATCH] Move submit buttons inside form and add formaction to review
 button

---
 atst/routes/task_orders/new.py  |  3 ++
 templates/task_orders/edit.html | 50 +++++++++++++++++----------------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py
index fd3ce160..d92f2d16 100644
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -56,6 +56,9 @@ def update(portfolio_id=None, task_order_id=None):
         else:
             task_order = TaskOrders.create(g.current_user, portfolio_id, **form.data)
 
+        if http_request.args.get('review'):
+            return redirect(url_for("task_orders.review_task_order", task_order_id=task_order.id))
+
         flash("task_order_draft")
 
         return redirect(url_for("task_orders.edit", task_order_id=task_order.id))
diff --git a/templates/task_orders/edit.html b/templates/task_orders/edit.html
index bbfdac81..1039a880 100644
--- a/templates/task_orders/edit.html
+++ b/templates/task_orders/edit.html
@@ -84,29 +84,31 @@
 {% endmacro %}
 
 {% block portfolio_content %}
-  {% call StickyCTA(text="Add Funding") %}
-    <span class="action-group">
-      <input type="submit" tabindex="0" value="Review task order" form="new-task-order" class="usa-button usa-button-primary">
-      <input type="submit" tabindex="0" value="Save" form="new-task-order" class="usa-button usa-button-secondary">
-      <a
-        href="{{ cancel_url }}"
-        class="action-group__action icon-link">
-        {{ "common.cancel" | translate }}
-      </a>
-    </span>
-  {% endcall %}
+  {% if task_order_id %}
+    {% set action = url_for("task_orders.update", task_order_id=task_order_id) %}
+    {% set review_action = url_for("task_orders.update", task_order_id=task_order_id, review=True) %}
+  {% else %}
+    {% set action = url_for("task_orders.update", portfolio_id=portfolio.id) %}
+    {% set review_action = url_for("task_orders.update", portfolio_id=portfolio.id, review=True) %}
+  {% endif %}
+  <form id="new-task-order" class="task_order__form" action='{{ action }}' method="POST" autocomplete="off" enctype="multipart/form-data">
+    {{ form.csrf_token }}
 
-  <to-form inline-template v-bind:initial-clin-count="{{ form.clins.data | length }}">
-    <div class="task-order">
-      {% include "fragments/flash.html" %}
-        {% if task_order_id %}
-          {% set action = url_for("task_orders.update", task_order_id=task_order_id) %}
-        {% else %}
-          {% set action = url_for("task_orders.update", portfolio_id=portfolio.id) %}
-        {% endif %}
-        <form id="new-task-order" class="task_order__form" action='{{ action }}' method="POST" autocomplete="off" enctype="multipart/form-data">
-          {{ form.csrf_token }}
+    {% call StickyCTA(text="Add Funding") %}
+      <span class="action-group">
+        <input type="submit" formaction="{{ review_action }}" tabindex="0" value="Review task order" form="new-task-order" class="usa-button usa-button-primary">
+        <input type="submit" tabindex="0" value="Save" form="new-task-order" class="usa-button usa-button-secondary">
+        <a
+          href="{{ cancel_url }}"
+          class="action-group__action icon-link">
+          {{ "common.cancel" | translate }}
+        </a>
+      </span>
+    {% endcall %}
 
+    <to-form inline-template v-bind:initial-clin-count="{{ form.clins.data | length }}">
+      <div class="task-order">
+        {% include "fragments/flash.html" %}
           {{ SemiCollapsibleText(paragraph="task_orders.new.form_help_text" | translate) }}
 
           <hr>
@@ -352,8 +354,8 @@
           </div>
           {{ TotalsBox(task_order=task_order) }}
         </div>
-      </form>
-    </div>
-  </to-form>
+      </div>
+    </to-form>
+  </form>
 
 {% endblock %}