diff --git a/application/controllers/Lookup.php b/application/controllers/Lookup.php index ac2a9820c..68e21242c 100644 --- a/application/controllers/Lookup.php +++ b/application/controllers/Lookup.php @@ -69,6 +69,10 @@ class Lookup extends CI_Controller { $data['location_list'] = $location_list; $data['user_map_custom'] = $this->optionslib->get_map_custom(); + if ($data['type'] == 'vucc') { + $data['vuccdxcc'] = $this->lookup_model->getDxccForVucc($data['grid']); + } + $data['result'] = $this->lookup_model->getSearchResult($data); $this->load->view('lookup/result', $data); } diff --git a/application/models/Lookup_model.php b/application/models/Lookup_model.php index 194f2ebf8..810760add 100644 --- a/application/models/Lookup_model.php +++ b/application/models/Lookup_model.php @@ -27,6 +27,24 @@ class Lookup_model extends CI_Model{ return $this->getResultFromDatabase($queryinfo, $modes); } + function getDxccForVucc($grid) { + $fixedgrid = (strlen($grid) > 4) ? substr($grid, 0, 4) : $grid; + + $sql = "select name from dxcc_entities + join vuccgrids on dxcc_entities.adif = vuccgrids.adif + where gridsquare = ?"; + $binds[] = $fixedgrid; + + $query = $this->db->query($sql, $binds); + $dxccArray = []; + + foreach ($query->result() as $row) { + $dxccArray[] = ucwords(strtolower($row->name), "- (/"); + } + + return $dxccArray; + } + function getResultFromDatabase($queryinfo, $modes) { // Creating an empty array with all the bands and modes from the database foreach ($modes as $mode) { diff --git a/application/views/lookup/result.php b/application/views/lookup/result.php index 8138b3532..b93111639 100644 --- a/application/views/lookup/result.php +++ b/application/views/lookup/result.php @@ -9,7 +9,15 @@ } - + 0) { + echo ''; +} ?>