diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index a97ff85d0..c955f89b2 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -573,6 +573,8 @@ class Logbookadvanced extends CI_Controller { $json_string['profilename']['show'] = $this->input->post('profilename'); $json_string['stationpower']['show'] = $this->input->post('stationpower'); $json_string['distance']['show'] = $this->input->post('distance'); + $json_string['antennaazimuth']['show'] = $this->input->post('antennaazimuth'); + $json_string['antennaelevation']['show'] = $this->input->post('antennaelevation'); $json_string['region']['show'] = $this->input->post('region'); $obj['column_settings']= json_encode($json_string); diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 8608781e5..dd780c95a 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -56,7 +56,9 @@ \"profilename\":{\"show\":\"true\"}, \"stationpower\":{\"show\":\"true\"}, \"distance\":{\"show\":\"true\"}, - \"region\":{\"show\":\"true\"} + \"region\":{\"show\":\"true\"}, + \"antennaazimuth\":{\"show\":\"true\"}, + \"antennaelevation\":{\"show\":\"true\"} }"; } $current_opts = json_decode($options); @@ -133,6 +135,14 @@ echo "\nvar o_template = { region: {show: 'true'}};"; echo "\nuser_options={...user_options, ...o_template};"; } + if (!isset($current_opts->antennaazimuth)) { + echo "\nvar o_template = { antennaazimuth: {show: 'true'}};"; + echo "\nuser_options={...user_options, ...o_template};"; + } + if (!isset($current_opts->antennaelevation)) { + echo "\nvar o_template = { antennaelevation: {show: 'true'}};"; + echo "\nuser_options={...user_options, ...o_template};"; + } foreach ($mapoptions as $mo) { @@ -724,6 +734,12 @@ $options = json_decode($options); } ?> distance->show ?? "true") == "true") { echo '' . __("Distance") . ''; + } ?> + antennaazimuth->show ?? "true") == "true") { + echo '' . __("Ant az") . ''; + } ?> + antennaelevation->show ?? "true") == "true") { + echo '' . __("Ant el") . ''; } ?> profilename->show ?? "true") == "true") { echo '' . __("Profile name") . ''; diff --git a/application/views/logbookadvanced/useroptions.php b/application/views/logbookadvanced/useroptions.php index 60c1bebd2..55577dc5c 100644 --- a/application/views/logbookadvanced/useroptions.php +++ b/application/views/logbookadvanced/useroptions.php @@ -154,6 +154,14 @@
distance->show ?? "true") == "true") { echo 'checked'; } ?>>
+ + +
antennaazimuth->show ?? "true") == "true") { echo 'checked'; } ?>>
+ + + +
antennaelevation->show ?? "true") == "true") { echo 'checked'; } ?>>
+
profilename->show ?? "true") == "true") { echo 'checked'; } ?>>
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 39dc2a072..9b9f71c34 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -133,6 +133,12 @@ function updateRow(qso) { if (user_options.distance.show == "true"){ cells.eq(c++).text(qso.distance); } + if (user_options.antennaazimuth.show == "true"){ + cells.eq(c++).text(qso.antennaazimuth); + } + if (user_options.antennaelevation.show == "true"){ + cells.eq(c++).text(qso.antennaelevation); + } if (user_options.profilename.show == "true"){ cells.eq(c++).text(qso.profilename); } @@ -310,6 +316,12 @@ function loadQSOTable(rows) { if (user_options.distance.show == "true"){ data.push(qso.distance); } + if (user_options.antennaazimuth.show == "true"){ + data.push(qso.antennaazimuth); + } + if (user_options.antennaelevation.show == "true"){ + data.push(qso.antennaelevation); + } if (user_options.profilename.show == "true"){ data.push(qso.profilename); } @@ -1270,6 +1282,8 @@ function saveOptions() { region: $('input[name="region"]').is(':checked') ? true : false, continent: $('input[name="continent"]').is(':checked') ? true : false, distance: $('input[name="distance"]').is(':checked') ? true : false, + antennaazimuth: $('input[name="antennaazimuth"]').is(':checked') ? true : false, + antennaelevation: $('input[name="antennaelevation"]').is(':checked') ? true : false, qrz: $('input[name="qrz"]').is(':checked') ? true : false, profilename: $('input[name="profilename"]').is(':checked') ? true : false, stationpower: $('input[name="stationpower"]').is(':checked') ? true : false, diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php index b59d5f910..a28002591 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -84,6 +84,8 @@ class QSO private string $stationpower; private float $distance; + private string $antennaazimuth; + private string $antennaelevation; private string $measurement_base; @@ -273,6 +275,8 @@ class QSO $this->stationpower = $data['COL_TX_PWR'] ?? ''; $this->distance = (float)$data['COL_DISTANCE'] ?? 0; + $this->antennaazimuth = $data['COL_ANT_AZ'] ?? ''; + $this->antennaelevation = $data['COL_ANT_EL'] ?? ''; if ($CI->session->userdata('user_measurement_base') == NULL) { $measurement_base = $CI->config->item('measurement_base'); @@ -1222,7 +1226,9 @@ class QSO 'profilename' => $this->profilename, 'stationpower' => $this->stationpower, 'distance' => $this->getFormattedDistance(), - 'region' => $this->region + 'region' => $this->region, + 'antennaelevation' => $this->antennaelevation, + 'antennaazimuth' => $this->antennaazimuth ]; }