diff --git a/atst/routes/task_orders/new.py b/atst/routes/task_orders/new.py index 507f2471..9cf07f05 100644 --- a/atst/routes/task_orders/new.py +++ b/atst/routes/task_orders/new.py @@ -113,6 +113,7 @@ def new(screen, task_order_id=None): workflow.template, current=screen, task_order_id=task_order_id, + task_order=workflow.task_order, screens=workflow.display_screens, form=workflow.form, ) diff --git a/templates/components/edit_link.html b/templates/components/edit_link.html new file mode 100644 index 00000000..01f4fc0d --- /dev/null +++ b/templates/components/edit_link.html @@ -0,0 +1,8 @@ +{% from "components/icon.html" import Icon %} + +{% macro EditLink(url) -%} + + {{ Icon('edit') }} + edit + +{% endmacro %} diff --git a/templates/components/required_label.html b/templates/components/required_label.html new file mode 100644 index 00000000..926a136f --- /dev/null +++ b/templates/components/required_label.html @@ -0,0 +1,3 @@ +{% macro RequiredLabel() -%} + Response Required +{%- endmacro %} diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html index 6296fe91..1e27de15 100644 --- a/templates/task_orders/new/review.html +++ b/templates/task_orders/new/review.html @@ -1,8 +1,8 @@ {% extends 'task_orders/_new.html' %} -{% from "components/text_input.html" import TextInput %} -{% from "components/options_input.html" import OptionsInput %} -{% from "components/date_input.html" import DateInput %} +{% from "components/edit_link.html" import EditLink %} +{% from "components/required_label.html" import RequiredLabel %} +{% from "components/icon.html" import Icon %} {% block heading %} Review & Download @@ -12,6 +12,126 @@ {% include "fragments/flash.html" %} -Download your Task Order Packet. +{% if task_order %} + {% set edit_link = EditLink(url_for("task_orders.new", screen=1, task_order_id=task_order.id)) %} +{% else %} + {% set edit_link = EditLink(url_for("task_orders.new", screen=1)) %} +{% endif %} + +

Scope (Statement of Work) {{ edit_link }}

+

+ {{ task_order.scope or RequiredLabel() }} +

+ +
+
+

Period of Performance length {{ edit_link }}

+

+ {{ task_order.scope or RequiredLabel() }} +

+
+ +
+

Total funding requested {{ edit_link }}

+

+ {{ task_order.budget }} +

+
+
+ +
+ +

Generated Documents

+ +

+ + {{ Icon('download') }} + Cover Sheet + +

+ +

+ + {{ Icon('download') }} + Market Research + +

+ +{% if task_order %} +

+ + {{ Icon('download') }} + Task Order Draft + +

+{% endif %} + +

+ + {{ Icon('download') }} + DD 254 + +

+ +
+ +

Invite Signatories/Collaborators

+ +
+
+
+
+ Financial Oversight +

+ {% if task_order.ko_first_name %} + {{ task_order.ko_first_name }} + {{ task_order.ko_last_name }} + {% else %} + {{ RequiredLabel() }} + {% endif %} + (Contracting Officer) +

+

+ {% if task_order.ko_first_name %} + {{ task_order.cor_first_name }} + {{ task_order.cor_last_name }} + {% else %} + {{ RequiredLabel() }} + {% endif %} + (Contracting Officer Representative) +

+
+
+
+
+
+
+ Invite? +
+
+
+
+
+
+
+
+ Security Officer +

+ {% if task_order.so_first_name %} + {{ task_order.so_first_name }} + {{ task_order.so_last_name }} + {% else %} + {{ RequiredLabel() }} + {% endif %} + (Security Officer) +

+
+
+
+
+
+
+
+
{% endblock %}