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

Add in some template code that was lost in a rebase

Browse Source
This commit is contained in:
Montana 2019-02-04 13:58:02 -05:00
parent 7305ae0ddf
commit d7eb8ab56f
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/fragments/task_order_review/funding.html
View File

@ -20,7 +20,7 @@
<td><h4>{{ "task_orders.new.review.to_value"| translate }}</h4></td> <td><h4>{{ "task_orders.new.review.to_value"| translate }}</h4></td>
<td class="table-cell--align-right"> <td class="table-cell--align-right">
{% if task_order.budget %} {% if task_order.budget %}
{{ task_order.budget | dollarsWithCents }} {{ task_order.budget | dollars }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -28,7 +28,7 @@
<td><h4 class='task-order-form__heading funding-summary__td'>{{ "task_orders.new.review.clin_1"| translate }}</h4></td> <td><h4 class='task-order-form__heading funding-summary__td'>{{ "task_orders.new.review.clin_1"| translate }}</h4></td>
<td class="table-cell--align-right"> <td class="table-cell--align-right">
{% if task_order.clin_01 %} {% if task_order.clin_01 %}
{{ task_order.clin_01 | dollarsWithCents }} {{ task_order.clin_01 | dollars }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -41,7 +41,7 @@
</h4></td> </h4></td>
<td class="table-cell--align-right"> <td class="table-cell--align-right">
{% if task_order.clin_02 and config.CLASSIFIED %} {% if task_order.clin_02 and config.CLASSIFIED %}
{{ task_order.clin_02 | dollarsWithCents or RequiredLabel() }} {{ task_order.clin_02 | dollars or RequiredLabel() }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -49,7 +49,7 @@
<td><h4 class='task-order-form__heading funding-summary__td'>{{ "task_orders.new.review.clin_3"| translate }}</h4></td> <td><h4 class='task-order-form__heading funding-summary__td'>{{ "task_orders.new.review.clin_3"| translate }}</h4></td>
<td class="table-cell--align-right"> <td class="table-cell--align-right">
{% if task_order.clin_03 %} {% if task_order.clin_03 %}
{{ task_order.clin_03 | dollarsWithCents or RequiredLabel() }} {{ task_order.clin_03 | dollars or RequiredLabel() }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
@ -62,7 +62,7 @@
</h4></td> </h4></td>
<td class="table-cell--align-right"> <td class="table-cell--align-right">
{% if task_order.clin_04 and config.CLASSIFIED %} {% if task_order.clin_04 and config.CLASSIFIED %}
{{ task_order.clin_04 | dollarsWithCents or RequiredLabel() }} {{ task_order.clin_04 | dollars or RequiredLabel() }}
{% endif %} {% endif %}
</td> </td>
<tr> <tr>

28
templates/fragments/task_order_review/reporting.html
View File

@ -1,8 +1,23 @@
{% from "components/review_field.html" import ReviewField %} {% from "components/review_field.html" import ReviewField %}
<div class="row"> <div class="row">
{{ ReviewField(("forms.task_order.app_migration.label" | translate), ("forms.task_order.app_migration.{}".format(task_order.app_migration) | translate), filter="removeHtml") }} {{
{{ ReviewField(("forms.task_order.native_apps.label" | translate), ("forms.task_order.native_apps.{}".format(task_order.native_apps))| translate) }} ReviewField(
("forms.task_order.app_migration.label" | translate),
(
("forms.task_order.app_migration.{}".format(task_order.app_migration) | translate) if task_order.app_migration
)
)
}}
{{
ReviewField(
("forms.task_order.native_apps.label" | translate),
(
("forms.task_order.native_apps.{}".format(task_order.native_apps) | translate) if task_order.native_apps
)
)
}}
</div> </div>
<h4 class='task-order-form__heading'>{{ "task_orders.new.review.complexity"| translate }}</h4> <h4 class='task-order-form__heading'>{{ "task_orders.new.review.complexity"| translate }}</h4>
@ -37,5 +52,12 @@
<p>{{ RequiredLabel() }}</p> <p>{{ RequiredLabel() }}</p>
{% endif %} {% endif %}
</div> </div>
{{ ReviewField(("forms.task_order.team_experience.label" |translate), ("forms.task_order.team_experience.{}".format(task_order.team_experience)) | translate) }} {{
ReviewField(
("forms.task_order.team_experience.label" |translate),
(
("forms.task_order.team_experience.{}".format(task_order.team_experience) | translate) if task_order.team_experience
)
)
}}
</div> </div>