diff --git a/atst/models/request.py b/atst/models/request.py index d7d1f96c..ebba9cc3 100644 --- a/atst/models/request.py +++ b/atst/models/request.py @@ -216,3 +216,13 @@ class Request(Base, mixins.TimestampsMixin): @property def displayname(self): return self.latest_revision.name or self.id + + @property + def contracting_officer_full_name(self): + if self.latest_revision.fname_co: + return "{} {}".format(self.latest_revision.fname_co, self.latest_revision.lname_co) + + @property + def contracting_officer_email(self): + return self.latest_revision.email_co + diff --git a/atst/routes/workspaces.py b/atst/routes/workspaces.py index 9879d90c..b1fed5f5 100644 --- a/atst/routes/workspaces.py +++ b/atst/routes/workspaces.py @@ -105,16 +105,20 @@ def workspace_reports(workspace_id): prev_month = current_month - timedelta(days=28) two_months_ago = prev_month - timedelta(days=28) - # lets just say it expires on Christmas... ho ho ho - expiration_date = date(2018, 12, 25) - remaining_difference = expiration_date - today - remaining_days = remaining_difference.days + expiration_date = workspace.request.task_order.expiration_date + if expiration_date: + remaining_difference = expiration_date - today + remaining_days = remaining_difference.days + else: + remaining_days = 0 return render_template( "workspaces/reports/index.html", cumulative_budget=Reports.cumulative_budget(workspace), workspace_totals=Reports.workspace_totals(workspace), monthly_totals=Reports.monthly_totals(workspace), + jedi_request=workspace.request, + task_order=workspace.request.task_order, current_month=current_month, prev_month=prev_month, two_months_ago=two_months_ago, diff --git a/templates/workspaces/reports/index.html b/templates/workspaces/reports/index.html index 6da7f860..61a18e7a 100644 --- a/templates/workspaces/reports/index.html +++ b/templates/workspaces/reports/index.html @@ -56,7 +56,7 @@