[Statistics] Fixed when no QSOs
这个提交包含在:
父节点
d71be33ffe
当前提交
ea93b69e04
共有 2 个文件被更改,包括 69 次插入 和 18 次删除
|
|
@ -991,6 +991,9 @@ class Logbook_model extends CI_Model {
|
||||||
$CI->load->model('logbooks_model');
|
$CI->load->model('logbooks_model');
|
||||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||||
|
|
||||||
|
if (!$logbooks_locations_array) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
$this->db->select('DATE_FORMAT(COL_TIME_ON, \'%Y\') as \'year\',COUNT(COL_PRIMARY_KEY) as \'total\'', FALSE);
|
$this->db->select('DATE_FORMAT(COL_TIME_ON, \'%Y\') as \'year\',COUNT(COL_PRIMARY_KEY) as \'total\'', FALSE);
|
||||||
$this->db->where_in('station_id', $logbooks_locations_array);
|
$this->db->where_in('station_id', $logbooks_locations_array);
|
||||||
|
|
@ -1197,6 +1200,10 @@ class Logbook_model extends CI_Model {
|
||||||
$CI->load->model('logbooks_model');
|
$CI->load->model('logbooks_model');
|
||||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||||
|
|
||||||
|
if (!$logbooks_locations_array) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
$this->db->select('COUNT( * ) as count', FALSE);
|
$this->db->select('COUNT( * ) as count', FALSE);
|
||||||
$this->db->where_in('station_id', $logbooks_locations_array);
|
$this->db->where_in('station_id', $logbooks_locations_array);
|
||||||
$this->db->where('COL_MODE', 'SSB');
|
$this->db->where('COL_MODE', 'SSB');
|
||||||
|
|
@ -1221,6 +1228,10 @@ class Logbook_model extends CI_Model {
|
||||||
$CI->load->model('logbooks_model');
|
$CI->load->model('logbooks_model');
|
||||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||||
|
|
||||||
|
if (!$logbooks_locations_array) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
$this->db->select('COL_SAT_NAME, COUNT( * ) as count', FALSE);
|
$this->db->select('COL_SAT_NAME, COUNT( * ) as count', FALSE);
|
||||||
$this->db->where_in('station_id', $logbooks_locations_array);
|
$this->db->where_in('station_id', $logbooks_locations_array);
|
||||||
$this->db->where('COL_SAT_NAME !=', 'null');
|
$this->db->where('COL_SAT_NAME !=', 'null');
|
||||||
|
|
@ -1237,6 +1248,10 @@ class Logbook_model extends CI_Model {
|
||||||
$CI->load->model('logbooks_model');
|
$CI->load->model('logbooks_model');
|
||||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||||
|
|
||||||
|
if (!$logbooks_locations_array) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
$this->db->select('COUNT( * ) as count', FALSE);
|
$this->db->select('COUNT( * ) as count', FALSE);
|
||||||
$this->db->where_in('station_id', $logbooks_locations_array);
|
$this->db->where_in('station_id', $logbooks_locations_array);
|
||||||
$this->db->where('COL_MODE', 'CW');
|
$this->db->where('COL_MODE', 'CW');
|
||||||
|
|
@ -1258,6 +1273,10 @@ class Logbook_model extends CI_Model {
|
||||||
$CI->load->model('logbooks_model');
|
$CI->load->model('logbooks_model');
|
||||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||||
|
|
||||||
|
if (!$logbooks_locations_array) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
$this->db->select('COUNT( * ) as count', FALSE);
|
$this->db->select('COUNT( * ) as count', FALSE);
|
||||||
$this->db->where_in('station_id', $logbooks_locations_array);
|
$this->db->where_in('station_id', $logbooks_locations_array);
|
||||||
$this->db->where('COL_MODE', 'FM');
|
$this->db->where('COL_MODE', 'FM');
|
||||||
|
|
@ -1279,6 +1298,10 @@ class Logbook_model extends CI_Model {
|
||||||
$CI->load->model('logbooks_model');
|
$CI->load->model('logbooks_model');
|
||||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||||
|
|
||||||
|
if (!$logbooks_locations_array) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
$this->db->select('COUNT( * ) as count', FALSE);
|
$this->db->select('COUNT( * ) as count', FALSE);
|
||||||
$this->db->where_in('station_id', $logbooks_locations_array);
|
$this->db->where_in('station_id', $logbooks_locations_array);
|
||||||
$this->db->where('COL_MODE !=', 'SSB');
|
$this->db->where('COL_MODE !=', 'SSB');
|
||||||
|
|
@ -1311,6 +1334,10 @@ class Logbook_model extends CI_Model {
|
||||||
$CI->load->model('logbooks_model');
|
$CI->load->model('logbooks_model');
|
||||||
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
|
||||||
|
|
||||||
|
if (!$logbooks_locations_array) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
$this->db->select('DISTINCT (COL_BAND) AS band, count( * ) AS count', FALSE);
|
$this->db->select('DISTINCT (COL_BAND) AS band, count( * ) AS count', FALSE);
|
||||||
$this->db->where_in('station_id', $logbooks_locations_array);
|
$this->db->where_in('station_id', $logbooks_locations_array);
|
||||||
$this->db->group_by('band');
|
$this->db->group_by('band');
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,18 @@
|
||||||
google.load('visualization', '1', {'packages':['corechart']});
|
google.load('visualization', '1', {'packages':['corechart']});
|
||||||
|
|
||||||
// Set a callback to run when the Google Visualization API is loaded.
|
// Set a callback to run when the Google Visualization API is loaded.
|
||||||
google.setOnLoadCallback(drawModeChart);
|
<?php if (($total_ssb != null) && ($total_cw != null) && ($total_fm != null) && ($total_digi != null)) { ?>
|
||||||
google.setOnLoadCallback(drawBandChart);
|
google.setOnLoadCallback(drawModeChart);
|
||||||
google.setOnLoadCallback(drawSatChart);
|
<?php } ?>
|
||||||
|
|
||||||
|
<?php if ($total_bands) { ?>
|
||||||
|
google.setOnLoadCallback(drawBandChart);
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
<?php if ($total_sat) { ?>
|
||||||
|
google.setOnLoadCallback(drawSatChart);
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
|
||||||
// Callback that creates and populates a data table,
|
// Callback that creates and populates a data table,
|
||||||
// instantiates the pie chart, passes in the data and
|
// instantiates the pie chart, passes in the data and
|
||||||
|
|
@ -19,10 +28,10 @@
|
||||||
data.addColumn('string', 'Topping');
|
data.addColumn('string', 'Topping');
|
||||||
data.addColumn('number', 'Slices');
|
data.addColumn('number', 'Slices');
|
||||||
data.addRows([
|
data.addRows([
|
||||||
['SSB', <?php echo $total_ssb; ?>],
|
['SSB', <?php echo $total_ssb==null?0:$total_ssb; ?>],
|
||||||
['CW', <?php echo $total_cw; ?>],
|
['CW', <?php echo $total_cw==null?0:$total_cw; ?>],
|
||||||
['FM', <?php echo $total_fm; ?>],
|
['FM', <?php echo $total_fm==null?0:$total_fm; ?>],
|
||||||
['Digi', <?php echo $total_digi; ?>],
|
['Digi', <?php echo $total_digi==null?0:$total_digi; ?>],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var color = ifDarkModeThemeReturn('white');
|
var color = ifDarkModeThemeReturn('white');
|
||||||
|
|
@ -58,9 +67,15 @@
|
||||||
data.addColumn('string', 'Topping');
|
data.addColumn('string', 'Topping');
|
||||||
data.addColumn('number', 'Slices');
|
data.addColumn('number', 'Slices');
|
||||||
data.addRows([
|
data.addRows([
|
||||||
<?php foreach($total_bands->result() as $row) { ?>
|
<?php
|
||||||
['<?php echo $row->band; ?>', <?php echo $row->count; ?>],
|
if ($total_bands) {
|
||||||
<?php } ?>
|
|
||||||
|
foreach($total_bands->result() as $row) { ?>
|
||||||
|
['<?php echo $row->band; ?>', <?php echo $row->count; ?>],
|
||||||
|
<?php }
|
||||||
|
}
|
||||||
|
|
||||||
|
?>
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var color = ifDarkModeThemeReturn('white');
|
var color = ifDarkModeThemeReturn('white');
|
||||||
|
|
@ -95,11 +110,14 @@
|
||||||
data.addColumn('string', 'Topping');
|
data.addColumn('string', 'Topping');
|
||||||
data.addColumn('number', 'Slices');
|
data.addColumn('number', 'Slices');
|
||||||
data.addRows([
|
data.addRows([
|
||||||
<?php foreach($total_sat->result() as $row1) { ?>
|
<?php
|
||||||
<?php if($row1->COL_SAT_NAME != null) { ?>
|
if ($total_sat) {
|
||||||
['<?php echo $row1->COL_SAT_NAME; ?>', <?php echo $row1->count; ?>],
|
foreach($total_sat->result() as $row1) { ?>
|
||||||
<?php } ?>
|
<?php if($row1->COL_SAT_NAME != null) { ?>
|
||||||
<?php } ?>
|
['<?php echo $row1->COL_SAT_NAME; ?>', <?php echo $row1->count; ?>],
|
||||||
|
<?php } ?>
|
||||||
|
<?php }
|
||||||
|
}?>
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var color = ifDarkModeThemeReturn('white');
|
var color = ifDarkModeThemeReturn('white');
|
||||||
|
|
@ -128,13 +146,19 @@
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
<?php if ($totals_year) { ?>
|
||||||
google.setOnLoadCallback(barchart);
|
google.setOnLoadCallback(barchart);
|
||||||
|
<?php } ?>
|
||||||
function barchart() {
|
function barchart() {
|
||||||
var data = google.visualization.arrayToDataTable([
|
var data = google.visualization.arrayToDataTable([
|
||||||
['Year', 'QSOs'],
|
['Year', 'QSOs'],
|
||||||
<?php foreach($totals_year->result() as $qso_numbers) { ?>
|
<?php
|
||||||
['<?php echo $qso_numbers->year; ?>', <?php echo $qso_numbers->total; ?>],
|
if ($totals_year) {
|
||||||
<?php } ?>
|
foreach($totals_year->result() as $qso_numbers) { ?>
|
||||||
|
['<?php echo $qso_numbers->year; ?>', <?php echo $qso_numbers->total; ?>],
|
||||||
|
<?php }
|
||||||
|
}
|
||||||
|
?>
|
||||||
]);
|
]);
|
||||||
|
|
||||||
var color = ifDarkModeThemeReturn('white');
|
var color = ifDarkModeThemeReturn('white');
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用