Add missing fields to form and fix display of text

atst/models/task_order.py

@@ -4,6 +4,7 @@ import pendulum
 from sqlalchemy import Column, Numeric, String, ForeignKey, Date, Integer
 from sqlalchemy.types import ARRAY
 from sqlalchemy.orm import relationship
+import re
 
 from atst.models import Base, types, mixins
 from atst.utils.localization import translate
@@ -103,14 +104,20 @@ class TaskOrder(Base, mixins.TimestampsMixin):
     def is_pending(self):
         return self.status == Status.PENDING
 
+    @property
+    def defense_component_description(self):
+        if self.defense_component:
+            return self.normalize_order(self.defense_component)
+        else:
+            return None
+
     @property
     def app_migration_description(self):
         if self.app_migration:
             text = translate(
                 "forms.task_order.app_migration.{}".format(self.app_migration)
             )
-            # remove html tags here?
-            return text
+            return self.remove_html(text)
         else:
             return None
 
@@ -152,6 +159,16 @@ class TaskOrder(Base, mixins.TimestampsMixin):
             },
         }
 
+    def remove_html(self, text):
+        html_tags = re.compile("<.*?>")
+        return re.sub(html_tags, "", text)
+
+    def normalize_order(self, department):
+        text = department.split(", ")
+        reordered_text = text[0:-1]
+        reordered_text.insert(0, text[-1])
+        return " ".join(reordered_text)
+
     def __repr__(self):
         return "<TaskOrder(number='{}', budget='{}', end_date='{}', id='{}')>".format(
             self.number, self.budget, self.end_date, self.id

templates/task_orders/new/review.html

@@ -28,7 +28,7 @@
 
   <div class="col col--grow">
     <h4>{{ "task_orders.new.review.dod"| translate }}</h4>
-    <p>{{ task_order.defense_component or RequiredLabel() }}</p>
+    <p>{{ task_order.defense_component_description or RequiredLabel() }}</p>
   </div>
 </div>
 
@@ -57,10 +57,11 @@
 {% if task_order.complexity %}
   <ul class="checked-list">
   {% for item in task_order.complexity %}
-    <li>{{ "forms.task_order.complexity.{}".format(item) | translate }}</li>
+    <li>
+      {{ "forms.task_order.complexity.{}".format(item) | translate }}{% if item == 'other' %}: {{ task_order.complexity_other }}{% endif %}
+    </li>
   {% endfor %}
   </ul>
-  <!-- need to add in other here! -->
 {% else %}
   <p>{{ RequiredLabel() }}</p>
 {% endif %}
@@ -71,10 +72,11 @@
     {% if task_order.dev_team %}
       <ul>
       {% for item in task_order.dev_team %}
-        <li>{{ item.title() }}</li>
+        <li>
+          {{ item.title() }}{% if item == 'other' %}: {{ task_order.dev_team_other }}{% endif %}
+        </li>
       {% endfor %}
       </ul>
-      <!-- need to add in other here -->
     {% else %}
       <p>{{ RequiredLabel() }}</p>
     {% endif %}