darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

moved table to parent dashboard

Browse Source
This commit is contained in:
Beverly Nguyen
2024-01-04 13:40:36 -08:00
parent a920528902
commit aac23a754f
3 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/templates/views/activity/notifications.html
View File

@@ -3,48 +3,7 @@
{% 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='job-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=['Template Name','Date/Time', 'Download (CSV) Report'],
field_headings_visible=False
) %}
{% if item.job.original_file_name %}
{% call row_heading() %}
<a class="usa-link file-list-filename" 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() %}
{{ item.status|format_notification_status_as_time(
item.created_at|format_datetime_short,
(item.updated_at or item.created_at)|format_datetime_short
) }}
{% endcall %}
{% call row_heading() %}
<a class="usa-link file-list-filename" href="/services/{{ item.service }}/jobs/{{ item.job.id }}.csv">{{ "Download" 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 %}

11
app/templates/views/dashboard/dashboard.html
View File

@@ -30,11 +30,11 @@
{{ ajax_block(partials, updates_url, 'template-statistics') }}
<h2 class="margin-top-4 margin-bottom-1">Batched Jobs</h2>
{% if batched %}
{% if notifications %}
<div class='job-table'>
{% endif %}
{% call(item, row_number) list_table(
batched['batched_data'],
notifications,
caption="Batched Jobs",
caption_visible=False,
border_visible=True,
@@ -42,7 +42,7 @@
field_headings=['Template Name','Date/Time', 'Download (CSV) Report'],
field_headings_visible=False
) %}
{% if item.job.original_file_name %}
{% if item.job.original_file_name and item.job.id %}
{% call row_heading() %}
<a class="usa-link file-list-filename" href="/services/{{ item.service }}/jobs/{{ item.job.id }}">{{ item.job.original_file_name|replace('.csv', '') if item.job.id else '' }}</a>
{% endcall %}
@@ -54,7 +54,10 @@
{% endcall %}
{% call row_heading() %}
<a class="usa-link file-list-filename" href="/services/{{ item.service }}/jobs/{{ item.job.id }}.csv">{{ "Download" if item.job.original_file_name else '' }}</a>
<span>- available for {{ service_data_retention_days }} days</span>
{% set availability = download_availability|selectattr('job_id', 'equalto', item.job.id)|first %}
{% if availability %}
<span>- {{ availability.time_left }}</span>
{% endif %}
{% endcall %}
{% endif %}
{% endcall %}