mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
fix callbook state data
This commit is contained in:
@@ -83,15 +83,12 @@ class Hamqth {
|
||||
$data['dxcc'] = (string)$xml->search->adif;
|
||||
$data['iota'] = (string)$xml->search->iota;
|
||||
$data['image'] = (string)$xml->search->picture;
|
||||
$data['us_state'] = (string)$xml->search->us_state;
|
||||
$data['us_county'] = (string)$xml->search->us_county;
|
||||
$data['state'] = (string)$xml->search->us_state;
|
||||
$data['error'] = (string)$xml->session->error;
|
||||
|
||||
if ($xml->search->country == "United States") {
|
||||
$data['state'] = (string)$xml->search->us_state;
|
||||
$data['us_county'] = (string)$xml->search->us_county;
|
||||
} else {
|
||||
$data['state'] = null;
|
||||
$data['us_county'] = null;
|
||||
}
|
||||
} finally {
|
||||
|
||||
@@ -92,15 +92,14 @@ class Qrz {
|
||||
$data['lat'] = (string)$xml->Callsign->lat;
|
||||
$data['long'] = (string)$xml->Callsign->lon;
|
||||
$data['dxcc'] = (string)$xml->Callsign->dxcc;
|
||||
$data['state'] = (string)$xml->Callsign->state;
|
||||
$data['iota'] = (string)$xml->Callsign->iota;
|
||||
$data['qslmgr'] = (string)$xml->Callsign->qslmgr;
|
||||
$data['image'] = (string)$xml->Callsign->image;
|
||||
|
||||
if ($xml->Callsign->country == "United States") {
|
||||
$data['state'] = (string)$xml->Callsign->state;
|
||||
$data['us_county'] = (string)$xml->Callsign->county;
|
||||
} else {
|
||||
$data['state'] = null;
|
||||
$data['us_county'] = null;
|
||||
}
|
||||
} finally {
|
||||
|
||||
@@ -2,9 +2,6 @@ $( document ).ready(function() {
|
||||
clearTimeout();
|
||||
set_timers();
|
||||
updateStateDropdown();
|
||||
$("#dxcc_id").change(function () {
|
||||
updateStateDropdown();
|
||||
});
|
||||
|
||||
|
||||
function set_timers() {
|
||||
@@ -804,9 +801,11 @@ $("#callsign").focusout(function() {
|
||||
/*
|
||||
* Update state with returned value
|
||||
*/
|
||||
if($("#stateDropdown").val() == "") {
|
||||
$("#stateDropdown").val(result.callsign_state).trigger('change');
|
||||
}
|
||||
setTimeout(function() { // we have some kind of raceconditions here... just a hotfix atm
|
||||
if($("#stateDropdown").val() == "") {
|
||||
$("#stateDropdown").val(result.callsign_state);
|
||||
}
|
||||
}, 1000);
|
||||
|
||||
/*
|
||||
* Update county with returned value
|
||||
|
||||
Reference in New Issue
Block a user