diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 89b6b0e4..fd48b189 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -46,6 +46,7 @@ class Logbookadvanced extends CI_Controller { $pageData['modes'] = $this->logbookadvanced_model->get_modes(); $pageData['dxccarray'] = $this->logbook_model->fetchDxcc(); $pageData['iotaarray'] = $this->logbook_model->fetchIota(); + $pageData['sats'] = $this->bands->get_worked_sats(); $pageData['bands'] = $this->bands->get_worked_bands(); @@ -80,6 +81,7 @@ class Logbookadvanced extends CI_Controller { 'gridsquare' => xss_clean($this->input->post('gridsquare')), 'state' => xss_clean($this->input->post('state')), 'qsoresults' => xss_clean($this->input->post('qsoresults')), + 'sats' => xss_clean($this->input->post('sats')), ); $qsos = []; diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index cd30794d..019fe030 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -41,6 +41,10 @@ class Logbookadvanced_model extends CI_Model { $binding[] = trim($searchCriteria['band']); } else { $conditions[] = "COL_PROP_MODE = 'SAT'"; + if ($searchCriteria['sats'] !== 'All') { + $conditions[] = "COL_SAT_NAME = ?"; + $binding[] = trim($searchCriteria['sats']); + } } } if ($searchCriteria['qslSent'] !== '') { @@ -77,7 +81,7 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "COL_PROP_MODE = ?"; $binding[] = $searchCriteria['propmode']; } - + $where = trim(implode(" AND ", $conditions)); if ($where != "") { $where = "AND $where"; diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index dd82ce9b..7b094c59 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -100,6 +100,15 @@ ?> +