From 1f9604e3c387eba65c5c70664e1e08a66dea9911 Mon Sep 17 00:00:00 2001 From: phl0 Date: Sun, 28 Dec 2025 22:49:45 +0100 Subject: [PATCH] Show info about source callbook --- application/controllers/Logbook.php | 1 + application/libraries/Hamqth.php | 7 ++++--- application/libraries/Qrz.php | 2 +- application/libraries/Qrzcq.php | 2 +- application/libraries/Qrzru.php | 1 + application/views/search/result.php | 5 +++++ assets/js/sections/qso.js | 15 +++++++++++++-- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 136411911..63a9931d0 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -222,6 +222,7 @@ class Logbook extends CI_Controller { $return['latlng'] = $this->qralatlng($return['callsign_qra']); $return['bearing'] = $this->bearing($return['callsign_qra'], $measurement_base, $station_id); } + $return['callbook_source'] = $callbook['source']; echo json_encode($return, JSON_PRETTY_PRINT); diff --git a/application/libraries/Hamqth.php b/application/libraries/Hamqth.php index 3aa372b93..44ac17e35 100644 --- a/application/libraries/Hamqth.php +++ b/application/libraries/Hamqth.php @@ -125,8 +125,9 @@ class Hamqth { $data['us_county'] = ''; } - } finally { - return $data; - } + } finally { + $data['source'] = 'HamQTH'; + return $data; + } } } diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php index a5c237dcc..6c536a603 100644 --- a/application/libraries/Qrz.php +++ b/application/libraries/Qrz.php @@ -186,7 +186,7 @@ class Qrz { $data['cqzone'] = ''; } } finally { - + $data['source'] = 'QRZ'; return $data; } } diff --git a/application/libraries/Qrzcq.php b/application/libraries/Qrzcq.php index de1968b73..70e549b38 100644 --- a/application/libraries/Qrzcq.php +++ b/application/libraries/Qrzcq.php @@ -144,7 +144,7 @@ class Qrzcq { } } finally { - + $data['source'] = 'QRZCQ'; return $data; } } diff --git a/application/libraries/Qrzru.php b/application/libraries/Qrzru.php index 92cd9c3ab..c8427cf6f 100644 --- a/application/libraries/Qrzru.php +++ b/application/libraries/Qrzru.php @@ -115,6 +115,7 @@ class Qrzru { $data['cqz'] = ''; } } finally { + $data['source'] = 'QRZ.ru'; return $data; } } diff --git a/application/views/search/result.php b/application/views/search/result.php index c6c5e8e17..cb6c066ee 100644 --- a/application/views/search/result.php +++ b/application/views/search/result.php @@ -61,6 +61,11 @@ + + + + + diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js index b106660d8..e799adac1 100644 --- a/assets/js/sections/qso.js +++ b/assets/js/sections/qso.js @@ -1692,6 +1692,11 @@ $("#callsign").on("focusout", function () { } profileInfo += '

'; } + // Email information + if (result.callsign_email) { + profileInfo += '

' + result.callsign_email + '

'; + } + // Born (with age calculation) if (result.profile_born) { let currentYear = new Date().getFullYear(); @@ -1756,7 +1761,7 @@ $("#callsign").on("focusout", function () { } // QSL information - let qslInfo = '' + lang_qso_profile_qsl + ': '; + let qslInfo = '' + lang_qso_profile_qsl + ': '; let qslMethodsIcons = []; // Build QSL methods icons list @@ -1783,7 +1788,13 @@ $("#callsign").on("focusout", function () { qslInfo += qslMethodsIcons.join(', '); } - profileInfo += '

' + qslInfo + '

'; $('#callsign-image-info').html(profileInfo); + profileInfo += '

' + qslInfo + '

'; + + // Email information + if (result.callbook_source) { + profileInfo += '

'+result.callbook_source+'

'; + } + $('#callsign-image-info').html(profileInfo); // Show the panel first so we can measure it $('#callsign-image').attr('style', 'display: true;');