diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py index e6606d91..c9b15705 100644 --- a/atst/routes/requests/index.py +++ b/atst/routes/requests/index.py @@ -11,6 +11,11 @@ def map_request(request): is_new = time_created.add(days=1) > pendulum.now() app_count = request.body.get("details_of_use", {}).get("num_software_systems", 0) annual_usage = request.annual_spend + last_submission_timestamp = ( + request.last_submission_timestamp.format("M/DD/YYY") + if request.last_submission_timestamp + else "-" + ) if Requests.is_pending_financial_verification(request): edit_link = url_for("requests.financial_verification", request_id=request.id) @@ -27,7 +32,7 @@ def map_request(request): "is_new": is_new, "status": request.status_displayname, "app_count": app_count, - "date": time_created.format("M/DD/YYYY"), + "last_submission_timestamp": last_submission_timestamp, "full_name": request.creator.full_name, "annual_usage": annual_usage, "edit_link": edit_link, diff --git a/atst/utils.py b/atst/utils.py index f836cea2..db4933f4 100644 --- a/atst/utils.py +++ b/atst/utils.py @@ -1,2 +1,2 @@ def first_or_none(predicate, lst): - return next((x for x in lst if predicate(x)), None,) + return next((x for x in lst if predicate(x)), None) diff --git a/templates/requests.html b/templates/requests.html index edb6f7d8..b95bd050 100644 --- a/templates/requests.html +++ b/templates/requests.html @@ -94,7 +94,7 @@ JEDI Cloud Request ID - Date Request Initiated / Created + Date Request Submitted {% if extended_view %} Requester Reason Flagged @@ -110,7 +110,7 @@ {{ r['order_id'] }} {% if r['is_new'] %}New{% endif %} - {{ r['date'] }} + {{ r.last_submission_timestamp }} {% if extended_view %} {{ r['full_name'] }}