diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 588b3dc3e..500e26c3f 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -552,7 +552,7 @@ class Logbookadvanced extends CI_Controller { $json_string['wwff']['show'] = $this->input->post('wwff'); $json_string['continent']['show'] = $this->input->post('continent'); $json_string['qrz']['show'] = $this->input->post('qrz'); - $json_string['stationname']['show'] = $this->input->post('stationname'); + $json_string['profilename']['show'] = $this->input->post('profilename'); $obj['column_settings']= json_encode($json_string); diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 79df3cbff..af314c3cb 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -53,7 +53,7 @@ \"sig\":{\"show\":\"true\"}, \"continent\":{\"show\":\"true\"}, \"qrz\":{\"show\":\"true\"}, - \"stationname\":{\"show\":\"true\"} + \"profilename\":{\"show\":\"true\"} }"; } $current_opts = json_decode($options); @@ -114,8 +114,8 @@ echo "\nvar o_template = { qrz: {show: 'true'}};"; echo "\nuser_options={...user_options, ...o_template};"; } - if (!isset($current_opts->stationname)) { - echo "\nvar o_template = { stationname: {show: 'true'}};"; + if (!isset($current_opts->profilename)) { + echo "\nvar o_template = { profilename: {show: 'true'}};"; echo "\nuser_options={...user_options, ...o_template};"; } @@ -666,8 +666,8 @@ $options = json_decode($options); continent->show ?? "true") == "true") { echo '' . __("Continent") . ''; } ?> - stationname->show ?? "true") == "true") { - echo '' . __("Station name") . ''; + profilename->show ?? "true") == "true") { + echo '' . __("Profile name") . ''; } ?> diff --git a/application/views/logbookadvanced/useroptions.php b/application/views/logbookadvanced/useroptions.php index d484fa142..3d038286a 100644 --- a/application/views/logbookadvanced/useroptions.php +++ b/application/views/logbookadvanced/useroptions.php @@ -147,8 +147,8 @@
qrz->show ?? "true") == "true") { echo 'checked'; } ?>>
- -
stationname->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 b11e1242b..1e574d84a 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -127,8 +127,8 @@ function updateRow(qso) { if (user_options.continent.show == "true"){ cells.eq(c++).text(qso.continent); } - if (user_options.stationname.show == "true"){ - cells.eq(c++).text(qso.stationname); + if (user_options.profilename.show == "true"){ + cells.eq(c++).text(qso.profilename); } $('[data-bs-toggle="tooltip"]').tooltip(); @@ -289,8 +289,8 @@ function loadQSOTable(rows) { data.push(qso.continent); } } - if (user_options.stationname.show == "true"){ - data.push(qso.stationname); + if (user_options.profilename.show == "true"){ + data.push(qso.profilename); } let createdRow = table.row.add(data).index(); @@ -1150,7 +1150,7 @@ function saveOptions() { sig: $('input[name="sig"]').is(':checked') ? true : false, continent: $('input[name="continent"]').is(':checked') ? true : false, qrz: $('input[name="qrz"]').is(':checked') ? true : false, - stationname: $('input[name="stationname"]').is(':checked') ? true : false, + profilename: $('input[name="profilename"]').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 ace60b37e..80c646021 100644 --- a/src/QSLManager/QSO.php +++ b/src/QSLManager/QSO.php @@ -12,7 +12,7 @@ class QSO private string $qsoID; private string $qsoDateTime; private string $de; - private string $stationname; + private string $profilename; private string $dx; private string $mode; private string $submode; @@ -225,7 +225,7 @@ class QSO $this->contest = $data['contestname'] ?? ''; - $this->stationname = $data['station_profile_name'] ?? ''; + $this->profilename = $data['station_profile_name'] ?? ''; } /** @@ -984,7 +984,7 @@ class QSO 'wwff' => $this->getFormattedWwff(), 'sig' => $this->getFormattedSig(), 'continent' => $this->continent, - 'stationname' => $this->stationname + 'profilename' => $this->profilename ]; }