diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index b099ab13..617b8bbc 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -454,4 +454,4 @@ class Logbookadvanced extends CI_Controller { $this->load->model('user_options_model'); $this->user_options_model->set_option('LogbookAdvanced', 'LogbookAdvanced', $obj); } -} \ No newline at end of file +} diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 8e83bb8b..32c63c6c 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -13,30 +13,25 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = "date(COL_TIME_ON) >= ?"; $binding[] = $from; } - if ($searchCriteria['dateTo'] !== '') { $to = DateTime::createFromFormat('d/m/Y', $searchCriteria['dateTo']); $to = $to->format('Y-m-d'); $conditions[] = "date(COL_TIME_ON) <= ?"; $binding[] = $to; } - if ($searchCriteria['de'] !== '') { $conditions[] = "COL_STATION_CALLSIGN = ?"; $binding[] = trim($searchCriteria['de']); } - if ($searchCriteria['dx'] !== '') { $conditions[] = "COL_CALL LIKE ?"; $binding[] = '%' . trim($searchCriteria['dx']) . '%'; } - if ($searchCriteria['mode'] !== '') { $conditions[] = "(COL_MODE = ? or COL_SUBMODE = ?)"; $binding[] = $searchCriteria['mode']; $binding[] = $searchCriteria['mode']; } - if ($searchCriteria['band'] !== '') { if($searchCriteria['band'] != "SAT") { $conditions[] = "COL_BAND = ? and COL_PROP_MODE != 'SAT'"; @@ -49,7 +44,6 @@ class Logbookadvanced_model extends CI_Model { } } } - if ($searchCriteria['qslSent'] !== '') { $condition = "COL_QSL_SENT = ?"; if ($searchCriteria['qslSent'] == 'N') { @@ -59,7 +53,6 @@ class Logbookadvanced_model extends CI_Model { $conditions[] = $condition; $binding[] = $searchCriteria['qslSent']; } - if ($searchCriteria['qslReceived'] !== '') { $condition = "COL_QSL_RCVD = ?"; if ($searchCriteria['qslReceived'] == 'N') { @@ -448,4 +441,4 @@ class Logbookadvanced_model extends CI_Model { return $this->db->get()->result(); } -} \ No newline at end of file +} diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index c9749e99..7020de76 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -464,4 +464,4 @@ $options = json_decode($options); - \ No newline at end of file +