From 25a34d560852bf5bcc87c6993a241885e9b60ebf Mon Sep 17 00:00:00 2001 From: dandds Date: Mon, 14 Jan 2019 12:42:46 -0500 Subject: [PATCH] include updated task order page and fix TaskOrders.get call --- atst/routes/portfolios/task_orders.py | 2 +- templates/portfolios/task_orders/show.html | 154 ++++++++++++++++++++- 2 files changed, 154 insertions(+), 2 deletions(-) diff --git a/atst/routes/portfolios/task_orders.py b/atst/routes/portfolios/task_orders.py index e069cbd9..7b5b7999 100644 --- a/atst/routes/portfolios/task_orders.py +++ b/atst/routes/portfolios/task_orders.py @@ -14,7 +14,7 @@ def portfolio_task_orders(portfolio_id): @portfolios_bp.route("/portfolios//task_order/") def view_task_order(portfolio_id, task_order_id): portfolio = Portfolios.get(g.current_user, portfolio_id) - task_order = TaskOrders.get(task_order_id) + task_order = TaskOrders.get(g.current_user, task_order_id) return render_template( "portfolios/task_orders/show.html", portfolio=portfolio, task_order=task_order ) diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html index c7468b10..1177df86 100644 --- a/templates/portfolios/task_orders/show.html +++ b/templates/portfolios/task_orders/show.html @@ -1,7 +1,159 @@ {% extends "portfolios/base.html" %} +{% from "components/icon.html" import Icon %} + {% block portfolio_content %} -You're looking at TO {{ task_order.id }} +{% macro Step(title="", description="", link_text=None, link_url=None, complete=True) %} +
+
+ {{ Icon("ok", classes="complete" if complete else "incomplete") }} +
+
+
+

{{ title }}

+ {% if link_url %} + + {{ Icon("edit") }} + {{ link_text }} + + {% endif %} +
+
+ {{ description }} +
+
+
+{% endmacro %} + +{% macro DocumentLink(title="", link_url="", description="") %} + {% set disabled = not link_url %} +
+
+ +
+ {{ Icon("download") }} +
+
+ {{ title }} +
+ +
+ {% if description %} +
+ {{ description }} +
+ {% endif %} +
+{% endmacro %} + +{% macro InvitationStatus(title, officer) %} + {% set class = "invited" if officer else "uninvited" %} +
+
+ {{ Icon("ok" if officer else "alert", classes=class) }} +
+
+ {{ title }} +
+
+{% endmacro %} + +
+
+
+

New Task Order

+ {{ task_order.status.value }} +
+
+
+
Started
+
+ + +
+
+
+
Task Order Value
+
{{ task_order.budget | dollars }}
+
+
+
+ +
+
+
+

What's next?

+ {{ Step( + title="Submit draft Task Order", + description="Complete initial task order request form.", + link_text="edit", + link_url=url_for("task_orders.new", screen=1, task_order_id=task_order.id), + complete=True) }} + {{ Step( + title="Complete a Security Requirements Document", + description="The IA Security Official you specified received an email invitation to complete and sign a DD-254: Security Requirements document that's been customized for the JEDI program here.", + complete=False) }} + {{ Step( + title="Prepare the Task Order Documents for your organization's contracting system", + description="You'll file your task order in your organization's contracting system. Change the formatting based on your office prefers.", + complete=False) }} + {{ Step( + title="Get a funding document", + description="User your organization's normal process to get a funding document, typically from your financial manager. Your Contracting Officer's Representative (COR) or Contracting Officer (KO) can help with this, too.", + complete=False) }} + {{ Step( + title="Have your KO submit your final task order", + description="Your KO will submit the final task order into your organization's contracting system and receive an official task order number. Your KO should enter your task order number in this system, along with a copy of the submitted task order.", + complete=False) }} +

Once your required information is submitted in this system, you're funded and ready to start using JEDI cloud services!

+
+
+
+
+
+

Download documents

+ {% set description -%} + last updated on + + {%- endset %} + {{ DocumentLink( + title="Task Order Draft", + link_url=url_for('task_orders.download_summary', task_order_id=task_order.id), + description=description) }} +
+
+
+ {{ DocumentLink( + title="Cloud Services Estimate", + link_url="#") }} + {{ DocumentLink( + title="Market Research", + link_url="#") }} + {{ DocumentLink( + title="DD 254", + link_url="") }} +
+
+
+
+

Invitations

+ {{ InvitationStatus('Contracting Officer', task_order.contracting_officer) }} + {{ InvitationStatus('Contracting Officer Representative', task_order.contracting_officer_representative) }} + {{ InvitationStatus('IA Security Officer', officer=task_order.security_officer) }} + + + {{ Icon("edit") }} + manage invitations + +
+
+
+
+
{% endblock %}