goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Added all to the gridsquare select. Fixes #470.

浏览代码
这个提交包含在：
AndreasK79 2020-04-25 08:36:44 +02:00
父节点 93b7100c51
当前提交 949c421a61
共有 2 个文件被更改，包括 41 次插入 和 14 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

51
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());

2
application/views/interface_assets/footer.php
查看文件

@ -983,7 +983,7 @@ $(document).ready(function(){
<?php if ($this->uri->segment(1) == "gridsquares" && $this->uri->segment(2) == "band") { ?>
var bands_available = <?php echo $bands_available; ?>;
$('#gridsquare_bands').append('<option value="All">All</option>')
$.each(bands_available, function(key, value) {
$('#gridsquare_bands')
.append($("<option></option>")