diff --git a/application/controllers/Statistics.php b/application/controllers/Statistics.php index 746be0461..698bfdd0e 100644 --- a/application/controllers/Statistics.php +++ b/application/controllers/Statistics.php @@ -309,10 +309,10 @@ class Statistics extends CI_Controller { } public function initials() { - $this->load->model('modes'); + $this->load->model('stats'); $this->load->model('bands'); - $data['modes'] = $this->modes->active(); + $data['modes'] = $this->stats->get_eme_modes(); $data['worked_bands'] = $this->bands->get_worked_bands_eme(); diff --git a/application/models/Stats.php b/application/models/Stats.php index 04ea57f79..3797400f4 100644 --- a/application/models/Stats.php +++ b/application/models/Stats.php @@ -951,6 +951,29 @@ return $result->result(); } + function get_eme_modes() { + + $modes = array(); + + $this->db->select('distinct col_mode, coalesce(col_submode, "") col_submode', FALSE); + $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); + $this->db->where('station_profile.user_id', $this->session->userdata('user_id')); + $this->db->where($this->config->item('table_name').'.col_prop_mode', 'EME'); + $this->db->order_by('col_mode, col_submode', 'ASC'); + + $query = $this->db->get($this->config->item('table_name')); + + foreach($query->result() as $mode){ + if ($mode->col_submode == null || $mode->col_submode == "") { + array_push($modes, $mode->col_mode); + } else { + array_push($modes, $mode->col_submode); + } + } + + return $modes; + } + } ?> diff --git a/application/views/statistics/initials.php b/application/views/statistics/initials.php index f540a76d5..5e47be5a6 100644 --- a/application/views/statistics/initials.php +++ b/application/views/statistics/initials.php @@ -9,9 +9,7 @@