Fixed begins / ends time for TOs

atst/models/task_order.py

@@ -84,6 +84,14 @@ class TaskOrder(Base, mixins.TimestampsMixin):
     def is_unsigned(self):
         return self.status == Status.UNSIGNED
 
+    @property
+    def has_begun(self):
+        return Clock.today() >= self.start_date
+
+    @property
+    def has_ended(self):
+        return Clock.today() >= self.end_date
+
     @property
     def is_completed(self):
         return all([self.pdf, self.number, len(self.clins)])

templates/portfolios/task_orders/index.html

@@ -24,12 +24,35 @@
 
 {% macro TaskOrderDate(task_order) %}
   <span class="datetime">
-    {% if task_order.is_active %}
+    <!-- Draft: {Begins, Began} start_date -->
-      Began {{ TaskOrderDateTime(task_order.start_date) }} &nbsp;&nbsp;|&nbsp;&nbsp; Ends {{ TaskOrderDateTime(task_order.end_date) }}
+    <!-- Everything else: {Starts, Started} start_date | {Ends, Ended} end_date -->
-    {% elif task_order.is_expired %}
+
-      Started {{ TaskOrderDateTime(task_order.start_date) }} &nbsp;&nbsp;|&nbsp;&nbsp; Ended {{ TaskOrderDateTime(task_order.end_date) }}
+    {% if task_order.is_draft %}
+      {% if task_order.has_begun %}
+        Started on
       {% else %}
-      Started {{ TaskOrderDateTime(task_order.start_date) }}
+        Starts on
+      {% endif %}
+    {% else %}
+      {% if task_order.has_begun %}
+        Began
+      {% else %}
+        Begins
+      {% endif %}
+    {% endif %}
+
+    {{ TaskOrderDateTime(task_order.start_date) }}
+
+    {% if not task_order.is_draft %}
+      &nbsp;&nbsp;|&nbsp;&nbsp;
+
+      {% if task_order.has_ended %}
+        Ended
+      {% else %}
+        Ends
+      {% endif %}
+
+      {{ TaskOrderDateTime(task_order.end_date) }}
     {% endif %}
   </span>
 {% endmacro %}