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

Show sat name

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-10-14 17:48:03 +02:00
parent d50fdce1b0
commit 2253c227a2
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/models/Wpx.php
View File

@@ -341,10 +341,10 @@ class WPX extends CI_Model {
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$bindings = [];
$sql = "select wpx_prefix, col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode,
$sql = "select wpx_prefix, col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode, col_sat_name,
col_lotw_qsl_rcvd, col_qsl_rcvd, col_eqsl_qsl_rcvd, COL_QRZCOM_QSO_DOWNLOAD_STATUS, COL_CLUBLOG_QSO_DOWNLOAD_STATUS
from (
select wpx_prefix, col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode,
select wpx_prefix, col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode, col_sat_name,
col_lotw_qsl_rcvd, col_qsl_rcvd, col_eqsl_qsl_rcvd, COL_QRZCOM_QSO_DOWNLOAD_STATUS, COL_CLUBLOG_QSO_DOWNLOAD_STATUS,
ROW_NUMBER() OVER (
PARTITION BY wpx_prefix
@@ -362,7 +362,7 @@ class WPX extends CI_Model {
/* Then by time */
col_time_on ASC
) as rn from (
SELECT col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode,
SELECT col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode, col_sat_name,
col_lotw_qsl_rcvd, col_qsl_rcvd, col_eqsl_qsl_rcvd, COL_QRZCOM_QSO_DOWNLOAD_STATUS, COL_CLUBLOG_QSO_DOWNLOAD_STATUS,
CASE
/* case 1: /digit suffix → handle multi-digit prefixes correctly */
@@ -409,7 +409,7 @@ class WPX extends CI_Model {
END AS wpx_prefix
FROM (
SELECT
col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode,
col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode, col_sat_name,
col_lotw_qsl_rcvd, col_qsl_rcvd, col_eqsl_qsl_rcvd, COL_QRZCOM_QSO_DOWNLOAD_STATUS, COL_CLUBLOG_QSO_DOWNLOAD_STATUS,
CASE
WHEN num_slashes >= 2 THEN left_part
@@ -423,7 +423,7 @@ class WPX extends CI_Model {
END AS call_core
FROM (
SELECT
col_primary_key, col_call, col_time_on, col_band, col_mode, col_submode, col_lotw_qsl_rcvd, col_qsl_rcvd, col_eqsl_qsl_rcvd, COL_QRZCOM_QSO_DOWNLOAD_STATUS, COL_CLUBLOG_QSO_DOWNLOAD_STATUS,
col_primary_key, col_call, col_sat_name, col_time_on, col_band, col_mode, col_submode, col_lotw_qsl_rcvd, col_qsl_rcvd, col_eqsl_qsl_rcvd, COL_QRZCOM_QSO_DOWNLOAD_STATUS, COL_CLUBLOG_QSO_DOWNLOAD_STATUS,
UPPER(TRIM(col_call)) AS call_raw,
(LENGTH(UPPER(TRIM(col_call))) - LENGTH(REPLACE(UPPER(TRIM(col_call)), '/', ''))) AS num_slashes,
SUBSTRING_INDEX(UPPER(TRIM(col_call)), '/', 1) AS left_part,

15
application/views/awards/wpx/wpx_details.php
View File

@@ -33,7 +33,7 @@ if ($this->session->userdata('user_date_format')) {
<td><?php echo $qso->wpx_prefix; ?></td>
<td><a href="javascript:displayQso(<?php echo $qso->col_primary_key; ?>)"><?php echo $qso->col_call; ?></a></td>
<td><?php echo date($custom_date_format, $qsotimestamp) . ' ' . date('H:i', $qsotimestamp); ?></td>
<td><?php echo $qso->col_band; ?></td>
<td><?php echo getFormattedBand($qso->col_band, $qso->col_sat_name); ?></td>
<td><?php echo (($qso->col_submode ?? '') == '') ? $qso->col_mode : $qso->col_submode; ?></td>
<td><?php echo cf_type($qso->col_qsl_rcvd, $qso->col_lotw_qsl_rcvd, $qso->col_eqsl_qsl_rcvd, $qso->COL_QRZCOM_QSO_DOWNLOAD_STATUS, $qso->COL_CLUBLOG_QSO_DOWNLOAD_STATUS); ?></td>
</tr>
@@ -57,4 +57,17 @@ function cf_type($qsl, $lotw, $eqsl, $qrz, $clublog) {
return '<div class="bg-success awardsBgSuccess">' . $string . '</div>';
}
function getFormattedBand($band, $satelliteName) {
$label = "";
if ($satelliteName !== '') {
$label .= 'SAT';
if ($satelliteName !== '') {
$label .= " " . $satelliteName;
}
} else {
$label .= $band;
}
return trim($label);
}
?>