From b72d9c934851b718d5198101346f1f619015b33a Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Thu, 11 Dec 2025 21:11:53 +0100
Subject: [PATCH] Fixed DXCC checking for ALL QSOs

---
 application/controllers/Logbookadvanced.php   |  2 +-
 .../views/logbookadvanced/dbtoolsdialog.php   |  4 +-
 application/views/logbookadvanced/index.php   |  2 +
 assets/js/sections/logbookadvanced.js         | 42 +++++++++++++------
 4 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php
index 88d748a8e..f343a180c 100644
--- a/application/controllers/Logbookadvanced.php
+++ b/application/controllers/Logbookadvanced.php
@@ -945,6 +945,6 @@ class Logbookadvanced extends CI_Controller {
         $result = $this->logbookadvanced_model->check_missing_dxcc_id($all);
 
 		header("Content-Type: application/json");
-		echo json_encode($result);
+		echo json_encode(__("The number of QSOs re-checked for DXCC was") .' ' . $result);
 	}
 }
diff --git a/application/views/logbookadvanced/dbtoolsdialog.php b/application/views/logbookadvanced/dbtoolsdialog.php
index 3de1e644f..109950720 100644
--- a/application/views/logbookadvanced/dbtoolsdialog.php
+++ b/application/views/logbookadvanced/dbtoolsdialog.php
@@ -2,7 +2,7 @@
     <div class="row">
         <div class="col-md-6">
             <h5><?= __("Data Repair Tools") ?>
-								<button type="button" class="btn btn-sm btn-info me-1 ld-ext-right" id="getDbToolsInfoBtn" onclick="getDbToolsInfo()">
+						<button type="button" class="btn btn-sm btn-info me-1 ld-ext-right" id="getDbToolsInfoBtn" onclick="getDbToolsInfo()">
                             <?= __("Info") ?><div class="ld ld-ring ld-spin"></div>
                         </button>
 		</h5>
@@ -86,7 +86,7 @@
 						<p class="mb-1 small alert-danger"><?= __("This will overwrite ALL existing DXCC information!") ?></p>
                     </div>
                     <div class="d-flex nowrap">
-                        <button type="button" class="btn btn-sm btn-primary ld-ext-right" id="updateDistancesBtn" onclick="fixMissingDxcc('All')">
+                        <button type="button" class="btn btn-sm btn-primary ld-ext-right" id="updateDxccBtn" onclick="fixMissingDxcc('All')">
                             <?= __("Run") ?><div class="ld ld-ring ld-spin"></div>
                         </button>
                     </div>
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 51710bd4a..eec6dafe0 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -70,6 +70,8 @@
 	let lang_gen_advanced_logbook_problem_updating_distances = '<?= __("There was a problem updating distances."); ?>';
 	let lang_gen_advanced_logbook_distances_updated = '<?= __("Distances updated successfully!"); ?>';
 
+	let lang_gen_advanced_logbook_confirm_fix_missing_dxcc = '<?= __("Are you sure you want to fix all QSOs with missing DXCC information? This action cannot be undone."); ?>';
+
     let homegrid ='<?php echo strtoupper($homegrid[0]); ?>';
     <?php
     if (!isset($options)) {
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index f83c8c29d..e366fa0d9 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -678,7 +678,7 @@ $(document).ready(function () {
 					callback: function (result) {
 					}
 				});
-				return false;
+			return false;
 		}
 
 		if(container != null){
@@ -2297,17 +2297,35 @@ function saveOptions() {
 	}
 
 	function fixMissingDxcc() {
-		$.ajax({
-			url: base_url + 'index.php/logbookadvanced/fixMissingDxcc',
-			data: {
-				all: 'false'
+		$('#updateDxccBtn').prop("disabled", true).addClass("running");
+		BootstrapDialog.confirm({
+			title: lang_general_word_danger,
+			message: lang_gen_advanced_logbook_confirm_fix_missing_dxcc,
+			type: BootstrapDialog.TYPE_DANGER,
+			closable: true,
+			draggable: true,
+			btnOKClass: 'btn-danger',
+			callback: function(result) {
+				if(result) {
+					$.ajax({
+						url: base_url + 'index.php/logbookadvanced/fixMissingDxcc',
+						type: 'post',
+						data: {
+							all: 'false'
+						},
+						success: function(data) {
+							$('#updateDxccBtn').prop("disabled", false).removeClass("running");
+							$('.result').html(data);
+						},
+						error: function(xhr, status, error) {
+							$('#updateDxccBtn').prop("disabled", false).removeClass("running");
+							$('.result').html(error);
+						}
+					})
+				} else {
+					$('#updateDxccBtn').prop("disabled", false).removeClass("running");
+				}
+
 			},
-			type: 'POST',
-			success: function(response) {
-				alert('dxcc');
-			},
-			error: function(xhr, status, error) {
-				alert('error');
-			}
 		});
 	}