diff --git a/application/models/Activated_gridmap_model.php b/application/models/Activated_gridmap_model.php index 53f2cfc34..89ad55257 100644 --- a/application/models/Activated_gridmap_model.php +++ b/application/models/Activated_gridmap_model.php @@ -22,7 +22,7 @@ class Activated_gridmap_model extends CI_Model { if ($band != 'All') { if ($band == 'SAT') { $sql .= " and col_prop_mode ='" . $band . "'"; - if ($sat != 'All') { + if ($sat != 'All' && $sat != '') { $sql .= " and col_sat_name ='" . $sat . "'"; } } else { @@ -65,7 +65,7 @@ class Activated_gridmap_model extends CI_Model { if ($band != 'All') { if ($band == 'SAT') { $sql .= " and col_prop_mode ='" . $band . "'"; - if ($sat != 'All') { + if ($sat != 'All' && $sat != '') { $sql .= " and col_sat_name ='" . $sat . "'"; } } else { @@ -107,7 +107,7 @@ class Activated_gridmap_model extends CI_Model { if ($band != 'All') { if ($band == 'SAT') { $sql .= " and col_prop_mode ='" . $band . "'"; - if ($sat != 'All') { + if ($sat != 'All' && $sat != '') { $sql .= " and col_sat_name ='" . $sat . "'"; } } else { @@ -150,7 +150,7 @@ class Activated_gridmap_model extends CI_Model { if ($band != 'All') { if ($band == 'SAT') { $sql .= " and col_prop_mode ='" . $band . "'"; - if ($sat != 'All') { + if ($sat != 'All' && $sat != '') { $sql .= " and col_sat_name ='" . $sat . "'"; } } else { diff --git a/application/models/Gridmap_model.php b/application/models/Gridmap_model.php index ee5a5a1df..cb50f1dc4 100644 --- a/application/models/Gridmap_model.php +++ b/application/models/Gridmap_model.php @@ -24,7 +24,7 @@ class Gridmap_model extends CI_Model { if ($band != 'All') { if ($band == 'SAT') { $sql .= " and col_prop_mode ='" . $band . "'"; - if ($sat != 'All') { + if ($sat != 'All' && $sat != '') { $sql .= " and col_sat_name ='" . $sat . "'"; } } else { @@ -70,7 +70,7 @@ class Gridmap_model extends CI_Model { if ($band != 'All') { if ($band == 'SAT') { $sql .= " and col_prop_mode ='" . $band . "'"; - if ($sat != 'All') { + if ($sat != 'All' && $sat != '') { $sql .= " and col_sat_name ='" . $sat . "'"; } } else { @@ -114,7 +114,7 @@ class Gridmap_model extends CI_Model { if ($band != 'All') { if ($band == 'SAT') { $sql .= " and col_prop_mode ='" . $band . "'"; - if ($sat != 'All') { + if ($sat != 'All' && $sat != '') { $sql .= " and col_sat_name ='" . $sat . "'"; } } else { @@ -159,7 +159,7 @@ class Gridmap_model extends CI_Model { if ($band != 'All') { if ($band == 'SAT') { $sql .= " and col_prop_mode ='" . $band . "'"; - if ($sat != 'All') { + if ($sat != 'All' && $sat != '') { $sql .= " and col_sat_name ='" . $sat . "'"; } } else { diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index a5be24728..655d7e095 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -23,8 +23,8 @@ -
style="display: none;" > - ' . $sat . '' . "\n"; diff --git a/assets/js/sections/gridmap.js b/assets/js/sections/gridmap.js index 78b3b8cc2..a7e4b883f 100644 --- a/assets/js/sections/gridmap.js +++ b/assets/js/sections/gridmap.js @@ -3,15 +3,15 @@ var modalloading=false; $('#band').change(function(){ var band = $("#band option:selected").text(); if (band != "SAT") { - $("#sats").val('All'); + $("#sat").val('All'); $("#orbits").val('All'); - $("#sats").hide(); + $("#sats_div").hide(); $("#orbits").hide(); $("#satslabel").hide(); $("#orbitslabel").hide(); $('#propagation').val('').prop('disabled', false); } else { - $("#sats").show(); + $("#sats_div").show(); $("#orbits").show(); $("#orbitslabel").show(); $("#satslabel").show(); @@ -62,7 +62,7 @@ function gridPlot(form, visitor=true) { lotw: $("#lotw").is(":checked"), eqsl: $("#eqsl").is(":checked"), qrz: $("#qrz").is(":checked"), - sat: $("#sats").val(), + sat: $("#sat").val(), orbit: $("#orbits").val(), propagation: $('#propagation').val() }, @@ -143,7 +143,7 @@ function spawnGridsquareModal(loc_4char) { 'Searchphrase': loc_4char, 'Band': $("#band").val(), 'Mode': $("#mode").val(), - 'Sat': $("#sats").val(), + 'Sat': $("#sat").val(), 'Orbit': $("#orbits").val(), 'Propagation': $('#propagation').val(), 'Type': 'VUCC'