diff --git a/application/models/Adif_data.php b/application/models/Adif_data.php index b6c40c2c..dc34ef1d 100644 --- a/application/models/Adif_data.php +++ b/application/models/Adif_data.php @@ -5,9 +5,11 @@ class adif_data extends CI_Model { function export_all() { $this->load->model('stations'); $active_station_id = $this->stations->find_active(); + $this->db->select($this->config->item('table_name').'.*, station_profile.*, dxcc_entities.name as station_country'); $this->db->where($this->config->item('table_name').'.station_id', $active_station_id); $this->db->order_by("COL_TIME_ON", "ASC"); $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); + $this->db->join('dxcc_entities', 'station_profile.station_dxcc = dxcc_entities.adif'); $query = $this->db->get($this->config->item('table_name')); return $query;