diff --git a/application/models/Gridsquares_model.php b/application/models/Gridsquares_model.php
index 0fb5705a..1357ce16 100644
--- a/application/models/Gridsquares_model.php
+++ b/application/models/Gridsquares_model.php
@@ -51,15 +51,22 @@ class Gridsquares_model extends CI_Model {
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
- return $this->db->query('SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '.$this->config->item('table_name').'
- WHERE station_id = "'.$station_id.'" AND COL_GRIDSQUARE != ""
- AND COL_BAND = "'.$band.'"
+
+ $sql = 'SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '
+ .$this->config->item('table_name')
+ .' WHERE station_id = "'
+ .$station_id.'" AND COL_GRIDSQUARE != ""';
+ if ($band != 'All') {
+ $sql .= ' AND COL_BAND = "' . $band
+ .'"
AND COL_PROP_MODE != "SAT"
AND COL_PROP_MODE != "INTERNET"
AND COL_PROP_MODE != "ECH"
AND COL_PROP_MODE != "RPT"
- AND COL_SAT_NAME = ""
- ');
+ AND COL_SAT_NAME = ""';
+ }
+
+ return $this->db->query($sql);
}
function get_band_confirmed($band) {
@@ -67,14 +74,24 @@ class Gridsquares_model extends CI_Model {
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
- return $this->db->query('SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '.$this->config->item('table_name').' WHERE station_id = "'.$station_id.'" AND COL_GRIDSQUARE != "" AND COL_BAND = "'.$band.'"
+ $sql = 'SELECT distinct substring(COL_GRIDSQUARE,1,6) as GRID_SQUARES, COL_BAND FROM '
+ .$this->config->item('table_name')
+ .' WHERE station_id = "'
+ .$station_id.'" AND COL_GRIDSQUARE != ""';
+ if ($band != 'All') {
+ $sql .= ' AND COL_BAND = "' . $band
+ .'"
AND COL_PROP_MODE != "SAT"
AND COL_PROP_MODE != "INTERNET"
AND COL_PROP_MODE != "ECH"
AND COL_PROP_MODE != "RPT"
- AND COL_SAT_NAME = ""
- AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y")
- ');
+ AND COL_SAT_NAME = ""';
+ }
+
+ $sql .= ' AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y")';
+
+
+ return $this->db->query($sql);
}
function search_band($band, $gridsquare) {
@@ -82,13 +99,23 @@ class Gridsquares_model extends CI_Model {
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
- $result = $this->db->query('SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_GRIDSQUARE FROM '.$this->config->item('table_name').' WHERE station_id = "'.$station_id.'" AND COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_BAND = "'.$band.'"
+ $sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_GRIDSQUARE FROM '
+ .$this->config->item('table_name')
+ .' WHERE station_id = "'
+ .$station_id.'" AND COL_GRIDSQUARE LIKE "%'
+ .$gridsquare.'%"';
+
+ if ($band != 'All') {
+ $sql .= ' AND COL_BAND = "' . $band
+ .'"
AND COL_PROP_MODE != "SAT"
AND COL_PROP_MODE != "INTERNET"
AND COL_PROP_MODE != "ECH"
AND COL_PROP_MODE != "RPT"
- AND COL_SAT_NAME = ""
- ');
+ AND COL_SAT_NAME = ""';
+ }
+
+ $result = $this->db->query($sql);
//print_r($result);
return json_encode($result->result());
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index b1cd656f..63e666fe 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -983,8 +983,8 @@ $(document).ready(function(){
uri->segment(1) == "gridsquares" && $this->uri->segment(2) == "band") { ?>
var bands_available = ;
-
- $.each(bands_available, function(key, value) {
+ $('#gridsquare_bands').append('')
+ $.each(bands_available, function(key, value) {
$('#gridsquare_bands')
.append($("")
.attr("value",value)