pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename routes

Browse Source
This commit is contained in:
leigh-mil 2019-07-16 13:41:25 -04:00
parent b3737619f0
commit b2db53096f
8 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/routes/task_orders/index.py
View File

@ -15,7 +15,7 @@ from atst.utils.flash import formatted_flash as flash
def review_task_order(task_order_id):
task_order = TaskOrders.get(task_order_id)
if task_order.is_draft:
return redirect(url_for("task_orders.add_to_pdf", task_order_id=task_order.id))
return redirect(url_for("task_orders.add_pdf", task_order_id=task_order.id))
else:
signature_form = SignatureForm()
return render_template(

10
atst/routes/task_orders/new.py
View File

@ -58,7 +58,7 @@ def update_task_order(
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/step_1")
@task_orders_bp.route("/task_orders/<task_order_id>/step_1")
@user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form")
def add_to_pdf(portfolio_id=None, task_order_id=None):
def add_pdf(portfolio_id=None, task_order_id=None):
return render_task_orders_edit(
"task_orders/step_1.html",
portfolio_id=portfolio_id,
@ -69,9 +69,9 @@ def add_to_pdf(portfolio_id=None, task_order_id=None):
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/step-1", methods=["POST"])
@task_orders_bp.route("/task_orders/<task_order_id>/step_1", methods=["POST"])
@user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form")
def upload_to_pdf(portfolio_id=None, task_order_id=None):
def upload_pdf(portfolio_id=None, task_order_id=None):
form_data = {**http_request.form, **http_request.files}
next_page = "task_orders.add_to_number"
next_page = "task_orders.add_number"
current_template = "task_orders/step_1.html"
return update_task_order(
@ -85,7 +85,7 @@ def upload_to_pdf(portfolio_id=None, task_order_id=None):
@task_orders_bp.route("/task_orders/<task_order_id>/step_2")
@user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form")
def add_to_number(task_order_id):
def add_number(task_order_id):
return render_task_orders_edit(
"task_orders/step_2.html", task_order_id=task_order_id
)
@ -93,7 +93,7 @@ def add_to_number(task_order_id):
@task_orders_bp.route("/task_orders/<task_order_id>/step_2", methods=["POST"])
@user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form")
def update_to_number(task_order_id):
def update_number(task_order_id):
form_data = {**http_request.form}
next_page = "task_orders.add_clins"
current_template = "task_orders/step_2.html"

2
templates/portfolios/task_orders/index.html
View File

@ -97,7 +97,7 @@
{% call StickyCTA(text="Funding") %}
{% if user_can(permissions.CREATE_TASK_ORDER) %}
<a href="{{ url_for("task_orders.add_to_pdf", portfolio_id=portfolio.id) }}" class="usa-button usa-button-primary" type="submit">Start a new task order</a>
<a href="{{ url_for("task_orders.add_pdf", portfolio_id=portfolio.id) }}" class="usa-button usa-button-primary" type="submit">Start a new task order</a>
{% endif %}
{% endcall %}

2
templates/portfolios/task_orders/review.html
View File

@ -22,7 +22,7 @@
{% endcall %}
{% call StickyCTA(text="Review Funding") %}
<a href="{{ url_for("task_orders.add_to_pdf", task_order_id=task_order.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
<a href="{{ url_for("task_orders.add_pdf", task_order_id=task_order.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
<a v-on:click="openModal('submit-to-1')" class="usa-button usa-button-primary" type="submit">Submit task order</a>
{% endcall %}

4
templates/task_orders/step_1.html
View File

@ -6,9 +6,9 @@
{% block portfolio_content %}
{% if task_order_id %}
{% set action = url_for("task_orders.upload_to_pdf", task_order_id=task_order_id) %}
{% set action = url_for("task_orders.upload_pdf", task_order_id=task_order_id) %}
{% else %}
{% set action = url_for("task_orders.upload_to_pdf", portfolio_id=portfolio.id) %}
{% set action = url_for("task_orders.upload_pdf", portfolio_id=portfolio.id) %}
{% endif %}
<base-form inline-template>

2
templates/task_orders/step_2.html
View File

@ -4,7 +4,7 @@
{% from 'components/text_input.html' import TextInput %}
{% block portfolio_content %}
{% set action = url_for("task_orders.update_to_number", task_order_id=task_order_id) %}
{% set action = url_for("task_orders.update_number", task_order_id=task_order_id) %}
<base-form inline-template>
<form id="upload-to-pdf" action='{{ action }}' method="POST" autocomplete="off" enctype="multipart/form-data">

3
tests/routes/task_orders/test_index.py
View File

@ -52,8 +52,7 @@ def test_review_task_order_draft(client, user_session, task_order):
)
assert response.status_code == 302
assert (
url_for("task_orders.add_to_pdf", task_order_id=task_order.id)
in response.location
url_for("task_orders.add_pdf", task_order_id=task_order.id) in response.location
)

39
tests/routes/task_orders/test_new.py
View File

@ -32,19 +32,17 @@ def user():
return UserFactory.create()
def test_task_orders_add_to_pdf(client, user_session, portfolio):
def test_task_orders_add_pdf(client, user_session, portfolio):
user_session(portfolio.owner)
response = client.get(url_for("task_orders.add_to_pdf", portfolio_id=portfolio.id))
response = client.get(url_for("task_orders.add_pdf", portfolio_id=portfolio.id))
assert response.status_code == 200
def test_task_orders_upload_to_pdf(
client, user_session, portfolio, pdf_upload, session
):
def test_task_orders_upload_pdf(client, user_session, portfolio, pdf_upload, session):
user_session(portfolio.owner)
form_data = {"pdf": pdf_upload}
response = client.post(
url_for("task_orders.upload_to_pdf", portfolio_id=portfolio.id), data=form_data
url_for("task_orders.upload_pdf", portfolio_id=portfolio.id), data=form_data
)
assert response.status_code == 302
@ -52,19 +50,19 @@ def test_task_orders_upload_to_pdf(
assert task_order.pdf.filename == pdf_upload.filename
def test_task_orders_add_to_number(client, user_session, task_order):
def test_task_orders_add_number(client, user_session, task_order):
user_session(task_order.creator)
response = client.get(
url_for("task_orders.add_to_number", task_order_id=task_order.id)
url_for("task_orders.add_number", task_order_id=task_order.id)
)
assert response.status_code == 200
def test_task_orders_update_to_number(client, user_session, task_order):
def test_task_orders_update_number(client, user_session, task_order):
user_session(task_order.creator)
form_data = {"number": "1234567890"}
response = client.post(
url_for("task_orders.update_to_number", task_order_id=task_order.id),
url_for("task_orders.update_number", task_order_id=task_order.id),
data=form_data,
)
@ -96,8 +94,7 @@ def test_task_orders_update_clins(client, user_session, task_order):
"clins-1-loas-0": "78979087",
}
response = client.post(
url_for("task_orders.update_to_number", task_order_id=task_order.id),
data=form_data,
url_for("task_orders.update_clins", task_order_id=task_order.id), data=form_data
)
assert response.status_code == 302
@ -126,15 +123,13 @@ def test_task_orders_save_incomplete(client, user_session, portfolio):
assert response.location == expected_url
def test_task_orders_add_to_pdf_existing_to(client, user_session, task_order):
def test_task_orders_add_pdf_existing_to(client, user_session, task_order):
user_session(task_order.creator)
response = client.get(
url_for("task_orders.add_to_pdf", task_order_id=task_order.id)
)
response = client.get(url_for("task_orders.add_pdf", task_order_id=task_order.id))
assert response.status_code == 200
def test_task_orders_upload_to_pdf_existing_to(
def test_task_orders_upload_pdf_existing_to(
client, user_session, task_order, pdf_upload, pdf_upload2
):
task_order.pdf = pdf_upload
@ -143,19 +138,18 @@ def test_task_orders_upload_to_pdf_existing_to(
user_session(task_order.creator)
form_data = {"pdf": pdf_upload2}
response = client.post(
url_for("task_orders.upload_to_pdf", task_order_id=task_order.id),
data=form_data,
url_for("task_orders.upload_pdf", task_order_id=task_order.id), data=form_data
)
assert response.status_code == 302
assert task_order.pdf.filename == pdf_upload2.filename
def test_task_orders_update_to_number_existing_to(client, user_session, task_order):
def test_task_orders_update_number_existing_to(client, user_session, task_order):
user_session(task_order.creator)
form_data = {"number": "0000000000"}
original_number = task_order.number
response = client.post(
url_for("task_orders.upload_to_pdf", task_order_id=task_order.id),
url_for("task_orders.update_number", task_order_id=task_order.id),
data=form_data,
)
assert response.status_code == 302
@ -195,8 +189,7 @@ def test_task_orders_update_clins_existing_to(client, user_session, task_order):
"clins-0-loas-0": "123123123123",
}
response = client.post(
url_for("task_orders.update_to_number", task_order_id=task_order.id),
data=form_data,
url_for("task_orders.update_clins", task_order_id=task_order.id), data=form_data
)
assert response.status_code == 302