From 46e10768828629fec32e8aaeebfd67d2ed96cb6c Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 27 Jan 2026 11:58:47 +0100
Subject: [PATCH] [DBTools] Fix for sat in band

---
 application/models/Logbookadvanced_model.php      | 9 +++++----
 application/views/logbookadvanced/checkresult.php | 8 ++++----
 assets/js/sections/logbookadvanced.js             | 1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index 6b9984841..5231ffef4 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -1664,7 +1664,7 @@ class Logbookadvanced_model extends CI_Model {
 			return ['status' => 'error', 'message' => __("VuccGrids table is empty. Please import the VUCC grids data first.")];
 		}
 
-		$sql = "select col_primary_key, col_time_on, col_call, col_band, col_gridsquare, col_dxcc, col_country, station_profile_name, col_lotw_qsl_rcvd, col_mode, col_submode,
+		$sql = "select col_primary_key, col_sat_name, col_time_on, col_call, col_band, col_gridsquare, col_dxcc, col_country, station_profile_name, col_lotw_qsl_rcvd, col_mode, col_submode,
 			(
 			select group_concat(distinct gridsquare order by gridsquare separator ', ')
 			from vuccgrids
@@ -1970,6 +1970,7 @@ class Logbookadvanced_model extends CI_Model {
 								'mode'              => isset($call->col_mode) ? $call->col_mode : '',
 								'submode'           => isset($call->col_submode) ? $call->col_submode : '',
 								'band'              => isset($call->col_band) ? $call->col_band : '',
+								'sat_name'          => isset($call->col_sat_name) ? $call->col_sat_name : '',
 								'lotw_qsl_rcvd'     => isset($call->col_lotw_qsl_rcvd) ? $call->col_lotw_qsl_rcvd : '',
 								'station_profile'   => $call->station_profile_name,
                                 'existing_dxcc'     => $call->col_country,
@@ -1995,7 +1996,7 @@ class Logbookadvanced_model extends CI_Model {
 	}
 
 	function getQsos() {
-		$sql = 'select distinct col_country, col_call, col_dxcc, date(col_time_on) date, col_mode, col_submode, col_band, col_lotw_qsl_rcvd, station_profile.station_profile_name, col_primary_key
+		$sql = 'select distinct col_country, col_sat_name, col_call, col_dxcc, date(col_time_on) date, col_mode, col_submode, col_band, col_lotw_qsl_rcvd, station_profile.station_profile_name, col_primary_key
 			from ' . $this->config->item('table_name') . '
 			join station_profile on ' . $this->config->item('table_name') . '.station_id = station_profile.station_id
 			where station_profile.user_id = ?';
@@ -2105,7 +2106,7 @@ class Logbookadvanced_model extends CI_Model {
 	 *
 	 */
 	public function checkSingleIota() {
-		$sql = "select col_primary_key, col_time_on, col_call, col_band, col_gridsquare, col_dxcc, col_country, station_profile_name, col_lotw_qsl_rcvd, col_mode, col_submode, col_iota, iotadxcc.name as correctdxcc
+		$sql = "select col_primary_key, col_time_on, col_call, col_sat_name, col_band, col_gridsquare, col_dxcc, col_country, station_profile_name, col_lotw_qsl_rcvd, col_mode, col_submode, col_iota, iotadxcc.name as correctdxcc
 		from  " . $this->config->item('table_name') . "  thcv
 		join station_profile on thcv.station_id = station_profile.station_id
 		join dxcc_entities on dxcc_entities.adif = thcv.COL_DXCC
@@ -2152,7 +2153,7 @@ class Logbookadvanced_model extends CI_Model {
 			// Build IN clause for SQL
 			$adifListStr = implode(',', $adifList);
 
-			$sql = "SELECT thcv.col_primary_key, thcv.col_time_on, thcv.col_call, thcv.col_band, thcv.col_gridsquare,
+			$sql = "SELECT thcv.col_primary_key, thcv.col_sat_name, thcv.col_time_on, thcv.col_call, thcv.col_band, thcv.col_gridsquare,
 					thcv.col_dxcc, thcv.col_country, station_profile.station_profile_name, thcv.col_lotw_qsl_rcvd,
 					thcv.col_mode, thcv.col_submode, thcv.col_iota,
 					(
diff --git a/application/views/logbookadvanced/checkresult.php b/application/views/logbookadvanced/checkresult.php
index 83ea007e5..5638ff186 100644
--- a/application/views/logbookadvanced/checkresult.php
+++ b/application/views/logbookadvanced/checkresult.php
@@ -114,7 +114,7 @@ function check_dxcc($result, $custom_date_format) { ?>
 									<td><div class="form-check"><input class="row-check form-check-input mt-1" type="checkbox" /></div></td>
 									<td><?php echo '<a id="edit_qso" href="javascript:displayQso(' . $qso['id'] . ')">' . htmlspecialchars($qso['callsign']) . '</a>'; ?></td>
 									<td><?php echo date($custom_date_format, strtotime($qso['qso_date'])); ?></td>
-									<td><?php echo htmlspecialchars($qso['band']); ?></td>
+									<td ><?php if($qso['sat_name'] != '') { echo $qso['sat_name']; } else { echo strtolower($qso['band']); }; ?></td>
 									<td><?php echo htmlspecialchars($qso['submode'] ? $qso['submode'] : $qso['mode']); ?></td>
 									<td style='text-align: center'><div class="<?php echo $qso['lotw_qsl_rcvd'] == 'Y' ? 'bg-success' : 'bg-danger'; ?>"><?php echo $qso['lotw_qsl_rcvd'] == 'Y' ? __('Yes') : __('No'); ?></div></td>
 									<td><?php echo $qso['station_profile']; ?></td>
@@ -173,7 +173,7 @@ function check_incorrect_gridsquares($result, $custom_date_format) { ?>
 								<tr id="qsoID-<?php echo $qso->col_primary_key; ?>">
 									<td><?php echo '<a id="edit_qso" href="javascript:displayQso(' . $qso->col_primary_key . ')">' . htmlspecialchars($qso->col_call) . '</a>'; ?></td>
 									<td><?php echo date($custom_date_format, strtotime($qso->col_time_on)); ?></td>
-									<td><?php echo htmlspecialchars($qso->col_band); ?></td>
+									<td ><?php if($qso->col_sat_name != null) { echo $qso->col_sat_name; } else { echo strtolower($qso->col_band); }; ?></td>
 									<td><?php echo htmlspecialchars($qso->col_submode ? $qso->col_submode : $qso->col_mode); ?></td>
 									<td style='text-align: center'><div class="<?php echo $qso->col_lotw_qsl_rcvd == 'Y' ? 'bg-success' : 'bg-danger'; ?>"><?php echo $qso->col_lotw_qsl_rcvd == 'Y' ? __('Yes') : __('No'); ?></div></td>
 									<td><?php echo $qso->station_profile_name; ?></td>
@@ -400,7 +400,7 @@ function check_iota($result, $custom_date_format) { ?>
 								<tr id="qsoID-<?php echo $qso->col_primary_key; ?>">
 									<td><?php echo '<a id="edit_qso" href="javascript:displayQso(' . $qso->col_primary_key . ')">' . htmlspecialchars($qso->col_call) . '</a>'; ?></td>
 									<td><?php echo date($custom_date_format, strtotime($qso->col_time_on)); ?></td>
-									<td><?php echo htmlspecialchars($qso->col_band); ?></td>
+									<td ><?php if($qso->col_sat_name != null) { echo $qso->col_sat_name; } else { echo strtolower($qso->col_band); }; ?></td>
 									<td><?php echo htmlspecialchars($qso->col_submode ? $qso->col_submode : $qso->col_mode); ?></td>
 									<td style='text-align: center'><div class="<?php echo $qso->col_lotw_qsl_rcvd == 'Y' ? 'bg-success' : 'bg-danger'; ?>"><?php echo $qso->col_lotw_qsl_rcvd == 'Y' ? __('Yes') : __('No'); ?></div></td>
 									<td><?php echo $qso->station_profile_name; ?></td>
@@ -427,4 +427,4 @@ function check_iota($result, $custom_date_format) { ?>
 			</div>
 
 		<?php }
-}
+}
\ No newline at end of file
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index 2948daa53..09fd511d0 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -1330,6 +1330,7 @@ $(document).ready(function () {
 					size: BootstrapDialog.SIZE_EXTRAWIDE,
 					cssClass: 'options',
 					nl2br: false,
+					closable: false,
 					message: html,
 					buttons: [
 					{