diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index a60f155cd..8dfd721cc 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -526,6 +526,7 @@ class Logbookadvanced extends CI_Controller { $json_string['sig']['show'] = $this->input->post('sig'); $json_string['wwff']['show'] = $this->input->post('wwff'); $json_string['continent']['show'] = $this->input->post('continent'); + $json_string['qrz']['show'] = $this->input->post('qrz'); $obj['column_settings']= json_encode($json_string); diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 5816f433b..30fba0bca 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -51,7 +51,8 @@ \"dok\":{\"show\":\"true\"}, \"wwff\":{\"show\":\"true\"}, \"sig\":{\"show\":\"true\"}, - \"continent\":{\"show\":\"true\"} + \"continent\":{\"show\":\"true\"}, + \"qrz\":{\"show\":\"true\"} }"; } $current_opts = json_decode($options); @@ -108,6 +109,10 @@ echo "\nvar o_template = { continent: {show: 'true'}};"; echo "\nuser_options={...user_options, ...o_template};"; } + if (!isset($current_opts->qrz)) { + echo "\nvar o_template = { qrz: {show: 'true'}};"; + echo "\nuser_options={...user_options, ...o_template};"; + } foreach ($mapoptions as $mo) { @@ -602,6 +607,9 @@ $options = json_decode($options); } ?> session->userdata('user_lotw_name') != "" && ($options->lotw->show ?? "true") == "true") { echo 'LoTW'; + } ?> + qrz->show ?? "true") == "true") { + echo '' . __("QRZ") . ''; } ?> qslmsg->show ?? "true") == "true") { echo '' . __("QSL Msg") . ''; diff --git a/application/views/logbookadvanced/useroptions.php b/application/views/logbookadvanced/useroptions.php index 9aa821a7a..ff3e6e0d2 100644 --- a/application/views/logbookadvanced/useroptions.php +++ b/application/views/logbookadvanced/useroptions.php @@ -142,6 +142,10 @@
continent->show ?? "true") == "true") { echo 'checked'; } ?>>
+ + +
qrz->show ?? "true") == "true") { echo 'checked'; } ?>>
+ diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 12c616a9c..b7700f7f6 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -73,6 +73,9 @@ function updateRow(qso) { if ($(".lotwconfirmation")[0] && user_options.lotw.show == "true"){ cells.eq(c++).html(qso.lotw); } + if (user_options.qrz.show == "true"){ + cells.eq(c++).html(qso.qrz); + } if (user_options.qslmsg.show == "true"){ cells.eq(c++).text(qso.qslMessage); } @@ -221,6 +224,9 @@ function loadQSOTable(rows) { if ($(".lotwconfirmation")[0] && user_options.lotw.show == "true"){ data.push(qso.lotw); } + if (user_options.qrz.show == "true"){ + data.push(qso.qrz); + } if (user_options.qslmsg.show == "true"){ data.push(qso.qslMessage); } @@ -1137,6 +1143,7 @@ function saveOptions() { wwff: $('input[name="wwff"]').is(':checked') ? true : false, sig: $('input[name="sig"]').is(':checked') ? true : false, continent: $('input[name="continent"]').is(':checked') ? true : false, + qrz: $('input[name="qrz"]').is(':checked') ? true : false, gridsquare_layer: $('input[name="gridsquareoverlay"]').is(':checked') ? true : false, path_lines: $('input[name="pathlines"]').is(':checked') ? true : false, cqzone_layer: $('input[name="cqzones"]').is(':checked') ? true : false, diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index 02cae70ad..7dfc6786d 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -64,6 +64,7 @@ class QSO private string $lotw; private string $eqsl; private string $clublog; + private string $qrz; /** Lotw callsign info **/ private string $callsign; private string $lastupload; @@ -200,6 +201,7 @@ class QSO $this->lotw = $this->getLotwString($data, $custom_date_format); $this->eqsl = $this->getEqslString($data, $custom_date_format); $this->clublog = $this->getClublogString($data, $custom_date_format); + $this->qrz = $this->getQrzString($data, $custom_date_format); $this->cqzone = ($data['COL_CQZ'] === null) ? '' : $this->geCqLink($data['COL_CQZ']); $this->ituzone = $data['COL_ITUZ'] ?? ''; @@ -451,6 +453,56 @@ class QSO return $clublogstring; } + /** + * @return string + */ + function getQrzString($data, $custom_date_format): string { + $CI =& get_instance(); + + $qrzstring = ''; + + $qrzstring .= ''; + + return $qrzstring; + } + + function getEqslString($data, $custom_date_format): string { $CI =& get_instance(); @@ -819,6 +871,14 @@ class QSO return $this->clublog; } + /** + * @return string + */ + public function getqrz(): string + { + return $this->qrz; + } + /** * @return string */ @@ -882,6 +942,7 @@ class QSO 'lotw' => $this->getlotw(), 'eqsl' => $this->geteqsl(), 'clublog' => $this->getclublog(), + 'qrz' => $this->getqrz(), 'qslMessage' => $this->getQSLMsg(), 'name' => $this->getName(), 'dxcc' => $this->getDXCC(),