diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 967e3e4b..42c0438c 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -203,12 +203,12 @@
Name |
QSL Via |
QSL |
- session->userdata('user_lotw_name') != ""){
- echo 'LoTW | ';
- } ?>
session->userdata('user_eqsl_name') != ""){
echo 'eQSL | ';
} ?>
+ session->userdata('user_lotw_name') != ""){
+ echo 'LoTW | ';
+ } ?>
QSL Msg |
DXCC |
State |
diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js
index 5a0a0382..304f4e45 100644
--- a/assets/js/sections/logbookadvanced.js
+++ b/assets/js/sections/logbookadvanced.js
@@ -27,12 +27,12 @@ function updateRow(qso) {
cells.eq(c++).text(qso.name);
cells.eq(c++).text(qso.qslVia);
cells.eq(c++).html(qso.qsl);
- if ($(".lotwconfirmation")[0]){
- cells.eq(c++).html(qso.lotw);
- }
if ($(".eqslconfirmation")[0]){
cells.eq(c++).html(qso.eqsl);
}
+ if ($(".lotwconfirmation")[0]){
+ cells.eq(c++).html(qso.lotw);
+ }
cells.eq(c++).text(qso.qslMessage);
cells.eq(c++).text(qso.dxcc);
cells.eq(c++).text(qso.state);
@@ -82,12 +82,12 @@ function loadQSOTable(rows) {
data.push(qso.name);
data.push(qso.qslVia);
data.push(qso.qsl);
- if ($(".lotwconfirmation")[0]){
- data.push(qso.lotw);
- }
if ($(".eqslconfirmation")[0]){
data.push(qso.eqsl);
}
+ if ($(".lotwconfirmation")[0]){
+ data.push(qso.lotw);
+ }
data.push(qso.qslMessage);
data.push(qso.dxcc+(qso.end == null ? '' : ' Deleted DXCC'));
data.push(qso.state);
diff --git a/src/QSLManager/QSO.php b/src/QSLManager/QSO.php
index 6d60b11e..64b87501 100644
--- a/src/QSLManager/QSO.php
+++ b/src/QSLManager/QSO.php
@@ -372,7 +372,7 @@ class QSO
$eqslstring .= "\" data-toggle=\"tooltip\"";
}
- $eqslstring .= ' class="eqsl-' . (($data['COL_EQSL_QSL_SENT'] =='Y') ? 'green':'red') . '">▲▲lang->line('eqsl_short')." ".$CI->lang->line('general_word_received');