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

fix adif county

Browse Source
This commit is contained in:
HB9HIL
2024-02-23 15:48:55 +01:00
parent 3cc52fd9d2
commit 8d62703b93
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
application/libraries/AdifHelper.php
View File

@@ -196,11 +196,14 @@ class AdifHelper {
$line .= $this->getAdifFieldLine("MY_ITU_ZONE", $qso->station_itu);
if($qso->state) {
$county = trim($qso->state) . "," . trim($qso->station_cnty);
} else {
$county = trim($qso->station_cnty);
}
$line .= $this->getAdifFieldLine("MY_STATE", $qso->state);
// We fill county only if it has a value and it's USA, Alaska or Hawaii. Other countrys are not supported at the moment due complex adif specs
if ($qso->station_cnty && ($qso->station_dxcc == '291' || $qso->station_dxcc == '006' || $qso->station_dxcc == '110')) {
$county = trim($qso->state) . "," . trim($qso->station_cnty);
} else {
$county = '';
}
$line .= $this->getAdifFieldLine("MY_CNTY", $county);
@@ -234,7 +237,6 @@ class AdifHelper {
MY_NAME
MY_POSTAL_CODE
MY_RIG
MY_STATE
MY_STREET
MY_USACA_COUNTIES
*/

18
application/models/Stations.php
View File

@@ -80,6 +80,13 @@ class Stations extends CI_Model {
$state = $this->input->post('station_state');
}
// Check if DXCC is USA, Alaska or Hawaii. If not true, we clear the County field due to complex adif specs
if (($this->input->post('dxcc') == 291 || $this->input->post('dxcc') == 006 || $this->input->post('dxcc') == 110) && $this->input->post('station_cnty') !="") {
$county = $this->input->post('station_cnty');
} else {
$county = '';
}
// Create data array with field values
$data = array(
'user_id' => $this->session->userdata('user_id'),
@@ -96,7 +103,7 @@ class Stations extends CI_Model {
'station_callsign' => xss_clean($this->input->post('station_callsign', true)),
'station_power' => is_numeric(xss_clean($this->input->post('station_power', true))) ? xss_clean($this->input->post('station_power', true)) : NULL,
'station_dxcc' => xss_clean($this->input->post('dxcc', true)),
'station_cnty' => xss_clean($this->input->post('station_cnty', true)),
'station_cnty' => $county,
'station_cq' => xss_clean($this->input->post('station_cq', true)),
'station_itu' => xss_clean($this->input->post('station_itu', true)),
'state' => $state,
@@ -133,6 +140,13 @@ class Stations extends CI_Model {
$state = $this->input->post('station_state');
}
// Check if DXCC is USA, Alaska or Hawaii. If not true, we clear the County field due to complex adif specs
if (($this->input->post('dxcc') == 291 || $this->input->post('dxcc') == 006 || $this->input->post('dxcc') == 110) && $this->input->post('station_cnty') !="") {
$county = $this->input->post('station_cnty');
} else {
$county = '';
}
$data = array(
'station_profile_name' => xss_clean($this->input->post('station_profile_name', true)),
'station_gridsquare' => xss_clean($this->input->post('gridsquare', true)),
@@ -146,7 +160,7 @@ class Stations extends CI_Model {
'station_callsign' => xss_clean($this->input->post('station_callsign', true)),
'station_power' => is_numeric(xss_clean($this->input->post('station_power', true))) ? xss_clean($this->input->post('station_power', true)) : NULL,
'station_dxcc' => xss_clean($this->input->post('dxcc', true)),
'station_cnty' => xss_clean($this->input->post('station_cnty', true)),
'station_cnty' => $county,
'station_cq' => xss_clean($this->input->post('station_cq', true)),
'station_itu' => xss_clean($this->input->post('station_itu', true)),
'state' => $state,