diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php
index 20bb51841..c7ea79796 100644
--- a/application/controllers/Logbookadvanced.php
+++ b/application/controllers/Logbookadvanced.php
@@ -60,14 +60,13 @@ class Logbookadvanced extends CI_Controller {
$pageData['bands'] = $this->bands->get_worked_bands();
- $CI =& get_instance();
// Get Date format
- if($CI->session->userdata('user_date_format')) {
+ if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
- $pageData['custom_date_format'] = $CI->session->userdata('user_date_format');
+ $pageData['custom_date_format'] = $this->session->userdata('user_date_format');
} else {
// Get Default date format from /config/wavelog.php
- $pageData['custom_date_format'] = $CI->config->item('qso_date_format');
+ $pageData['custom_date_format'] = $this->config->item('qso_date_format');
}
switch ($pageData['custom_date_format']) {
@@ -509,6 +508,7 @@ class Logbookadvanced extends CI_Controller {
$json_string['pota']['show'] = $this->input->post('pota');
$json_string['operator']['show'] = $this->input->post('operator');
$json_string['comment']['show'] = $this->input->post('comment');
+ $json_string['propagation']['show'] = $this->input->post('propagation');
$obj['column_settings']= json_encode($json_string);
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index efad26ebe..31a9b1232 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -13,7 +13,7 @@
propagation)) {
+ echo "\nvar o_template = { propagation: {show: 'true'}};";
+ echo "\nuser_options={...user_options, ...o_template};";
+ }
foreach ($mapoptions as $mo) {
if ($mo != null) {
@@ -510,6 +514,9 @@ $options = json_decode($options);
} ?>
comment->show ?? "true") == "true") {
echo '
' . lang('general_word_comment') . ' | ';
+ } ?>
+ propagation->show ?? "true") == "true") {
+ echo '' . lang('filter_general_propagation') . ' | ';
} ?>
@@ -517,4 +524,4 @@ $options = json_decode($options);
-
\ No newline at end of file
+
diff --git a/application/views/logbookadvanced/useroptions.php b/application/views/logbookadvanced/useroptions.php
index 851cb7419..8061f47f1 100644
--- a/application/views/logbookadvanced/useroptions.php
+++ b/application/views/logbookadvanced/useroptions.php
@@ -114,6 +114,10 @@
|
comment->show ?? "true") == "true") { echo 'checked'; } ?>> |
+
+ |
+ propagation->show ?? "true") == "true") { echo 'checked'; } ?>> |
+
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index 173628501..aaa06dc51 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -97,6 +97,9 @@ function updateRow(qso) {
if ( (user_options.comment) && (user_options.comment.show == "true")){
cells.eq(c++).html(qso.comment);
}
+ if ( (user_options.propagation) && (user_options.propagation.show == "true")){
+ cells.eq(c++).html(qso.propagation);
+ }
$('[data-bs-toggle="tooltip"]').tooltip();
return row;
@@ -205,6 +208,9 @@ function loadQSOTable(rows) {
if (user_options.comment.show == "true"){
data.push(qso.comment);
}
+ if (user_options.propagation.show == "true"){
+ data.push(qso.propagation);
+ }
let createdRow = table.row.add(data).index();
table.rows(createdRow).nodes().to$().data('qsoID', qso.qsoID);
@@ -908,6 +914,7 @@ function saveOptions() {
pota: $('input[name="pota"]').is(':checked') ? true : false,
operator: $('input[name="operator"]').is(':checked') ? true : false,
comment: $('input[name="comment"]').is(':checked') ? true : false,
+ propagation: $('input[name="propagation"]').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 2d7d21d86..68b8451ec 100644
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@@ -839,7 +839,8 @@ class QSO
'lastupload' => $this->lastupload,
'lotw_hint' => $this->lotw_hint,
'comment' => $this->comment,
- 'orbit' => $this->orbit
+ 'orbit' => $this->orbit,
+ 'propagation' => $this->getPropagationMode(),
];
}