Use last_submission_timestamp in requests index

This commit is contained in:
richard-dds 2018-09-04 13:09:48 -04:00
parent 3af630e4dd
commit 0af7fb4573
3 changed files with 9 additions and 4 deletions

View File

@ -11,6 +11,11 @@ def map_request(request):
is_new = time_created.add(days=1) > pendulum.now() is_new = time_created.add(days=1) > pendulum.now()
app_count = request.body.get("details_of_use", {}).get("num_software_systems", 0) app_count = request.body.get("details_of_use", {}).get("num_software_systems", 0)
annual_usage = request.annual_spend 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): if Requests.is_pending_financial_verification(request):
edit_link = url_for("requests.financial_verification", request_id=request.id) edit_link = url_for("requests.financial_verification", request_id=request.id)
@ -27,7 +32,7 @@ def map_request(request):
"is_new": is_new, "is_new": is_new,
"status": request.status_displayname, "status": request.status_displayname,
"app_count": app_count, "app_count": app_count,
"date": time_created.format("M/DD/YYYY"), "last_submission_timestamp": last_submission_timestamp,
"full_name": request.creator.full_name, "full_name": request.creator.full_name,
"annual_usage": annual_usage, "annual_usage": annual_usage,
"edit_link": edit_link, "edit_link": edit_link,

View File

@ -1,2 +1,2 @@
def first_or_none(predicate, lst): 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)

View File

@ -94,7 +94,7 @@
<thead> <thead>
<tr> <tr>
<th scope="col">JEDI Cloud Request ID</th> <th scope="col">JEDI Cloud Request ID</th>
<th scope="col">Date Request Initiated / Created</th> <th scope="col">Date Request Submitted</th>
{% if extended_view %} {% if extended_view %}
<th scope="col">Requester</th> <th scope="col">Requester</th>
<th scope="col">Reason Flagged</th> <th scope="col">Reason Flagged</th>
@ -110,7 +110,7 @@
<a class='icon-link icon-link--large' href="{{ r['edit_link'] }}">{{ r['order_id'] }}</a> <a class='icon-link icon-link--large' href="{{ r['edit_link'] }}">{{ r['order_id'] }}</a>
{% if r['is_new'] %}<span class="usa-label">New</span>{% endif %} {% if r['is_new'] %}<span class="usa-label">New</span>{% endif %}
</th> </th>
<td>{{ r['date'] }}</td> <td>{{ r.last_submission_timestamp }}</td>
{% if extended_view %} {% if extended_view %}
<td>{{ r['full_name'] }}</td> <td>{{ r['full_name'] }}</td>
<td></td> <td></td>