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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Weblate
2025-12-23 14:57:20 +00:00
parent b98044c65f 88d5282513
commit 819b4b59f7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/models/Logbookadvanced_model.php
View File

@@ -1259,7 +1259,7 @@ class Logbookadvanced_model extends CI_Model {
if ($ids == null) {
$sql = "UPDATE ".$this->config->item('table_name')." JOIN dxcc_entities ON ". $this->config->item('table_name').".col_dxcc = dxcc_entities.adif JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" .
" SET " . $this->config->item('table_name').".COL_CQZ = dxcc_entities.cqz" .
" WHERE station_profile.user_id = ? and (" . $this->config->item('table_name').".COL_CQZ IS NULL OR " . $this->config->item('table_name').".COL_CQZ = '')";
" WHERE station_profile.user_id = ? and " . $this->config->item('table_name') . ".COL_CQZ IS NULL";
$query = $this->db->query($sql, array($this->session->userdata('user_id')));
return $this->db->affected_rows();
@@ -1277,7 +1277,7 @@ class Logbookadvanced_model extends CI_Model {
if ($ids == null) {
$sql = "UPDATE ".$this->config->item('table_name')." JOIN dxcc_entities ON ". $this->config->item('table_name').".col_dxcc = dxcc_entities.adif JOIN station_profile ON ". $this->config->item('table_name').".station_id = station_profile.station_id" .
" SET " . $this->config->item('table_name').".COL_ITUZ = dxcc_entities.ituz" .
" WHERE station_profile.user_id = ? and (" . $this->config->item ('table_name').".COL_ITUZ IS NULL OR " . $this->config->item('table_name').".COL_ITUZ = '')";
" WHERE station_profile.user_id = ? and " . $this->config->item('table_name') . ".COL_ITUZ IS NULL";
$query = $this->db->query($sql, array($this->session->userdata('user_id')));
return $this->db->affected_rows();
}
@@ -1556,7 +1556,7 @@ class Logbookadvanced_model extends CI_Model {
$sql = "select count(*) as count from " . $this->config->item('table_name') . "
join station_profile on " . $this->config->item('table_name') . ".station_id = station_profile.station_id
join dxcc_entities on " . $this->config->item('table_name') . ".col_dxcc = dxcc_entities.adif
where user_id = ? and coalesce(col_cqz, '') = ''";
where user_id = ? and col_cqz is NULL";
$bindings[] = [$this->session->userdata('user_id')];
@@ -1568,7 +1568,7 @@ class Logbookadvanced_model extends CI_Model {
$sql = "select count(*) as count from " . $this->config->item('table_name') . "
join station_profile on " . $this->config->item('table_name') . ".station_id = station_profile.station_id
join dxcc_entities on " . $this->config->item('table_name') . ".col_dxcc = dxcc_entities.adif
where user_id = ? and coalesce(col_ituz, '') = ''";
where user_id = ? and col_ituz is NULL";
$bindings[] = [$this->session->userdata('user_id')];

2
application/views/logbookadvanced/checkresult.php
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/>