diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py index d24e2a2c..7130c722 100644 --- a/atst/routes/requests/index.py +++ b/atst/routes/requests/index.py @@ -10,6 +10,7 @@ def map_request(request): time_created = pendulum.instance(request.time_created) 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.body.get("details_of_use", {}).get("dollar_value", 0) update_url = url_for( "requests.requests_form_update", screen=1, request_id=request.id ) @@ -22,6 +23,7 @@ def map_request(request): "app_count": app_count, "date": time_created.format("M/DD/YYYY"), "full_name": request.creator.full_name, + "annual_usage": annual_usage, "edit_link": verify_url if Requests.is_pending_financial_verification( request ) else update_url, @@ -47,4 +49,5 @@ def requests_index(): requests=mapped_requests, pending_financial_verification=pending_fv, pending_ccpo_approval=pending_ccpo, + extended_view=is_ccpo ) diff --git a/templates/requests.html b/templates/requests.html index 566da288..42d6ac1b 100644 --- a/templates/requests.html +++ b/templates/requests.html @@ -48,53 +48,59 @@ {% endif %} -
-
-
3
-
Pending Requests
+ {% if extended_view %} +
+
+
3
+
Pending Requests
+
+
+
2,456
+
Completed Requests This Year
+
+
+
234
+
Denied Requests
+
-
-
2,456
-
Completed Requests This Year
-
-
-
234
-
Denied Requests
-
-
+ {% endif %}
- +
+ + +
+ + {% endif %}
- - - - - - + + + {% if extended_view %} + + + {% endif %} + + @@ -106,13 +112,12 @@ {% endif %} - - + {% if extended_view %} + + + {% endif %} + - {% endfor %}
Order IDRequest DateRequesterTotal AppsStatusActionsJEDI Cloud Request IDDate Request Initiated / CreatedRequesterReason FlaggedProjected Annual Usage ($)Request Status
{{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['full_name'] }}${{ r['annual_usage'] }} {{ r['status'] }} - Download - Approval -