From 8017b7f03fcb96aad2c2a6eda8e6e0468353f7a6 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Wed, 9 Jan 2019 10:35:57 -0500 Subject: [PATCH 1/2] Add rudimentary task order listing and viewing pages --- atst/routes/workspaces/__init__.py | 1 + atst/routes/workspaces/task_orders.py | 20 ++++++++++++++ templates/workspaces/task_orders/index.html | 30 +++++++++++++++++++++ templates/workspaces/task_orders/show.html | 7 +++++ 4 files changed, 58 insertions(+) create mode 100644 atst/routes/workspaces/task_orders.py create mode 100644 templates/workspaces/task_orders/index.html create mode 100644 templates/workspaces/task_orders/show.html diff --git a/atst/routes/workspaces/__init__.py b/atst/routes/workspaces/__init__.py index 6ba95d77..96aa24b5 100644 --- a/atst/routes/workspaces/__init__.py +++ b/atst/routes/workspaces/__init__.py @@ -6,6 +6,7 @@ from . import index from . import projects from . import members from . import invitations +from . import task_orders from atst.domain.exceptions import UnauthorizedError from atst.domain.workspaces import Workspaces from atst.domain.authz import Authorization diff --git a/atst/routes/workspaces/task_orders.py b/atst/routes/workspaces/task_orders.py new file mode 100644 index 00000000..7fdcbc9a --- /dev/null +++ b/atst/routes/workspaces/task_orders.py @@ -0,0 +1,20 @@ +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(task_order_id) + return render_template( + "workspaces/task_orders/show.html", workspace=workspace, task_order=task_order + ) diff --git a/templates/workspaces/task_orders/index.html b/templates/workspaces/task_orders/index.html new file mode 100644 index 00000000..19de849c --- /dev/null +++ b/templates/workspaces/task_orders/index.html @@ -0,0 +1,30 @@ +{% from "components/empty_state.html" import EmptyState %} + +{% extends "workspaces/base.html" %} + +{% block workspace_content %} + +{% if not workspace.task_orders %} + + {{ EmptyState( + 'This workspace doesn’t have any task orders yet.', + action_label='Add a New Task Order', + action_href=url_for('task_orders.new', screen=1, workspace_id=workspace.id), + icon='cloud', + ) }} + +{% else %} + + + +{% endif %} + +{% endblock %} diff --git a/templates/workspaces/task_orders/show.html b/templates/workspaces/task_orders/show.html new file mode 100644 index 00000000..d65f9ec0 --- /dev/null +++ b/templates/workspaces/task_orders/show.html @@ -0,0 +1,7 @@ +{% extends "workspaces/base.html" %} + +{% block workspace_content %} + +You're looking at TO {{ task_order.id }} + +{% endblock %} From 189bf5a92e54c5122adaebcafd52a2efdd4f191b Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Wed, 9 Jan 2019 10:36:20 -0500 Subject: [PATCH 2/2] Add task orders to side nav for workspaces --- templates/navigation/workspace_navigation.html | 7 +++++++ translations.yaml | 1 + 2 files changed, 8 insertions(+) diff --git a/templates/navigation/workspace_navigation.html b/templates/navigation/workspace_navigation.html index 9dc27119..3a36bff5 100644 --- a/templates/navigation/workspace_navigation.html +++ b/templates/navigation/workspace_navigation.html @@ -40,6 +40,13 @@ ) }} {% endif %} + {{ SidenavItem( + ("navigation.workspace_navigation.task_orders" | translate), + href=url_for("workspaces.workspace_task_orders", workspace_id=workspace.id), + active=request.url_rule.rule.startswith('/workspaces//task_order'), + subnav=None + ) }} + {% if user_can(permissions.EDIT_WORKSPACE_INFORMATION) %} {{ SidenavItem( ("navigation.workspace_navigation.workspace_settings" | translate), diff --git a/translations.yaml b/translations.yaml index 401ee178..d4268246 100644 --- a/translations.yaml +++ b/translations.yaml @@ -204,6 +204,7 @@ navigation: budget_report: Budget Report members: Members projects: Projects + task_orders: Task Orders workspace_settings: Workspace Settings requests: _new: