diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index f3ca0e4b..be950799 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -651,12 +651,14 @@ class Awards extends CI_Controller { $data['gridsquares_gridsquares_worked']= lang('gridsquares_gridsquares_worked'); $data['gridsquares_gridsquares_lotw']= lang('gridsquares_gridsquares_lotw'); $data['gridsquares_gridsquares_paper']= lang('gridsquares_gridsquares_paper'); + $data['grid_count'] = $this->ffma_model->get_grid_count(); + $data['grids'] = $this->ffma_model->get_grids(); $footerData = []; $footerData['scripts']= [ 'assets/js/leaflet/geocoding.js', 'assets/js/leaflet/L.MaidenheadColouredGridmasterMap.js', - 'assets/js/sections/ffma.js?' + 'assets/js/sections/ffma.js' ]; $this->load->view('interface_assets/header',$data); @@ -731,6 +733,8 @@ class Awards extends CI_Controller { $data['grid_4char_lotw'] = ($array_grid_4char_lotw); $data['grid_4char_paper'] = ($array_grid_4char_paper); $data['grid_4char'] = ($array_grid_4char); + $data['grid_count'] = $this->ffma_model->get_grid_count(); + $data['grids'] = $this->ffma_model->get_grids(); header('Content-Type: application/json'); echo json_encode($data); diff --git a/application/models/Ffma_model.php b/application/models/Ffma_model.php index d9ae6cbd..b78f7b9f 100644 --- a/application/models/Ffma_model.php +++ b/application/models/Ffma_model.php @@ -186,4 +186,12 @@ class Ffma_model extends CI_Model { return $vucc_grids; } + function get_grid_count() { + return count($this->us_grids); + } + + function get_grids() { + return $this->us_grids; + } + } diff --git a/assets/js/sections/ffma.js b/assets/js/sections/ffma.js index 2930cd34..5096b834 100644 --- a/assets/js/sections/ffma.js +++ b/assets/js/sections/ffma.js @@ -26,7 +26,8 @@ function gridPlot(form) { $(".ld-ext-right-plot").removeClass('running'); $(".ld-ext-right-plot").prop('disabled', false); $('#plot').prop("disabled", false); - grid_max = 488; + grids = data.grids; + grid_max = data.grid_count; grid_four = data.grid_4char; grid_four_lotw = data.grid_4char_lotw; grid_four_paper = data.grid_4char_paper;