2.20.25 Bug fix for field names in medium and narrow layout to not tr…

…y to include 'hidden' fields - thanks [Brian Keyte]
classaxe · Dec 1, 2020 · acd87f8 · acd87f8
1 parent 198de29
commit acd87f8
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 35 deletions.
diff --git a/public/js/functions.js b/public/js/functions.js
@@ -1,8 +1,8 @@
 /*
  * Project:    RXX - NDB Logging Database
  * Homepage:   https://rxx.classaxe.com
- * Version:    2.20.11
- * Date:       2020-09-24
+ * Version:    2.20.24
+ * Date:       2020-12-01
  * Licence:    LGPL
  * Copyright:  2020 Martin Francis
  */
@@ -1851,15 +1851,17 @@ var RT = {
         var idx = 0;
         this.source.find('thead tr th').each(function () {
             var header = $(this);
-            RT.fields.push({
-                idx: idx++,
-                html: header.html().trim().split('<br>')[0],
-                l2: header.hasClass('l2'),
-                rowspan2: header.hasClass('rowspan2'),
-                type: (header.hasClass('th') ? 'th' : 'td')
-            });
-            RT.classes.push(header.prop('title').trim());
-            RT.titles.push(header.prop('title').trim());
+            if (!header.hasClass('hidden')) {
+                RT.fields.push({
+                    idx: idx++,
+                    html: header.html().trim().split('<br>')[0],
+                    l2: header.hasClass('l2'),
+                    rowspan2: header.hasClass('rowspan2'),
+                    type: (header.hasClass('th') ? 'th' : 'td')
+                });
+                RT.classes.push(header.prop('title').trim());
+                RT.titles.push(header.prop('title').trim());
+            }
         });
         this.source.find('tbody tr').each(function () {
             var ele = $(this);

diff --git a/public/js/functions.min.js b/public/js/functions.min.js
diff --git a/src/Controller/Web/Stats/Stats.php b/src/Controller/Web/Stats/Stats.php
@@ -20,13 +20,11 @@ class Stats extends Base
      *     },
      *     name="stats_listeners"
      * )
-     * @param $_locale
      * @param $system
      * @param $region
      * @return Response
      */
     public function listeners(
-        $_locale,
         $system,
         $region = ''
     ) {
@@ -62,13 +60,11 @@ public function listeners(
      *     },
      *     name="stats_listeners_count"
      * )
-     * @param $_locale
      * @param $system
      * @param $region
      * @return Response
      */
     public function listeners_count(
-        $_locale,
         $system,
         $region = ''
     ) {
@@ -87,13 +83,11 @@ public function listeners_count(
      *     },
      *     name="stats_logs_count"
      * )
-     * @param $_locale
      * @param $system
      * @param $region
      * @return Response
      */
     public function logs_count(
-        $_locale,
         $system,
         $region = ''
     ) {
@@ -112,13 +106,11 @@ public function logs_count(
      *     },
      *     name="stats_logs_first"
      * )
-     * @param $_locale
      * @param $system
      * @param $region
      * @return Response
      */
     public function logs_first(
-        $_locale,
         $system,
         $region = ''
     ) {
@@ -137,13 +129,11 @@ public function logs_first(
      *     },
      *     name="stats_logs_last"
      * )
-     * @param $_locale
      * @param $system
      * @param $region
      * @return Response
      */
     public function logs_last(
-        $_locale,
         $system,
         $region = ''
     ) {
@@ -163,12 +153,10 @@ public function logs_last(
      *     },
      *     name="stats_signals_count"
      * )
-     * @param $_locale
      * @param $system
      * @return Response
      */
     public function signals_count (
-        $_locale,
         $system,
         $sys
     ) {

diff --git a/src/js/responsive_table.js b/src/js/responsive_table.js
@@ -74,15 +74,17 @@ var RT = {
         var idx = 0;
         this.source.find('thead tr th').each(function () {
             var header = $(this);
-            RT.fields.push({
-                idx: idx++,
-                html: header.html().trim().split('<br>')[0],
-                l2: header.hasClass('l2'),
-                rowspan2: header.hasClass('rowspan2'),
-                type: (header.hasClass('th') ? 'th' : 'td')
-            });
-            RT.classes.push(header.prop('title').trim());
-            RT.titles.push(header.prop('title').trim());
+            if (!header.hasClass('hidden')) {
+                RT.fields.push({
+                    idx: idx++,
+                    html: header.html().trim().split('<br>')[0],
+                    l2: header.hasClass('l2'),
+                    rowspan2: header.hasClass('rowspan2'),
+                    type: (header.hasClass('th') ? 'th' : 'td')
+                });
+                RT.classes.push(header.prop('title').trim());
+                RT.titles.push(header.prop('title').trim());
+            }
         });
         this.source.find('tbody tr').each(function () {
             var ele = $(this);