Automatically populate USA state from QRZ if its been supplied
这个提交包含在:
		
							父节点
							
								
									01cade18fe
								
							
						
					
					
						当前提交
						4ddaa36592
					
				
					共有  4 个文件被更改,包括 28 次插入 和 9 次删除
				
			
		|  | @ -71,6 +71,7 @@ class Logbook extends CI_Controller { | ||||||
| 			"callsign_qra"  => "", | 			"callsign_qra"  => "", | ||||||
| 			"callsign_qth"  => "", | 			"callsign_qth"  => "", | ||||||
| 			"callsign_iota" => "", | 			"callsign_iota" => "", | ||||||
|  | 			"callsign_state" => "", | ||||||
| 			"qsl_manager" => "", | 			"qsl_manager" => "", | ||||||
| 			"bearing" 		=> "", | 			"bearing" 		=> "", | ||||||
| 			"workedBefore" => false, | 			"workedBefore" => false, | ||||||
|  | @ -139,6 +140,8 @@ class Logbook extends CI_Controller { | ||||||
| 		$return['callsign_qra'] = $callbook['gridsquare']; | 		$return['callsign_qra'] = $callbook['gridsquare']; | ||||||
| 		$return['callsign_qth'] = $callbook['city']; | 		$return['callsign_qth'] = $callbook['city']; | ||||||
| 		$return['callsign_iota'] = $callbook['iota']; | 		$return['callsign_iota'] = $callbook['iota']; | ||||||
|  | 		$return['callsign_state'] = $callbook['state']; | ||||||
|  | 
 | ||||||
| 		if(isset($callbook['qslmgr'])) { | 		if(isset($callbook['qslmgr'])) { | ||||||
| 			$return['qsl_manager'] = $callbook['qslmgr']; | 			$return['qsl_manager'] = $callbook['qslmgr']; | ||||||
| 		} | 		} | ||||||
|  |  | ||||||
|  | @ -81,6 +81,13 @@ class Qrz { | ||||||
| 		$data['iota'] = (string) $xml->Callsign->iota; | 		$data['iota'] = (string) $xml->Callsign->iota; | ||||||
| 		$data['qslmgr'] = (string) $xml->Callsign->qslmgr; | 		$data['qslmgr'] = (string) $xml->Callsign->qslmgr; | ||||||
| 
 | 
 | ||||||
|  | 		if($xml->Callsign->country == "United States") { | ||||||
|  | 			$data['state'] = (string) $xml->Callsign->state; | ||||||
|  | 		} else { | ||||||
|  | 			$data['state'] = null;  | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 		 | ||||||
| 		return $data; | 		return $data; | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -360,9 +360,9 @@ $(document).on('keypress',function(e) { | ||||||
|       $('#callsign_info').removeClass("badge-secondary"); |       $('#callsign_info').removeClass("badge-secondary"); | ||||||
|       $('#callsign_info').removeClass("badge-success"); |       $('#callsign_info').removeClass("badge-success"); | ||||||
|       $('#callsign_info').removeClass("badge-danger"); |       $('#callsign_info').removeClass("badge-danger"); | ||||||
| 
 |  | ||||||
|       $('#qsl_via').val(""); |       $('#qsl_via').val(""); | ||||||
|       $('#callsign_info').text(""); |       $('#callsign_info').text(""); | ||||||
|  |       $('#input_usa_state').val(""); | ||||||
| 
 | 
 | ||||||
|       mymap.setView([51.505, -0.09], 13); |       mymap.setView([51.505, -0.09], 13); | ||||||
|       mymap.removeLayer(markers); |       mymap.removeLayer(markers); | ||||||
|  | @ -573,6 +573,14 @@ $(document).on('keypress',function(e) { | ||||||
|                 $('#qth').val(result.callsign_qth); |                 $('#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() == "") { |             if($('#iota_ref').val() == "") { | ||||||
|                 $('#iota_ref').val(result.callsign_iota); |                 $('#iota_ref').val(result.callsign_iota); | ||||||
|             } |             } | ||||||
|  | @ -598,6 +606,7 @@ $(document).on('keypress',function(e) { | ||||||
| 			      $('#callsign_info').removeClass("badge-secondary"); | 			      $('#callsign_info').removeClass("badge-secondary"); | ||||||
| 			      $('#callsign_info').removeClass("badge-success"); | 			      $('#callsign_info').removeClass("badge-success"); | ||||||
| 			      $('#callsign_info').removeClass("badge-danger"); | 			      $('#callsign_info').removeClass("badge-danger"); | ||||||
|  |             $('#input_usa_state').val(""); | ||||||
|         }   |         }   | ||||||
|     }) |     }) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -217,7 +217,7 @@ | ||||||
| 
 | 
 | ||||||
|             <div class="form-group"> |             <div class="form-group"> | ||||||
|               <label for="usa_state">USA State</label> |               <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=""></option> | ||||||
|                 <option value="AL">Alabama (AL)</option> |                 <option value="AL">Alabama (AL)</option> | ||||||
|                 <option value="AK">Alaska (AK)</option> |                 <option value="AK">Alaska (AK)</option> | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用