From 885d2ad60e400fc82715b4c716f0ce06814fe827 Mon Sep 17 00:00:00 2001
From: n0mjs710 <n0mjs@me.com>
Date: Fri, 30 Nov 2018 14:31:07 -0600
Subject: [PATCH] updated formatting for realtime status

---
 templates/hblink_table.html | 17 +++++++++++++----
 web_tables.py               |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/templates/hblink_table.html b/templates/hblink_table.html
index 0d6cc23..e12fdf7 100755
--- a/templates/hblink_table.html
+++ b/templates/hblink_table.html
@@ -2,28 +2,37 @@
 <h4>Master Systems</h4>
 <table style="width:100%; font: 10pt arial, sans-serif">
     <colgroup>
-        <col style="width: 15%" />
-        <col style="width: 15%" />
+        <col style="width: 10%" />
+        <col style="width: 20%" />
         <col style="width: 10%" />
         <col style="width: 5%" />
+        <col style="width: 55%" />
     </colgroup>
     <tr style="width:100%; font: 10pt arial, sans-serif; background-color:#666666; color:white">
         <th>HBP System</th>
         <th>ID/Callsign/Location<br>IP:Port/KeepAlives</th>
         <th>Frequency</th>
         <th>ColorCode<br>LinkedTS</th>
+        <th>Realtime Status (to come)</th>
     </tr>
 
     {% for _master in _table['MASTERS'] %}    
 
     <tr>
-        <td style="font-weight:bold" rowspan="{{ _table['MASTERS'][_master]['PEERS']|(length + 1)*2 }}"> {{ _master}} </td>
+        <td style="font-weight:bold" rowspan="{{ (_table['MASTERS'][_master]['PEERS']|length * 2) +1 }}"> {{ _master}} </td>
     </tr>
     {% for _client, _cdata in _table['MASTERS'][_master]['PEERS'].iteritems() %}
     <tr>
         <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 rowspan="2">TX: {{ _cdata['RX_FREQ'] }}<br>RX: {{ _cdata['TX_FREQ] }}</td>
+        <td rowspan="2">TX: {{ _cdata['RX_FREQ'] }}<br>RX: {{ _cdata['TX_FREQ'] }}</td>
         <td rowspan="2">{{ _cdata['COLORCODE'] }}<br>{{ _cdata['SLOTS'] }}</td>
+
+        <td>TS1</td>
+        
+        <tr>
+        <td>TS2</td>
+        </tr>
+
     </tr>    
     {% endfor %}
 {% endfor %}
diff --git a/web_tables.py b/web_tables.py
index 7346e2e..84a17f1 100755
--- a/web_tables.py
+++ b/web_tables.py
@@ -130,6 +130,7 @@ def build_hblink_table(_config):
                     _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)] = {}
                     _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['CALLSIGN'] = _hbp_data['PEERS'][_client]['CALLSIGN']
                     _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['TX_FREQ'] = _hbp_data['PEERS'][_client]['TX_FREQ'][:3] + '.' + _hbp_data['PEERS'][_client]['TX_FREQ'][3:7]
+                    _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['RX_FREQ'] = _hbp_data['PEERS'][_client]['RX_FREQ'][:3] + '.' + _hbp_data['PEERS'][_client]['RX_FREQ'][3:7]
                     _stats_table['MASTERS'][_hbp]['PEERS'][int_id(_client)]['COLORCODE'] = _hbp_data['PEERS'][_client]['COLORCODE']
                     _slots = _hbp_data['PEERS'][_client]['SLOTS']
                     if (_slots <= '2'):