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

Revert "Merge pull request #578 from AndreasK79/award_dxcc_summary"

浏览代码 
This reverts commit 3935971e3c, reversing
changes made to 640d0c151b.
这个提交包含在：
Peter Goodhall 2020-08-19 13:42:20 +01:00
父节点 3935971e3c
当前提交 fa19166da9
共有 3 个文件被更改，包括 129 次插入 和 217 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

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

@ -128,7 +128,6 @@ class Awards extends CI_Controller {
$dxcclist = $this->dxcc->fetchdxcc($postdata); $dxcclist = $this->dxcc->fetchdxcc($postdata);
$data['dxcc_array'] = $this->dxcc->get_dxcc_array($dxcclist, $bands, $postdata); $data['dxcc_array'] = $this->dxcc->get_dxcc_array($dxcclist, $bands, $postdata);
$data['dxcc_summary'] = $this->dxcc->get_dxcc_summary($bands);
// Render Page // Render Page
$data['page_title'] = "Awards - DXCC"; $data['page_title'] = "Awards - DXCC";

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

@ -1,30 +1,29 @@
<?php <?php
class DXCC extends CI_Model class DXCC extends CI_Model {
{
public $bandslots = array("160m" => 0, public $bandslots = array("160m"=>0,
"80m" => 0, "80m"=>0,
"60m" => 0, "60m"=>0,
"40m" => 0, "40m"=>0,
"30m" => 0, "30m"=>0,
"20m" => 0, "20m"=>0,
"17m" => 0, "17m"=>0,
"15m" => 0, "15m"=>0,
"12m" => 0, "12m"=>0,
"10m" => 0, "10m"=>0,
"6m" => 0, "6m" =>0,
"4m" => 0, "4m" =>0,
"2m" => 0, "2m" =>0,
"70cm" => 0, "70cm"=>0,
"23cm" => 0, "23cm"=>0,
"13cm" => 0, "13cm"=>0,
"9cm" => 0, "9cm"=>0,
"6cm" => 0, "6cm"=>0,
"3cm" => 0, "3cm"=>0,
"1.25cm" => 0, "1.25cm"=>0,
"SAT" => 0, "SAT"=>0,
); );
function __construct() function __construct()
{ {
@ -33,126 +32,125 @@ class DXCC extends CI_Model
} }
function get_worked_bands() function get_worked_bands() {
{
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('Stations');
$station_id = $CI->Stations->find_active(); $station_id = $CI->Stations->find_active();
// 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_PROP_MODE != \"SAT\"" "SELECT distinct LOWER(`COL_BAND`) as `COL_BAND` FROM `".$this->config->item('table_name')."` WHERE station_id = ".$station_id." AND COL_PROP_MODE != \"SAT\""
); );
$worked_slots = array(); $worked_slots = array();
foreach ($data->result() as $row) { foreach($data->result() as $row){
array_push($worked_slots, $row->COL_BAND); array_push($worked_slots, $row->COL_BAND);
} }
$SAT_data = $this->db->query( $SAT_data = $this->db->query(
"SELECT distinct LOWER(`COL_PROP_MODE`) as `COL_PROP_MODE` FROM `" . $this->config->item('table_name') . "` WHERE station_id = " . $station_id . " AND COL_PROP_MODE = \"SAT\"" "SELECT distinct LOWER(`COL_PROP_MODE`) as `COL_PROP_MODE` FROM `".$this->config->item('table_name')."` WHERE station_id = ".$station_id." AND COL_PROP_MODE = \"SAT\""
); );
foreach ($SAT_data->result() as $row) { foreach($SAT_data->result() as $row){
array_push($worked_slots, strtoupper($row->COL_PROP_MODE)); array_push($worked_slots, strtoupper($row->COL_PROP_MODE));
} }
// bring worked-slots in order of defined $bandslots // bring worked-slots in order of defined $bandslots
$results = array(); $results = array();
foreach (array_keys($this->bandslots) as $slot) { foreach(array_keys($this->bandslots) as $slot) {
if (in_array($slot, $worked_slots)) { if(in_array($slot, $worked_slots)) {
array_push($results, $slot); array_push($results, $slot);
} }
} }
return $results; return $results;
} }
function show_stats() function show_stats(){
{
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('Stations');
$station_id = $CI->Stations->find_active(); $station_id = $CI->Stations->find_active();
$data = $this->db->query( $data = $this->db->query(
"select COL_COUNTRY, COL_MODE, lcase(COL_BAND) as COL_BAND, count(COL_COUNTRY) as cnt "select COL_COUNTRY, COL_MODE, lcase(COL_BAND) as COL_BAND, count(COL_COUNTRY) as cnt
from " . $this->config->item('table_name') . " from ".$this->config->item('table_name')."
where station_id = " . $station_id . " AND COL_PROP_MODE != \"SAT\" where station_id = ".$station_id." AND COL_PROP_MODE != \"SAT\"
group by COL_COUNTRY, COL_MODE, COL_BAND" group by COL_COUNTRY, COL_MODE, COL_BAND"
); );
$results = array(); $results = array();
$last_country = ""; $last_country = "";
foreach ($data->result() as $row) { foreach($data->result() as $row){
if ($last_country != $row->COL_COUNTRY) { if ($last_country != $row->COL_COUNTRY){
// new row // new row
$results[$row->COL_COUNTRY] = $this->bandslots; $results[$row->COL_COUNTRY] = $this->bandslots;
$last_country = $row->COL_COUNTRY; $last_country = $row->COL_COUNTRY;
} }
// update stats // update stats
if (!isset($results[$row->COL_COUNTRY])) if (!isset($results[$row->COL_COUNTRY]))
$results[$row->COL_COUNTRY] = []; $results[$row->COL_COUNTRY] = [];
if (!isset($results[$row->COL_COUNTRY][$row->COL_BAND])) if (!isset($results[$row->COL_COUNTRY][$row->COL_BAND]))
$results[$row->COL_COUNTRY][$row->COL_BAND] = 0; $results[$row->COL_COUNTRY][$row->COL_BAND] = 0;
$results[$row->COL_COUNTRY][$row->COL_BAND] += $row->cnt; $results[$row->COL_COUNTRY][$row->COL_BAND] += $row->cnt;
} }
// Satellite DXCC // Satellite DXCC
$satellite_data = $this->db->query( $satellite_data = $this->db->query(
"select COL_COUNTRY, COL_PROP_MODE as COL_PROP_MODE, count(COL_COUNTRY) as cnt "select COL_COUNTRY, COL_PROP_MODE as COL_PROP_MODE, count(COL_COUNTRY) as cnt
from " . $this->config->item('table_name') . " from ".$this->config->item('table_name')."
where station_id = " . $station_id . " AND COL_PROP_MODE = \"SAT\" where station_id = ".$station_id." AND COL_PROP_MODE = \"SAT\"
group by COL_COUNTRY" group by COL_COUNTRY"
); );
foreach ($satellite_data->result() as $row) { foreach($satellite_data->result() as $row){
if ($last_country != $row->COL_COUNTRY) { if ($last_country != $row->COL_COUNTRY){
// new row // new row
$results[$row->COL_COUNTRY] = $this->bandslots; $results[$row->COL_COUNTRY] = $this->bandslots;
$last_country = $row->COL_COUNTRY; $last_country = $row->COL_COUNTRY;
} }
// update stats // update stats
if (!isset($results[$row->COL_COUNTRY])) if (!isset($results[$row->COL_COUNTRY]))
$results[$row->COL_COUNTRY] = []; $results[$row->COL_COUNTRY] = [];
if (!isset($results[$row->COL_COUNTRY][$row->COL_PROP_MODE])) if (!isset($results[$row->COL_COUNTRY][$row->COL_PROP_MODE]))
$results[$row->COL_COUNTRY][$row->COL_PROP_MODE] = 0; $results[$row->COL_COUNTRY][$row->COL_PROP_MODE] = 0;
$results[$row->COL_COUNTRY][$row->COL_PROP_MODE] += $row->cnt; $results[$row->COL_COUNTRY][$row->COL_PROP_MODE] += $row->cnt;
} }
// print_r($results); // print_r($results);
// return; // return;
return $results; return $results;
} }
/** /**
* Function: mostactive * Function: mostactive
* Information: Returns the most active band * Information: Returns the most active band
**/ **/
function info($callsign) function info($callsign)
{ {
$exceptions = $this->db->query(' $exceptions = $this->db->query('
SELECT * SELECT *
FROM `dxccexceptions` FROM `dxccexceptions`
WHERE `prefix` = \'' . $callsign . '\' WHERE `prefix` = \''.$callsign.'\'
LIMIT 1 LIMIT 1
'); ');
if ($exceptions->num_rows() > 0) { if ($exceptions->num_rows() > 0)
{
return $exceptions; return $exceptions;
} else { } else {
$query = $this->db->query(' $query = $this->db->query('
SELECT * SELECT *
FROM dxcc_entities FROM dxcc_entities
WHERE prefix = SUBSTRING( \'' . $callsign . '\', 1, LENGTH( prefix ) ) WHERE prefix = SUBSTRING( \''.$callsign.'\', 1, LENGTH( prefix ) )
ORDER BY LENGTH( prefix ) DESC ORDER BY LENGTH( prefix ) DESC
LIMIT 1 LIMIT 1
'); ');
@ -161,30 +159,26 @@ class DXCC extends CI_Model
} }
} }
function search() function search(){
{ print_r($this->input->get());
print_r($this->input->get()); return;
return; }
}
function empty_table($table) function empty_table($table) {
{
$this->db->empty_table($table); $this->db->empty_table($table);
} }
function list() function list() {
{
$this->db->order_by('name', 'ASC'); $this->db->order_by('name', 'ASC');
return $this->db->get('dxcc_entities'); return $this->db->get('dxcc_entities');
} }
function get_dxcc_array($dxccArray, $bands, $postdata) function get_dxcc_array($dxccArray, $bands, $postdata) {
{
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('Stations');
$station_id = $CI->Stations->find_active(); $station_id = $CI->Stations->find_active();
foreach ($bands as $band) { // Looping through bands and entities to generate the array needed for display foreach ($bands as $band) { // Looping through bands and entities to generate the array needed for display
foreach ($dxccArray as $dxcc) { foreach ($dxccArray as $dxcc) {
$dxccMatrix[$dxcc->adif]['name'] = $dxcc->name; $dxccMatrix[$dxcc->adif]['name'] = $dxcc->name;
$dxccMatrix[$dxcc->adif]['Dxccprefix'] = $dxcc->prefix; $dxccMatrix[$dxcc->adif]['Dxccprefix'] = $dxcc->prefix;
@ -197,7 +191,7 @@ class DXCC extends CI_Model
if ($postdata['worked'] != NULL) { if ($postdata['worked'] != NULL) {
$workedDXCC = $this->getDxccBandWorked($station_id, $band, $postdata); $workedDXCC = $this->getDxccBandWorked($station_id, $band, $postdata);
foreach ($workedDXCC as $wdxcc) { foreach ($workedDXCC as $wdxcc) {
$dxccMatrix[$wdxcc->dxcc][$band] = '<div class="alert-danger"><a href=\'dxcc_details?Country="' . str_replace("&", "%26", $wdxcc->name) . '"&Band="' . $band . '"\'>W</a></div>';; $dxccMatrix[$wdxcc->dxcc][$band] = '<div class="alert-danger"><a href=\'dxcc_details?Country="'.str_replace("&", "%26", $wdxcc->name).'"&Band="'. $band . '"\'>W</a></div>';;
} }
} }
@ -205,7 +199,7 @@ class DXCC extends CI_Model
if ($postdata['confirmed'] != NULL) { if ($postdata['confirmed'] != NULL) {
$confirmedDXCC = $this->getDxccBandConfirmed($station_id, $band, $postdata); $confirmedDXCC = $this->getDxccBandConfirmed($station_id, $band, $postdata);
foreach ($confirmedDXCC as $cdxcc) { foreach ($confirmedDXCC as $cdxcc) {
$dxccMatrix[$cdxcc->dxcc][$band] = '<div class="alert-success"><a href=\'dxcc_details?Country="' . str_replace("&", "%26", $cdxcc->name) . '"&Band="' . $band . '"\'>C</a></div>';; $dxccMatrix[$cdxcc->dxcc][$band] = '<div class="alert-success"><a href=\'dxcc_details?Country="'.str_replace("&", "%26", $cdxcc->name).'"&Band="'. $band . '"\'>C</a></div>';;
} }
} }
} }
@ -232,22 +226,23 @@ class DXCC extends CI_Model
if (isset($dxccMatrix)) { if (isset($dxccMatrix)) {
return $dxccMatrix; return $dxccMatrix;
} else { }
else {
return 0; return 0;
} }
} }
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 " . $this->config->item('table_name') . " 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";
if ($band == 'SAT') { if ($band == 'SAT') {
$sql .= " and col_prop_mode ='" . $band . "'"; $sql .= " and col_prop_mode ='" . $band . "'";
} else { }
else {
$sql .= " and col_prop_mode !='SAT'"; $sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $band . "'"; $sql .= " and col_band ='" . $band . "'";
} }
@ -268,17 +263,17 @@ class DXCC extends CI_Model
return $query->result(); return $query->result();
} }
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 " . $this->config->item('table_name') . " 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";
if ($band == 'SAT') { if ($band == 'SAT') {
$sql .= " and col_prop_mode ='" . $band . "'"; $sql .= " and col_prop_mode ='" . $band . "'";
} else { }
else {
$sql .= " and col_prop_mode !='SAT'"; $sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $band . "'"; $sql .= " and col_band ='" . $band . "'";
} }
@ -297,8 +292,7 @@ class DXCC extends CI_Model
return $query->result(); return $query->result();
} }
function fetchDxcc($postdata) function fetchDxcc($postdata) {
{
$CI =& get_instance(); $CI =& get_instance();
$CI->load->model('Stations'); $CI->load->model('Stations');
$station_id = $CI->Stations->find_active(); $station_id = $CI->Stations->find_active();
@ -307,12 +301,13 @@ 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 " . $this->config->item('table_name') . " 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') {
$sql .= " and col_prop_mode ='" . $postdata['band'] . "'"; $sql .= " and col_prop_mode ='" . $postdata['band'] . "'";
} else { }
else {
$sql .= " and col_prop_mode !='SAT'"; $sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $postdata['band'] . "'"; $sql .= " and col_band ='" . $postdata['band'] . "'";
} }
@ -335,30 +330,31 @@ class DXCC extends CI_Model
return $query->result(); return $query->result();
} }
function getDxccWorked($station_id, $postdata) function getDxccWorked($station_id, $postdata) {
{
$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 " . $this->config->item('table_name') . " 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";
if ($postdata['band'] != 'All') { if ($postdata['band'] != 'All') {
if ($postdata['band'] == 'SAT') { if ($postdata['band'] == 'SAT') {
$sql .= " and col_prop_mode ='" . $postdata['band'] . "'"; $sql .= " and col_prop_mode ='" . $postdata['band'] . "'";
} else { }
else {
$sql .= " and col_prop_mode !='SAT'"; $sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $postdata['band'] . "'"; $sql .= " and col_band ='" . $postdata['band'] . "'";
} }
} }
$sql .= " and not exists (select 1 from " . $this->config->item('table_name') . " 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') {
$sql .= " and col_prop_mode ='" . $postdata['band'] . "'"; $sql .= " and col_prop_mode ='" . $postdata['band'] . "'";
} else { }
else {
$sql .= " and col_prop_mode !='SAT'"; $sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $postdata['band'] . "'"; $sql .= " and col_band ='" . $postdata['band'] . "'";
} }
@ -383,19 +379,19 @@ class DXCC extends CI_Model
return $query->result(); return $query->result();
} }
function getDxccConfirmed($station_id, $postdata) function getDxccConfirmed($station_id, $postdata) {
{
$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 " . $this->config->item('table_name') . " 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";
if ($postdata['band'] != 'All') { if ($postdata['band'] != 'All') {
if ($postdata['band'] == 'SAT') { if ($postdata['band'] == 'SAT') {
$sql .= " and col_prop_mode ='" . $postdata['band'] . "'"; $sql .= " and col_prop_mode ='" . $postdata['band'] . "'";
} else { }
else {
$sql .= " and col_prop_mode !='SAT'"; $sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $postdata['band'] . "'"; $sql .= " and col_band ='" . $postdata['band'] . "'";
} }
@ -419,8 +415,7 @@ class DXCC extends CI_Model
} }
// Made function instead of repeating this several times // Made function instead of repeating this several times
function addQslToQuery($postdata) function addQslToQuery($postdata) {
{
$sql = ''; $sql = '';
if ($postdata['lotw'] != NULL and $postdata['qsl'] == NULL) { if ($postdata['lotw'] != NULL and $postdata['qsl'] == NULL) {
$sql .= " and col_lotw_qsl_rcvd = 'Y'"; $sql .= " and col_lotw_qsl_rcvd = 'Y'";
@ -437,8 +432,7 @@ class DXCC extends CI_Model
} }
// Made function instead of repeating this several times // Made function instead of repeating this several times
function addContinentsToQuery($postdata) function addContinentsToQuery($postdata) {
{
$sql = ''; $sql = '';
if ($postdata['Africa'] == NULL) { if ($postdata['Africa'] == NULL) {
$sql .= " and cont <> 'AF'"; $sql .= " and cont <> 'AF'";
@ -469,56 +463,5 @@ class DXCC extends CI_Model
} }
return $sql; return $sql;
} }
/*
* Function gets worked and confirmed summary on each band on the active stationprofile
*/
function get_dxcc_summary($bands)
{
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
foreach ($bands as $band) {
$result = $this->getSummaryByBand($band, $station_id);
$dxccSummary['worked'][$band] = $result[0]->count;
$dxccSummary['confirmed'][$band] = $result[0]->cfmdxcc;
}
return $dxccSummary;
}
function getSummaryByBand($band, $station_id)
{
$sql = "SELECT thcv.col_band, count(distinct thcv.col_dxcc) as count, coalesce (cfmdxcc.count, 0) as cfmdxcc FROM " . $this->config->item('table_name') . " thcv";
$sql .= " left outer join (
select col_band, count(distinct col_dxcc) as count from " . $this->config->item('table_name') . " thcv";
$sql .= " where station_id = " . $station_id;
if ($band == 'SAT') {
$sql .= " and col_prop_mode ='" . $band . "'";
} else {
$sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band ='" . $band . "'";
}
$sql .= " and (col_qsl_rcvd = 'Y' or col_lotw_qsl_rcvd = 'Y')";
$sql .= ") cfmdxcc on thcv.col_band = cfmdxcc.col_band ";
$sql .= " where station_id = " . $station_id;
if ($band == 'SAT') {
$sql .= " and thcv.col_prop_mode ='" . $band . "'";
} else {
$sql .= " and thcv.col_prop_mode !='SAT'";
$sql .= " and thcv.col_band ='" . $band . "'";
}
$query = $this->db->query($sql);
return $query->result();
}
} }
?> ?>

32
application/views/awards/dxcc/index.php
查看文件

@ -140,37 +140,7 @@
} }
echo '</tr>'; echo '</tr>';
} }
echo '</table> echo '</tfoot></table></div>';
<h1>Summary</h1>
<table class="table table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr><td></td>';
foreach($bands as $band) {
echo '<td>' . $band . '</td>';
}
echo '</tr>';
echo '</tr>
</thead>
<tbody>
<tr><td>Total worked</td>';
foreach ($dxcc_summary['worked'] as $dxcc) { // Fills the table with the data
echo '<td style="text-align: center">' . $dxcc . '</td>';
}
echo '</tr><tr>
<td>Total confirmed</td>';
foreach ($dxcc_summary['confirmed'] as $dxcc) { // Fills the table with the data
echo '<td style="text-align: center">' . $dxcc . '</td>';
}
echo '</tr>
</table>
</div>';
} }
else { else {