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

fix edit links and formatting in TO review template

Browse Source
This commit is contained in:
dandds 2018-12-21 13:46:24 -05:00
parent c024d12e3b
commit 5cf2534445
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
templates/task_orders/new/review.html
View File

@ -12,26 +12,28 @@
{% include "fragments/flash.html" %} {% include "fragments/flash.html" %}
{% macro TOEditLink(screen=1) %}
{% if task_order %} {% if task_order %}
{% set edit_link = EditLink(url_for("task_orders.new", screen=1, task_order_id=task_order.id)) %} {{ EditLink(url_for("task_orders.new", screen=screen, task_order_id=task_order.id)) }}
{% else %} {% else %}
{% set edit_link = EditLink(url_for("task_orders.new", screen=1)) %} {{ EditLink(url_for("task_orders.new", screen=screen)) }}
{% endif %} {% endif %}
{% endmacro %}
<section> <section>
<h3>Scope (Statement of Work) {{ edit_link }}</h3> <h3>Scope (Statement of Work) {{ TOEditLink() }}</h3>
<p> <p>
{{ task_order.scope or RequiredLabel() }} {{ task_order.scope or RequiredLabel() }}
</p> </p>
<div class="row"> <div class="row">
<div class="col col--grow"> <div class="col col--grow">
<h3>Period of Performance length {{ edit_link }}</h3> <h3>Period of Performance length {{ TOEditLink(screen=2) }}</h3>
{{ task_order.period or RequiredLabel() }} {{ task_order.period or RequiredLabel() }}
</div> </div>
<div class="col col--grow"> <div class="col col--grow">
<h3>Total funding requested {{ edit_link }}</h3> <h3>Total funding requested {{ TOEditLink(screen=2) }}</h3>
{{ task_order.budget }} {{ task_order.budget }}
</div> </div>
</div> </div>
@ -55,7 +57,8 @@
{{ Icon('download') }} {{ Icon('download') }}
Market Research Market Research
</a> </a>
</li> </li
>
{% if task_order %} {% if task_order %}
<li> <li>
@ -87,19 +90,19 @@
<legend>Financial Oversight</legend> <legend>Financial Oversight</legend>
<p> <p>
{% if task_order.ko_first_name %} {% if task_order.ko_first_name %}
{{ task_order.ko_first_name }} {{ task_order.ko_first_name }}
{{ task_order.ko_last_name }} {{ task_order.ko_last_name }}
{% else %} {% else %}
{{ RequiredLabel() }} {{ RequiredLabel() }}
{% endif %} {% endif %}
(Contracting Officer) (Contracting Officer)
</p> </p>
<p> <p>
{% if task_order.ko_first_name %} {% if task_order.ko_first_name %}
{{ task_order.cor_first_name }} {{ task_order.cor_first_name }}
{{ task_order.cor_last_name }} {{ task_order.cor_last_name }}
{% else %} {% else %}
{{ RequiredLabel() }} {{ RequiredLabel() }}
{% endif %} {% endif %}
(Contracting Officer Representative) (Contracting Officer Representative)
</p> </p>
@ -121,10 +124,10 @@
<legend>Security Officer</legend> <legend>Security Officer</legend>
<p> <p>
{% if task_order.so_first_name %} {% if task_order.so_first_name %}
{{ task_order.so_first_name }} {{ task_order.so_first_name }}
{{ task_order.so_last_name }} {{ task_order.so_last_name }}
{% else %} {% else %}
{{ RequiredLabel() }} {{ RequiredLabel() }}
{% endif %} {% endif %}
(Security Officer) (Security Officer)
</p> </p>