From c3b0cfd568d3543fc036c2fdbdf7a92c98a76b93 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Sat, 17 Feb 2024 22:25:21 +0100
Subject: [PATCH] fix callbook state data

---
 application/libraries/Hamqth.php |  5 +----
 application/libraries/Qrz.php    |  3 +--
 assets/js/sections/qso.js        | 11 +++++------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/application/libraries/Hamqth.php b/application/libraries/Hamqth.php
index 171eb6d77..195d284b0 100644
--- a/application/libraries/Hamqth.php
+++ b/application/libraries/Hamqth.php
@@ -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 {
diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php
index 5a44825ac..075292791 100755
--- a/application/libraries/Qrz.php
+++ b/application/libraries/Qrz.php
@@ -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 {
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index b977e578b..4275bb665 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -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