From 4a667c01edbdc29e75d90bd0e9424296c777662f Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Fri, 29 Dec 2023 15:47:10 -0800
Subject: [PATCH] batched job table added

---
 app/templates/components/table.html           |  8 ++---
 .../views/activity/notifications.html         | 35 +++++++++++++++++++
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/app/templates/components/table.html b/app/templates/components/table.html
index dc1460a20..803030e54 100644
--- a/app/templates/components/table.html
+++ b/app/templates/components/table.html
@@ -1,5 +1,5 @@
-{% macro mapping_table(caption='', field_headings=[], field_headings_visible=True, caption_visible=True, equal_length=False) -%}
-  <table class="usa-table usa-table--borderless width-full">
+{% macro mapping_table(caption='', field_headings=[], field_headings_visible=True, caption_visible=True, equal_length=False, border_visible=False) -%}
+  <table class="usa-table{{' usa-table--borderless' if not border_visible}} width-full">
     <caption class="font-body-lg table-heading{{ ' usa-sr-only' if not caption_visible}}">
       {{ caption }}
     </caption>
@@ -22,10 +22,10 @@
   </table>
 {%- endmacro %}
 
-{% macro list_table(items, caption='', empty_message='', field_headings=[], field_headings_visible=True, caption_visible=True, equal_length=False) -%}
+{% macro list_table(items, caption='', empty_message='', field_headings=[], field_headings_visible=True, caption_visible=True, equal_length=False, border_visible=False) -%}
   {% set parent_caller = caller %}
 
-  {% call mapping_table(caption, field_headings, field_headings_visible, caption_visible, equal_length) %}
+  {% call mapping_table(caption, field_headings, field_headings_visible, caption_visible, equal_length, border_visible) %}
     {% for item in items %}
       {% call row(item.id) %}
         {{ parent_caller(item, loop.index + 1) }}
diff --git a/app/templates/views/activity/notifications.html b/app/templates/views/activity/notifications.html
index 1a2ec8f8e..5909474a7 100644
--- a/app/templates/views/activity/notifications.html
+++ b/app/templates/views/activity/notifications.html
@@ -3,7 +3,42 @@
 {% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading, row_heading, notification_status_field, notification_carrier_field, notification_carrier_message_field %}
 
 <div class="ajax-block-container" id='pill-selected-item'>
+  <!-- Batched Job Table -->
+  {% if notifications %}
+    <div class='dashboard-table'>
+  {% endif %}
+    {% call(item, row_number) list_table(
+      notifications,
+      caption="Batched Jobs",
+      caption_visible=False,
+      border_visible=True,
+      empty_message='No batched job messages found &thinsp;(messages are kept for {} days)'.format(limit_days)|safe,
+      field_headings=['Batched Job', 'Download (CSV) Report'],
+      field_headings_visible=False
+    ) %}
+      {% if item.job.original_file_name %}
+        {% call row_heading() %}
+        <a class="usa-link" href="/services/{{ item.service }}/jobs/{{ item.job.id }}">{{ item.job.original_file_name|replace('.csv', '') if item.job.id else '' }}</a>
+        {% endcall %}
+      {% call row_heading() %}
+        <a class="usa-link file-list-filename" href="/services/{{ item.service }}/jobs/{{ item.job.id }}.csv">{{ "Download Report" if item.job.original_file_name else '' }}</a>
+        <span>- available for {{ limit_days }} days</span>
+      {% endcall %}
+      {% endif %}
+    {% endcall %}
+  {% if notifications %}
+    </div>
+  {% endif %}
 
+  {% if show_pagination %}
+    {{ previous_next_navigation(prev_page, next_page) }}
+  {% elif next_page %}
+    <p class="table-show-more-link">
+      Only showing the first 50 messages
+    </p>
+  {% endif %}
+
+  <!-- Dashboard Table -->
   {% if notifications %}
     <div class='dashboard-table'>
   {% endif %}