Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2981 from phl0/dokCallbookLookup

Browse Source 
Query callbook (hamqth) for DARC DOK
This commit is contained in:
Florian (DF2ET)
2026-02-19 10:41:03 +01:00
committed by GitHub
parent c74e8ff147 b284586c19
commit 266cc77a4e
5 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/Logbook.php
View File

@@ -178,6 +178,7 @@ class Logbook extends CI_Controller {
$return['callsign_us_county'] = $this->nval($this->logbook_model->call_us_county($callsign), $callbook['us_county'] ?? '', $lookup_priority);
$return['callsign_ituz'] = $this->nval($this->logbook_model->call_ituzone($callsign), $callbook['ituz'] ?? '', $lookup_priority);
$return['callsign_cqz'] = $this->nval($this->logbook_model->call_cqzone($callsign), $callbook['cqz'] ?? '', $lookup_priority);
$return['callsign_darc_dok'] = $this->nval($this->logbook_model->call_darc_dok($callsign), $callbook['darc_dok'] ?? '', $lookup_priority);
$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);

18
application/controllers/Lookup.php
View File

@@ -158,24 +158,6 @@ class Lookup extends CI_Controller {
}
}
public function dok($call) {
session_write_close();
if($call) {
$call = str_replace("-","/",$call);
$uppercase_callsign = strtoupper($call);
}
// DOK results from logbook
$this->load->model('logbook_model');
$query = $this->logbook_model->get_dok($uppercase_callsign);
if ($query->row()) {
echo $query->row()->COL_DARC_DOK;
}
}
public function ham_of_note($call = '') {
session_write_close();

2
application/libraries/Hamqth.php
View File

@@ -100,6 +100,7 @@ class Hamqth {
$data['error'] = (string)$xml->session->error;
$data['ituz'] = (string)$xml->search->itu;
$data['cqz'] = (string)$xml->search->cq;
$data['darc_dok'] = (string)$xml->search->dok;
if ($xml->search->country == "United States") {
$data['us_county'] = (string)$xml->search->us_county;
@@ -120,6 +121,7 @@ class Hamqth {
$data['error'] = (string)$xml->session->error;
$data['ituz'] = '';
$data['cqz'] = '';
$data['darc_dok'] = '';
$data['us_county'] = '';

10
application/models/Logbook_model.php
View File

@@ -777,7 +777,7 @@ class Logbook_model extends CI_Model {
return $this->db->get($this->config->item('table_name'));
}
public function get_dok($callsign) {
public function call_darc_dok($callsign) {
$this->load->model('logbooks_model');
$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->select('COL_DARC_DOK');
@@ -786,7 +786,13 @@ class Logbook_model extends CI_Model {
$this->db->order_by("COL_TIME_ON", "desc");
$this->db->limit(1);
return $this->db->get($this->config->item('table_name'));
$query = $this->db->get($this->config->item('table_name'));
if ($query->num_rows() > 0) {
$data = $query->row();
return $data->COL_DARC_DOK;
} else {
return NULL;
}
}
function add_qso($data, $skipexport = false, $batchmode = false) {

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

@@ -1482,7 +1482,8 @@ $("#callsign").on("focusout", function () {
lotw_days: result.lotw_days,
eqsl_member: result.eqsl_member,
qsl_manager: result.qsl_manager,
slot_confirmed: result.dxcc_confirmed_on_band_mode
slot_confirmed: result.dxcc_confirmed_on_band_mode,
darc_dok: result.callsign_darc_dok
};
window.broadcastLookupResult(broadcastData);
}
@@ -1580,12 +1581,12 @@ $("#callsign").on("focusout", function () {
var $dok_select = $('#darc_dok').selectize();
var dok_selectize = $dok_select[0].selectize;
if ((result.dxcc.adif == '230') && (($("#callsign").val().trim().length) > 0)) {
$.get(base_url + 'index.php/lookup/dok/' + $('#callsign').val().toUpperCase().replaceAll('Ø', '0').replaceAll('/','-'), function (result) {
if (result) {
dok_selectize.addOption({ name: result });
dok_selectize.setValue(result, false);
if (result.callsign_darc_dok != '') {
dok_selectize.addOption({ name: result.callsign_darc_dok });
dok_selectize.setValue(result.callsign_darc_dok, false);
} else {
dok_selectize.clear();
}
});
} else {
dok_selectize.clear();
}