From bd1a3c09c4497347748215c404b2611ec4b6ac64 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Tue, 14 Aug 2018 09:13:27 -0400
Subject: [PATCH] update requests index column names

---
 templates/requests.html | 45 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/templates/requests.html b/templates/requests.html
index 7e0638c5..e2d55138 100644
--- a/templates/requests.html
+++ b/templates/requests.html
@@ -48,20 +48,22 @@
 
   {% endif %}
 
-  <div class="row kpi">
-    <div class="kpi__item col col--grow">
-      <div class="kpi__item__value">3</div>
-      <div class="kpi__item__description">Pending Requests</div>
+  {% if extended_view %}
+    <div class="row kpi">
+      <div class="kpi__item col col--grow">
+        <div class="kpi__item__value">3</div>
+        <div class="kpi__item__description">Pending Requests</div>
+      </div>
+      <div class="kpi__item col col--grow">
+        <div class="kpi__item__value">2,456</div>
+        <div class="kpi__item__description">Completed Requests This Year</div>
+      </div>
+      <div class="kpi__item col col--grow">
+        <div class="kpi__item__value">234</div>
+        <div class="kpi__item__description">Denied Requests</div>
+      </div>
     </div>
-    <div class="kpi__item col col--grow">
-      <div class="kpi__item__value">2,456</div>
-      <div class="kpi__item__description">Completed Requests This Year</div>
-    </div>
-    <div class="kpi__item col col--grow">
-      <div class="kpi__item__value">234</div>
-      <div class="kpi__item__description">Denied Requests</div>
-    </div>
-  </div>
+  {% endif %}
 
   <div class="col col--grow">
 
@@ -91,15 +93,14 @@
       <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>
-            {% else %}
-              <th scope="col">Annual Usage</th>
+              <th scope="col">Reason Flagged</th>
             {% endif %}
-            <th scope="col">Status</th>
+            <th scope="col">Projected Annual Usage ($)</th>
+            <th scope="col">Request Status</th>
             <th scope="col" class="table-cell--shrink">Actions</th>
           </tr>
         </thead>
@@ -114,13 +115,11 @@
             <td>{{ r['date'] }}</td>
             {% if extended_view %}
               <td>{{ r['full_name'] }}</td>
-              <td>{{ r['app_count'] }}</td>
-            {% else %}
-              <td>{{ r['annual_usage'] }}</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>