Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 18:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1741 from int2001/timeline_dxcc_fix

Browse Source 
Ignore country-column since dxcc is joined
This commit is contained in:
Joerg (DJ7NT)
2025-03-07 08:43:35 +01:00
committed by GitHub
parent dcde4d3176 64d17b4331
commit aed5a03bbd
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/controllers/Lotw.php
View File

@@ -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 .= "<tr>";
$table .= "<td>".$record['station_callsign']."</td>";

6
application/models/Logbook_model.php
View File

@@ -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;
}

3
application/models/Timeline_model.php
View File

@@ -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();
}