From efed6b310ff014eb4e823c57eb7c6442203cfc00 Mon Sep 17 00:00:00 2001 From: phl0 Date: Wed, 21 Jan 2026 17:15:34 +0100 Subject: [PATCH] Hide double SAT names if LoTW name not present in logbook view --- application/models/Logbook_model.php | 2 +- application/views/view_log/partial/log_ajax.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 5f0569c93..f86403146 100644 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2285,7 +2285,7 @@ class Logbook_model extends CI_Model { } $binding = array(); - $sql = "SELECT qsos.*, station_profile.*, dxcc_entities.*, lotw_users.callsign, lotw_users.lastupload, satellite.displayname AS sat_displayname + $sql = "SELECT qsos.*, station_profile.*, dxcc_entities.*, lotw_users.callsign, lotw_users.lastupload, satellite.displayname AS sat_displayname, satellite.name AS sat_name FROM ".$this->config->item('table_name')." qsos JOIN `station_profile` ON `station_profile`.`station_id` = qsos.`station_id` LEFT JOIN `dxcc_entities` ON qsos.`col_dxcc` = `dxcc_entities`.`adif` diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 8a7e37cf2..8d5760a63 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -41,9 +41,9 @@ function echo_table_col($row, $name) { case 'Distance':echo '' . getDistance($row->COL_DISTANCE) . ''; break; case 'Bearing':echo 'COL_VUCC_GRIDS : $row->COL_GRIDSQUARE).'">' . getBearing(($row->COL_VUCC_GRIDS!="" ? $row->COL_VUCC_GRIDS : $row->COL_GRIDSQUARE)) . ''; break; case 'Band': - 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; + echo ''; if($row->COL_SAT_NAME ?? '' != '') { echo ''.($row->sat_name != null ? $row->sat_name." (".$row->sat_displayname.")" : $row->sat_displayname).''; } 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->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 && $row->COL_FREQ != 0) { 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_name != null ? $row->sat_name." (".$row->sat_displayname.")" : $row->sat_displayname).''; } else { echo $row->COL_SAT_NAME; } echo ''; } else { if ($row->COL_FREQ != null && $row->COL_FREQ != 0) { 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;