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

fixed bug in logbook returning past qso info

浏览代码
这个提交包含在：
Peter Goodhall 2019-09-26 21:11:10 +01:00
父节点 4b2bb08f8f
当前提交 4180a1aa4a
共有 1 个文件被更改，包括 8 次插入 和 8 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

16
application/controllers/Logbook.php
查看文件

@ -152,6 +152,10 @@ class Logbook extends CI_Controller {
if (strlen($gridsquare) < 4) if (strlen($gridsquare) < 4)
return false; return false;
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
if($type == "SAT") { if($type == "SAT") {
$this->db->where('COL_PROP_MODE', 'SAT'); $this->db->where('COL_PROP_MODE', 'SAT');
@ -162,11 +166,6 @@ class Logbook extends CI_Controller {
} }
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$this->db->where('station_id', $station_id); $this->db->where('station_id', $station_id);
$this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4)); $this->db->like('SUBSTRING(COL_GRIDSQUARE, 1, 4)', substr($gridsquare, 0, 4));
$query = $this->db->get($this->config->item('table_name'), 1, 0); $query = $this->db->get($this->config->item('table_name'), 1, 0);
@ -189,6 +188,10 @@ class Logbook extends CI_Controller {
"workedBefore" => false, "workedBefore" => false,
]; ];
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
if($type == "SAT") { if($type == "SAT") {
$this->db->where('COL_PROP_MODE', 'SAT'); $this->db->where('COL_PROP_MODE', 'SAT');
} else { } else {
@ -197,9 +200,6 @@ class Logbook extends CI_Controller {
$this->db->where('COL_PROP_MODE !=','SAT'); $this->db->where('COL_PROP_MODE !=','SAT');
} }
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$this->db->where('station_id', $station_id); $this->db->where('station_id', $station_id);