From 3158b91378c5155c63f2fc2b6d7d220c19777dfd Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 29 Aug 2024 14:28:37 -0700
Subject: [PATCH] new revised table

---
 app/main/views/dashboard.py                   |  6 ++
 app/templates/views/dashboard/dashboard.html  |  4 +-
 .../views/dashboard/template-statistics.html  | 71 +++++++++++--------
 3 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index d5d26f0a3..447a4b552 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -327,6 +327,12 @@ def aggregate_template_usage(template_statistics, sort_key="count"):
                 "template_name": template_stats[0]["template_name"],
                 "template_type": template_stats[0]["template_type"],
                 "count": sum(s["count"] for s in template_stats),
+                "last_used": max(s["last_used"] for s in template_stats if s["last_used"]),
+                "created_by": template_stats[0]["created_by"],
+                "created_by_id": template_stats[0]["created_by_id"],
+                "status": template_stats[0]["status"],
+                "template_folder": template_stats[0]["template_folder"],
+                "template_folder_id": template_stats[0]["template_folder_id"],
             }
         )
 
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 114667f2d..a6b410105 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -52,9 +52,7 @@
     </div>
     <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
 
-    {% if current_user.has_permissions('manage_service') %}{% endif %}
 
-    {{ ajax_block(partials, updates_url, 'template-statistics') }}
     <h2 class="margin-top-4 margin-bottom-1">Recent Batches</h2>
     <div class="table-overflow-x-auto">
       <table class="usa-table usa-table--borderless job-table">
@@ -122,7 +120,7 @@
       </table>
     </div>
 
-    <h2>Recent templates</h2>
+    <h2>Most Used Templates</h2>
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
   </div>
 
diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html
index 9acd142d6..6e7b8e3a8 100644
--- a/app/templates/views/dashboard/template-statistics.html
+++ b/app/templates/views/dashboard/template-statistics.html
@@ -1,34 +1,47 @@
-{% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading, spark_bar_field %}
-
 <div class="ajax-block-container">
   {% if template_statistics|length > 1 %}
-    <div class='template-statistics-table table-overflow-x-auto'>
-      {% call(item, row_number) list_table(
-        template_statistics,
-        caption="Messages sent by template",
-        caption_visible=False,
-        border_visible=True,
-        empty_message='',
-        field_headings=[
-          'Template',
-          'Messages sent'
-        ],
-        field_headings_visible=False
-      ) %}
-
-        {% call row_heading() %}
-          <a class="usa-link template-statistics-table-template-name" href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.template_id) }}">{{ item.template_name }}</a>
-          <span class="template-statistics-table-hint">
-            {{ 1|message_count_label(item.template_type, suffix='template')|capitalize }}
-          </span>
-        {% endcall %}
-
-        {{ spark_bar_field(item.count, most_used_template_count, id=item.template_id) }}
-      {% endcall %}
-      <a
-        href="{{ url_for('.template_usage', service_id=current_service.id) }}"
-        class="usa-link show-more-no-border"
-      ><span>See templates used by month</span></a>
+    <div class="template-statistics-table table-overflow-x-auto">
+      <table class="usa-table width-full">
+        <caption class="font-body-lg table-heading usa-sr-only">
+          Messages sent by template
+        </caption>
+        <thead class="table-field-headings">
+          <tr>
+            <th class="table-field-heading-first" width="">
+              <span>Template name</span>
+            </th>
+            <th class="table-field-heading" width="">
+              <span>Folder</span>
+            </th>
+            <th class="table-field-heading" width="">
+              <span>Last used</span>
+            </th>
+            <th class="table-field-heading" width="">
+              <span>Created by</span>
+            </th>
+            <th class="table-field-heading" width="">
+              <span># Times used</span>
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for item in template_statistics[:8] %}
+            <tr class="table-row">
+              <td>
+                <a class="usa-link template-statistics-table-template-name" href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.template_id) }}">{{ item.template_name }}</a>
+                <span class="template-statistics-table-hint">
+                  {{ 1|message_count_label(item.template_type, suffix='template')|capitalize }}
+                </span>
+              </td>
+              <td><p>{{ item.template_folder }}</p></td>
+              <td><p>{{ item.last_used|format_datetime_table}}</p></td>
+              <td><p>{{ item.created_by }}</p></td>
+              <td><p>{{ item.count }}</p></td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+        <a href="/services/78409625-0c0a-485e-b82c-b19c8f4b1bdb/template-usage" class="usa-link show-more-no-border"><span>See templates by month</span></a>
     </div>
   {% endif %}
 </div>