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

Rename route functions to be clearer

Browse Source
This commit is contained in:
leigh-mil
2019-07-17 15:38:58 -04:00
parent a8df5044a9
commit 4826e8002b
13 changed files with 102 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/portfolios/header.html
View File

@@ -27,7 +27,7 @@
icon='funding',
text='navigation.portfolio_navigation.breadcrumbs.funding' | translate,
url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id),
active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.review_task_order", "task_orders.add_pdf", "task_orders.upload_pdf", "task_orders.add_number", "task_orders.update_number", "task_orders.add_clins", "task_orders.update_clins", "task_orders.review", "task_orders.confirm_signature"],
active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.review_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"],
) }}
{{ Link(
icon='applications',

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

@@ -13,7 +13,7 @@
{% endmacro %}
{% macro TaskOrderEditButton(task_order, text="Edit", secondary=False) %}
<a href="{{ url_for('task_orders.add_pdf', task_order_id=task_order.id) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
<a href="{{ url_for('task_orders.form_step_one_add_pdf', task_order_id=task_order.id) }}" class="usa-button {{ 'usa-button-secondary' if secondary else '' }}">
{{ text }}
</a>
{% endmacro %}
@@ -97,7 +97,7 @@
{% call StickyCTA(text="Funding") %}
{% if user_can(permissions.CREATE_TASK_ORDER) %}
<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>
<a href="{{ url_for("task_orders.form_step_one_add_pdf", portfolio_id=portfolio.id) }}" class="usa-button usa-button-primary" type="submit">Start a new task order</a>
{% endif %}
{% endcall %}
@@ -111,7 +111,7 @@
{{ EmptyState(
'This portfolio doesn’t have any active or pending task orders.',
action_label='Add a New Task Order',
action_href=url_for('task_orders.add_pdf', portfolio_id=portfolio.id),
action_href=url_for('task_orders.form_step_one_add_pdf', portfolio_id=portfolio.id),
icon='cloud',
add_perms=user_can(permissions.CREATE_TASK_ORDER)
) }}

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

@@ -5,7 +5,7 @@
{% block portfolio_content %}
{% call StickyCTA(text="Task order details") %}
<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 href="{{ url_for('task_orders.form_step_one_add_pdf', task_order_id=task_order.id) }}" class="usa-button usa-button-secondary" type="submit">Edit</a>
{% endcall %}
{% include "fragments/task_order_review.html" %}

4
templates/task_orders/step_1.html
View File

@@ -5,9 +5,9 @@
{% from 'components/upload_input.html' import UploadInput %}
{% if task_order_id %}
{% set action = url_for("task_orders.upload_pdf", task_order_id=task_order_id) %}
{% set action = url_for("task_orders.submit_form_step_one_add_pdf", task_order_id=task_order_id) %}
{% else %}
{% set action = url_for("task_orders.upload_pdf", portfolio_id=portfolio.id) %}
{% set action = url_for("task_orders.submit_form_step_one_add_pdf", portfolio_id=portfolio.id) %}
{% endif %}
{% set next_button_text = "Next: Add TO Number" %}

4
templates/task_orders/step_2.html
View File

@@ -2,9 +2,9 @@
{% from 'components/text_input.html' import TextInput %}
{% set action = url_for("task_orders.update_number", task_order_id=task_order_id) %}
{% set action = url_for("task_orders.submit_form_step_two_add_number", task_order_id=task_order_id) %}
{% set next_button_text = "Next: Add Base CLIN" %}
{% set previous_button_link = url_for("task_orders.add_pdf", task_order_id=task_order_id) %}
{% set previous_button_link = url_for("task_orders.form_step_one_add_pdf", task_order_id=task_order_id) %}
{% set step = "2" %}
{% block to_builder_form_field %}

4
templates/task_orders/step_3.html
View File

@@ -5,9 +5,9 @@
{% from 'components/options_input.html' import OptionsInput %}
{% from 'components/text_input.html' import TextInput %}
{% set action = url_for("task_orders.update_clins", task_order_id=task_order_id) %}
{% set action = url_for("task_orders.submit_form_step_three_add_clins", task_order_id=task_order_id) %}
{% set next_button_text = "Next: Review Funding" %}
{% set previous_button_link = url_for("task_orders.add_number", task_order_id=task_order_id) %}
{% set previous_button_link = url_for("task_orders.form_step_two_add_number", task_order_id=task_order_id) %}
{% set step = "3" %}
{% macro LOAInput() %}

4
templates/task_orders/step_4.html
View File

@@ -1,7 +1,7 @@
{% extends "task_orders/builder_base.html" %}
{% set action = url_for('task_orders.confirm_signature', task_order_id=task_order_id) %}
{% set previous_button_link = url_for("task_orders.add_clins", task_order_id=task_order_id) %}
{% set action = url_for('task_orders.form_step_five_confirm_signature', task_order_id=task_order_id) %}
{% set previous_button_link = url_for("task_orders.form_step_three_add_clins", task_order_id=task_order_id) %}
{% set step = "4" %}
{% block next_button %}

2
templates/task_orders/step_5.html
View File

@@ -5,7 +5,7 @@
{% set action = url_for("task_orders.submit_task_order", task_order_id=task_order_id) %}
{% set next_button_text = "Next: Confirm & Submit" %}
{% set previous_button_link = url_for("task_orders.review", task_order_id=task_order_id) %}
{% set previous_button_link = url_for("task_orders.form_step_four_review", task_order_id=task_order_id) %}
{% set step = "5" %}
{% block to_builder_form_field %}