ShaYmez/HBmonitor
1
0
Fork 0
mirror of https://github.com/ShaYmez/HBmonitor.git synced 2024-11-25 09:18:53 -05:00
Code Issues Projects Releases Wiki Activity

updating table format – prepare for additional information

Browse Source
This commit is contained in:
Cort Buffington 2018-11-30 13:38:44 -06:00
parent d1282ff682
commit f3f35d7365
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
templates/hblink_table.html
View File

@ -3,45 +3,27 @@
<table style="width:100%; font: 10pt arial, sans-serif"> <table style="width:100%; font: 10pt arial, sans-serif">
<colgroup> <colgroup>
<col style="width: 15%" /> <col style="width: 15%" />
<col style="width: 10%" />
<col style="width: 10%" />
<col style="width: 10%" />
<col style="width: 5%" />
<col style="width: 5%" />
<col style="width: 15%" /> <col style="width: 15%" />
<col style="width: 10%" /> <col style="width: 10%" />
<col style="width: 10%" /> <col style="width: 5%" />
<col style="width: 10%" />
</colgroup> </colgroup>
<tr style="width:100%; font: 10pt arial, sans-serif; background-color:#666666; color:white"> <tr style="width:100%; font: 10pt arial, sans-serif; background-color:#666666; color:white">
<th>HBP System</th> <th>HBP System</th>
<th>Client Radio ID</th> <th>ID/Callsign/Location<br>IP:Port/KeepAlives</th>
<th>Callsign</th>
<th>Frequency</th> <th>Frequency</th>
<th>ColorCode</th> <th>ColorCode<br>LinkedTS</th>
<th>LinkTS</th>
<th>Location</th>
<th>Pings Received</th>
<th>IP</th>
<th>Port</th>
</tr> </tr>
{% for _master in _table['MASTERS'] %} {% for _master in _table['MASTERS'] %}
<tr> <tr>
<td style="font-weight:bold" rowspan="{{ _table['MASTERS'][_master]['PEERS']|length + 1 }}"> {{ _master}} </td> <td style="font-weight:bold" rowspan="{{ _table['MASTERS'][_master]['PEERS']|(length + 1)*2 }}"> {{ _master}} </td>
</tr> </tr>
{% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].iteritems() %} {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].iteritems() %}
<tr> <tr>
<td>{{ _client }}</td> <td rowspan="2">{{ _client }}, {{ _cdata['CALLSIGN'] }}, {{ _cdata['LOCATION'] }}<br><div style="font: 8pt arial, sans-serif">{{ _cdata['IP'] }}:{{ _cdata['PORT'] }} / {{ _cdata['PINGS_RECEIVED'] }}</div></td>
<td>{{ _cdata['CALLSIGN'] }}</td> <td rowspan="2">TX: {{ _cdata['RX_FREQ'] }}<br>RX: {{ _cdata['TX_FREQ] }}</td>
<td>{{ _cdata['TX_FREQ'] }}</td> <td rowspan="2">{{ _cdata['COLORCODE'] }}<br>{{ _cdata['SLOTS'] }}</td>
<td>{{ _cdata['COLORCODE'] }}</td>
<td>{{ _cdata['SLOTS'] }}</td>
<td>{{ _cdata['LOCATION'] }}</td>
<td>{{ _cdata['PINGS_RECEIVED'] }}</td>
<td>{{ _cdata['IP'] }}</td>
<td>{{ _cdata['PORT'] }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% endfor %} {% endfor %}

2
web_tables.py
View File

@ -67,7 +67,7 @@ OPCODE = {
# Global Variables: # Global Variables:
CONFIG = {} CONFIG = {}
CTABLE = {'MASTERS': {}, 'PEERS': {}} CTABLE = {'MASTERS': {}, 'PEERS': {}, 'OPENBRIDGES': {}}
BRIDGES = {} BRIDGES = {}
BTABLE = {} BTABLE = {}
BTABLE['BRIDGES'] = {} BTABLE['BRIDGES'] = {}