ShaYmez/HBmonitor
1
0
Fork 0
mirror of https://github.com/ShaYmez/HBmonitor.git synced 2024-10-31 22:37:14 -04:00
Code Issues Projects Releases Wiki Activity

client table formatting

Browse Source
This commit is contained in:
Cort Buffington 2018-12-06 11:51:07 -06:00
parent 2d2ed8c938
commit 40ea0bb14b
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/hblink_table.html
View File

@ -84,7 +84,7 @@
<td style="font-weight:bold" rowspan="2"> {{ _peer}}</td> <td style="font-weight:bold" rowspan="2"> {{ _peer}}</td>
<td rowspan="2">{{ _table['PEERS'][_peer]['RADIO_ID'] }}, {{_table['PEERS'][_peer]['CALLSIGN']}}, {{_table['PEERS'][_peer]['LOCATION']}}<br><div style="font: 8pt arial, sans-serif">Master: {{ _table['PEERS'][_peer]['MASTER_IP'] }}:{{ _table['PEERS'][_peer]['MASTER_PORT'] }}</div></td> <td rowspan="2">{{ _table['PEERS'][_peer]['RADIO_ID'] }}, {{_table['PEERS'][_peer]['CALLSIGN']}}, {{_table['PEERS'][_peer]['LOCATION']}}<br><div style="font: 8pt arial, sans-serif">Master: {{ _table['PEERS'][_peer]['MASTER_IP'] }}:{{ _table['PEERS'][_peer]['MASTER_PORT'] }}</div></td>
<td rowspan="2"; style={{ 'background-color:#00ff00' if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' else ';background-color:#ff0000' }}>{{ _table['PEERS'][_peer]['STATS']['CONNECTED'] }}<br>{{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] }}/{{ _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }}/{{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] - _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }}</td> <td rowspan="2"; style={{ 'background-color:#00ff00' if _table['PEERS'][_peer]['STATS']['CONNECTION'] == 'YES' else ';background-color:#ff0000' }}>{{ _table['PEERS'][_peer]['STATS']['CONNECTED'] }}<br>{{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] }}/{{ _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }}/{{ _table['PEERS'][_peer]['STATS']['PINGS_SENT'] - _table['PEERS'][_peer]['STATS']['PINGS_ACKD'] }}</td>
<td rowspan="2"></td> <td rowspan="2"> {{ _table['PEERS'][_peer]['SLOTS'] }}</td>
<td>TS1</td> <td>TS1</td>
<td></td> <td></td>

15
web_tables.py
View File

@ -152,7 +152,7 @@ def add_hb_peer(_peer_conf, _ctable_loc, _peer):
# timeslots are kinda complicated too. 0 = none, 1 or 2 mean that one slot, 3 is both, and anythign else it considered DMO # timeslots are kinda complicated too. 0 = none, 1 or 2 mean that one slot, 3 is both, and anythign else it considered DMO
if (_peer_conf['SLOTS'] == '0'): if (_peer_conf['SLOTS'] == '0'):
_ctable_peer['SLOTS'] = 'NONE' _ctable_peer['SLOTS'] = 'NONE'
if (_peer_conf['SLOTS'] <= '2'): elif (_peer_conf['SLOTS'] <= '2'):
_ctable_peer['SLOTS'] = _peer_conf['SLOTS'] _ctable_peer['SLOTS'] = _peer_conf['SLOTS']
elif (_peer_conf['SLOTS'] == '3'): elif (_peer_conf['SLOTS'] == '3'):
_ctable_peer['SLOTS'] = 'BOTH' _ctable_peer['SLOTS'] = 'BOTH'
@ -205,9 +205,18 @@ def build_hblink_table(_config, _stats_table):
_stats_table['PEERS'][_hbp]['RADIO_ID'] = int_id(_hbp_data['RADIO_ID']) _stats_table['PEERS'][_hbp]['RADIO_ID'] = int_id(_hbp_data['RADIO_ID'])
_stats_table['PEERS'][_hbp]['MASTER_IP'] = _hbp_data['MASTER_IP'] _stats_table['PEERS'][_hbp]['MASTER_IP'] = _hbp_data['MASTER_IP']
_stats_table['PEERS'][_hbp]['MASTER_PORT'] = _hbp_data['MASTER_PORT'] _stats_table['PEERS'][_hbp]['MASTER_PORT'] = _hbp_data['MASTER_PORT']
_stats_table['PEERS'][_hbp]['CONNECTION'] = 'YES' #_hbp_data['CONNECTION'] _stats_table['PEERS'][_hbp]['CONNECTION'] = _hbp_data['CONNECTION']
_stats_table['PEERS'][_hbp]['CONNECTED'] = 'now' #since(_hbp_data['CONNECTED']) _stats_table['PEERS'][_hbp]['CONNECTED'] = since(_hbp_data['CONNECTED'])
_stats_table['PEERS'][_hbp]['STATS'] = _hbp_data['STATS'] _stats_table['PEERS'][_hbp]['STATS'] = _hbp_data['STATS']
if _hbp_data['SLOTS'] == 0:
_stats_table['SLOTS'][_hbp]['SLOTS'] = 'NONE'
elif _hbp_data['SLOTS'] <= '2':
_stats_table['SLOTS'][_hbp]['SLOTS'] = _hbp_data['SLOTS']
elif _hbp_data['SLOTS'] == '3':
_stats_table['SLOTS'][_hbp]['SLOTS'] = 'BOTH'
else:
_stats_table['SLOTS'][_hbp]['SLOTS'] = 'DMO'
# Process OpenBridge systems # Process OpenBridge systems
elif _hbp_data['MODE'] == 'OPENBRIDGE': elif _hbp_data['MODE'] == 'OPENBRIDGE':