From 299e0f80126517c9cef7712642be0ebba347f8fb Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 18 Nov 2024 15:57:33 +0100 Subject: [PATCH 1/2] Add adif for DB query --- application/models/Logbookadvanced_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 91d90344f..4bb2196a5 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -383,7 +383,7 @@ class Logbookadvanced_model extends CI_Model { $order = $this->getSortorder($sortorder); $sql = " - SELECT qsos.*, lotw_users.*, station_profile.*, dxcc_entities.name AS station_country, d2.name as dxccname, exists(select 1 from qsl_images where qsoid = qsos.COL_PRIMARY_KEY) as qslcount, coalesce(contest.name, qsos.col_contest_id) as contestname + SELECT qsos.*, lotw_users.*, station_profile.*, dxcc_entities.name AS station_country, dxcc_entities.adif as adif, d2.name as dxccname, exists(select 1 from qsl_images where qsoid = qsos.COL_PRIMARY_KEY) as qslcount, coalesce(contest.name, qsos.col_contest_id) as contestname FROM " . $this->config->item('table_name') . " qsos INNER JOIN station_profile ON qsos.station_id = station_profile.station_id LEFT OUTER JOIN dxcc_entities ON qsos.COL_MY_DXCC = dxcc_entities.adif From 27b879f8a82c0bfd9d859f7c2cd73aa2758cc3b3 Mon Sep 17 00:00:00 2001 From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:25:26 +0100 Subject: [PATCH 2/2] Fixed dxcc name updated --- assets/js/sections/logbookadvanced.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 9b7a37a16..58a20c82d 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -80,7 +80,7 @@ function updateRow(qso) { cells.eq(c++).text(qso.qslMessage); } if (user_options.dxcc.show == "true"){ - cells.eq(c++).html(qso.dxccname); + cells.eq(c++).html(qso.dxcc); } if (user_options.state.show == "true"){ cells.eq(c++).html(qso.state);