Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/magicbug/Cloudlog

Browse Source
This commit is contained in:
Peter Goodhall
2019-06-19 14:14:22 +01:00
parent 45a809c331 b793325ba9
commit 754098f986
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/models/Cq.php
View File

@@ -11,7 +11,7 @@ class CQ extends CI_Model{
function get_zones(){
$data = $this->db->query(
"select COL_CQZ, count(COL_CQZ)
from TABLE_HRD_CONTACTS_V01
from ".$this->config->item('table_name')."
where COL_CQZ is not null
group by COL_CQZ order by COL_CQZ"
);

10
application/models/Dxcc.php
View File

@@ -32,7 +32,7 @@ class DXCC extends CI_Model {
function get_worked_bands() {
// get all worked slots from database
$data = $this->db->query(
"SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `TABLE_HRD_CONTACTS_V01`"
"SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `".$this->config->item('table_name')."`"
);
$worked_slots = array();
foreach($data->result() as $row){
@@ -54,7 +54,7 @@ class DXCC extends CI_Model {
$data = $this->db->query(
"select COL_COUNTRY, COL_MODE, lcase(COL_BAND) as COL_BAND, count(COL_COUNTRY) as cnt
from TABLE_HRD_CONTACTS_V01
from ".$this->config->item('table_name')."
group by COL_COUNTRY, COL_MODE, COL_BAND"
);
@@ -68,6 +68,12 @@ class DXCC extends CI_Model {
}
// update stats
if (!isset($results[$row->COL_COUNTRY]))
$results[$row->COL_COUNTRY] = [];
if (!isset($results[$row->COL_COUNTRY][$row->COL_BAND]))
$results[$row->COL_COUNTRY][$row->COL_BAND] = 0;
$results[$row->COL_COUNTRY][$row->COL_BAND] += $row->cnt;
}