From 5177239e23ac36180d8aa349d55a178c64c1c36c Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 1 Jan 2024 04:58:49 +0100 Subject: [PATCH 1/3] fetched dxcc_id --- application/libraries/Hamqth.php | 1 + application/libraries/Qrz.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/libraries/Hamqth.php b/application/libraries/Hamqth.php index 1b71449b..6689ba3c 100644 --- a/application/libraries/Hamqth.php +++ b/application/libraries/Hamqth.php @@ -80,6 +80,7 @@ class Hamqth { $data['city'] = (string)$xml->search->adr_city; $data['lat'] = (string)$xml->search->latitude; $data['long'] = (string)$xml->search->longitude; + $data['dxcc'] = (string)$xml->search->adif; $data['iota'] = (string)$xml->search->iota; $data['image'] = (string)$xml->search->picture; $data['us_state'] = (string)$xml->search->us_state; diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php index f87bd5af..cfecdac1 100755 --- a/application/libraries/Qrz.php +++ b/application/libraries/Qrz.php @@ -91,6 +91,7 @@ class Qrz { $data['city'] = (string)$xml->Callsign->addr2; $data['lat'] = (string)$xml->Callsign->lat; $data['long'] = (string)$xml->Callsign->lon; + $data['dxcc'] = (string)$xml->Callsign->dxcc; $data['iota'] = (string)$xml->Callsign->iota; $data['qslmgr'] = (string)$xml->Callsign->qslmgr; $data['image'] = (string)$xml->Callsign->image; From ffc9ab5f4a122c873541fb2f196083683ee5c09d Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 1 Jan 2024 04:59:27 +0100 Subject: [PATCH 2/3] show dxcc in callbook result --- application/views/search/result.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/views/search/result.php b/application/views/search/result.php index b6ed83cb..7c15a474 100644 --- a/application/views/search/result.php +++ b/application/views/search/result.php @@ -22,6 +22,11 @@ + + DXCC + + + Gridsquare From abca127b7461b0adccd96f6604cc8804ee67a9ea Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Mon, 1 Jan 2024 13:38:32 +0100 Subject: [PATCH 3/3] show dxcc name instead of id --- application/controllers/Logbook.php | 10 ++++++++++ application/views/search/result.php | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php index ab8111ee..bf57c479 100644 --- a/application/controllers/Logbook.php +++ b/application/controllers/Logbook.php @@ -930,6 +930,11 @@ class Logbook extends CI_Controller { $this->load->model('logbook_model'); $data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band')); } + if (isset($data['callsign']['dxcc'])) { + $this->load->model('logbook_model'); + $entity = $this->logbook_model->get_entity($data['callsign']['dxcc']); + $data['callsign']['dxcc_name'] = $entity['name']; + } if (isset($data['callsign']['error'])) { $data['error'] = $data['callsign']['error']; } @@ -954,6 +959,11 @@ class Logbook extends CI_Controller { $this->load->model('logbook_model'); $data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band')); } + if (isset($data['callsign']['dxcc'])) { + $this->load->model('logbook_model'); + $entity = $this->logbook_model->get_entity($data['callsign']['dxcc']); + $data['callsign']['dxcc_name'] = $entity['name']; + } if (isset($data['callsign']['error'])) { $data['error'] = $data['callsign']['error']; } diff --git a/application/views/search/result.php b/application/views/search/result.php index 7c15a474..a7d62863 100644 --- a/application/views/search/result.php +++ b/application/views/search/result.php @@ -13,18 +13,18 @@ - Name + Name - City + City - DXCC - + DXCC +