darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-17 03:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1296 from GSA/1215-clean-up-macros-table-on-preview-page

Browse Source 
Converting 'preview page' table Macro to HTML
This commit is contained in:
Carlo Costino
2024-04-03 18:38:31 -04:00
committed by GitHub
parent c4611a291f bc71549d12
commit 8b17adeb34
2 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/templates/views/check/preview.html
View File

@@ -42,25 +42,55 @@
</ul>
</div>
<div class="usa-table-container--scrollable" tabindex="0">
{% call(item, row_number) list_table(
recipients.displayed_rows,
caption="Note: Only the first 5 rows are displayed here.",
caption_visible=True,
field_headings=recipients.column_headers
) %}
{% for column in recipients.column_headers %}
{% if item[column].ignore %}
{{ text_field(item[column].data or '', status='default') }}
{% else %}
{{ text_field(item[column].data or '') }}
{% endif %}
{% endfor %}
{% if item[None].data %}
{% for column in item[None].data %}
{{ text_field(column, status='default') }}
<table class="usa-table usa-table--borderless width-full">
<caption class="font-body-lg table-heading">
Note: Only the first 5 rows are displayed here.
</caption>
<thead class="table-field-headings-visible">
<tr>
{% for header in recipients.column_headers %}
<th scope="col" class="table-field-heading-first">
{{ header }}
</th>
{% endfor %}
</tr>
</thead>
<tbody>
{% for item in recipients.displayed_rows %}
{% if loop.index <= 5 %}
<tr class="table-row">
{% for column in recipients.column_headers %}
<td class="table-field-left-aligned">
<div>
{% set column_data = item[column].data or '' %}
{% if column_data is iterable and column_data is not string %}
<ul>
{% for data_item in column_data %}
{% if data_item is not none %}
<li>{{ data_item }}</li>
{% endif %}
{% endfor %}
</ul>
{% else %}
{{ column_data }}
{% endif %}
</div>
</td>
{% endfor %}
{% if item[None].data %}
{% for column in item[None].data %}
<td class="table-field-left-aligned">
<div class="">
{{ column }}
</div>
</td>
{% endfor %}
{% endif %}
</tr>
{% endif %}
{% endfor %}
{% endif %}
{% endcall %}
</tbody>
</table>
</div>
{% endif %}
<!-- <div class="bottom-gutter-3-2">

18
tests/app/main/views/test_send.py
View File

@@ -975,11 +975,11 @@ def test_upload_valid_csv_shows_preview_and_table(
for row_index, row in enumerate(
[
(
'<td class="table-field-left-aligned"> <div class=""> 2028675301 </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> A </div> </td>',
'<td class="table-field-left-aligned"> <div> 2028675301 </div> </td>',
'<td class="table-field-left-aligned"> <div> A </div> </td>',
(
'<td class="table-field-left-aligned"> '
'<div class="table-field-status-default"> '
'<div> '
"<ul> "
"<li>foo</li> <li>foo</li> <li>foo</li> "
"</ul> "
@@ -988,11 +988,11 @@ def test_upload_valid_csv_shows_preview_and_table(
),
),
(
'<td class="table-field-left-aligned"> <div class=""> 2028675302 </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> B </div> </td>',
'<td class="table-field-left-aligned"> <div> 2028675302 </div> </td>',
'<td class="table-field-left-aligned"> <div> B </div> </td>',
(
'<td class="table-field-left-aligned"> '
'<div class="table-field-status-default"> '
'<div> '
"<ul> "
"<li>foo</li> <li>foo</li> <li>foo</li> "
"</ul> "
@@ -1001,11 +1001,11 @@ def test_upload_valid_csv_shows_preview_and_table(
),
),
(
'<td class="table-field-left-aligned"> <div class=""> 2028675303 </div> </td>',
'<td class="table-field-left-aligned"> <div class=""> C </div> </td>',
'<td class="table-field-left-aligned"> <div> 2028675303 </div> </td>',
'<td class="table-field-left-aligned"> <div> C </div> </td>',
(
'<td class="table-field-left-aligned"> '
'<div class="table-field-status-default"> '
'<div> '
"<ul> "
"<li>foo</li> <li>foo</li> "
"</ul> "