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

Send portfolio to template instead of using query param

Browse Source
This commit is contained in:
Montana 2019-03-01 13:39:11 -05:00
parent 943aa79aba
commit e8a7131948
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,20 +206,22 @@ def get_started():
@task_orders_bp.route("/task_orders/new/<int:screen>/<task_order_id>") @task_orders_bp.route("/task_orders/new/<int:screen>/<task_order_id>")
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new/<int:screen>") @task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new/<int:screen>")
def new(screen, task_order_id=None, portfolio_id=None): def new(screen, task_order_id=None, portfolio_id=None):
workflow = ShowTaskOrderWorkflow(g.current_user, screen, task_order_id)
template_args = {
"current": screen,
"task_order_id": task_order_id,
"screens": workflow.display_screens,
"form": workflow.form,
"complete": workflow.is_complete,
}
if task_order_id and screen is 4: if task_order_id and screen is 4:
task_order = TaskOrders.get(g.current_user, task_order_id) task_order = TaskOrders.get(g.current_user, task_order_id)
if not TaskOrders.all_sections_complete(task_order): if not TaskOrders.all_sections_complete(task_order):
flash("task_order_draft") flash("task_order_draft")
workflow = ShowTaskOrderWorkflow(g.current_user, screen, task_order_id) if portfolio_id:
template_args = { template_args["portfolio"] = Portfolios.get(g.current_user, portfolio_id)
"current": screen,
"task_order_id": task_order_id,
"portfolio_id": portfolio_id,
"screens": workflow.display_screens,
"form": workflow.form,
"complete": workflow.is_complete,
}
url_args = {"screen": screen} url_args = {"screen": screen}
if task_order_id: if task_order_id:
@ -237,11 +239,6 @@ def new(screen, task_order_id=None, portfolio_id=None):
task_order_id=task_order_id, task_order_id=task_order_id,
) )
url_args["next"] = template_args["next"] url_args["next"] = template_args["next"]
elif http_request.args.get("new_to_on_portfolio"):
portfolio = Portfolios.get(g.current_user, portfolio_id)
template_args["portfolio_name"] = portfolio.name
template_args["defense_component"] = portfolio.defense_component
template_args["new_to_on_portfolio"] = True
template_args["action_url"] = url_for("task_orders.update", **url_args) template_args["action_url"] = url_for("task_orders.update", **url_args)

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

@ -93,7 +93,7 @@
<div class="portfolio-funding"> <div class="portfolio-funding">
<div class='portfolio-funding__header row'> <div class='portfolio-funding__header row'>
<a href="{{ url_for("task_orders.new", screen=1, portfolio_id=portfolio.id, new_to_on_portfolio=True) }}" class="usa-button">Start a New Task Order</a> <a href="{{ url_for("task_orders.new", screen=1, portfolio_id=portfolio.id) }}" class="usa-button">Start a New Task Order</a>
</div> </div>
{% for task_order in pending_task_orders %} {% for task_order in pending_task_orders %}

8
templates/task_orders/new/app_info.html
View File

@ -16,8 +16,8 @@
<!-- App Info Section --> <!-- App Info Section -->
<h3 class="task-order-form__heading subheading">{{ "task_orders.new.app_info.basic_info_title"| translate }}</h3> <h3 class="task-order-form__heading subheading">{{ "task_orders.new.app_info.basic_info_title"| translate }}</h3>
{% if new_to_on_portfolio %} {% if portfolio %}
{{ ReviewField(heading="forms.portfolio.name_label" | translate, field=portfolio_name) }} {{ ReviewField(heading="forms.portfolio.name_label" | translate, field=portfolio.name) }}
{% else %} {% else %}
{{ TextInput(form.portfolio_name, placeholder="The name of your office or organization", validation="portfolioName") }} {{ TextInput(form.portfolio_name, placeholder="The name of your office or organization", validation="portfolioName") }}
{{ TextInput(form.scope, paragraph=True) }} {{ TextInput(form.scope, paragraph=True) }}
@ -25,8 +25,8 @@
{% endif %} {% endif %}
<div class="subheading--black"> <div class="subheading--black">
{% if new_to_on_portfolio %} {% if portfolio %}
{{ ReviewField(heading="forms.task_order.defense_component_label" | translate, field=defense_component) }} {{ ReviewField(heading="forms.task_order.defense_component_label" | translate, field=portfolio.defense_component) }}
{% else %} {% else %}
{{ OptionsInput(form.defense_component) }} {{ OptionsInput(form.defense_component) }}
{% endif %} {% endif %}