From d51c24adb1872204b88811269f4f1bc2872905f1 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 19 Jun 2023 13:17:07 +0200 Subject: [PATCH 1/2] Fix LoTW users for activated grids --- application/models/Logbook_model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 8f5d4409..d053d154 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -391,9 +391,10 @@ class Logbook_model extends CI_Model { $sql = 'SELECT COL_FREQ, COL_SOTA_REF, COL_OPERATOR, COL_IOTA, COL_VUCC_GRIDS, COL_STATE, COL_GRIDSQUARE, COL_PRIMARY_KEY, COL_CALL, COL_TIME_ON, COL_BAND, COL_SAT_NAME, COL_MODE, COL_SUBMODE, COL_RST_SENT, '; $sql .= 'COL_RST_RCVD, COL_STX, COL_SRX, COL_STX_STRING, COL_SRX_STRING, COL_COUNTRY, COL_QSL_SENT, COL_QSL_SENT_VIA, '; $sql .= 'COL_QSLSDATE, COL_QSL_RCVD, COL_QSL_RCVD_VIA, COL_QSLRDATE, COL_EQSL_QSL_SENT, COL_EQSL_QSLSDATE, COL_EQSL_QSLRDATE, '; - $sql .= 'COL_EQSL_QSL_RCVD, COL_LOTW_QSL_SENT, COL_LOTW_QSLSDATE, COL_LOTW_QSL_RCVD, COL_LOTW_QSLRDATE, COL_CONTEST_ID, station_gridsquare, dxcc_entities.name as name, dxcc_entities.end as end '; + $sql .= 'COL_EQSL_QSL_RCVD, COL_LOTW_QSL_SENT, COL_LOTW_QSLSDATE, COL_LOTW_QSL_RCVD, COL_LOTW_QSLRDATE, COL_CONTEST_ID, station_gridsquare, dxcc_entities.name as name, dxcc_entities.end as end, callsign, lastupload '; $sql .= 'FROM '.$this->config->item('table_name').' JOIN `station_profile` ON station_profile.station_id = '.$this->config->item('table_name').'.station_id '; $sql .= 'LEFT OUTER JOIN `dxcc_entities` ON dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC '; + $sql .= 'LEFT OUTER JOIN `lotw_users` ON lotw_users.callsign = '.$this->config->item('table_name').'.COL_CALL '; $sql .= 'WHERE '.$this->config->item('table_name').'.station_id IN (SELECT station_id from station_profile '; $sql .= 'WHERE station_gridsquare LIKE "%'.$searchphrase.'%") '; From 95084142b058e711cd2ab8b7b1fab1c1f02e7e63 Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 19 Jun 2023 13:21:15 +0200 Subject: [PATCH 2/2] LoTW users info for timeline QSOs --- application/models/Timeline_model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/models/Timeline_model.php b/application/models/Timeline_model.php index 99cb800d..74411911 100644 --- a/application/models/Timeline_model.php +++ b/application/models/Timeline_model.php @@ -218,6 +218,7 @@ class Timeline_model extends CI_Model $this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id'); $this->db->join('dxcc_entities', 'dxcc_entities.adif = '.$this->config->item('table_name').'.COL_DXCC'); + $this->db->join('lotw_users', 'lotw_users.callsign = '.$this->config->item('table_name').'.col_call', 'left outer'); if ($band != 'All') { if ($band == 'SAT') {