diff --git a/application/controllers/Satellite.php b/application/controllers/Satellite.php index 5156b36aa..df0dbd17b 100644 --- a/application/controllers/Satellite.php +++ b/application/controllers/Satellite.php @@ -20,20 +20,6 @@ class Satellite extends CI_Controller { $this->load->model('logbook_model'); $satellites = $this->satellite_model->get_all_satellites(); - $qsonum = $this->logbook_model->get_sat_qso_count(); - foreach ($satellites as $sat) { - if (array_key_exists($sat->satname, $qsonum)) { - if ($sat->satname != '') { - $sat->qsocount = $qsonum[$sat->satname]; - } - } elseif (array_key_exists($sat->displayname, $qsonum)) { - if ($sat->displayname != '') { - $sat->qsocount = $qsonum[$sat->displayname]; - } - } else { - $sat->qsocount = ''; - } - } $pageData['satellites'] = $satellites; if($this->session->userdata('user_date_format')) { diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index f9f074e84..03fa7111d 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -6592,18 +6592,6 @@ class Logbook_model extends CI_Model { return; } - function get_sat_qso_count() { - $sats = array(); - $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); - $location_list = "'" . implode("','", $logbooks_locations_array) . "'"; - $sql = "SELECT COL_SAT_NAME, COUNT(COL_CALL) AS qsocount FROM ".$this->config->item('table_name')." WHERE station_id IN (".$location_list.") AND COL_PROP_MODE = 'SAT' AND COL_SAT_NAME != '' GROUP BY COL_SAT_NAME ORDER BY COL_SAT_NAME ASC;"; - foreach ($this->db->query($sql)->result() as $row) { - $sats[$row->COL_SAT_NAME] = $row->qsocount; - } - return $sats; - } -} - function validateADIFDate($date, $format = 'Ymd') { try { $d = DateTime::createFromFormat($format, $date);