diff --git a/templates/fragments/task_order_review/funding.html b/templates/fragments/task_order_review/funding.html index 8b9e1225..f1df6364 100644 --- a/templates/fragments/task_order_review/funding.html +++ b/templates/fragments/task_order_review/funding.html @@ -20,7 +20,7 @@

{{ "task_orders.new.review.to_value"| translate }}

{% if task_order.budget %} - {{ task_order.budget | dollarsWithCents }} + {{ task_order.budget | dollars }} {% endif %} @@ -28,7 +28,7 @@

{{ "task_orders.new.review.clin_1"| translate }}

{% if task_order.clin_01 %} - {{ task_order.clin_01 | dollarsWithCents }} + {{ task_order.clin_01 | dollars }} {% endif %} @@ -41,7 +41,7 @@ {% if task_order.clin_02 and config.CLASSIFIED %} - {{ task_order.clin_02 | dollarsWithCents or RequiredLabel() }} + {{ task_order.clin_02 | dollars or RequiredLabel() }} {% endif %} @@ -49,7 +49,7 @@

{{ "task_orders.new.review.clin_3"| translate }}

{% if task_order.clin_03 %} - {{ task_order.clin_03 | dollarsWithCents or RequiredLabel() }} + {{ task_order.clin_03 | dollars or RequiredLabel() }} {% endif %} @@ -62,7 +62,7 @@ {% if task_order.clin_04 and config.CLASSIFIED %} - {{ task_order.clin_04 | dollarsWithCents or RequiredLabel() }} + {{ task_order.clin_04 | dollars or RequiredLabel() }} {% endif %} diff --git a/templates/fragments/task_order_review/reporting.html b/templates/fragments/task_order_review/reporting.html index 0b30db0c..b493a00b 100644 --- a/templates/fragments/task_order_review/reporting.html +++ b/templates/fragments/task_order_review/reporting.html @@ -1,8 +1,23 @@ {% from "components/review_field.html" import ReviewField %}
- {{ 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 + ) + ) + }}

{{ "task_orders.new.review.complexity"| translate }}

@@ -37,5 +52,12 @@

{{ RequiredLabel() }}

{% endif %} - {{ 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 + ) + ) + }}