2.64.3 Listeners shown in 'Personalise for' control in Signals now sh…

…ows logs for each location
classaxe · Mar 15, 2024 · e2e465f · e2e465f
1 parent fcb19f8
commit e2e465f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 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.64.2
- * Date:       2024-03-14
+ * Version:    2.64.3
+ * Date:       2024-03-15
  * Licence:    LGPL
  * Copyright:  2024 Martin Francis
  */
@@ -3232,7 +3232,7 @@ var SIGNALS_FORM = {
         if (enable) {
             $('#form_personalise').change(function () {
                 var lbl = $('#form_personalise option:selected').text();
-                var gsq = (lbl.split('|').length === 2 ? lbl.split('|')[1] : '').trim();
+                var gsq = (lbl.split('|').length === 3 ? lbl.split('|')[1] : '').trim();
                 var form_range_gsq = $('#form_range_gsq');
                 form_range_gsq.val(gsq);
                 form_range_gsq.trigger('keyup');

diff --git a/public/js/functions.min.js b/public/js/functions.min.js
diff --git a/src/Repository/ListenerRepository.php b/src/Repository/ListenerRepository.php
@@ -589,7 +589,7 @@ public function getAllOptions(
             $qb =
                 $this
                     ->createQueryBuilder('l')
-                    ->select('l.id, l.active, l.name, l.qth, l.sp, l.itu, l.gsq, l.primaryQth, l.callsign, l.multiOperator')
+                    ->select('l.id, l.active, l.name, l.qth, l.sp, l.itu, l.gsq, l.primaryQth, l.callsign, l.multiOperator, l.countLogs')
                     ->addOrderBy('l.name', 'ASC')
                     ->addOrderBy('l.primaryQth', 'DESC');
             $this->addFilterSystem($qb, $system);
@@ -617,6 +617,7 @@ public function getAllOptions(
                     . " "
                     . $row['itu']
                     . ($row['gsq'] ? ' | ' . $row['gsq'] : '')
+                    . ($row['countLogs'] ? ' | ' . $row['countLogs'] . ' logs': '')
                 ] = $row['id'];
             } else {
                 $out[

diff --git a/src/js/signals.js b/src/js/signals.js
@@ -329,7 +329,7 @@ var SIGNALS_FORM = {
         if (enable) {
             $('#form_personalise').change(function () {
                 var lbl = $('#form_personalise option:selected').text();
-                var gsq = (lbl.split('|').length === 2 ? lbl.split('|')[1] : '').trim();
+                var gsq = (lbl.split('|').length === 3 ? lbl.split('|')[1] : '').trim();
                 var form_range_gsq = $('#form_range_gsq');
                 form_range_gsq.val(gsq);
                 form_range_gsq.trigger('keyup');