AIL/ail-framework
8
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2025-01-18 16:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chg: [dashboard] show tracker description

Browse source
This commit is contained in:
terrtia 2024-12-06 16:42:17 +01:00
parent 4af3fc76fd
commit 9dde795c12
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/lib/ail_stats.py
View file

@ -44,8 +44,7 @@ def get_feeders_by_time(timestamp): # TODO
def get_feeders_dashboard_full(): def get_feeders_dashboard_full():
timestamp = get_current_feeder_timestamp(int(time.time())) timestamp = get_current_feeder_timestamp(int(time.time()))
print(timestamp) # print(timestamp)
# timestamp = 1731491970
f_dashboard = {} f_dashboard = {}
feeders = get_feeders() feeders = get_feeders()

12
var/www/templates/dashboard/dashboard.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>Objects - AIL</title> <title>AIL Framework</title>
<link rel="icon" href="{{ url_for('static', filename='image/ail-icon.png') }}"> <link rel="icon" href="{{ url_for('static', filename='image/ail-icon.png') }}">
<!-- Core CSS --> <!-- Core CSS -->
@ -152,7 +152,7 @@
<tr> <tr>
<td>{{ tracker['type'] }}</td> <td>{{ tracker['type'] }}</td>
<td style="word-break: break-all;"> <td style="word-break: break-all;">
<a href="{{ url_for('hunters.show_tracker') }}?uuid={{ tracker['uuid'] }}">{{ tracker['tracked'] }}</a> <a href="{{ url_for('hunters.show_tracker') }}?uuid={{ tracker['uuid'] }}">{% if tracker['description'] %}{{ tracker['description'] }}{% else %}{{ tracker['tracked'] }}{% endif %}</a>
</td> </td>
<td class="text-center"> <td class="text-center">
<a href="{{ tracker['obj']['link'] }}" onmouseenter="show_obj_tooltip(this, '{{ tracker['obj']['gid'] }}')" onmouseleave="hide_obj_tooltip(this)"> <a href="{{ tracker['obj']['link'] }}" onmouseenter="show_obj_tooltip(this, '{{ tracker['obj']['gid'] }}')" onmouseleave="hide_obj_tooltip(this)">
@ -412,7 +412,13 @@ function update_tracked_objs_dashboard(data) {
let tracker = data[elem]; let tracker = data[elem];
var row = $('<tr></tr>'); var row = $('<tr></tr>');
row.append('<td>' + tracker['type'] + '</td>'); row.append('<td>' + tracker['type'] + '</td>');
row.append('<td style="word-break: break-all;"><a href="{{ url_for('hunters.show_tracker') }}?uuid=' + tracker['uuid'] + '">' + sanitize_text(tracker['tracked']) + '</a></td>'); let name;
if (tracker['description']) {
name = tracker['description'];
} else {
name = tracker['tracked'];
}
row.append('<td style="word-break: break-all;"><a href="{{ url_for('hunters.show_tracker') }}?uuid=' + tracker['uuid'] + '">' + sanitize_text(name) + '</a></td>');
ntd = $('<td class="text-center"></td>'); ntd = $('<td class="text-center"></td>');
row.append(create_obj_svg(ntd, tracker['obj']['gid'], tracker['obj']['link'], tracker['obj']['icon']['color'], tracker['obj']['icon']['style'], tracker['obj']['icon']['icon'])); row.append(create_obj_svg(ntd, tracker['obj']['gid'], tracker['obj']['link'], tracker['obj']['icon']['color'], tracker['obj']['icon']['style'], tracker['obj']['icon']['icon']));
row.append('<td>' + tracker['timestamp'] + '</td>'); row.append('<td>' + tracker['timestamp'] + '</td>');