Public_Tools/wavelog
3
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-25 19:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1092 from AndreasK79/gridsquare_mao_query_fix

Browse Source 
[Gridsquare Map] Added support for searching in COL_VUCC_GRIDS when c…
This commit is contained in:
Peter Goodhall
2021-07-19 17:58:31 +01:00
committed by GitHub
parent e63f3c8c6f 2e3990fb2a
commit d4a3045ff8
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/models/Gridsquares_model.php
View File

@@ -31,7 +31,7 @@ class Gridsquares_model extends CI_Model {
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
return $this->db->query('SELECT COL_VUCC_GRIDS, COL_SAT_NAME FROM '.$this->config->item('table_name').' WHERE station_id = "'.$station_id.'" AND COL_VUCC_GRIDS != "" AND COL_SAT_NAME != "" AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y") AND (COL_LOTW_QSL_RCVD = "Y" OR COL_QSL_RCVD = "Y")');
}
@@ -58,7 +58,7 @@ class Gridsquares_model extends CI_Model {
.$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"
@@ -80,7 +80,7 @@ class Gridsquares_model extends CI_Model {
.$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"
@@ -99,15 +99,14 @@ class Gridsquares_model extends CI_Model {
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_GRIDSQUARE FROM '
$sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_GRIDSQUARE, COL_VUCC_GRIDS FROM '
.$this->config->item('table_name')
.' WHERE station_id = "'
.$station_id.'" AND COL_GRIDSQUARE LIKE "%'
.$gridsquare.'%"';
.' WHERE station_id = "' . $station_id . '" '
. ' AND (COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" or COL_VUCC_GRIDS 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"
@@ -126,7 +125,13 @@ 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_SAT_NAME, COL_GRIDSQUARE FROM '.$this->config->item('table_name').' WHERE station_id = "'.$station_id.'" AND COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" AND COL_PROP_MODE = "SAT"');
$sql = 'SELECT COL_CALL, COL_TIME_ON, COL_BAND, COL_MODE, COL_SAT_NAME, COL_GRIDSQUARE, COL_VUCC_GRIDS FROM ' .
$this->config->item('table_name').
' WHERE station_id = "'.$station_id. '"' .
' AND (COL_GRIDSQUARE LIKE "%'.$gridsquare.'%" or COL_VUCC_GRIDS LIKE "%'.$gridsquare.'%")'.
' AND COL_PROP_MODE = "SAT"';
$result = $this->db->query($sql);
//print_r($result);
return json_encode($result->result());

4
application/views/interface_assets/footer.php
View File

@@ -827,9 +827,9 @@ $(document).ready(function(){
$.each( data, function( i, item ) {
console.log(item.COL_CALL + item.COL_SAT_NAME);
if(item.COL_SAT_NAME != undefined) {
items.push( "<tr><td>" + item.COL_TIME_ON + "</td><td>" + item.COL_CALL + "</td><td>" + item.COL_MODE + "</td><td>" + item.COL_SAT_NAME + "</td><td>" + item.COL_GRIDSQUARE + "</td></tr>" );
items.push( "<tr><td>" + item.COL_TIME_ON + "</td><td>" + item.COL_CALL + "</td><td>" + item.COL_MODE + "</td><td>" + item.COL_SAT_NAME + "</td><td>" + item.COL_GRIDSQUARE + item.COL_VUCC_GRIDS + "</td></tr>" );
} else {
items.push( "<tr><td>" + item.COL_TIME_ON + "</td><td>" + item.COL_CALL + "</td><td>" + item.COL_MODE + "</td><td>" + item.COL_BAND + "</td><td>" + item.COL_GRIDSQUARE + "</td></tr>" );
items.push( "<tr><td>" + item.COL_TIME_ON + "</td><td>" + item.COL_CALL + "</td><td>" + item.COL_MODE + "</td><td>" + item.COL_BAND + "</td><td>" + item.COL_GRIDSQUARE + item.COL_VUCC_GRIDS + "</td></tr>" );
}
});