diff --git a/alembic/versions/acd0c11be93a_change_workspace_and_project.py b/alembic/versions/acd0c11be93a_change_workspace_and_project.py index 7e495665..3dacc6b5 100644 --- a/alembic/versions/acd0c11be93a_change_workspace_and_project.py +++ b/alembic/versions/acd0c11be93a_change_workspace_and_project.py @@ -1,7 +1,7 @@ """change workspace and project Revision ID: acd0c11be93a -Revises: 71cbe76c3b87 +Revises: 7f2040715b0d Create Date: 2019-01-11 10:01:07.667126 """ @@ -11,7 +11,7 @@ from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. revision = 'acd0c11be93a' -down_revision = '71cbe76c3b87' +down_revision = '7f2040715b0d' branch_labels = None depends_on = None diff --git a/atst/routes/workspaces/task_orders.py b/atst/routes/workspaces/task_orders.py deleted file mode 100644 index d99d6c3b..00000000 --- a/atst/routes/workspaces/task_orders.py +++ /dev/null @@ -1,20 +0,0 @@ -from flask import g, render_template - -from . import workspaces_bp -from atst.domain.task_orders import TaskOrders -from atst.domain.workspaces import Workspaces - - -@workspaces_bp.route("/workspaces//task_orders") -def workspace_task_orders(workspace_id): - workspace = Workspaces.get(g.current_user, workspace_id) - return render_template("workspaces/task_orders/index.html", workspace=workspace) - - -@workspaces_bp.route("/workspaces//task_order/") -def view_task_order(workspace_id, task_order_id): - workspace = Workspaces.get(g.current_user, workspace_id) - task_order = TaskOrders.get(g.current_user, task_order_id) - return render_template( - "workspaces/task_orders/show.html", workspace=workspace, task_order=task_order - ) diff --git a/templates/workspaces/task_orders/show.html b/templates/workspaces/task_orders/show.html deleted file mode 100644 index 1ea2d3a7..00000000 --- a/templates/workspaces/task_orders/show.html +++ /dev/null @@ -1,159 +0,0 @@ -{% extends "workspaces/base.html" %} - -{% from "components/icon.html" import Icon %} - -{% block workspace_content %} - -{% 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 %}