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

New DXCC modal wasn't getting log qso table name from config file

浏览代码
这个提交包含在：
Peter Goodhall 2020-03-03 14:50:59 +00:00
父节点 96e5000e08
当前提交 5e8ca71d59
共有 1 个文件被更改，包括 6 次插入 和 6 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

12
application/models/Dxcc.php
查看文件

@ -234,7 +234,7 @@ class DXCC extends CI_Model {
function getDxccBandConfirmed($station_id, $band, $postdata) { function getDxccBandConfirmed($station_id, $band, $postdata) {
$sql = "select adif as dxcc, name from dxcc_entities $sql = "select adif as dxcc, name from dxcc_entities
join ( join (
select col_dxcc from table_hrd_contacts_v01 thcv select col_dxcc from ".$this->config->item('table_name')." thcv
where station_id = " . $station_id . where station_id = " . $station_id .
" and col_dxcc > 0"; " and col_dxcc > 0";
@ -264,7 +264,7 @@ class DXCC extends CI_Model {
function getDxccBandWorked($station_id, $band, $postdata) { function getDxccBandWorked($station_id, $band, $postdata) {
$sql = "select adif as dxcc, name from dxcc_entities $sql = "select adif as dxcc, name from dxcc_entities
join ( join (
select col_dxcc from table_hrd_contacts_v01 thcv select col_dxcc from ".$this->config->item('table_name')." thcv
where station_id = " . $station_id . where station_id = " . $station_id .
" and col_dxcc > 0"; " and col_dxcc > 0";
@ -298,7 +298,7 @@ class DXCC extends CI_Model {
from dxcc_entities"; from dxcc_entities";
if ($postdata['notworked'] == NULL) { if ($postdata['notworked'] == NULL) {
$sql .= " join (select col_dxcc from table_hrd_contacts_v01 where station_id = $station_id"; $sql .= " join (select col_dxcc from ".$this->config->item('table_name')." where station_id = $station_id";
if ($postdata['band'] != 'All') { if ($postdata['band'] != 'All') {
if ($postdata['band'] == 'SAT') { if ($postdata['band'] == 'SAT') {
@ -330,7 +330,7 @@ class DXCC extends CI_Model {
$sql = "SELECT adif as dxcc FROM dxcc_entities $sql = "SELECT adif as dxcc FROM dxcc_entities
join ( join (
select col_dxcc select col_dxcc
from table_hrd_contacts_v01 thcv from ".$this->config->item('table_name')." thcv
where station_id = " . $station_id . where station_id = " . $station_id .
" and col_dxcc > 0"; " and col_dxcc > 0";
@ -343,7 +343,7 @@ class DXCC extends CI_Model {
} }
} }
$sql .= " and not exists (select 1 from table_hrd_contacts_v01 where station_id = $station_id and col_dxcc = thcv.col_dxcc"; $sql .= " and not exists (select 1 from ".$this->config->item('table_name')." where station_id = $station_id and col_dxcc = thcv.col_dxcc";
if ($postdata['band'] != 'All') { if ($postdata['band'] != 'All') {
if ($postdata['band'] == 'SAT') { if ($postdata['band'] == 'SAT') {
@ -377,7 +377,7 @@ class DXCC extends CI_Model {
$sql = "SELECT adif as dxcc FROM dxcc_entities $sql = "SELECT adif as dxcc FROM dxcc_entities
join ( join (
select col_dxcc select col_dxcc
from table_hrd_contacts_v01 thcv from ".$this->config->item('table_name')." thcv
where station_id = ". $station_id . where station_id = ". $station_id .
" and col_dxcc > 0"; " and col_dxcc > 0";