Merge branch 'dev' into geojson_map_plots

This commit is contained in:
Andreas Kristiansen
2025-12-23 16:31:17 +01:00
committed by GitHub
39 changed files with 9225 additions and 8188 deletions

View File

@@ -68,7 +68,7 @@ function check_missing_dxcc($result) { ?>
}
function check_missing_cq_zones($result) { ?>
<h5></h5><?= __("CQ Zone Check Results") ?></h5>
<h5><?= __("CQ Zone Check Results") ?></h5>
<?= __("QSOs to update found:"); ?> <?php echo $result[0]->count; ?>
<?php if ($result[0]->count > 0) { ?>
<br/>

View File

@@ -0,0 +1,49 @@
<div class="card">
<div class="card-header">
<h5 class="card-title mb-0">
<i class="fas fa-search me-2"></i><?= __("Search for duplicates using:"); ?>
</h5>
</div>
<div class="card-body">
<form method="post">
<div class="row g-3">
<div class="col-md-6">
<div class="form-check form-check-lg border rounded p-3 bg-light h-100">
<input class="form-check-input" type="checkbox" name="date_check" id="date_check" checked>
<label class="form-check-label fw-semibold" for="date_check">
<i class="fas fa-calendar-alt me-2 text-primary"></i><?= __("Date"); ?>
</label>
<small class="d-block text-muted"><?= __("Match QSOs within 1800s (30min) of each other"); ?></small>
</div>
</div>
<div class="col-md-6">
<div class="form-check form-check-lg border rounded p-3 bg-light h-100">
<input class="form-check-input" type="checkbox" name="mode_check" id="mode_check" checked>
<label class="form-check-label fw-semibold" for="mode_check">
<i class="fas fa-broadcast-tower me-2 text-success"></i><?= __("Mode"); ?>
</label>
<small class="d-block text-muted"><?= __("Match QSOs with the same mode (SSB, CW, FM, etc.)"); ?></small>
</div>
</div>
<div class="col-md-6">
<div class="form-check form-check-lg border rounded p-3 bg-light h-100">
<input class="form-check-input" type="checkbox" name="band_check" id="band_check" checked>
<label class="form-check-label fw-semibold" for="band_check">
<i class="fas fa-wave-square me-2 text-warning"></i><?= __("Band"); ?>
</label>
<small class="d-block text-muted"><?= __("Match QSOs on the same band"); ?></small>
</div>
</div>
<div class="col-md-6">
<div class="form-check form-check-lg border rounded p-3 bg-light h-100">
<input class="form-check-input" type="checkbox" name="satellite_check" id="satellite_check">
<label class="form-check-label fw-semibold" for="satellite_check">
<i class="fas fa-satellite me-2 text-info"></i><?= __("Satellite"); ?>
</label>
<small class="d-block text-muted"><?= __("Match QSOs using the same satellite"); ?></small>
</div>
</div>
</div>
</form>
</div>
</div>

View File

@@ -71,6 +71,9 @@
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 lang_gen_advanced_logbook_dupe_search = '<?= __("Duplicate Search"); ?>';
let lang_gen_advanced_logbook_search = '<?= __("Search"); ?>';
let homegrid ='<?php echo strtoupper($homegrid[0]); ?>';
<?php
@@ -262,6 +265,10 @@ $options = json_decode($options);
<form id="searchForm" name="searchForm" action="<?php echo base_url() . "index.php/logbookadvanced/search"; ?>" method="post">
<input type="hidden" id="dupes" name="dupes" value="">
<input type="hidden" id="invalid" name="invalid" value="">
<input type="hidden" id="dupedate" name="dupedate" value="">
<input type="hidden" id="dupemode" name="dupemode" value="">
<input type="hidden" id="dupeband" name="dupeband" value="">
<input type="hidden" id="dupesat" name="dupesat" value="">
<div class="row pt-2">
<div class="d-flex flex-wrap btn-group w-auto mx-auto">