diff --git a/atst/filters.py b/atst/filters.py
index 6a0eed36..47ac3afc 100644
--- a/atst/filters.py
+++ b/atst/filters.py
@@ -65,6 +65,13 @@ def renderList(value):
return app.jinja_env.filters["safe"]("
".join(value))
+def formattedDate(value):
+ if value:
+ return value.strftime("%m/%d/%Y")
+ else:
+ return "-"
+
+
def register_filters(app):
app.jinja_env.filters["iconSvg"] = iconSvg
app.jinja_env.filters["dollars"] = dollars
@@ -74,3 +81,4 @@ def register_filters(app):
app.jinja_env.filters["mixedContentToJson"] = mixedContentToJson
app.jinja_env.filters["findFilter"] = findFilter
app.jinja_env.filters["renderList"] = renderList
+ app.jinja_env.filters["formattedDate"] = formattedDate
diff --git a/atst/models/request.py b/atst/models/request.py
index 4e155504..a59e17f7 100644
--- a/atst/models/request.py
+++ b/atst/models/request.py
@@ -1,7 +1,6 @@
from sqlalchemy import Column, func, ForeignKey
from sqlalchemy.types import DateTime
from sqlalchemy.orm import relationship
-import pendulum
from atst.models import Base
from atst.models.types import Id
@@ -145,7 +144,7 @@ class Request(Base):
last_submission = first_or_none(_is_submission, reversed(self.status_events))
if last_submission:
- return pendulum.instance(last_submission.time_created)
+ return last_submission.time_created
return None
@property
diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py
index 75be2c87..1edcae21 100644
--- a/atst/routes/requests/index.py
+++ b/atst/routes/requests/index.py
@@ -64,11 +64,6 @@ class RequestsIndex(object):
"num_software_systems", 0
)
annual_usage = request.annual_spend
- last_submission_timestamp = (
- request.last_submission_timestamp.format("M/DD/YYYY")
- if request.last_submission_timestamp
- else "-"
- )
if viewing_role == "ccpo":
edit_link = url_for("requests.approval", request_id=request.id)
@@ -89,11 +84,13 @@ class RequestsIndex(object):
"is_new": is_new,
"status": request.status_displayname,
"app_count": app_count,
- "last_submission_timestamp": last_submission_timestamp,
+ "last_submission_timestamp": request.last_submission_timestamp,
+ "last_edited_timestamp": request.latest_revision.time_updated,
"full_name": request.creator.full_name,
"annual_usage": annual_usage,
"edit_link": edit_link,
"action_required": request.action_required_by == viewing_role,
+ "dod_component": request.latest_revision.dod_component,
}
diff --git a/templates/requests/index.html b/templates/requests/index.html
index f8871215..ae6606f9 100644
--- a/templates/requests/index.html
+++ b/templates/requests/index.html
@@ -105,26 +105,29 @@