From 42e63e1a1680ab0723a99423088859ec80461cf5 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Thu, 25 Dec 2025 18:20:05 +0100
Subject: [PATCH] Update works

---
 application/controllers/Logbookadvanced.php   | 13 ++++
 application/models/Logbookadvanced_model.php  | 31 +++++++-
 .../views/logbookadvanced/checkresult.php     | 58 ++++++++-------
 .../views/logbookadvanced/dbtoolsdialog.php   |  3 +-
 assets/js/sections/logbookadvanced.js         | 72 +++++++++++++++++++
 5 files changed, 149 insertions(+), 28 deletions(-)

diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php
index e19768668..0cd00b110 100644
--- a/application/controllers/Logbookadvanced.php
+++ b/application/controllers/Logbookadvanced.php
@@ -992,4 +992,17 @@ class Logbookadvanced extends CI_Controller {
 		$this->load->view('logbookadvanced/dupesearchdialog');
 	}
 
+	function fixDxccSelected() {
+		if(!clubaccess_check(9)) return;
+
+		$ids = xss_clean($this->input->post('ids'));
+
+		$this->load->model('logbookadvanced_model');
+		$result = $this->logbookadvanced_model->fixDxccSelected($ids);
+		$result['message'] = '<div class="alert alert-' . ($result['count'] == 0 ? 'danger' : 'success') . '" role="alert">' . sprintf(__("DXCC updated for %d QSO(s)."), $result['count']) . '</div>';
+
+		header("Content-Type: application/json");
+		print json_encode($result);
+	}
+
 }
diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index aacc09b23..a2a05b5d5 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -1905,7 +1905,6 @@ class Logbookadvanced_model extends CI_Model {
 		foreach ($callarray->result() as $call) {
 
             $i++;
-            //$dxcc = $this->logbook_model->dxcc_lookup($call->col_call, $call->date);
 			$dxcc = $dxccobj->dxcc_lookup($call->col_call, $call->date);
 
             $dxcc['adif'] = (isset($dxcc['adif'])) ? $dxcc['adif'] : 0;
@@ -1951,4 +1950,34 @@ class Logbookadvanced_model extends CI_Model {
 
 		return $query;
 	}
+
+	function fixDxccSelected($ids) {
+		$sql = "select COL_PRIMARY_KEY, COL_CALL, COL_TIME_ON, COL_TIME_OFF, station_profile.station_profile_name 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 = ? and " . $this->config->item('table_name') . ".col_primary_key in ?";
+
+		$r = $this->db->query($sql, array($this->session->userdata('user_id'), json_decode($ids, true)));
+
+		$count = 0;
+		$dxccobj = new Dxcc(null);
+
+		if ($r->num_rows() > 0) { //query dxcc_prefixes
+			$sql = "update " . $this->config->item('table_name') . " set COL_COUNTRY = ?, COL_DXCC = ? where COL_PRIMARY_KEY = ?";
+			$q = $this->db->conn_id->prepare($sql);
+			foreach ($r->result_array() as $row) {
+				$qso_date = $row['COL_TIME_OFF'] == '' ? $row['COL_TIME_ON'] : $row['COL_TIME_OFF'];
+				$qso_date = date("Y-m-d", strtotime($qso_date));
+				$dxcc = $dxccobj->dxcc_lookup($row['COL_CALL'], $qso_date);
+				$dxcc['adif'] = (isset($dxcc['adif'])) ? $dxcc['adif'] : 0;
+				$dxcc['entity'] = (isset($dxcc['entity'])) ? $dxcc['entity'] : 'None';
+				if ($dxcc['adif'] != 'Not Found') {
+					$q->execute(array(addslashes(ucwords(strtolower($dxcc['entity']), "- (/")), $dxcc['adif'], $row['COL_PRIMARY_KEY']));
+					$count++;
+				}
+			}
+		}
+
+		$result['count'] = $count;
+		return $result;
+	}
 }
diff --git a/application/views/logbookadvanced/checkresult.php b/application/views/logbookadvanced/checkresult.php
index 8cfca38a4..a7ce37d6b 100644
--- a/application/views/logbookadvanced/checkresult.php
+++ b/application/views/logbookadvanced/checkresult.php
@@ -114,35 +114,43 @@ function check_missing_grids($result) { ?>
 function check_dxcc($result, $custom_date_format) { ?>
 	<h5><?= __("DXCC Check Results") ?></h5>
 	<?php
-		echo "<p>" . __("Callsigns tested: ") .  $result['calls_tested'] . "</p>";
-		echo "<p>" . __("Execution time: ") . round($result['execution_time'], 2) . "s</p>";
-		echo "<p>" . __("Number of potential QSOs with wrong DXCC: ") . count($result['result']) . "</p>";
+		echo __("Callsigns tested: ") .  $result['calls_tested'] . ". <br />";
+		echo __("Execution time: ") . round($result['execution_time'], 2) . "s. <br />";
+		echo __("Number of potential QSOs with wrong DXCC: ") . count($result['result']);
 
 		if ($result) { ?>
-		<div class="table-responsive" style="max-height:70vh; overflow:auto;">
-			<table class="table table-sm table-striped table-bordered table-condensed mb-0">
-				<thead>
-					<tr>
-						<th><?= __("Callsign"); ?></th>
-						<th><?= __("QSO Date"); ?></th>
-						<th><?= __("Station Profile"); ?></th>
-						<th><?= __("Existing DXCC"); ?></th>
-						<th><?= __("Result DXCC"); ?></th>
-					</tr>
-				</thead>
-				<tbody>
-					<?php foreach ($result['result'] as $qso): ?>
+		<br />
+		<button type="button" class="mt-2 mb-2 btn btn-sm btn-primary ld-ext-right" id="fixSelectedDxccBtn" onclick="fixDxccSelected(true)">
+			<?= __("Update selected") ?><div class="ld ld-ring ld-spin"></div>
+		</button>
+		<div class="dxcctablediv"></div>
+
+			<div class="table-responsive" style="max-height:60vh; overflow:auto;">
+				<table class="table table-sm table-striped table-bordered table-condensed" id="dxccCheckTable">
+					<thead>
 						<tr>
-							<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 $qso['station_profile']; ?></td>
-							<td><?php echo htmlspecialchars(ucwords(strtolower($qso['existing_dxcc']), "- (/"), ENT_QUOTES, 'UTF-8'); ?></td>
-							<td><?php echo htmlspecialchars(ucwords(strtolower($qso['result_country']), "- (/"), ENT_QUOTES, 'UTF-8'); ?></td>
+							<th><div class="form-check"><input class="form-check-input mt-2" type="checkbox" id="checkBoxAllDxcc" /></div></th>
+							<th><?= __("Callsign"); ?></th>
+							<th><?= __("QSO Date"); ?></th>
+							<th><?= __("Station Profile"); ?></th>
+							<th><?= __("Existing DXCC"); ?></th>
+							<th><?= __("Result DXCC"); ?></th>
 						</tr>
-					<?php endforeach; ?>
-				</tbody>
-			</table>
-		</div>
+					</thead>
+					<tbody>
+						<?php foreach ($result['result'] as $qso): ?>
+								<tr id="qsoID-<?php echo $qso['id']; ?>">
+									<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 $qso['station_profile']; ?></td>
+									<td><?php echo htmlspecialchars(ucwords(strtolower($qso['existing_dxcc']), "- (/"), ENT_QUOTES, 'UTF-8'); ?></td>
+									<td><?php echo htmlspecialchars(ucwords(strtolower($qso['result_country']), "- (/"), ENT_QUOTES, 'UTF-8'); ?></td>
+								</tr>
+						<?php endforeach; ?>
+					</tbody>
+				</table>
+			</div>
 
 		<?php }
 }
diff --git a/application/views/logbookadvanced/dbtoolsdialog.php b/application/views/logbookadvanced/dbtoolsdialog.php
index 32c4f998f..6ce0a6695 100644
--- a/application/views/logbookadvanced/dbtoolsdialog.php
+++ b/application/views/logbookadvanced/dbtoolsdialog.php
@@ -80,9 +80,8 @@
 
 				<div class="list-group-item d-flex justify-content-between align-items-center">
                     <div>
-                        <h6 class="mb-1"><?= __("Re-check DXCC for all QSOs in the logbook") ?></h6>
+                        <h6 class="mb-1"><?= __("Check all QSOs in the logbook for incorrect DXCC") ?></h6>
                         <p class="mb-1 small text-muted"><?= __("Use Wavelog to determine DXCC for all QSOs.") ?></p>
-						<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-success me-1 ld-ext-right" id="checkDxccBtn" onclick="checkDxcc()">
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index bf4d3ee8b..01fee69f6 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -2529,6 +2529,7 @@ function saveOptions() {
 				$('#checkDxccBtn').prop("disabled", false).removeClass("running");
 				$('#closeButton').prop("disabled", false);
 				$('.result').html(response);
+				rebind_checkbox_trigger_dxcc();
 			},
 			error: function(xhr, status, error) {
 				$('#checkDxccBtn').prop('disabled', false).text('<?= __("Check") ?>');
@@ -2547,3 +2548,74 @@ function saveOptions() {
 			}
 		});
 	}
+
+	function rebind_checkbox_trigger_dxcc() {
+		$('#checkBoxAllDxcc').change(function (event) {
+			if (this.checked) {
+				$('#dxccCheckTable tbody tr').each(function (i) {
+					selectQsoIDDxcc($(this).first().closest('tr').attr('id')?.replace(/\D/g, ''));
+				});
+			} else {
+				$('#dxccCheckTable tbody tr').each(function (i) {
+					unselectQsoIDDxcc($(this).first().closest('tr').attr('id')?.replace(/\D/g, ''));
+				});
+			}
+		});
+	}
+
+	function selectQsoIDDxcc(qsoID) {
+		var element = $("#qsoID-" + qsoID);
+		element.find("input[type=checkbox]").prop("checked", true);
+		element.addClass('activeRow');
+	}
+
+	function unselectQsoIDDxcc(qsoID) {
+		var element = $("#qsoID-" + qsoID);
+		element.find("input[type=checkbox]").prop("checked", false);
+		element.removeClass('activeRow');
+		$('#checkBoxAllDxcc').prop("checked", false);
+	}
+
+	function fixDxccSelected() {
+		let id_list = [];
+		$('#dxccCheckTable tbody input:checked').each(function () {
+			let id = $(this).closest('tr').attr('id')?.replace(/\D/g, '');
+			id_list.push(id);
+		});
+
+		if (id_list.length === 0) {
+			BootstrapDialog.alert({
+				title: lang_gen_advanced_logbook_info,
+				message: lang_gen_advanced_logbook_select_at_least_one_row,
+				type: BootstrapDialog.TYPE_INFO,
+				closable: false,
+				draggable: false,
+				callback: function (result) {
+				}
+			});
+			return;
+		}
+
+		$('#fixSelectedDxccBtn').prop("disabled", true).addClass("running");
+		$('#closeButton').prop("disabled", true);
+
+		$.ajax({
+			url: base_url + 'index.php/logbookadvanced/fixDxccSelected',
+			type: 'post',
+			data: {'ids': JSON.stringify(id_list, null, 2)},
+			success: function(data) {
+				$('#fixSelectedDxccBtn').prop("disabled", false).removeClass("running");
+				$('#closeButton').prop("disabled", false);
+				id_list.forEach(function(id) {
+					let row = $("#dxccCheckTable tbody tr#qsoID-" + id);
+					row.remove();
+				});
+				$('.dxcctablediv').html(data.message);
+			},
+			error: function(xhr, status, error) {
+				$('#fixSelectedDxccBtn').prop("disabled", false).removeClass("running");
+				$('#closeButton').prop("disabled", false);
+				$('.result').html(error);
+			}
+		});
+	}