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

Limit callbook grid fixer to 150 per run, and add batch update

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-12-21 08:41:48 +01:00
parent 09bbaf1898
commit bf8b8b7100
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
application/models/Logbookadvanced_model.php
View File

@@ -1776,29 +1776,41 @@ class Logbookadvanced_model extends CI_Model {
$result = $this->getMissingGridQsos();
$count = 0;
$batch_updates = [];
$this->db->trans_start();
if (count($result) > 0) {
if (!$this->load->is_loaded('callbook')) {
$this->load->library('callbook');
}
foreach ($result as $row) {
$callsign = $row->col_call;
if (!$this->load->is_loaded('callbook')) {
$this->load->library('callbook');
}
$callbook = $this->callbook->getCallbookData($callsign);
if (isset($callbook)) {
if (isset($callbook['error'])) {
log_message('error', "Error: " . $callbook['error']);
} else {
if ($callbook['gridsquare'] != '') {
$sql = "update " . $this->config->item('table_name') . " set COL_GRIDSQUARE = ? where COL_PRIMARY_KEY = ?";
$this->db->query($sql, array($callbook['gridsquare'], $row->col_primary_key));
$count++;
if (isset($callbook['gridsquare']) && $callbook['gridsquare'] != '') {
// Prepare data for batch update
$batch_updates[] = [
'COL_PRIMARY_KEY' => $row->col_primary_key,
'COL_GRIDSQUARE' => $callbook['gridsquare']
];
}
}
}
}
// Perform batch update if there are any updates
if (!empty($batch_updates)) {
$this->db->update_batch($this->config->item('table_name'), $batch_updates, 'COL_PRIMARY_KEY');
$count = count($batch_updates);
}
}
$this->db->trans_complete();
return $count;
@@ -1810,7 +1822,7 @@ class Logbookadvanced_model extends CI_Model {
WHERE station_profile.user_id = ?
AND (qsos.COL_GRIDSQUARE IS NULL OR qsos.COL_GRIDSQUARE = '')
AND (qsos.COL_VUCC_GRIDS IS NULL OR qsos.COL_VUCC_GRIDS = '')
ORDER BY COL_TIME_ON DESC limit 250";
ORDER BY COL_TIME_ON DESC limit 150";
$query = $this->db->query($sql, [$this->session->userdata('user_id')]);

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

@@ -95,7 +95,7 @@
<div>
<h6 class="mb-1"><?= __("Lookup QSOs with missing grid in callbook") ?></h6>
<p class="mb-1 small text-muted"><?= __("Use callbook lookup to set gridsquare") ?></p>
<p class="mb-1 small alert-danger"><?= __("This is limited to 250 callsigns for each run!") ?></p>
<p class="mb-1 small alert-danger"><?= __("This is limited to 150 callsigns for each run!") ?></p>
</div>
<div class="d-flex nowrap">
<button type="button" class="btn btn-sm btn-success me-1 ld-ext-right" id="checkGridsBtn" onclick="checkGrids()">