From d7eb8ab56fe1d64e2909fe7b26128301ea6d6a7f Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Mon, 4 Feb 2019 13:58:02 -0500
Subject: [PATCH] Add in some template code that was lost in a rebase

---
 .../fragments/task_order_review/funding.html  | 10 +++----
 .../task_order_review/reporting.html          | 28 +++++++++++++++++--
 2 files changed, 30 insertions(+), 8 deletions(-)

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 @@
           <td><h4>{{ "task_orders.new.review.to_value"| translate }}</h4></td>
           <td class="table-cell--align-right">
             {% if task_order.budget %}
-              {{ task_order.budget | dollarsWithCents }}
+              {{ task_order.budget | dollars }}
             {% endif %}
           </td>
         </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 class="table-cell--align-right">
             {% if task_order.clin_01 %}
-              {{ task_order.clin_01 | dollarsWithCents }}
+              {{ task_order.clin_01 | dollars }}
             {% endif %}
           </td>
         </tr>
@@ -41,7 +41,7 @@
           </h4></td>
           <td class="table-cell--align-right">
             {% if task_order.clin_02 and config.CLASSIFIED %}
-              {{ task_order.clin_02 | dollarsWithCents or RequiredLabel() }}
+              {{ task_order.clin_02 | dollars or RequiredLabel() }}
             {% endif %}
           </td>
         </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 class="table-cell--align-right">
             {% if task_order.clin_03 %}
-              {{ task_order.clin_03 | dollarsWithCents or RequiredLabel() }}
+              {{ task_order.clin_03 | dollars or RequiredLabel() }}
             {% endif %}
           </td>
         </tr>
@@ -62,7 +62,7 @@
           </h4></td>
           <td class="table-cell--align-right">
             {% if task_order.clin_04 and config.CLASSIFIED %}
-              {{ task_order.clin_04 | dollarsWithCents or RequiredLabel() }}
+              {{ task_order.clin_04 | dollars or RequiredLabel() }}
             {% endif %}
           </td>
         <tr>
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 %}
 
 <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>
 
 <h4 class='task-order-form__heading'>{{ "task_orders.new.review.complexity"| translate }}</h4>
@@ -37,5 +52,12 @@
       <p>{{ RequiredLabel() }}</p>
     {% endif %}
   </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>