diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index d26e056f2..e3053070d 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2084,7 +2084,7 @@ class Logbook_model extends CI_Model { function get_qso($id, $trusted = false) { if ($trusted || ($this->check_qso_is_accessible($id))) { - $this->db->select($this->config->item('table_name') . '.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end, eQSL_images.image_file as eqsl_image_file, lotw_users.callsign as lotwuser, lotw_users.lastupload, primary_subdivisions.subdivision, satellite.displayname AS sat_displayname'); + $this->db->select($this->config->item('table_name') . '.*, station_profile.*, dxcc_entities.*, coalesce(dxcc_entities_2.name, "- NONE -") as station_country, dxcc_entities_2.end as station_end, eQSL_images.image_file as eqsl_image_file, lotw_users.callsign as lotwuser, lotw_users.lastupload, primary_subdivisions.subdivision, satellite.displayname AS sat_displayname, contest.name AS contestname'); $this->db->from($this->config->item('table_name')); $this->db->join('dxcc_entities', $this->config->item('table_name') . '.col_dxcc = dxcc_entities.adif', 'left'); $this->db->join('station_profile', 'station_profile.station_id = ' . $this->config->item('table_name') . '.station_id', 'left'); @@ -2093,6 +2093,7 @@ class Logbook_model extends CI_Model { $this->db->join('lotw_users', $this->config->item('table_name') . '.COL_CALL = lotw_users.callsign', 'left outer'); $this->db->join('primary_subdivisions', $this->config->item('table_name') . '.COL_DXCC = primary_subdivisions.adif AND ' . $this->config->item('table_name') . '.COL_STATE = primary_subdivisions.state', 'left outer'); $this->db->join('satellite', $this->config->item('table_name') . '.COL_SAT_NAME = satellite.name', 'left outer'); + $this->db->join('contest', $this->config->item('table_name') . '.COL_CONTEST_ID = contest.adifname', 'left outer'); $this->db->where('COL_PRIMARY_KEY', $id); $this->db->limit(1); diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 54274152a..e6b5ff2f7 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -370,10 +370,10 @@ - COL_CONTEST_ID != null) { ?> + contestname != null) { ?> - COL_CONTEST_ID; ?> + contestname; ?>