mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Automatically populate USA state from QRZ if its been supplied

pull/434/head
Peter Goodhall 2020-03-07 16:36:21 +00:00
rodzic 01cade18fe
commit 4ddaa36592
4 zmienionych plików z 28 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
application/controllers/Logbook.php
Wyświetl plik

@ -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'];
}

7
application/libraries/Qrz.php
Wyświetl plik

@ -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;
}

25
application/views/interface_assets/footer.php
Wyświetl plik

@ -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("");
}
})

2
application/views/qso/index.php
Wyświetl plik

@ -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>