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

Merge pull request #1913 from phl0/lotwImportCnty

Browse Source 
Import county from LotW matches
This commit is contained in:
Peter Goodhall
2023-01-10 12:03:04 +00:00
committed by GitHub
parent ab12eca088 9ed225e375
commit e25174379d
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/controllers/Lotw.php
View File

@@ -545,7 +545,13 @@ class Lotw extends CI_Controller {
$iota = "";
}
$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $iota);
if (isset($record['cnty'])) {
$cnty = $record['cnty'];
} else {
$cnty = "";
}
$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $iota, $cnty);
}

6
application/models/Logbook_model.php
View File

@@ -2075,7 +2075,7 @@ class Logbook_model extends CI_Model {
}
}
function lotw_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $state, $qsl_gridsquare, $iota) {
function lotw_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $state, $qsl_gridsquare, $iota, $cnty) {
$data = array(
'COL_LOTW_QSLRDATE' => $qsl_date,
@@ -2089,6 +2089,10 @@ class Logbook_model extends CI_Model {
$data['COL_IOTA'] = $iota;
}
if($cnty != "") {
$data['COL_CNTY'] = $cnty;
}
$this->db->where('date_format(COL_TIME_ON, \'%Y-%m-%d %H:%i\') = "'.$datetime.'"');
$this->db->where('COL_CALL', $callsign);
$this->db->where('COL_BAND', $band);