Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2714 from AndreasK79/dbtools_dxcc_fix

Browse Source 
Dbtools dxcc fix
This commit is contained in:
Andreas Kristiansen
2025-12-26 08:32:48 +01:00
committed by GitHub
parent b91d9d5fa4 8e1be2710e
commit 17e36258a5
5 changed files with 279 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
application/views/logbookadvanced/checkresult.php
View File

@@ -1,4 +1,14 @@
<?php
// Get Date format
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
$custom_date_format = $this->session->userdata('user_date_format');
} else {
// Get Default date format from /config/wavelog.php
$custom_date_format = $this->config->item('qso_date_format');
}
switch ($type) {
case 'checkdistance':
check_missing_distance($result);
@@ -6,7 +16,7 @@ switch ($type) {
case 'checkcontinent':
check_qsos_missing_continent($result);
break;
case 'checkdxcc':
case 'checkmissingdxcc':
check_missing_dxcc($result);
break;
case 'checkcqzones':
@@ -18,6 +28,9 @@ switch ($type) {
case 'checkgrids':
check_missing_grids($result);
break;
case 'checkdxcc':
check_dxcc($result, $custom_date_format);
break;
default:
// Invalid type
break;
@@ -97,3 +110,47 @@ function check_missing_grids($result) { ?>
<?= __("Update now") ?><div class="ld ld-ring ld-spin"></div>
</button>
<?php }
function check_dxcc($result, $custom_date_format) { ?>
<h5><?= __("DXCC Check Results") ?></h5>
<?php
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) { ?>
<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>
<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>
</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 }
}

15
application/views/logbookadvanced/dbtoolsdialog.php
View File

@@ -1,6 +1,6 @@
<div class="container">
<div class="container-fluid">
<div class="row">
<div class="col-md-6">
<div class="col-md-5">
<h5><?= __("Data Repair Tools") ?>
<a href="https://github.com/wavelog/wavelog/wiki/Advanced-Logbook#database-tools-dbtools" target="_blank" rel="noopener noreferrer" class="btn btn-sm btn-info me-1 ld-ext-right">
<?= __("Wiki Help") ?></a>
@@ -80,17 +80,16 @@
<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-primary me-1 ld-ext-right" id="updateDxccBtn" onclick="fixMissingDxcc(true)">
<?= __("Run") ?><div class="ld ld-ring ld-spin"></div>
<button type="button" class="btn btn-sm btn-success me-1 ld-ext-right" id="checkDxccBtn" onclick="checkDxcc()">
<?= __("Check") ?><div class="ld ld-ring ld-spin"></div>
</button>
</div>
</div>
<?php if ($this->config->item('callbook_batch_lookup') ?? true): ?>
<?php if (($this->config->item('callbook_batch_lookup') ?? true) && $this->config->item('callbook')): ?>
<div class="list-group-item d-flex justify-content-between align-items-center">
<div>
<h6 class="mb-1"><?= __("Lookup QSOs with missing grid in callbook") ?></h6>
@@ -107,7 +106,7 @@
</div>
</div>
<div class="col-md-6 result"></div>
<div class="col-md-7 result"></div>
</div>