From f522c4cbd305f70a9f8024a9ad35a1e40116b504 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 31 Dec 2025 13:04:48 +0100
Subject: [PATCH 1/6] [Advanced Logbook] DBTools tweaking

---
 application/models/Logbookadvanced_model.php     |  2 +-
 .../views/logbookadvanced/dbtoolsdialog.php      | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index ecb0a3eed..93051dbea 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -2042,7 +2042,7 @@ class Logbookadvanced_model extends CI_Model {
             $dxcc['adif'] = (isset($dxcc['adif'])) ? $dxcc['adif'] : 0;
             $dxcc['entity'] = (isset($dxcc['entity'])) ? $dxcc['entity'] : 'None';
 
-            if ($call->col_dxcc != $dxcc['adif']) {
+            if (($call->col_dxcc ?? 'Unset') != $dxcc['adif']) {
                 $result[] = array(
                                 'callsign'          => $call->col_call,
 								'qso_date'          => $call->date,
diff --git a/application/views/logbookadvanced/dbtoolsdialog.php b/application/views/logbookadvanced/dbtoolsdialog.php
index b4990e92d..62412d1ce 100644
--- a/application/views/logbookadvanced/dbtoolsdialog.php
+++ b/application/views/logbookadvanced/dbtoolsdialog.php
@@ -40,7 +40,6 @@
                         </button>
                     </div>
                 </div>
-
                 <div class="list-group-item d-flex justify-content-between align-items-center">
                     <div>
                         <h6 class="mb-1"><?= __("Fix Continent") ?></h6>
@@ -52,7 +51,6 @@
                         </button>
                     </div>
                 </div>
-
                 <div class="list-group-item d-flex justify-content-between align-items-center">
                     <div>
                         <h6 class="mb-1"><?= __("Fix State") ?></h6>
@@ -64,7 +62,6 @@
                         </button>
                     </div>
                 </div>
-
                 <div class="list-group-item d-flex justify-content-between align-items-center">
                     <div>
                         <h6 class="mb-1"><?= __("Update Distances") ?></h6>
@@ -76,19 +73,6 @@
                         </button>
                     </div>
                 </div>
-
-				<div class="list-group-item d-flex justify-content-between align-items-center">
-                    <div>
-                        <h6 class="mb-1"><?= __("Check QSOs missing DXCC data") ?></h6>
-                        <p class="mb-1 small text-muted"><?= __("Identify QSOs that are missing DXCC information") ?></p>
-                    </div>
-                    <div class="d-flex nowrap">
-                        <button type="button" class="btn btn-sm btn-success me-1 ld-ext-right" id="checkMissingDxccsBtn" onclick="checkMissingDxcc()">
-                            <?= __("Check") ?><div class="ld ld-ring ld-spin"></div>
-                        </button>
-                    </div>
-                </div>
-
 				<div class="list-group-item d-flex justify-content-between align-items-center">
                     <div>
                         <h6 class="mb-1"><?= __("Check all QSOs in the logbook for incorrect DXCC") ?></h6>

From 2b8ea00db4b5c4333f353043d2d8ee37d3eac18b Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 31 Dec 2025 13:20:24 +0100
Subject: [PATCH 2/6] Remove correctly from dxcc table since it's datatable

---
 assets/js/sections/logbookadvanced.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index b7876832c..4693514bf 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -2761,6 +2761,8 @@ function saveOptions() {
 			return;
 		}
 
+		let table = $('#dxccCheckTable').DataTable();
+
 		$('#fixSelectedDxccBtn').prop("disabled", true).addClass("running");
 		$('#closeButton').prop("disabled", true);
 
@@ -2773,7 +2775,8 @@ function saveOptions() {
 				$('#closeButton').prop("disabled", false);
 				id_list.forEach(function(id) {
 					let row = $("#dxccCheckTable tbody tr#qsoID-" + id);
-					row.remove();
+					table.row(row).remove();
+					table.draw(false);
 				});
 				$('.dxcctablediv').html(data.message);
 			},

From 10a54c9656730377634007e4518e51ee0e5ac768 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 31 Dec 2025 13:41:58 +0100
Subject: [PATCH 3/6] Update only for single zone qsos

---
 .../views/logbookadvanced/checkresult.php      | 13 ++++++++++---
 assets/js/sections/logbookadvanced.js          | 18 +++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/application/views/logbookadvanced/checkresult.php b/application/views/logbookadvanced/checkresult.php
index 890501263..e4d9f8bb3 100644
--- a/application/views/logbookadvanced/checkresult.php
+++ b/application/views/logbookadvanced/checkresult.php
@@ -260,7 +260,14 @@ function check_incorrect_cq_zones($result, $custom_date_format) { ?>
 	<h5><?= __("CQ Zone Check Results") ?></h5>
 	<?php if ($result) {
 		echo __("The following QSOs were found to have a different CQ zone compared to what this DXCC normally has (a maximum of 5000 QSOs are shown):"); ?>
-		<br />
+		<br /><br />
+		<div class="col-md-12">
+			<div class="form-check form-check-lg border rounded p-3 bg-light h-100">
+				<input class="form-check-input me-2" type="checkbox" id="forceMultiZoneUpdate" />
+				<?= __("Force update even if DXCC covers multiple CQ zones") ?>
+				<div class="d-block mb-1 alert-danger"><?= __("The update function can only set the main CQ zone which is assigned to the DXCC. If the DXCC covers multiple CQ zones there is a chance that this is not correct. So by default only QSOs with DXCCs covering a single CQ zone are updated. This checkbox overrides this but might result in wrong data. Use with caution!"); ?></div>
+			</div>
+		</div>
 		<button type="button" class="mt-2 mb-2 btn btn-sm btn-primary ld-ext-right" id="fixSelectedCqZoneBtn" onclick="fixCqZoneSelected(true)">
 			<?= __("Update selected") ?><div class="ld ld-ring ld-spin"></div>
 		</button>
@@ -294,7 +301,7 @@ function check_incorrect_cq_zones($result, $custom_date_format) { ?>
 			echo '<td style=\'text-align: center\'>'; if($qso->COL_SAT_NAME != null) { echo $qso->COL_SAT_NAME; } else { echo strtolower($qso->COL_BAND); }; echo '</td>';
 			echo '<td style=\'text-align: center\'>'; echo strlen($qso->COL_GRIDSQUARE ?? '')==0?$qso->COL_VUCC_GRIDS:$qso->COL_GRIDSQUARE; echo '</td>';
 			echo '<td style=\'text-align: center\'>' . $qso->COL_CQZ . '</td>';
-			echo '<td style=\'text-align: center\'>' . $qso->correctcqzone . '</td>';
+			echo '<td id=\'cqZones\' style=\'text-align: center\'>' . $qso->correctcqzone . '</td>';
 			echo '<td style=\'text-align: center\'>' . ucwords(strtolower($qso->COL_COUNTRY), "- (/") . '</td>';
 			echo '<td style=\'text-align: center\'>' . $qso->station_profile_name . '</td>';
 			echo '</tr>';
@@ -334,7 +341,7 @@ function check_incorrect_itu_zones($result, $custom_date_format) { ?>
 			<div class="form-check form-check-lg border rounded p-3 bg-light h-100">
 				<input class="form-check-input me-2" type="checkbox" id="forceMultiZoneUpdate" />
 				<?= __("Force update even if DXCC covers multiple ITU zones") ?>
-				<div class="d-block mb-1 alert-danger"><?= __("The update function can only set the main ITU zone which is assigned to the DXCC. If the DXCC covers multiple ITU zones there is a chance that this is not correct. So by default only QSOs with DXCCs covering a single ITU zone are updated. This checkbox overrides this but might result in wrong data. USe with caution!"); ?></div>
+				<div class="d-block mb-1 alert-danger"><?= __("The update function can only set the main ITU zone which is assigned to the DXCC. If the DXCC covers multiple ITU zones there is a chance that this is not correct. So by default only QSOs with DXCCs covering a single ITU zone are updated. This checkbox overrides this but might result in wrong data. Use with caution!"); ?></div>
 			</div>
 		</div>
 		<button type="button" class="mt-2 mb-2 btn btn-sm btn-primary ld-ext-right" id="fixSelectedItuZoneBtn" onclick="fixItuZoneSelected(true)">
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index 4693514bf..cd7f2c125 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -2711,12 +2711,18 @@ function saveOptions() {
 		$('#checkBoxAllCqZones').change(function (event) {
 			if (this.checked) {
 				$('#incorrectcqzonetable tbody tr').each(function (i) {
-					selectQsoIdDxcc($(this).first().closest('tr').attr('id')?.replace(/\D/g, ''), 'incorrectcqzonetable');
+					if (!$(this).first().closest('tr').find("td[id='cqZones']").text().includes(',') || $('#forceMultiZoneUpdate').prop("checked")) {
+						selectQsoIdDxcc($(this).first().closest('tr').attr('id')?.replace(/\D/g, ''), 'incorrectcqzonetable');
+					}
 				});
+				if (!$('#forceMultiZoneUpdate').prop("checked")) {
+					$('#incorrectcqzonetable').DataTable().column(8).search('^[^,]*$', true, false).draw();
+				}
 			} else {
 				$('#incorrectcqzonetable tbody tr').each(function (i) {
 					unselectQsoIdDxcc($(this).first().closest('tr').attr('id')?.replace(/\D/g, ''), 'incorrectcqzonetable');
 				});
+				$('#incorrectcqzonetable').DataTable().column(8).search('').draw();
 			}
 		});
 	}
@@ -2865,7 +2871,10 @@ function saveOptions() {
 		let id_list = [];
 		$('#incorrectcqzonetable tbody input:checked').each(function () {
 			let id = $(this).closest('tr').attr('id')?.replace(/\D/g, '');
-			id_list.push(id);
+			// Skip entry if DXCC covers multiple CQ zones as the matching one cannot be identified automagically atm or force update
+			if (!$(this).closest('tr').find("td[id='cqZones']").text().includes(',') || $('#forceMultiZoneUpdate').prop("checked")) {
+				id_list.push(id);
+			}
 		});
 
 		if (id_list.length === 0) {
@@ -2881,6 +2890,8 @@ function saveOptions() {
 			return;
 		}
 
+		let table = $('#incorrectcqzonetable').DataTable();
+
 		$('#fixSelectedCqZoneBtn').prop("disabled", true).addClass("running");
 		$('#closeButton').prop("disabled", true);
 
@@ -2893,7 +2904,8 @@ function saveOptions() {
 				$('#closeButton').prop("disabled", false);
 				id_list.forEach(function(id) {
 					let row = $("#incorrectcqzonetable tbody tr#qsoID-" + id);
-					row.remove();
+					table.row(row).remove();
+					table.draw(false);
 				});
 				$('.dxcctablediv').html(data.message);
 			},

From 4d71392261d328a6276d5792479efc4e3bc1cdd5 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 31 Dec 2025 14:20:50 +0100
Subject: [PATCH 4/6] On change listener on force

---
 application/views/logbookadvanced/checkresult.php | 6 +++---
 assets/js/sections/logbookadvanced.js             | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/application/views/logbookadvanced/checkresult.php b/application/views/logbookadvanced/checkresult.php
index e4d9f8bb3..4241b51e4 100644
--- a/application/views/logbookadvanced/checkresult.php
+++ b/application/views/logbookadvanced/checkresult.php
@@ -263,7 +263,7 @@ function check_incorrect_cq_zones($result, $custom_date_format) { ?>
 		<br /><br />
 		<div class="col-md-12">
 			<div class="form-check form-check-lg border rounded p-3 bg-light h-100">
-				<input class="form-check-input me-2" type="checkbox" id="forceMultiZoneUpdate" />
+				<input class="form-check-input me-2" type="checkbox" id="forceMultiZoneUpdateCq" />
 				<?= __("Force update even if DXCC covers multiple CQ zones") ?>
 				<div class="d-block mb-1 alert-danger"><?= __("The update function can only set the main CQ zone which is assigned to the DXCC. If the DXCC covers multiple CQ zones there is a chance that this is not correct. So by default only QSOs with DXCCs covering a single CQ zone are updated. This checkbox overrides this but might result in wrong data. Use with caution!"); ?></div>
 			</div>
@@ -281,7 +281,7 @@ function check_incorrect_cq_zones($result, $custom_date_format) { ?>
 				<th style=\'text-align: center\'>' . __("Mode") . '</th>
 				<th style=\'text-align: center\'>' . __("Band") . '</th>
 				<th style=\'text-align: center\'>' . __("Gridsquare") . '</th>
-				<th style=\'text-align: center\'>' . __("CQ Zone") . '</th>
+				<th style=\'text-align: center\' class="select-filter" scope="col">' . __("CQ Zone") . '</th>
 				<th style=\'text-align: center\'>' . __("DXCC CQ Zone") . '</th>
 				<th style=\'text-align: center\' class="select-filter" scope="col">' . __("DXCC") . '</th>
 				<th style=\'text-align: center\' class="select-filter" scope="col">' . __("Station") . '</th>
@@ -357,7 +357,7 @@ function check_incorrect_itu_zones($result, $custom_date_format) { ?>
 				<th style=\'text-align: center\'>' . __("Mode") . '</th>
 				<th style=\'text-align: center\'>' . __("Band") . '</th>
 				<th style=\'text-align: center\'>' . __("Gridsquare") . '</th>
-				<th style=\'text-align: center\'>' . __("ITU Zone") . '</th>
+				<th style=\'text-align: center\' class="select-filter" scope="col">' . __("ITU Zone") . '</th>
 				<th style=\'text-align: center\'>' . __("DXCC ITU Zone") . '</th>
 				<th style=\'text-align: center\' class="select-filter" scope="col">' . __("DXCC") . '</th>
 				<th style=\'text-align: center\' class="select-filter" scope="col">' . __("Station") . '</th>
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index cd7f2c125..d0ce657a4 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -2611,6 +2611,14 @@ function saveOptions() {
 									});
 							});
 						rebind_checkbox_trigger_cq_zone();
+
+						$('#forceMultiZoneUpdateCq').on('change', function() {
+							if ($(this).is(':checked')) {
+								$('#incorrectcqzonetable').DataTable().column(8).search('').draw();
+								$('#incorrectcqzonetable tbody input[type="checkbox"]').prop('checked', false);
+								$('#incorrectcqzonetable tbody tr.activeRow').removeClass('activeRow');
+							}
+						});
 					},
 				});
 			},

From e40324cbce8fd7c9b001f7406241310cb756e225 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 31 Dec 2025 14:27:05 +0100
Subject: [PATCH 5/6] Fix checkbox logic for cq zones

---
 assets/js/sections/logbookadvanced.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index d0ce657a4..667a7419b 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -2613,11 +2613,10 @@ function saveOptions() {
 						rebind_checkbox_trigger_cq_zone();
 
 						$('#forceMultiZoneUpdateCq').on('change', function() {
-							if ($(this).is(':checked')) {
-								$('#incorrectcqzonetable').DataTable().column(8).search('').draw();
-								$('#incorrectcqzonetable tbody input[type="checkbox"]').prop('checked', false);
-								$('#incorrectcqzonetable tbody tr.activeRow').removeClass('activeRow');
-							}
+							$('#incorrectcqzonetable').DataTable().column(8).search('').draw();
+							$('#checkBoxAllCqZones').prop('checked', false);
+							$('#incorrectcqzonetable tbody input[type="checkbox"]').prop('checked', false);
+							$('#incorrectcqzonetable tbody tr.activeRow').removeClass('activeRow');
 						});
 					},
 				});
@@ -2719,11 +2718,11 @@ function saveOptions() {
 		$('#checkBoxAllCqZones').change(function (event) {
 			if (this.checked) {
 				$('#incorrectcqzonetable tbody tr').each(function (i) {
-					if (!$(this).first().closest('tr').find("td[id='cqZones']").text().includes(',') || $('#forceMultiZoneUpdate').prop("checked")) {
+					if (!$(this).first().closest('tr').find("td[id='cqZones']").text().includes(',') || $('#forceMultiZoneUpdateCq').prop("checked")) {
 						selectQsoIdDxcc($(this).first().closest('tr').attr('id')?.replace(/\D/g, ''), 'incorrectcqzonetable');
 					}
 				});
-				if (!$('#forceMultiZoneUpdate').prop("checked")) {
+				if (!$('#forceMultiZoneUpdateCq').prop("checked")) {
 					$('#incorrectcqzonetable').DataTable().column(8).search('^[^,]*$', true, false).draw();
 				}
 			} else {

From 590e3724522895608cd56000d062afbf647513c0 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Wed, 31 Dec 2025 14:30:41 +0100
Subject: [PATCH 6/6] Added logic for ITU zone checkbox too

---
 assets/js/sections/logbookadvanced.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index 667a7419b..22c2c3fc4 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -2679,6 +2679,13 @@ function saveOptions() {
 					},
 				});
 
+				$('#forceMultiZoneUpdate').on('change', function() {
+					$('#incorrectituzonetable').DataTable().column(8).search('').draw();
+					$('#checkBoxAllItuZones').prop('checked', false);
+					$('#incorrectituzonetable tbody input[type="checkbox"]').prop('checked', false);
+					$('#incorrectituzonetable tbody tr.activeRow').removeClass('activeRow');
+				});
+
 			},
 			error: function(xhr, status, error) {
 				$('#checkIncorrectItuZonesBtn').prop("disabled", false).removeClass("running");