2.52.3 Remote Radio links now styled differently than listener websit…

…es in listeners list and display inactive if receiver location is inactive
classaxe · Aug 28, 2022 · 7b3f9be · 7b3f9be
1 parent 2ecc264
commit 7b3f9be
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 10 deletions.
diff --git a/src/Columns/ListenerRemoteLogsessions.php b/src/Columns/ListenerRemoteLogsessions.php
@@ -72,7 +72,7 @@ public function getColumns()
                 'admin'     =>  false,
                 'arg'       =>  '',
                 'field'     =>  'listener',
-                'label'     =>  'Receiver [link]',
+                'label'     =>  'Receiver',
                 'order'     =>  'a',
                 'sort'      =>  'listener',
                 'td_class'  =>  '',

diff --git a/src/Columns/Listeners.php b/src/Columns/Listeners.php
@@ -378,7 +378,7 @@ public function getColumns()
                 'arg' =>        '',
                 'field' =>      'website',
                 'highlight' =>  false,
-                'label' =>      'WWW',
+                'label' =>      'URL',
                 'sortBy'    =>  [['l.wn','DESC'],['l.website', 'DIR']],
                 'order' =>      'a',
                 'sort' =>       'l.website',
@@ -391,11 +391,11 @@ public function getColumns()
                 'arg' =>        '',
                 'field' =>      'ndbWebLog',
                 'highlight' =>  false,
-                'label' =>      'NWL',
+                'label' =>      'NDB Web Log',
                 'order' =>      '',
                 'sort' =>       '',
                 'td_class' =>   '',
-                'th_class' =>   '',
+                'th_class' =>   'txt_vertical',
                 'tooltip' =>    'NDB Weblog for Listener',
             ],
             'map' => [

diff --git a/src/Columns/Logsessions.php b/src/Columns/Logsessions.php
@@ -61,7 +61,7 @@ public function getColumns()
                 'admin'     =>  false,
                 'arg'       =>  '',
                 'field'     =>  'listener',
-                'label'     =>  'Listener | Location [Link]',
+                'label'     =>  'Listener | Location',
                 'order'     =>  'a',
                 'sort'      =>  'li.name',
                 'td_class'  =>  '',

diff --git a/src/Repository/LogRepository.php b/src/Repository/LogRepository.php
@@ -206,7 +206,9 @@ public function getLogs(array $args, $columns = [])
             .'l.operatorId,'
             .'l.listenerId,'
             .'(CASE WHEN op.name IS NULL THEN \'\' ELSE op.name END) as operator,'
-            .'CONCAT(li.name, \', \', li.qth, \' \', li.sp, \', \', li.itu, \' | \', li.gsq) as receiver';
+            .'li.website,'
+            .'li.active,'
+            .'CONCAT(li.name, \', \', li.qth, \' \', li.sp, \', \', li.itu, \' \', li.gsq) as receiver';
 
         $qb = $this
             ->createQueryBuilder('l')

diff --git a/templates/listener/logs.grid.html.twig b/templates/listener/logs.grid.html.twig
@@ -36,7 +36,11 @@
             elseif key == 'id'
         %}{% if isAdmin %}<a href="{{ url('log', { 'system' : system, 'id' : l.log_id }) }}" data-popup="1" title="Click to view this log record">{{ l.log_id }}</a>{% else %}{{ l.log_id }}{% endif %}{%
             elseif key == 'receiver'
-        %}{% if l.operatorId %}<a href="{{ url('listener', { 'system' : system, 'id': l.listenerId }) }}" data-popup="1" title="Click to see profile for this Receiver">{{ l.receiver|raw }}</a>{% endif %}{%
+        %}{% if l.operatorId %}<a href="{{ url('listener', { 'system' : system, 'id': l.listenerId }) }}" data-popup="1" title="Click to see profile for this Receiver">{{ l.receiver|raw }}</a>{% endif %}
+            {% if l.operator and l.website %}
+                <span {% if l.active == 'Y' %}class="link" title="Click to access receiver"{% else %}class="inactive" title="Inactive receiver"{% endif %}>[<a href="{{ l.website }}" data-popup="www_{{ l.listenerId }}|width=800,height=640,status=1,scrollbars=1,resizable=1">RX Link</a>]</span>
+            {% endif
+        %}{%
             elseif key == 'operator'
         %}{% if l.operatorId %}<a href="{{ url('listener', { 'system' : system, 'id': l.operatorId }) }}" data-popup="1" title="Click to see profile for this Listener">{{ l.operator|raw }}</a>{% endif %}{%
             elseif key == 'delete' and isAdmin

diff --git a/templates/listener/logsessions.grid.html.twig b/templates/listener/logsessions.grid.html.twig
@@ -42,7 +42,7 @@
             elseif key == 'receiver'
         %}<a href="{{ url('listener_logsessions', { 'system' : system, 'id' : ls.listenerId }) }}" data-popup="1" title="Click to view Log Sessions for this Listener Location">{{ ls.listener|raw }}</a>
             {% if ls.operator and ls.website %}
-                <span {% if ls.active == 'Y' %}class="link" title="Click to access receiver"{% else %}class="inactive" title="Inactive receiver"{% endif %}>[<a href="{{ ls.website }}" data-popup="www_{{ ls.listenerId }}|width=800,height=640,status=1,scrollbars=1,resizable=1">Link</a>]</span>
+                <span {% if ls.active == 'Y' %}class="link" title="Click to access receiver"{% else %}class="inactive" title="Inactive receiver"{% endif %}>[<a href="{{ ls.website }}" data-popup="www_{{ ls.listenerId }}|width=800,height=640,status=1,scrollbars=1,resizable=1">RX Link</a>]</span>
             {% endif
         %}{%
             elseif key == 'operator'

diff --git a/templates/listeners/list.html.twig b/templates/listeners/list.html.twig
@@ -100,7 +100,14 @@
                 elseif key == 'email'
                     %}{% if l.email %}<a href="mailto:{{ l.email }}">{{ l.email|raw }}</a>{% endif %}{%
                 elseif key == 'website'
-                    %}{% if l.website %}<a href="{{ l.website }}" data-popup="www_{{ l.id }}|width=800,height=640,status=1,scrollbars=1,resizable=1">{% trans %}Link...{% endtrans %}</a>{% endif %}{%
+                    %}{% if l.website %}{%
+                    if l.multiOperator == 'Y'
+                        %}<span {% if l.active == 'Y' %}class="link" title="Click to access remote receiver"{% else %}class="inactive" title="Remote receiver is inactive"{% endif %}>[<a href="{{ l.website }}" data-popup="www_{{ l.id }}|width=800,height=640,status=1,scrollbars=1,resizable=1">RX Link</a>]</span>{%
+                        else
+                            %}[<a title="Click to access website" href="{{ l.website }}" data-popup="www_{{ l.id }}|width=800,height=640,status=1,scrollbars=1,resizable=1">{% trans %}Website{% endtrans %}</a>]{%
+                        endif
+                    %}{%
+                    endif %}{%
                 elseif key == 'countRemoteLogSessions'
                     %}{% if l.countSignals %}<a href="{{ url('listener_remote_logsessions', { 'system' : system, 'id' : l.ID }) }}" data-popup="1">{{ value }}</a>{% endif %}{%
                 elseif key == 'addlog'

diff --git a/templates/log_sessions/grid.html.twig b/templates/log_sessions/grid.html.twig
@@ -45,7 +45,7 @@
             elseif key == 'listener'
         %}<a href="{{ url('listener_logsessions', { 'system' : system, 'id' : ls.listenerId }) }}" data-popup="1" title="Click to view Log Sessions for this Listener Location">{{ ls.listener|raw }}</a>
             {% if ls.operator and ls.website %}
-                <span {% if ls.active == 'Y' %}class="link" title="Click to access receiver"{% else %}class="inactive" title="Inactive receiver"{% endif %}>[<a href="{{ ls.website }}" data-popup="www_{{ ls.listenerId }}|width=800,height=640,status=1,scrollbars=1,resizable=1">Link</a>]</span>
+                <span {% if ls.active == 'Y' %}class="link" title="Click to access receiver"{% else %}class="inactive" title="Inactive receiver"{% endif %}>[<a href="{{ ls.website }}" data-popup="www_{{ ls.listenerId }}|width=800,height=640,status=1,scrollbars=1,resizable=1">RX Link</a>]</span>
             {% endif
         %}{%
             elseif key == 'signals'