From 9d73c30f916e8c56a55c8240b9178a79f3945bf6 Mon Sep 17 00:00:00 2001 From: Andreas <6977712+AndreasK79@users.noreply.github.com> Date: Wed, 5 Jul 2023 09:29:13 +0200 Subject: [PATCH] [Advanced Logbook] Added Quickfilter search. Mark one line and click filter button --- application/controllers/Logbookadvanced.php | 1 + application/models/Logbookadvanced_model.php | 5 ++ application/views/logbookadvanced/index.php | 57 +++++++++++++----- assets/js/sections/logbookadvanced.js | 63 ++++++++++++++++++++ src/QSLManager/QSO.php | 4 +- 5 files changed, 112 insertions(+), 18 deletions(-) diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 736fc077..1bb0432c 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -104,6 +104,7 @@ class Logbookadvanced extends CI_Controller { 'propmode' => xss_clean($this->input->post('propmode')), 'gridsquare' => xss_clean($this->input->post('gridsquare')), 'state' => xss_clean($this->input->post('state')), + 'cqzone' => xss_clean($this->input->post('cqzone')), 'qsoresults' => xss_clean($this->input->post('qsoresults')), 'sats' => xss_clean($this->input->post('sats')), 'lotwSent' => xss_clean($this->input->post('lotwSent')), diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index cc361181..8fb7f61d 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -89,6 +89,11 @@ class Logbookadvanced_model extends CI_Model { $binding[] = $searchCriteria['state']; } + if ($searchCriteria['cqzone'] !== '') { + $conditions[] = "COL_CQZ = ?"; + $binding[] = $searchCriteria['cqzone']; + } + if ($searchCriteria['gridsquare'] !== '') { $conditions[] = "(COL_GRIDSQUARE like ? or COL_VUCC_GRIDS like ?)"; $binding[] = '%' . $searchCriteria['gridsquare'] . '%'; diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 671ba95c..894e2483 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -144,6 +144,18 @@ +