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

[CQ Award] Updated code to support station logbooks

浏览代码
这个提交包含在：
Andreas 2021-09-09 18:14:41 +02:00
父节点 a6422fa341
当前提交 5622c488a7
共有 2 个文件被更改，包括 16 次插入 和 13 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -27,7 +27,6 @@ class Awards extends CI_Controller {
public function dok () public function dok ()
{ {
//echo "Needs Developed";
$this->load->model('dok'); $this->load->model('dok');
$data['doks'] = $this->dok->show_stats(); $data['doks'] = $this->dok->show_stats();
$data['worked_bands'] = $this->dok->get_worked_bands(); $data['worked_bands'] = $this->dok->get_worked_bands();

16
application/models/Dok.php
查看文件

@ -31,12 +31,14 @@ class DOK extends CI_Model {
function get_worked_bands() { function get_worked_bands() {
$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)."'";
// get all worked slots from database // get all worked slots from database
$data = $this->db->query( $data = $this->db->query(
"SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `".$this->config->item('table_name')."` WHERE station_id = ".$station_id." AND COL_DARC_DOK IS NOT NULL AND COL_DARC_DOK != '' AND COL_DXCC = 230 " "SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `".$this->config->item('table_name')."` WHERE station_id in (" . $location_list . ") AND COL_DARC_DOK IS NOT NULL AND COL_DARC_DOK != '' AND COL_DXCC = 230 "
); );
$worked_slots = array(); $worked_slots = array();
foreach($data->result() as $row){ foreach($data->result() as $row){
@ -56,12 +58,14 @@ class DOK extends CI_Model {
function show_stats() { function show_stats() {
$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)."'";
$data = $this->db->query( $data = $this->db->query(
"select upper(COL_DARC_DOK) as COL_DARC_DOK, COL_MODE, lcase(COL_BAND) as COL_BAND, count(COL_DARC_DOK) as cnt "select upper(COL_DARC_DOK) as COL_DARC_DOK, COL_MODE, lcase(COL_BAND) as COL_BAND, count(COL_DARC_DOK) as cnt
from ".$this->config->item('table_name')." WHERE station_id = ".$station_id." AND COL_DARC_DOK IS NOT NULL AND COL_DARC_DOK != '' AND COL_DXCC = 230 from ".$this->config->item('table_name')." WHERE station_id in (" . $location_list . ") AND COL_DARC_DOK IS NOT NULL AND COL_DARC_DOK != '' AND COL_DXCC = 230
group by COL_DARC_DOK, COL_MODE, COL_BAND" group by COL_DARC_DOK, COL_MODE, COL_BAND"
); );