Merge pull request #170 from dod-ccpo/requests-columns-159274521

Requests index view 159274521

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
     )

templates/requests.html

@@ -48,6 +48,7 @@
 
   {% endif %}
 
+  {% if extended_view %}
     <div class="row kpi">
       <div class="kpi__item col col--grow">
         <div class="kpi__item__value">3</div>
@@ -62,9 +63,11 @@
         <div class="kpi__item__description">Denied Requests</div>
       </div>
     </div>
+  {% endif %}
 
   <div class="col col--grow">
 
+    {% if extended_view %}
       <form class='search-bar'>
         <div class='usa-input search-input'>
           <label for='requests-search'>Search requests by Order ID</label>
@@ -84,17 +87,20 @@
           </select>
         </div>
       </form>
+    {% endif %}
 
     <div class='responsive-table-wrapper'>
       <table>
         <thead>
           <tr>
-            <th scope="col">Order ID</th>
-            <th scope="col">Request Date</th>
+            <th scope="col">JEDI Cloud Request ID</th>
+            <th scope="col">Date Request Initiated / Created</th>
+            {% if extended_view %}
               <th scope="col">Requester</th>
-            <th scope="col">Total Apps</th>
-            <th scope="col">Status</th>
-            <th scope="col" class="table-cell--shrink">Actions</th>
+              <th scope="col">Reason Flagged</th>
+            {% endif %}
+            <th scope="col">Projected Annual Usage ($)</th>
+            <th scope="col">Request Status</th>
           </tr>
         </thead>
         <tbody>
@@ -106,13 +112,12 @@
             </th>
             {% endif %}
             <td>{{ r['date'] }}</td>
+            {% if extended_view %}
               <td>{{ r['full_name'] }}</td>
-            <td>{{ r['app_count'] }}</td>
+              <td></td>
+            {% endif %}
+            <td>${{ r['annual_usage'] }}</td>
             <td>{{ r['status'] }}</td>
-            <td class="table-cell--shrink">
-              <a href="" class='icon-link'>Download</a>
-              <a href="/request/approval" class='icon-link'>Approval</a>
-            </td>
           </tr>
           {% endfor %}
         </tbody>