[Gridmap] Added country grids

This commit is contained in:
Andreas Kristiansen
2025-10-18 19:36:17 +02:00
parent 6be185b29e
commit 0ba4c8bd9c
9 changed files with 200 additions and 55 deletions

View File

@@ -20,6 +20,7 @@ class Gridmap extends CI_Controller {
$data['bands'] = $this->bands->get_worked_bands();
$data['orbits'] = $this->bands->get_worked_orbits();
$data['sats_available'] = $this->bands->get_worked_sats();
$data['countries'] = $this->gridmap_model->get_countries();
$data['user_default_band'] = $this->session->userdata('user_default_band');
$data['user_default_confirmation'] = $this->session->userdata('user_default_confirmation');
@@ -60,8 +61,12 @@ class Gridmap extends CI_Controller {
$sat = $this->input->post('sat', TRUE);
$orbit = $this->input->post('orbit', TRUE);
$propagation = $this->input->post('propagation', TRUE);
$dxcc = $this->input->post('dxcc', TRUE);
$this->load->model('gridmap_model');
$data['grids'] = $this->gridmap_model->get_grids_for_country($dxcc);
$data['grid_count'] = count($data['grids']);
$array_grid_2char = array();
$array_grid_4char = array();
$array_grid_6char = array();
@@ -78,7 +83,7 @@ class Gridmap extends CI_Controller {
$grid_4char_confirmed = "";
$grid_6char_confirmed = "";
$query = $this->gridmap_model->get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit, $propagation);
$query = $this->gridmap_model->get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit, $propagation, $dxcc);
if ($query && $query->num_rows() > 0) {
foreach ($query->result() as $row) {
@@ -105,7 +110,7 @@ class Gridmap extends CI_Controller {
}
}
$query = $this->gridmap_model->get_band($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit, $propagation);
$query = $this->gridmap_model->get_band($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit, $propagation, $dxcc);
if ($query && $query->num_rows() > 0) {
foreach ($query->result() as $row) {
@@ -132,7 +137,7 @@ class Gridmap extends CI_Controller {
}
}
}
$query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit, $propagation);
$query_vucc = $this->gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit, $propagation, $dxcc);
if ($query_vucc && $query_vucc->num_rows() > 0) {
foreach ($query_vucc->result() as $row) {
@@ -157,7 +162,7 @@ class Gridmap extends CI_Controller {
}
// // Confirmed Squares
$query_vucc = $this->gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit, $propagation);
$query_vucc = $this->gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat, $orbit, $propagation, $dxcc);
if ($query_vucc && $query_vucc->num_rows() > 0) {
foreach ($query_vucc->result() as $row) {