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 remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Weblate
2026-01-27 15:38:08 +00:00
parent 9bae6fbc32 6b7fa89412
commit 5e30a22bf1
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/models/Logbookadvanced_model.php
View File

@@ -1664,7 +1664,7 @@ class Logbookadvanced_model extends CI_Model {
return ['status' => 'error', 'message' => __("VuccGrids table is empty. Please import the VUCC grids data first.")];
}
$sql = "select col_primary_key, col_time_on, col_call, col_band, col_gridsquare, col_dxcc, col_country, station_profile_name, col_lotw_qsl_rcvd, col_mode, col_submode,
$sql = "select col_primary_key, col_sat_name, col_time_on, col_call, col_band, col_gridsquare, col_dxcc, col_country, station_profile_name, col_lotw_qsl_rcvd, col_mode, col_submode,
(
select group_concat(distinct gridsquare order by gridsquare separator ', ')
from vuccgrids
@@ -1970,6 +1970,7 @@ class Logbookadvanced_model extends CI_Model {
'mode' => isset($call->col_mode) ? $call->col_mode : '',
'submode' => isset($call->col_submode) ? $call->col_submode : '',
'band' => isset($call->col_band) ? $call->col_band : '',
'sat_name' => isset($call->col_sat_name) ? $call->col_sat_name : '',
'lotw_qsl_rcvd' => isset($call->col_lotw_qsl_rcvd) ? $call->col_lotw_qsl_rcvd : '',
'station_profile' => $call->station_profile_name,
'existing_dxcc' => $call->col_country,
@@ -1995,7 +1996,7 @@ class Logbookadvanced_model extends CI_Model {
}
function getQsos() {
$sql = 'select distinct col_country, col_call, col_dxcc, date(col_time_on) date, col_mode, col_submode, col_band, col_lotw_qsl_rcvd, station_profile.station_profile_name, col_primary_key
$sql = 'select distinct col_country, col_sat_name, col_call, col_dxcc, date(col_time_on) date, col_mode, col_submode, col_band, col_lotw_qsl_rcvd, station_profile.station_profile_name, col_primary_key
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 = ?';
@@ -2105,7 +2106,7 @@ class Logbookadvanced_model extends CI_Model {
*
*/
public function checkSingleIota() {
$sql = "select col_primary_key, col_time_on, col_call, col_band, col_gridsquare, col_dxcc, col_country, station_profile_name, col_lotw_qsl_rcvd, col_mode, col_submode, col_iota, iotadxcc.name as correctdxcc
$sql = "select col_primary_key, col_time_on, col_call, col_sat_name, col_band, col_gridsquare, col_dxcc, col_country, station_profile_name, col_lotw_qsl_rcvd, col_mode, col_submode, col_iota, iotadxcc.name as correctdxcc
from " . $this->config->item('table_name') . " thcv
join station_profile on thcv.station_id = station_profile.station_id
join dxcc_entities on dxcc_entities.adif = thcv.COL_DXCC
@@ -2152,7 +2153,7 @@ class Logbookadvanced_model extends CI_Model {
// Build IN clause for SQL
$adifListStr = implode(',', $adifList);
$sql = "SELECT thcv.col_primary_key, thcv.col_time_on, thcv.col_call, thcv.col_band, thcv.col_gridsquare,
$sql = "SELECT thcv.col_primary_key, thcv.col_sat_name, thcv.col_time_on, thcv.col_call, thcv.col_band, thcv.col_gridsquare,
thcv.col_dxcc, thcv.col_country, station_profile.station_profile_name, thcv.col_lotw_qsl_rcvd,
thcv.col_mode, thcv.col_submode, thcv.col_iota,
(

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

@@ -114,7 +114,7 @@ function check_dxcc($result, $custom_date_format) { ?>
<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 htmlspecialchars($qso['band']); ?></td>
<td ><?php if($qso['sat_name'] != '') { echo $qso['sat_name']; } else { echo strtolower($qso['band']); }; ?></td>
<td><?php echo htmlspecialchars($qso['submode'] ? $qso['submode'] : $qso['mode']); ?></td>
<td style='text-align: center'><div class="<?php echo $qso['lotw_qsl_rcvd'] == 'Y' ? 'bg-success' : 'bg-danger'; ?>"><?php echo $qso['lotw_qsl_rcvd'] == 'Y' ? __('Yes') : __('No'); ?></div></td>
<td><?php echo $qso['station_profile']; ?></td>
@@ -173,7 +173,7 @@ function check_incorrect_gridsquares($result, $custom_date_format) { ?>
<tr id="qsoID-<?php echo $qso->col_primary_key; ?>">
<td><?php echo '<a id="edit_qso" href="javascript:displayQso(' . $qso->col_primary_key . ')">' . htmlspecialchars($qso->col_call) . '</a>'; ?></td>
<td><?php echo date($custom_date_format, strtotime($qso->col_time_on)); ?></td>
<td><?php echo htmlspecialchars($qso->col_band); ?></td>
<td ><?php if($qso->col_sat_name != null) { echo $qso->col_sat_name; } else { echo strtolower($qso->col_band); }; ?></td>
<td><?php echo htmlspecialchars($qso->col_submode ? $qso->col_submode : $qso->col_mode); ?></td>
<td style='text-align: center'><div class="<?php echo $qso->col_lotw_qsl_rcvd == 'Y' ? 'bg-success' : 'bg-danger'; ?>"><?php echo $qso->col_lotw_qsl_rcvd == 'Y' ? __('Yes') : __('No'); ?></div></td>
<td><?php echo $qso->station_profile_name; ?></td>
@@ -400,7 +400,7 @@ function check_iota($result, $custom_date_format) { ?>
<tr id="qsoID-<?php echo $qso->col_primary_key; ?>">
<td><?php echo '<a id="edit_qso" href="javascript:displayQso(' . $qso->col_primary_key . ')">' . htmlspecialchars($qso->col_call) . '</a>'; ?></td>
<td><?php echo date($custom_date_format, strtotime($qso->col_time_on)); ?></td>
<td><?php echo htmlspecialchars($qso->col_band); ?></td>
<td ><?php if($qso->col_sat_name != null) { echo $qso->col_sat_name; } else { echo strtolower($qso->col_band); }; ?></td>
<td><?php echo htmlspecialchars($qso->col_submode ? $qso->col_submode : $qso->col_mode); ?></td>
<td style='text-align: center'><div class="<?php echo $qso->col_lotw_qsl_rcvd == 'Y' ? 'bg-success' : 'bg-danger'; ?>"><?php echo $qso->col_lotw_qsl_rcvd == 'Y' ? __('Yes') : __('No'); ?></div></td>
<td><?php echo $qso->station_profile_name; ?></td>
@@ -427,4 +427,4 @@ function check_iota($result, $custom_date_format) { ?>
</div>
<?php }
}
}

1
assets/js/sections/logbookadvanced.js
View File

@@ -1330,6 +1330,7 @@ $(document).ready(function () {
size: BootstrapDialog.SIZE_EXTRAWIDE,
cssClass: 'options',
nl2br: false,
closable: false,
message: html,
buttons: [
{