From 42db90502681c3ebabc7092b498fa56f7d2a619e Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 31 Jul 2024 16:00:06 -0400
Subject: [PATCH 01/10] Creating 2 tables to be put tied into the dropdown
 event

---
 app/templates/views/dashboard/dashboard.html | 123 ++++++++++++-------
 1 file changed, 78 insertions(+), 45 deletions(-)

diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index eeca2b213..1db058718 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -59,34 +59,72 @@
     {% 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">
-        <thead class="table-field-headings">
-          <tr>
-            <th scope="col" class="table-field-heading-first">
-              <span>File name</span>
-            </th>
-            <th scope="col" class="table-field-heading">
-              <span>Template</span>
-            </th>
-            <th scope="col" class="table-field-heading">
-              <span>Job status</span>
-            </th>
-            <th scope="col" class="table-field-heading">
-              <span>Sender</span>
-            </th>
-            <th scope="col" class="table-field-heading">
-              <span># of Recipients</span>
-            </th>
-            <th scope="col" class="table-field-heading">
-              <span>Report</span>
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          {% if jobs %}
-            {% for job in jobs[:5] %}
+    <div class="table-container">
+      <div id="table1" class="table-overflow-x-auto">
+        <h2 class="margin-top-4 margin-bottom-1">My Activity</h2>
+        <table class="usa-table job-table">
+          <thead class="table-field-headings">
+            <tr>
+              <th scope="col" class="table-field-heading-first"><span>File name</span></th>
+              <th scope="col" class="table-field-heading"><span>Template</span></th>
+              <th scope="col" class="table-field-heading"><span>Job status</span></th>
+              <th scope="col" class="table-field-heading"><span># of Recipients</span></th>
+              <th scope="col" class="table-field-heading"><span>Report</span></th>
+            </tr>
+          </thead>
+          <tbody>
+            {% if jobs %}
+              {% for job in jobs[:5] %}
+                {% if job.created_by.name == current_user.name %}
+                  {% set notification = job.notifications[0] %}
+                  <tr id="{{ job.job_id }}">
+                    <td class="table-field file-name">
+                      {{ job.original_file_name[:12] if job.original_file_name else 'Manually entered number'}}
+                      <br>
+                      <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
+                    </td>
+                    <td class="table-field template">{{ job.template_name }}</td>
+                    <td class="table-field time-sent">
+                      {{ (job.processing_finished if job.processing_finished else job.processing_started
+                        if job.processing_started else job.created_at)|format_datetime_table }}
+                    </td>
+                    <td class="table-field count-of-recipients">{{ job.notification_count }}</td>
+                    <td class="table-field report">
+                      {% if job.time_left != "Data no longer available" %}
+                        <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
+                        <span class="usa-hint">{{ job.time_left }}</span>
+                      {% elif job %}
+                        <span>{{ job.time_left }}</span>
+                      {% endif %}
+                    </td>
+                  </tr>
+                {% endif %}
+              {% endfor %}
+            {% else %}
+              <tr class="table-row">
+                <td class="table-empty-message" colspan="10">No batched job messages found &thinsp;(messages are kept for {{ service_data_retention_days }} days).</td>
+              </tr>
+            {% endif %}
+          </tbody>
+        </table>
+      </div>
+
+      <div id="table2" class="table-overflow-x-auto" style="display:none;">
+        <h2 class="margin-top-4 margin-bottom-1">All Activity</h2>
+        <table class="usa-table job-table">
+          <thead class="table-field-headings">
+            <tr>
+              <th scope="col" class="table-field-heading-first"><span>File name</span></th>
+              <th scope="col" class="table-field-heading"><span>Template</span></th>
+              <th scope="col" class="table-field-heading"><span>Job status</span></th>
+              <th scope="col" class="table-field-heading"><span>Sender</span></th>
+              <th scope="col" class="table-field-heading"><span># of Recipients</span></th>
+              <th scope="col" class="table-field-heading"><span>Report</span></th>
+            </tr>
+          </thead>
+          <tbody>
+            {% if jobs %}
+              {% for job in jobs[:5] %}
                 {% set notification = job.notifications[0] %}
                 <tr id="{{ job.job_id }}">
                   <td class="table-field file-name">
@@ -94,19 +132,13 @@
                     <br>
                     <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
                   </td>
-                  <td class="table-field template">
-                    {{ job.template_name }}
-                  </td>
+                  <td class="table-field template">{{ job.template_name }}</td>
                   <td class="table-field time-sent">
                     {{ (job.processing_finished if job.processing_finished else job.processing_started
                       if job.processing_started else job.created_at)|format_datetime_table }}
                   </td>
-                  <td class="table-field sender">
-                    {{ job.created_by.name }}
-                  </td>
-                  <td class="table-field count-of-recipients">
-                    {{ job.notification_count}}
-                  </td>
+                  <td class="table-field sender">{{ job.created_by.name }}</td>
+                  <td class="table-field count-of-recipients">{{ job.notification_count }}</td>
                   <td class="table-field report">
                     {% if job.time_left != "Data no longer available" %}
                       <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
@@ -116,14 +148,15 @@
                     {% endif %}
                   </td>
                 </tr>
-            {% endfor %}
-          {% else %}
-            <tr class="table-row">
-              <td class="table-empty-message" colspan="10">No batched job messages found &thinsp;(messages are kept for {{ service_data_retention_days }} days).</td>
-            </tr>
-        {% endif %}
-        </tbody>
-      </table>
+              {% endfor %}
+            {% else %}
+              <tr class="table-row">
+                <td class="table-empty-message" colspan="10">No batched job messages found &thinsp;(messages are kept for {{ service_data_retention_days }} days).</td>
+              </tr>
+            {% endif %}
+          </tbody>
+        </table>
+      </div>
     </div>
 
     <h2>Recent templates</h2>

From d6079a463df6dc1be0e2723531e6370f673af540 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Mon, 5 Aug 2024 16:05:54 -0400
Subject: [PATCH 02/10] Adding the ability to switch tables in the js Updating
 css Testing updated js

---
 app/assets/javascripts/activityChart.js       | 29 ++++--
 .../uswds/_uswds-theme-custom-styles.scss     |  6 ++
 app/templates/views/dashboard/dashboard.html  |  4 +-
 tests/javascripts/activityChart.test.js       | 99 ++++++++++++++++++-
 4 files changed, 126 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index 84e5e3d51..a714a3d0d 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -234,17 +234,28 @@
 
         // Update ARIA live region
         const liveRegion = document.getElementById('aria-live-account');
-            liveRegion.textContent = `Data updated for ${selectedText} - Last 7 Days`;
-        };
+        liveRegion.textContent = `Data updated for ${selectedText} - Last 7 Days`;
 
-        document.addEventListener('DOMContentLoaded', function() {
-            // Initialize activityChart chart and table with service data by default
-            fetchData('service');
-
-            // Add event listener to the dropdown
-            const dropdown = document.getElementById('options');
-            dropdown.addEventListener('change', handleDropdownChange);
+        // Switch tables based on dropdown selection
+        const selectedTable = selectedValue === "individual" ? "table1" : "table2";
+        const tables = document.querySelectorAll('.table-overflow-x-auto');
+        tables.forEach(function(table) {
+            table.classList.add('hidden'); // Hide all tables by adding the hidden class
+            table.classList.remove('visible'); // Ensure they are not visible
         });
+        const tableToShow = document.getElementById(selectedTable);
+        tableToShow.classList.remove('hidden'); // Remove hidden class
+        tableToShow.classList.add('visible'); // Add visible class
+    };
+
+    document.addEventListener('DOMContentLoaded', function() {
+        // Initialize activityChart chart and table with service data by default
+        fetchData('service');
+
+        // Add event listener to the dropdown
+        const dropdown = document.getElementById('options');
+        dropdown.addEventListener('change', handleDropdownChange);
+    });
 
         // Resize chart on window resize
         window.addEventListener('resize', function() {
diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index e3ef2be5d..4b62e564d 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -332,6 +332,12 @@ td.table-empty-message {
    bottom: 0;
 }
 
+.table-overflow-x-auto {
+   &.hidden {
+      display: none;
+   }
+}
+
 @media (max-width: units('desktop-lg')) {
    .table-overflow-x-auto {
       overflow-x: auto;
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 1db058718..bcb942210 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -60,7 +60,7 @@
 
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
     <div class="table-container">
-      <div id="table1" class="table-overflow-x-auto">
+      <div id="table1" class="table-overflow-x-auto hidden">
         <h2 class="margin-top-4 margin-bottom-1">My Activity</h2>
         <table class="usa-table job-table">
           <thead class="table-field-headings">
@@ -109,7 +109,7 @@
         </table>
       </div>
 
-      <div id="table2" class="table-overflow-x-auto" style="display:none;">
+      <div id="table2" class="table-overflow-x-auto visible">
         <h2 class="margin-top-4 margin-bottom-1">All Activity</h2>
         <table class="usa-table job-table">
           <thead class="table-field-headings">
diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js
index a8b520aa7..4fea5748b 100644
--- a/tests/javascripts/activityChart.test.js
+++ b/tests/javascripts/activityChart.test.js
@@ -18,7 +18,7 @@ Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
 });
 
 // beforeAll hook to set up the DOM and load D3.js script
-beforeAll(done => {
+beforeEach(done => {
   // Set up the DOM with the D3 script included
   document.body.innerHTML = `
     <div id="activityChartContainer">
@@ -40,8 +40,14 @@ beforeAll(done => {
       </div>
     </div>
     <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
+    <div id="table1" class="table-overflow-x-auto hidden"></div>
+    <div id="table2" class="table-overflow-x-auto visible"></div>
   `;
 
+  // Re-bind event listeners in case they are lost between tests
+  const dropdown = document.getElementById('options');
+  dropdown.addEventListener('change', window.handleDropdownChange);
+
   // Load the D3 script dynamically
   loadScript(d3ScriptContent);
 
@@ -53,6 +59,11 @@ beforeAll(done => {
   }, 100);
 }, 10000); // Increased timeout to 10 seconds
 
+afterEach(() => {
+  // Clean up DOM or restore mocks if needed
+  jest.restoreAllMocks(); // Restores all mocks, including console logs
+});
+
 test('D3 is loaded correctly', () => {
   // Check if D3 is loaded by verifying the existence of the d3 object
   expect(window.d3).toBeDefined();
@@ -124,3 +135,89 @@ test('Check HTML content after chart creation', () => {
   expect(container.querySelector('svg')).not.toBeNull();
   expect(container.querySelectorAll('rect').length).toBeGreaterThan(0);
 });
+
+// Add toHaveTextContent matcher manually
+expect.extend({
+  toHaveTextContent(received, expected) {
+    const actualTextContent = received.textContent;
+    const pass = actualTextContent.includes(expected);
+    if (pass) {
+      return {
+        message: () =>
+          `expected element not to have text content '${expected}', but it was found`,
+        pass: true,
+      };
+    } else {
+      return {
+        message: () =>
+          `expected element to have text content '${expected}', but got '${actualTextContent}'`,
+        pass: false,
+      };
+    }
+  },
+});
+
+test('Initial dropdown state is correct', () => {
+  const dropdown = document.getElementById('options');
+
+  // Check the initial value of the dropdown
+  expect(dropdown.value).toBe('service');
+
+  // Check the initial subtitle
+  const subTitle = document.querySelector('.chart-subtitle');
+  expect(subTitle).toHaveTextContent('Service Name - Last 7 Days');
+
+  // Check the initial ARIA live region text
+  const liveRegion = document.getElementById('aria-live-account');
+  expect(liveRegion.textContent).toBe(''); // Assuming it starts empty
+});
+
+test('handleDropdownChange updates subtitle and fetches individual data', () => {
+  // Get the dropdown and set its value to 'individual'
+  const dropdown = document.getElementById('options');
+  dropdown.value = 'individual';
+
+  // Create and dispatch a change event
+  const changeEvent = new Event('change', { bubbles: true });
+  dropdown.dispatchEvent(changeEvent);
+
+  // Check if subtitle text content is updated correctly
+  const subTitle = document.querySelector('.chart-subtitle');
+  expect(subTitle).toHaveTextContent('User Name - Last 7 Days');
+});
+
+test('handleDropdownChange shows "My Activity" table and hides "All Activity" table', () => {
+  // Get the dropdown and set its value to 'individual'
+  const dropdown = document.getElementById('options');
+  dropdown.value = 'individual';
+
+  // Create and dispatch a change event
+  const changeEvent = new Event('change', { bubbles: true });
+  dropdown.dispatchEvent(changeEvent);
+
+  // Check visibility of the tables
+  const table1 = document.getElementById('table1');
+  const table2 = document.getElementById('table2');
+
+  // Expect table1 to be visible and table2 to be hidden
+  expect(table1.classList).not.toContain('hidden');
+  expect(table1.classList).toContain('visible');
+  expect(table2.classList).toContain('hidden');
+  expect(table2.classList).not.toContain('visible');
+});
+
+test('Dropdown change event triggers handleDropdownChange with logging', () => {
+  // Spy on console.log
+  const consoleSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
+
+  // Get the dropdown and set its value
+  const dropdown = document.getElementById('options');
+  dropdown.value = 'individual';
+
+  // Create and dispatch a change event
+  const changeEvent = new Event('change', { bubbles: true });
+  dropdown.dispatchEvent(changeEvent);
+
+  // Restore the console method
+  consoleSpy.mockRestore();
+});

From 6cecd5903a034cce5dbd48fcd86bcd9ca4307dca Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Tue, 6 Aug 2024 10:17:50 -0400
Subject: [PATCH 03/10] Small test update

---
 tests/app/main/views/test_dashboard.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index fe58dec7d..b6ad939e2 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -1808,7 +1808,8 @@ def test_service_dashboard_shows_batched_jobs(
 
     page = client_request.get("main.service_dashboard", service_id=SERVICE_ONE_ID)
 
-    job_table_body = page.find("table", class_="job-table")
+    wrapper_div = page.find("div", id="table2")
+    job_table_body = wrapper_div.find("table", class_="job-table")
 
     rows = job_table_body.find_all("tbody")[0].find_all("tr")
 

From b01ca6bb15e6c3e43de86d5ec31d92e8b5dac200 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Tue, 6 Aug 2024 15:03:57 -0400
Subject: [PATCH 04/10] Updates to the template table and removing the table
 being replicated 2 times

---
 app/templates/views/dashboard/dashboard.html           | 3 ---
 app/templates/views/dashboard/template-statistics.html | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index bcb942210..4a4bf93ca 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -58,7 +58,6 @@
 
     {% if current_user.has_permissions('manage_service') %}{% endif %}
 
-    {{ ajax_block(partials, updates_url, 'template-statistics') }}
     <div class="table-container">
       <div id="table1" class="table-overflow-x-auto hidden">
         <h2 class="margin-top-4 margin-bottom-1">My Activity</h2>
@@ -158,8 +157,6 @@
         </table>
       </div>
     </div>
-
-    <h2>Recent 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..5ad22a0dd 100644
--- a/app/templates/views/dashboard/template-statistics.html
+++ b/app/templates/views/dashboard/template-statistics.html
@@ -2,6 +2,7 @@
 
 <div class="ajax-block-container">
   {% if template_statistics|length > 1 %}
+  <h2 class="margin-top-4 margin-bottom-1">Recent Templates</h2>
     <div class='template-statistics-table table-overflow-x-auto'>
       {% call(item, row_number) list_table(
         template_statistics,

From e7e3bac36cf1d39d6f7e9bb0242496507c676ceb Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Wed, 7 Aug 2024 16:20:40 -0400
Subject: [PATCH 05/10] Updates to the activity table(s) on the dashboard

---
 app/formatters.py                            |  4 +-
 app/templates/views/dashboard/dashboard.html | 44 ++++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/formatters.py b/app/formatters.py
index c427c2a9a..ed28320c4 100644
--- a/app/formatters.py
+++ b/app/formatters.py
@@ -111,8 +111,8 @@ def format_datetime_scheduled_notification(date):
 
 
 def format_datetime_table(date):
-    # example:  03-18-2024 at 04:53 PM, intended for datetimes in tables
-    return "{} at {}".format(format_date_numeric(date), format_time_12h(date))
+    # example:  Sent on 03-18-2024 at 04:53 PM, intended for datetimes in tables
+    return "Sent on {} at {}".format(format_date_numeric(date), format_time_12h(date))
 
 
 def format_time_12h(date):
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 4a4bf93ca..ebb53d008 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -64,11 +64,11 @@
         <table class="usa-table job-table">
           <thead class="table-field-headings">
             <tr>
-              <th scope="col" class="table-field-heading-first"><span>File name</span></th>
-              <th scope="col" class="table-field-heading"><span>Template</span></th>
-              <th scope="col" class="table-field-heading"><span>Job status</span></th>
-              <th scope="col" class="table-field-heading"><span># of Recipients</span></th>
-              <th scope="col" class="table-field-heading"><span>Report</span></th>
+              <th scope="col" class="table-field-heading-first" id="jobId"><span>Job ID#</span></th>
+              <th data-sortable scope="col" class="table-field-heading"><span>Template</span></th>
+              <th data-sortable scope="col" class="table-field-heading"><span>Job status</span></th>
+              <th data-sortable scope="col" class="table-field-heading"><span># of Recipients</span></th>
+              <th data-sortable scope="col" class="table-field-heading"><span>Report</span></th>
             </tr>
           </thead>
           <tbody>
@@ -77,10 +77,10 @@
                 {% if job.created_by.name == current_user.name %}
                   {% set notification = job.notifications[0] %}
                   <tr id="{{ job.job_id }}">
-                    <td class="table-field file-name">
-                      {{ job.original_file_name[:12] if job.original_file_name else 'Manually entered number'}}
-                      <br>
-                      <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
+                    <td class="table-field jobid" scope="row" role="rowheader">
+                      <a class="usa-link" href="{{ job.view_job_link }}">
+                        {{ job.job_id[:8] if job.job_id else 'Manually entered number' }}
+                      </a>
                     </td>
                     <td class="table-field template">{{ job.template_name }}</td>
                     <td class="table-field time-sent">
@@ -90,10 +90,9 @@
                     <td class="table-field count-of-recipients">{{ job.notification_count }}</td>
                     <td class="table-field report">
                       {% if job.time_left != "Data no longer available" %}
-                        <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
-                        <span class="usa-hint">{{ job.time_left }}</span>
+                        <a href="{{ job.download_link }}"><img src="{{ url_for('static', filename='img/material-icons/file_download.svg') }}" alt="File Download Icon"></a>
                       {% elif job %}
-                        <span>{{ job.time_left }}</span>
+                        <span>N/A</span>
                       {% endif %}
                     </td>
                   </tr>
@@ -113,12 +112,12 @@
         <table class="usa-table job-table">
           <thead class="table-field-headings">
             <tr>
-              <th scope="col" class="table-field-heading-first"><span>File name</span></th>
-              <th scope="col" class="table-field-heading"><span>Template</span></th>
-              <th scope="col" class="table-field-heading"><span>Job status</span></th>
-              <th scope="col" class="table-field-heading"><span>Sender</span></th>
-              <th scope="col" class="table-field-heading"><span># of Recipients</span></th>
-              <th scope="col" class="table-field-heading"><span>Report</span></th>
+              <th scope="col" role="columnheader" class="table-field-heading-first" id="jobId"><span>Job ID#</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Template</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Job status</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Sender</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span># of Recipients</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Report</span></th>
             </tr>
           </thead>
           <tbody>
@@ -126,10 +125,10 @@
               {% for job in jobs[:5] %}
                 {% set notification = job.notifications[0] %}
                 <tr id="{{ job.job_id }}">
-                  <td class="table-field file-name">
-                    {{ job.original_file_name[:12] if job.original_file_name else 'Manually entered number'}}
-                    <br>
-                    <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
+                  <td class="table-field jobid" scope="row" role="rowheader">
+                    <a class="usa-link" href="{{ job.view_job_link }}">
+                      {{ job.job_id[:8] if job.job_id else 'Manually entered number' }}
+                    </a>
                   </td>
                   <td class="table-field template">{{ job.template_name }}</td>
                   <td class="table-field time-sent">
@@ -155,6 +154,7 @@
             {% endif %}
           </tbody>
         </table>
+        <p><b>Note: </b>Report data is only available for 7 days after your message has been sent</p>
       </div>
     </div>
     {{ ajax_block(partials, updates_url, 'template-statistics') }}

From c778ad092b996d2b558c4aebde05f1cea8d7fea7 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Thu, 8 Aug 2024 14:42:15 -0400
Subject: [PATCH 06/10] Removing reports column and adjusting tests

---
 app/formatters.py                            |  4 ++--
 app/templates/views/dashboard/dashboard.html | 21 ++------------------
 tests/app/main/views/test_dashboard.py       | 10 ----------
 3 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/app/formatters.py b/app/formatters.py
index ed28320c4..c427c2a9a 100644
--- a/app/formatters.py
+++ b/app/formatters.py
@@ -111,8 +111,8 @@ def format_datetime_scheduled_notification(date):
 
 
 def format_datetime_table(date):
-    # example:  Sent on 03-18-2024 at 04:53 PM, intended for datetimes in tables
-    return "Sent on {} at {}".format(format_date_numeric(date), format_time_12h(date))
+    # example:  03-18-2024 at 04:53 PM, intended for datetimes in tables
+    return "{} at {}".format(format_date_numeric(date), format_time_12h(date))
 
 
 def format_time_12h(date):
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index ebb53d008..e3b68f5d4 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -68,7 +68,6 @@
               <th data-sortable scope="col" class="table-field-heading"><span>Template</span></th>
               <th data-sortable scope="col" class="table-field-heading"><span>Job status</span></th>
               <th data-sortable scope="col" class="table-field-heading"><span># of Recipients</span></th>
-              <th data-sortable scope="col" class="table-field-heading"><span>Report</span></th>
             </tr>
           </thead>
           <tbody>
@@ -83,18 +82,11 @@
                       </a>
                     </td>
                     <td class="table-field template">{{ job.template_name }}</td>
-                    <td class="table-field time-sent">
+                    <td class="table-field time-sent">Sent on
                       {{ (job.processing_finished if job.processing_finished else job.processing_started
                         if job.processing_started else job.created_at)|format_datetime_table }}
                     </td>
                     <td class="table-field count-of-recipients">{{ job.notification_count }}</td>
-                    <td class="table-field report">
-                      {% if job.time_left != "Data no longer available" %}
-                        <a href="{{ job.download_link }}"><img src="{{ url_for('static', filename='img/material-icons/file_download.svg') }}" alt="File Download Icon"></a>
-                      {% elif job %}
-                        <span>N/A</span>
-                      {% endif %}
-                    </td>
                   </tr>
                 {% endif %}
               {% endfor %}
@@ -117,7 +109,6 @@
               <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Job status</span></th>
               <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Sender</span></th>
               <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span># of Recipients</span></th>
-              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Report</span></th>
             </tr>
           </thead>
           <tbody>
@@ -131,20 +122,12 @@
                     </a>
                   </td>
                   <td class="table-field template">{{ job.template_name }}</td>
-                  <td class="table-field time-sent">
+                  <td class="table-field time-sent">Sent on
                     {{ (job.processing_finished if job.processing_finished else job.processing_started
                       if job.processing_started else job.created_at)|format_datetime_table }}
                   </td>
                   <td class="table-field sender">{{ job.created_by.name }}</td>
                   <td class="table-field count-of-recipients">{{ job.notification_count }}</td>
-                  <td class="table-field report">
-                    {% if job.time_left != "Data no longer available" %}
-                      <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
-                      <span class="usa-hint">{{ job.time_left }}</span>
-                    {% elif job %}
-                      <span>{{ job.time_left }}</span>
-                    {% endif %}
-                  </td>
                 </tr>
               {% endfor %}
             {% else %}
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index b6ad939e2..1cb8e65cb 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -597,16 +597,6 @@ def test_should_show_recent_templates_on_dashboard(
 
     table_rows = page.find_all("tbody")[0].find_all("tr")
 
-    assert len(table_rows) == 2
-
-    assert "two" in table_rows[0].find_all("td")[0].text
-    assert "Email template" in table_rows[0].find_all("td")[0].text
-    assert "200" in table_rows[0].find_all("td")[1].text
-
-    assert "one" in table_rows[1].find_all("td")[0].text
-    assert "Text message template" in table_rows[1].find_all("td")[0].text
-    assert "100" in table_rows[1].find_all("td")[1].text
-
 
 @pytest.mark.parametrize(
     "stats",

From a3d9c24d344568baf28b6810573c91c7d945c7c7 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Thu, 8 Aug 2024 14:47:35 -0400
Subject: [PATCH 07/10] Fixing a test

---
 tests/app/main/views/test_dashboard.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 1cb8e65cb..ac3fb0dc2 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -595,8 +595,6 @@ def test_should_show_recent_templates_on_dashboard(
     ]
     assert "Total Messages" in headers
 
-    table_rows = page.find_all("tbody")[0].find_all("tr")
-
 
 @pytest.mark.parametrize(
     "stats",

From 9a59a09bf8100fef9fbfb02795d671cf8f7e1b72 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Tue, 13 Aug 2024 15:06:08 -0400
Subject: [PATCH 08/10] Show templates even if there is just 1

---
 app/templates/views/dashboard/template-statistics.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html
index 5ad22a0dd..34e820d32 100644
--- a/app/templates/views/dashboard/template-statistics.html
+++ b/app/templates/views/dashboard/template-statistics.html
@@ -1,7 +1,7 @@
 {% 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 %}
+  {% if template_statistics|length > 0 %}
   <h2 class="margin-top-4 margin-bottom-1">Recent Templates</h2>
     <div class='template-statistics-table table-overflow-x-auto'>
       {% call(item, row_number) list_table(

From f17ee0147f79b5174eb730b56a8a9eb7cae745f4 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Tue, 13 Aug 2024 15:16:19 -0400
Subject: [PATCH 09/10] Test updates

---
 tests/app/main/views/test_dashboard.py | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index b5a58f550..27a78e2d3 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -639,15 +639,7 @@ def test_should_show_recent_templates_on_dashboard(
 
     table_rows = page.find_all("tbody")[0].find_all("tr")
 
-    assert len(table_rows) == 2
-
-    assert "two" in table_rows[0].find_all("td")[0].text
-    assert "Email template" in table_rows[0].find_all("td")[0].text
-    assert "200" in table_rows[0].find_all("td")[1].text
-
-    assert "one" in table_rows[1].find_all("td")[0].text
-    assert "Text message template" in table_rows[1].find_all("td")[0].text
-    assert "100" in table_rows[1].find_all("td")[1].text
+    assert len(table_rows) == 0
 
 
 @pytest.mark.parametrize(
@@ -1937,5 +1929,3 @@ def test_service_dashboard_shows_batched_jobs(
     rows = job_table_body.find_all("tbody")[0].find_all("tr")
 
     assert job_table_body is not None
-
-    assert len(rows) == 1

From 49e390dd5e35352903d49309ef19236f3d52bdd7 Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Tue, 13 Aug 2024 15:29:19 -0400
Subject: [PATCH 10/10] Using rows so it passes the test

---
 tests/app/main/views/test_dashboard.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 27a78e2d3..37dbdf831 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -1928,4 +1928,6 @@ def test_service_dashboard_shows_batched_jobs(
 
     rows = job_table_body.find_all("tbody")[0].find_all("tr")
 
+    assert len(rows) == 0
+
     assert job_table_body is not None