From 4ddaa36592c179b36caf9905a892149df12e9d7e Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Sat, 7 Mar 2020 16:36:21 +0000
Subject: [PATCH] Automatically populate USA state from QRZ if its been
 supplied

---
 application/controllers/Logbook.php           |  3 +++
 application/libraries/Qrz.php                 |  7 ++++++
 application/views/interface_assets/footer.php | 25 +++++++++++++------
 application/views/qso/index.php               |  2 +-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
index 7f0b9955..68379119 100755
--- a/application/controllers/Logbook.php
+++ b/application/controllers/Logbook.php
@@ -71,6 +71,7 @@ class Logbook extends CI_Controller {
 			"callsign_qra"  => "",
 			"callsign_qth"  => "",
 			"callsign_iota" => "",
+			"callsign_state" => "",
 			"qsl_manager" => "",
 			"bearing" 		=> "",
 			"workedBefore" => false,
@@ -139,6 +140,8 @@ class Logbook extends CI_Controller {
 		$return['callsign_qra'] = $callbook['gridsquare'];
 		$return['callsign_qth'] = $callbook['city'];
 		$return['callsign_iota'] = $callbook['iota'];
+		$return['callsign_state'] = $callbook['state'];
+
 		if(isset($callbook['qslmgr'])) {
 			$return['qsl_manager'] = $callbook['qslmgr'];
 		}
diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php
index d301ffc3..de0e1805 100755
--- a/application/libraries/Qrz.php
+++ b/application/libraries/Qrz.php
@@ -80,6 +80,13 @@ class Qrz {
 		$data['long'] = (string) $xml->Callsign->lon;
 		$data['iota'] = (string) $xml->Callsign->iota;
 		$data['qslmgr'] = (string) $xml->Callsign->qslmgr;
+
+		if($xml->Callsign->country == "United States") {
+			$data['state'] = (string) $xml->Callsign->state;
+		} else {
+			$data['state'] = null; 
+		}
+
 		
 		return $data;
 	}
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 8dee383c..02157902 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -357,12 +357,12 @@ $(document).on('keypress',function(e) {
       $("#locator").removeClass("newGrid");
       $("#callsign").removeClass("workedGrid");
       $("#callsign").removeClass("newGrid");
-	  $('#callsign_info').removeClass("badge-secondary");
-	  $('#callsign_info').removeClass("badge-success");
-	  $('#callsign_info').removeClass("badge-danger");
-
+      $('#callsign_info').removeClass("badge-secondary");
+      $('#callsign_info').removeClass("badge-success");
+      $('#callsign_info').removeClass("badge-danger");
       $('#qsl_via').val("");
       $('#callsign_info').text("");
+      $('#input_usa_state').val("");
 
       mymap.setView([51.505, -0.09], 13);
       mymap.removeLayer(markers);
@@ -564,7 +564,7 @@ $(document).on('keypress',function(e) {
                 $('#qsl_via').val(result.qsl_manager);
             }
 
-                        /* Find Operators Name */
+            /* Find Operators Name */
             if($('#name').val() == "") {
                 $('#name').val(result.callsign_name);
             }
@@ -573,6 +573,14 @@ $(document).on('keypress',function(e) {
                 $('#qth').val(result.callsign_qth);
             }
 
+            /*
+            * Update state with returned value
+            */
+            if($("#input_usa_state").val() == "") {
+              $("#input_usa_state").val(result.callsign_state).trigger('change');
+            }
+
+
             if($('#iota_ref').val() == "") {
                 $('#iota_ref').val(result.callsign_iota);
             }
@@ -595,9 +603,10 @@ $(document).on('keypress',function(e) {
             $("#locator").removeClass("newGrid");
             $("#callsign").removeClass("workedGrid");
             $("#callsign").removeClass("newGrid");
-			$('#callsign_info').removeClass("badge-secondary");
-			$('#callsign_info').removeClass("badge-success");
-			$('#callsign_info').removeClass("badge-danger");
+			      $('#callsign_info').removeClass("badge-secondary");
+			      $('#callsign_info').removeClass("badge-success");
+			      $('#callsign_info').removeClass("badge-danger");
+            $('#input_usa_state').val("");
         }  
     })
 
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 81db6cd5..29c9b2c5 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -217,7 +217,7 @@
 
             <div class="form-group">
               <label for="usa_state">USA State</label>
-              <select class="custom-select" name="usa_state">
+              <select class="custom-select" id="input_usa_state" name="usa_state">
                 <option value=""></option>
                 <option value="AL">Alabama (AL)</option>
                 <option value="AK">Alaska (AK)</option>