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

Merge pull request #1158 from AndreasK79/sig_station_logbooks

浏览代码 
[SIG Award] Updated code to support station logbooks
这个提交包含在：
Peter Goodhall 2021-09-09 21:52:02 +01:00 提交者 GitHub
当前提交 ab9553883d
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改，包括 17 次插入 和 14 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
application/controllers/Awards.php
查看文件

@ -477,7 +477,7 @@ class Awards extends CI_Controller {
ini_set('memory_limit', '-1'); ini_set('memory_limit', '-1');
$this->load->model('adif_data'); $this->load->model('adif_data');
//$type = str_replace('"', "", $this->input->get("type"));
$type = $this->uri->segment(3); $type = $this->uri->segment(3);
$data['qsos'] = $this->adif_data->sig_all($type); $data['qsos'] = $this->adif_data->sig_all($type);

7
application/models/Adif_data.php
查看文件

@ -128,12 +128,13 @@ class adif_data extends CI_Model {
} }
function sig_all($type) { function sig_all($type) {
$this->load->model('stations'); $CI =& get_instance();
$active_station_id = $this->stations->find_active(); $CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->select(''.$this->config->item('table_name').'.*, station_profile.*'); $this->db->select(''.$this->config->item('table_name').'.*, station_profile.*');
$this->db->from($this->config->item('table_name')); $this->db->from($this->config->item('table_name'));
$this->db->where($this->config->item('table_name').'.station_id', $active_station_id); $this->db->where_in($this->config->item('table_name').'.station_id', $logbooks_locations_array);
$this->db->where($this->config->item('table_name').'.COL_SIG', $type); $this->db->where($this->config->item('table_name').'.COL_SIG', $type);
$this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "ASC"); $this->db->order_by($this->config->item('table_name').".COL_TIME_ON", "ASC");

14
application/models/Sig.php
查看文件

@ -9,10 +9,10 @@ class Sig extends CI_Model {
function get_all($type) { function get_all($type) {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$this->db->where("station_id", $station_id); $this->db->where_in("station_id", $logbooks_locations_array);
$this->db->order_by("COL_SIG_INFO", "ASC"); $this->db->order_by("COL_SIG_INFO", "ASC");
$this->db->where('COL_SIG =', $type); $this->db->where('COL_SIG =', $type);
@ -21,12 +21,14 @@ class Sig extends CI_Model {
function get_all_sig_types() { function get_all_sig_types() {
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('logbooks_model');
$station_id = $CI->Stations->find_active(); $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
$location_list = "'".implode("','",$logbooks_locations_array)."'";
$sql = "select col_sig, count(*) qsos, count(distinct col_sig_info) refs from " . $this->config->item('table_name') . $sql = "select col_sig, count(*) qsos, count(distinct col_sig_info) refs from " . $this->config->item('table_name') .
" where col_sig <> ''" . " where col_sig <> ''" .
" and station_id = " . $station_id . " and station_id in (" . $location_list . ")" .
" group by col_sig"; " group by col_sig";
$query = $this->db->query($sql); $query = $this->db->query($sql);