From 894e8c7d1beca120f9d5e541f36c3c53b170027a Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 7 Aug 2025 09:57:44 -0700
Subject: [PATCH] adding status column

---
 .../uswds/_uswds-theme-custom-styles.scss     |  2 ++
 .../views/activity/all-activity.html          | 25 +++++++++++--------
 .../views/dashboard/activity-table.html       | 10 ++++----
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index 094f9d138..9aebabd35 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -490,6 +490,8 @@ td.table-empty-message {
 }
 
 .job-table {
+  width: 100%;
+  border-collapse: collapse;
   th {
     padding: 0.5rem 1rem;
   }
diff --git a/app/templates/views/activity/all-activity.html b/app/templates/views/activity/all-activity.html
index fde69dba3..2584caefb 100644
--- a/app/templates/views/activity/all-activity.html
+++ b/app/templates/views/activity/all-activity.html
@@ -84,10 +84,7 @@
               <span>Report</span>
             </th>
             <th data-sortable scope="col" role="columnheader" class="table-field-heading">
-              <span>Delivered</span>
-            </th>
-            <th data-sortable scope="col" role="columnheader" class="table-field-heading">
-              <span>Failed</span>
+              <span>Status</span>
             </th>
           </tr>
         </thead>
@@ -95,17 +92,17 @@
           {% if all_jobs_dict %}
             {% for job in all_jobs_dict %}
               <tr class="table-row">
-                <td class="table-field jobid width-10" role="rowheader">
+                <td class="table-field width-5" 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 width-35 text-wrap">{{ job.template_name }}</td>
-                <td data-sort-value="{{ job.activity_time | convert_time_unixtimestamp }}" class="table-field time-sent width-15">
+                <td class="table-field width-16">{{ job.template_name }}</td>
+                <td data-sort-value="{{ job.activity_time | convert_time_unixtimestamp }}" class="table-field width-18">
                   {{ job.activity_time|format_datetime_table }}
                 </td>
-                <td class="table-field sender width-20 text-wrap">{{ job.created_by.name }}</td>
-                <td class="text-center table-field report width-5">
+                <td class="table-field width-30 ">{{ job.created_by.name }}</td>
+                <td class="text-center table-field width-2">
                   {% if job.can_download %}
                     <a href="{{ job.download_link }}">
                       <img src="{{ url_for('static', filename='img/material-icons/file_download.svg') }}" alt="" class="padding-top-05">
@@ -115,8 +112,14 @@
                     <span>N/A</span>
                   {% endif %}
                 </td>
-                <td class="text-center table-field delivered width-7">{{ job.delivered_count if job.delivered_count is not none else '0' }}</td>
-                <td class="text-center table-field failed width-8">{{ job.failed_count if job.failed_count is not none else '0' }}</td>
+                <td class="table-field width-15">
+                  <span class="bg-base-lighter padding-x-05 padding-y-0 font-body-3xs text-bold radius-sm margin-right-05 display-inline-block ">
+                    {{ job.delivered_count if job.delivered_count is not none else '0' }} delivered
+                  </span>
+                  <span class="bg-base-lighter padding-x-05 padding-y-0 font-body-3xs text-bold radius-sm display-inline-block">
+                    {{ job.failed_count if job.failed_count is not none else '0' }} failed
+                  </span>
+                </td>
               </tr>
             {% endfor %}
           {% else %}
diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html
index 249c4f376..b9999ad62 100644
--- a/app/templates/views/dashboard/activity-table.html
+++ b/app/templates/views/dashboard/activity-table.html
@@ -39,13 +39,13 @@
                 {% if jobs %}
                 {% for job in jobs %}
                 <tr id="{{ job.id }}">
-                    <td class="table-field jobid" role="rowheader">
+                    <td class="table-field" role="rowheader">
                         <a class="usa-link" href="{{ url_for('.view_job', service_id=current_service.id, job_id=job.id )}}">
                             {{ job.id[:8] if job.id else 'Manually entered number' }}
                         </a>
                     </td>
-                    <td class="table-field template">{{ job.template_name }}</td>
-                    <td class="table-field time-sent">
+                    <td class="table-field width-35">{{ job.template_name }}</td>
+                    <td class="table-field width-20">
                         {% if not job.finished_processing %}
                             {% if job.scheduled_for%}
                                 Scheduled for {{ job.scheduled_for|format_datetime_table }}
@@ -58,8 +58,8 @@
                             Sent on {{ job.processing_started|format_datetime_table }}
                         {% endif %}
                     </td>
-                    <td class="table-field sender sender-column">{{ job.created_by.name }}</td>
-                    <td class="table-field count-of-recipients">{{ job.notification_count }}</td>
+                    <td class="table-field">{{ job.created_by.name }}</td>
+                    <td class="table-field width-5">{{ job.notification_count }}</td>
                 </tr>
                 {% endfor %}
                 {% else %}