diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
index 19bb31586..302278e56 100644
--- a/application/controllers/Lotw.php
+++ b/application/controllers/Lotw.php
@@ -592,7 +592,13 @@ class Lotw extends CI_Controller {
$dxcc = "";
}
- $lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $qsl_vucc_grids, $iota, $cnty, $cqz, $ituz, $record['station_callsign'],$qso_id4lotw, $station_ids, $dxcc, $ant_path);
+ if (isset($record['country'])) {
+ $country = $record['country'];
+ } else {
+ $country = "";
+ }
+
+ $lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $qsl_vucc_grids, $iota, $cnty, $cqz, $ituz, $record['station_callsign'],$qso_id4lotw, $station_ids, $dxcc, $country, $ant_path);
$table .= "
";
$table .= "| ".$record['station_callsign']." | ";
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 306fd0750..e26179f79 100644
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -3727,7 +3727,7 @@ class Logbook_model extends CI_Model {
}
}
- function lotw_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $state, $qsl_gridsquare, $qsl_vucc_grids, $iota, $cnty, $cqz, $ituz, $station_callsign, $qsoid, $station_ids, $dxcc = null, $ant_path = null) {
+ function lotw_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $state, $qsl_gridsquare, $qsl_vucc_grids, $iota, $cnty, $cqz, $ituz, $station_callsign, $qsoid, $station_ids, $dxcc = null, $country = null, $ant_path = null) {
$data = array(
'COL_LOTW_QSLRDATE' => $qsl_date,
@@ -3753,6 +3753,10 @@ class Logbook_model extends CI_Model {
$data['COL_DXCC'] = $dxcc;
}
+ if (($country ?? '') != '') {
+ $data['COL_COUNTRY'] = $country;
+ }
+
if ($ituz != "") {
$data['COL_ITUZ'] = $ituz;
}
diff --git a/application/models/Timeline_model.php b/application/models/Timeline_model.php
index 94020db1a..a36f09633 100644
--- a/application/models/Timeline_model.php
+++ b/application/models/Timeline_model.php
@@ -63,11 +63,10 @@ class Timeline_model extends CI_Model {
$sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $clublog, $qrz);
- $sql .= " group by col_dxcc, col_country
+ $sql .= " group by col_dxcc
order by date desc";
$query = $this->db->query($sql, $binding);
-
return $query->result();
}