diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 0eb4a68f3..a55394f34 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -1995,12 +1995,13 @@ class Logbook_model extends CI_Model {
return array();
}
- $this->db->select($this->config->item('table_name') . '.*, station_profile.*, dxcc_entities.*, lotw_users.callsign, lotw_users.lastupload');
+ $this->db->select($this->config->item('table_name') . '.*, station_profile.*, dxcc_entities.*, lotw_users.callsign, lotw_users.lastupload, satellite.displayname AS sat_displayname');
$this->db->from($this->config->item('table_name'));
$this->db->join('station_profile', 'station_profile.station_id = ' . $this->config->item('table_name') . '.station_id');
$this->db->join('dxcc_entities', $this->config->item('table_name') . '.col_dxcc = dxcc_entities.adif', 'left');
$this->db->join('lotw_users', 'lotw_users.callsign = ' . $this->config->item('table_name') . '.col_call', 'left outer');
+ $this->db->join('satellite', 'satellite.name = ' . $this->config->item('table_name') . '.COL_SAT_NAME', 'left outer');
if ($band != '') {
if ($band == 'SAT') {
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 22a24caca..d0219b7a8 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -38,9 +38,9 @@ function echo_table_col($row, $name) {
echo '
' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ' | '; break;
case 'Distance':echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ' | '; break;
case 'Band':
- echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.$row->COL_SAT_NAME.' | '; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' '. strtolower($row->COL_BAND ?? '').''; } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break;
+ echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.($row->sat_displayname != null ? $row->sat_displayname." (".$row->COL_SAT_NAME.")" : $row->COL_SAT_NAME).' | '; } else { if ($row->COL_FREQ ?? ''!= '') { echo ' '. strtolower($row->COL_BAND ?? '').''; } else { echo strtolower($row->COL_BAND ?? ''); } } echo ''; break;
case 'Frequency':
- echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''; if ($row->COL_FREQ != null) { echo ' '.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } echo ' | '; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->qrg_conversion($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break;
+ echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''; if ($row->COL_FREQ != null) { echo ' '.($row->sat_displayname != null ? $row->sat_displayname." (".$row->COL_SAT_NAME.")" : $row->COL_SAT_NAME).''; } else { echo $row->COL_SAT_NAME; } echo ' | '; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->qrg_conversion($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break;
case 'State': echo '' . ($row->COL_STATE ?? '') . ' | '; break;
case 'Operator':echo '' . ($row->COL_OPERATOR ?? '') . ' | '; break;
case 'Location':echo '' . ($row->station_profile_name ?? '') . ' | '; break;