From bd679e578a3179e8c0fc1e7115bf91fd42443db1 Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:07:45 +0100 Subject: [PATCH 1/3] [Advanced Logbook] Added distance filter --- application/controllers/Logbookadvanced.php | 4 +++- application/models/Logbookadvanced_model.php | 14 ++++++++++++++ application/views/logbookadvanced/index.php | 10 +++++++--- assets/js/sections/logbookadvanced.js | 1 + assets/js/sections/logbookadvanced_map.js | 3 ++- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 238010819..f2d0e6d95 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -153,7 +153,8 @@ class Logbookadvanced extends CI_Controller { 'qsoids' => xss_clean($this->input->post('qsoids')), 'dok' => xss_clean($this->input->post('dok')), 'qrzSent' => xss_clean($this->input->post('qrzSent')), - 'qrzReceived' => xss_clean($this->input->post('qrzReceived')) + 'qrzReceived' => xss_clean($this->input->post('qrzReceived')), + 'distance' => xss_clean($this->input->post('distance')), ); } @@ -378,6 +379,7 @@ class Logbookadvanced extends CI_Controller { 'dok' => '*', 'qrzSent' => '', 'qrzReceived' => '', + 'distance' => '', 'ids' => json_decode(xss_clean($this->input->post('ids'))), 'qsoids' => xss_clean($this->input->post('qsoids')) ); diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 0fd5d38c8..acc2358e3 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -409,6 +409,20 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "(coalesce(COL_GRIDSQUARE, '') = '' and coalesce(COL_VUCC_GRIDS, '') = '')"; } + + if ($searchCriteria['distance'] !== '*' && $searchCriteria['distance'] !== '') { + if (strtolower($searchCriteria['distance']) == '!empty') { + $conditions[] = "COL_DISTANCE <> ''"; + } else { + $conditions[] = "COL_DISTANCE >= ?"; + $binding[] = $searchCriteria['distance']; + } + } + + if ($searchCriteria['distance'] == '') { + $conditions[] = "coalesce(COL_DISTANCE, '') = ''"; + } + if (($searchCriteria['propmode'] ?? '') == 'None') { $conditions[] = "(trim(COL_PROP_MODE) = '' OR COL_PROP_MODE is null)"; } elseif ($searchCriteria['propmode'] !== '') { diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index e43386d15..9e5ddde6b 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -256,7 +256,7 @@ $options = json_decode($options);
-
+
datetime->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> @@ -449,11 +449,15 @@ $options = json_decode($options);
-
+
-
comment->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> +
comment->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-2 col-xl-3"> "> +
+
distance->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-2 col-xl-3"> + + ">
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index c0f37506b..c2a679313 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -657,6 +657,7 @@ $(document).ready(function () { dok: this.dok.value, qrzSent: this.qrzSent.value, qrzReceived: this.qrzReceived.value, + distance: this.distance.value, }, dataType: 'json', success: function (data) { diff --git a/assets/js/sections/logbookadvanced_map.js b/assets/js/sections/logbookadvanced_map.js index 89dd1f448..7f48662d3 100644 --- a/assets/js/sections/logbookadvanced_map.js +++ b/assets/js/sections/logbookadvanced_map.js @@ -548,7 +548,8 @@ function getFormData(form) { comment: form.comment.value, dok: form.dok.value, qrzSent: form.qrzSent.value, - qrzReceived: form.qrzReceived.value + qrzReceived: form.qrzReceived.value, + distance: form.distance.value, }; } From 18a6a5b94355480b949dbbeba5c01e4b13777b3c Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 17 Nov 2025 14:26:32 +0100 Subject: [PATCH 2/3] Fixed distance filter and layout --- application/controllers/Logbookadvanced.php | 4 +++- application/views/logbookadvanced/index.php | 8 ++++---- assets/js/sections/logbookadvanced.js | 2 +- assets/js/sections/logbookadvanced_map.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index f2d0e6d95..9da7a1231 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -379,7 +379,9 @@ class Logbookadvanced extends CI_Controller { 'dok' => '*', 'qrzSent' => '', 'qrzReceived' => '', - 'distance' => '', + 'distance' => '*', + 'qrzSent' => '', + 'qrzReceived' => '', 'ids' => json_decode(xss_clean($this->input->post('ids'))), 'qsoids' => xss_clean($this->input->post('qsoids')) ); diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 9e5ddde6b..746fe1ecf 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -451,13 +451,13 @@ $options = json_decode($options);
-
comment->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-2 col-xl-3"> +
comment->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> ">
-
distance->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-2 col-xl-3"> - - "> +
distance->show ?? "true") == "false") { echo 'style="display:none"'; } ?> class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl"> + + ">
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index c2a679313..4e9a69c8f 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -657,7 +657,7 @@ $(document).ready(function () { dok: this.dok.value, qrzSent: this.qrzSent.value, qrzReceived: this.qrzReceived.value, - distance: this.distance.value, + distance: this.distanceinput.value, }, dataType: 'json', success: function (data) { diff --git a/assets/js/sections/logbookadvanced_map.js b/assets/js/sections/logbookadvanced_map.js index 7f48662d3..314e04622 100644 --- a/assets/js/sections/logbookadvanced_map.js +++ b/assets/js/sections/logbookadvanced_map.js @@ -549,7 +549,7 @@ function getFormData(form) { dok: form.dok.value, qrzSent: form.qrzSent.value, qrzReceived: form.qrzReceived.value, - distance: form.distance.value, + distance: form.distanceinput.value, }; } From ade2914a287dfa70824ddd46712ecfb00dbebbbb Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 17 Nov 2025 15:06:54 +0100 Subject: [PATCH 3/3] Fix tooltip in dropdown --- assets/css/general.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/css/general.css b/assets/css/general.css index 0066ed66c..40e945d31 100644 --- a/assets/css/general.css +++ b/assets/css/general.css @@ -1402,3 +1402,9 @@ svg text.month { fill: #AAA; } .legendClose { float: right; } + + +/* Ensure tooltip appears above everything */ +.tooltip { + z-index: 9999 !important; +} \ No newline at end of file