From 53728a851d899749c43cfc5d6c912f13d7ab7fad Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Sun, 16 Jun 2019 17:49:39 +0100 Subject: [PATCH] Populate QSL Manager from QRZ in the QSL Via field on the QSO Page --- application/controllers/Logbook.php | 2 ++ application/libraries/Qrz.php | 1 + application/views/interface_assets/footer.php | 6 ++++++ application/views/qso/index.php | 4 ++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index 2e75ccc0..fe46f901 100755 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -126,10 +126,12 @@ class Logbook extends CI_Controller { if (isset($callbook)) { + $return['callsign_name'] = $callbook['name']; $return['callsign_qra'] = $callbook['gridsquare']; $return['callsign_qth'] = $callbook['city']; $return['callsign_iota'] = $callbook['iota']; + $return['qsl_manager'] = $callbook['qslmgr']; if ($return['callsign_qra'] != "") { $return['latlng'] = $this->qralatlng($return['callsign_qra']); } diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php index 952253de..d301ffc3 100755 --- a/application/libraries/Qrz.php +++ b/application/libraries/Qrz.php @@ -79,6 +79,7 @@ class Qrz { $data['lat'] = (string) $xml->Callsign->lat; $data['long'] = (string) $xml->Callsign->lon; $data['iota'] = (string) $xml->Callsign->iota; + $data['qslmgr'] = (string) $xml->Callsign->qslmgr; return $data; } diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 70c003a9..f55aaa7d 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -248,6 +248,7 @@ $(document).ready(function(){ } markers.addLayer(marker).addTo(mymap); + /* Find Locator if the field is empty */ if($('#locator').val() == "") { @@ -277,6 +278,11 @@ $(document).ready(function(){ } /* Find Operators Name */ + if($('#qsl_via').val() == "") { + $('#qsl_via').val(result.qsl_manager); + } + + /* Find Operators Name */ if($('#name').val() == "") { $('#name').val(result.callsign_name); } diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 9b611b1a..14513446 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -255,9 +255,9 @@
- +
- +