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

Added some extra bits to handle empty results

浏览代码
这个提交包含在：
Peter Goodhall 2022-02-18 13:30:26 +00:00
父节点 3a83145e09
当前提交 be8771de2e
共有 2 个文件被更改，包括 37 次插入 和 9 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

44
application/models/Logbook_model.php
查看文件

@ -916,10 +916,14 @@ class Logbook_model extends CI_Model {
return $query;
}
function get_qsos($num, $offset) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
function get_qsos($num, $offset, $StationLocationsArray) {
if($StationLocationsArray == null) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
} else {
$logbooks_locations_array = $StationLocationsArray;
}
//$this->db->select(''.$this->config->item('table_name').'.COL_CALL, '.$this->config->item('table_name').'.COL_BAND, '.$this->config->item('table_name').'.COL_TIME_ON, '.$this->config->item('table_name').'.COL_RST_RCVD, '.$this->config->item('table_name').'.COL_RST_SENT, '.$this->config->item('table_name').'.COL_MODE, '.$this->config->item('table_name').'.COL_SUBMODE, '.$this->config->item('table_name').'.COL_NAME, '.$this->config->item('table_name').'.COL_COUNTRY, '.$this->config->item('table_name').'.COL_PRIMARY_KEY, '.$this->config->item('table_name').'.COL_SAT_NAME, '.$this->config->item('table_name').'.COL_GRIDSQUARE, '.$this->config->item('table_name').'.COL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_RCVD, '.$this->config->item('table_name').'.COL_EQSL_QSL_SENT, '.$this->config->item('table_name').'.COL_QSL_SENT, '.$this->config->item('table_name').'.COL_STX, '.$this->config->item('table_name').'.COL_STX_STRING, '.$this->config->item('table_name').'.COL_SRX, '.$this->config->item('table_name').'.COL_SRX_STRING, '.$this->config->item('table_name').'.COL_LOTW_QSL_SENT, '.$this->config->item('table_name').'.COL_LOTW_QSL_RCVD, '.$this->config->item('table_name').'.COL_VUCC_GRIDS, station_profile.*');
$this->db->from($this->config->item('table_name'));
@ -1507,10 +1511,26 @@ class Logbook_model extends CI_Model {
}
else
{
return false;
$QSLBreakdown['QSL_Sent'] = 0;
$QSLBreakdown['QSL_Received'] = 0;
$QSLBreakdown['QSL_Requested'] = 0;
$QSLBreakdown['eQSL_Sent'] = 0;
$QSLBreakdown['eQSL_Received'] = 0;
$QSLBreakdown['LoTW_Sent'] = 0;
$QSLBreakdown['LoTW_Received'] = 0;
return $QSLBreakdown;
}
} else {
return false;
$QSLBreakdown['QSL_Sent'] = 0;
$QSLBreakdown['QSL_Received'] = 0;
$QSLBreakdown['QSL_Requested'] = 0;
$QSLBreakdown['eQSL_Sent'] = 0;
$QSLBreakdown['eQSL_Received'] = 0;
$QSLBreakdown['LoTW_Sent'] = 0;
$QSLBreakdown['LoTW_Received'] = 0;
return $QSLBreakdown;
}
}
@ -1766,10 +1786,18 @@ class Logbook_model extends CI_Model {
}
else
{
return false;
$CountriesBreakdown['Countries_Worked'] = 0;
$CountriesBreakdown['Countries_Worked_QSL'] = 0;
$CountriesBreakdown['Countries_Worked_EQSL'] = 0;
$CountriesBreakdown['Countries_Worked_LOTW'] = 0;
return $CountriesBreakdown;
}
} else {
return false;
$CountriesBreakdown['Countries_Worked'] = 0;
$CountriesBreakdown['Countries_Worked_QSL'] = 0;
$CountriesBreakdown['Countries_Worked_EQSL'] = 0;
$CountriesBreakdown['Countries_Worked_LOTW'] = 0;
return $CountriesBreakdown;
}
}