diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 238010819..9da7a1231 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,9 @@ class Logbookadvanced extends CI_Controller { 'dok' => '*', 'qrzSent' => '', 'qrzReceived' => '', + 'distance' => '*', + 'qrzSent' => '', + 'qrzReceived' => '', '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..746fe1ecf 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -256,7 +256,7 @@ $options = json_decode($options);