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

Fixed begins / ends time for TOs

Browse Source
This commit is contained in:
richard-dds 2019-06-11 14:35:43 -04:00
parent 13eb277f4a
commit 1de4fe7cc5
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
atst/models/task_order.py
View File

@ -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)])

33
templates/portfolios/task_orders/index.html
View File

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