Filter shown fields and add some icons to boolean values

This commit is contained in:
Mark Veidemanis 2022-08-11 07:22:22 +01:00
parent 86ec95ab6c
commit f7b82147c7
Signed by: m
GPG Key ID: 5ACFCEED46C0904F
3 changed files with 42 additions and 9 deletions

View File

@ -13,7 +13,7 @@
<tr>
{% for column in table.columns %}
{% if column.name not in hide %}
{% if column.name in show and not column.name in hide %}
{% block table.thead.th %}
<th {% render_attrs column.attrs.th class="" %}>
{% if column.orderable %}
@ -68,12 +68,12 @@
has-background-info-light
{% endif %}">
{% for column, cell in row.items %}
{% if column.name not in hide %}
{% if column.name in show and not column.name in hide %}
{% block table.tbody.td %}
{% if column.name == 'src' %}
<td>
<a class="has-text-link is-underlined"
onclick="populateSearch('src', '{{ cell|escapejs }}')">
onclick="populateSearch('src', '{{ cell|escapejs }}')">
{% if row.cells.src == 'irc' %}
<span class="icon" data-tooltip="IRC">
<i class="fa-solid fa-hashtag" aria-hidden="true"></i>
@ -93,7 +93,7 @@
{% elif column.name == 'type' %}
<td>
<a class="has-text-link is-underlined"
onclick="populateSearch('type', '{{ cell|escapejs }}')">
onclick="populateSearch('type', '{{ cell|escapejs }}')">
{% if row.cells.type == 'msg' %}
<span class="icon" data-tooltip="Message">
<i class="fa-solid fa-message"></i>
@ -136,7 +136,7 @@
{% elif column.name == 'host' %}
<td>
<a class="has-text-link is-underlined"
onclick="populateSearch('host', '{{ cell|escapejs }}')">
onclick="populateSearch('host', '{{ cell|escapejs }}')">
{{ cell }}
</a>
</td>
@ -187,7 +187,7 @@
<td>
<div class="nowrap-parent">
<a class="nowrap-child has-text-link is-underlined"
onclick="populateSearch('channel', '{{ cell|escapejs }}')">
onclick="populateSearch('channel', '{{ cell|escapejs }}')">
{{ cell }}
</a>
{% if row.cells.num_users is not None %}
@ -202,10 +202,22 @@
{% elif column.name == 'net' %}
<td>
<a class="has-text-link is-underlined"
onclick="populateSearch('net', '{{ cell|escapejs }}')">
onclick="populateSearch('net', '{{ cell|escapejs }}')">
{{ cell }}
</a>
</td>
{% elif cell == True or cell == False %}
<td>
{% if cell == True %}
<span class="icon has-text-success">
<i class="fa-solid fa-check"></i>
</span>
{% else %}
<span class="icon">
<i class="fa-solid fa-xmark"></i>
</span>
{% endif %}
</td>
{% else %}
<td>
{{ cell }}

View File

@ -171,6 +171,15 @@ class DrilldownTableView(SingleTableView):
def get(self, request, *args, **kwargs):
self.object_list = self.get_queryset(request)
show = []
if len(self.object_list) > 0:
first = self.object_list[0]
fields = first.keys()
for field in fields:
values_present = all([x[field] is not None for x in self.object_list])
if values_present:
if field not in show:
show.append(field)
allow_empty = self.get_allow_empty()
if not allow_empty:
@ -190,8 +199,18 @@ class DrilldownTableView(SingleTableView):
for k, v in self.context.items():
if k not in context:
context[k] = v
context["hide"] = ["date", "time", "id", "num", "channel_nsfw", "num_users", "num_chans", "exemption", "version_sentiment"]
context["hide"] = [
"date",
"time",
"id",
"num",
"channel_nsfw",
"num_users",
"num_chans",
"exemption",
"version_sentiment",
]
context["show"] = show
if request.method == "GET":
if not request.htmx:
self.template_name = "ui/drilldown/drilldown.html"

View File

@ -5,6 +5,7 @@ from django_tables2.columns.base import BoundColumn
# Make the table column headings lowercase
orig_Column_header = BoundColumn.header
@property
def format_header(self):
header = orig_Column_header.__get__(self)
@ -19,6 +20,7 @@ def format_header(self):
return header
BoundColumn.header = format_header