kc9uhi/wavelog
3
0
Fork 1
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-27 01:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lookup CQ zones in qrz/hamqth

Browse Source
This commit is contained in:
phl0
2024-08-27 10:13:30 +02:00
parent 6a6fafdacc
commit 695dbc2ea2
5 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Logbook.php
View File

@@ -115,6 +115,7 @@ class Logbook extends CI_Controller {
"callsign_state" => "",
"callsign_us_county" => "",
"callsign_ituz" => "",
"callsign_cqz" => "",
"qsl_manager" => "",
"bearing" => "",
"workedBefore" => false,
@@ -147,6 +148,7 @@ class Logbook extends CI_Controller {
$return['callsign_state'] = $this->nval($callbook['state'] ?? '', $this->logbook_model->call_state($callsign));
$return['callsign_us_county'] = $this->nval($callbook['us_county'] ?? '', $this->logbook_model->call_us_county($callsign));
$return['callsign_ituz'] = $this->nval($callbook['ituz'] ?? '', $this->logbook_model->call_ituzone($callsign));
$return['callsign_cqz'] = $this->nval($callbook['cqz'] ?? '', $this->logbook_model->call_cqzone($callsign));
$return['workedBefore'] = $this->worked_grid_before($return['callsign_qra'], $band, $mode);
$return['confirmed'] = $this->confirmed_grid_before($return['callsign_qra'], $band, $mode);
$return['timesWorked'] = $this->logbook_model->times_worked($lookupcall);

2
application/libraries/Hamqth.php
View File

@@ -95,6 +95,7 @@ class Hamqth {
$data['state'] = (string)$xml->search->us_state;
$data['error'] = (string)$xml->session->error;
$data['ituz'] = (string)$xml->search->itu;
$data['cqz'] = (string)$xml->search->cq;
if ($xml->search->country == "United States") {
$data['us_county'] = (string)$xml->search->us_county;
@@ -114,6 +115,7 @@ class Hamqth {
$data['state'] = '';
$data['error'] = (string)$xml->session->error;
$data['ituz'] = '';
$data['cqz'] = '';
$data['us_county'] = '';

2
application/libraries/Qrz.php
View File

@@ -110,6 +110,7 @@ class Qrz {
$data['qslmgr'] = (string)$xml->Callsign->qslmgr;
$data['image'] = (string)$xml->Callsign->image;
$data['ituz'] = (string)$xml->Callsign->ituzone;
$data['cqz'] = (string)$xml->Callsign->cqzone;
if ($xml->Callsign->country == "United States") {
$data['us_county'] = (string)$xml->Callsign->county;
@@ -130,6 +131,7 @@ class Qrz {
$data['image'] = (string)$xml->Callsign->image;
$data['us_county'] = '';
$data['ituz'] = '';
$data['cqz'] = '';
}
} finally {

22
application/models/Logbook_model.php
View File

@@ -1608,6 +1608,28 @@ class Logbook_model extends CI_Model {
}
}
function call_cqzone($callsign) {
$this->db->select('COL_CALL, COL_CQZ');
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');
$this->db->where('COL_CALL', $callsign);
$this->db->where('station_profile.user_id', $this->session->userdata('user_id'));
$where = "COL_CQZ != \"\"";
$this->db->where($where);
$this->db->order_by("COL_TIME_ON", "desc");
$this->db->limit(1);
$query = $this->db->get($this->config->item('table_name'));
if ($query->num_rows() > 0)
{
$data = $query->row();
$qsl_cqz = $data->COL_CQZ;
return $qsl_cqz;
} else {
return NULL;
}
}
function call_qth($callsign) {
$this->db->select('COL_CALL, COL_QTH, COL_TIME_ON');
$this->db->join('station_profile', 'station_profile.station_id = '.$this->config->item('table_name').'.station_id');

6
assets/js/sections/qso.js
View File

@@ -895,7 +895,11 @@ $( document ).ready(function() {
$('#dxcc_id').val(result.dxcc.adif).multiselect('refresh');
await updateStateDropdown('#dxcc_id', '#stateInputLabel', '#location_us_county', '#stationCntyInputEdit');
$('#cqz').val(result.dxcc.cqz);
if (result.callsign_cqz != '') {
$('#cqz').val(result.callsign_cqz);
} else {
$('#cqz').val(result.dxcc.cqz);
}
if (result.callsign_ituz != '') {
$('#ituz').val(result.callsign_ituz);