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/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; diff --git a/application/views/search/result.php b/application/views/search/result.php index b6ed83cb..a7d62863 100644 --- a/application/views/search/result.php +++ b/application/views/search/result.php @@ -13,15 +13,20 @@