diff --git a/application/models/Stats.php b/application/models/Stats.php index 26c066a06..3f3989b28 100644 --- a/application/models/Stats.php +++ b/application/models/Stats.php @@ -77,7 +77,7 @@ $sats = $this->get_sats(); $modes = $this->get_sat_modes(); - $satunique = $this->getUniqueSatCallsigns(); + $satunique = $this->getUniqueSatCallsignsSat(); $modeunique = $this->getUniqueSatCallsignsModes(); // Generating the band/mode table @@ -172,6 +172,27 @@ return $result; } + function getUniqueSatCallsignsSat() { + $this->load->model('logbooks_model'); + $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + + if (!$logbooks_locations_array) { + return null; + } + + $bands = array(); + + $this->db->select('count(distinct col_call) as calls, upper(col_sat_name) as sat', FALSE); + $this->db->where('col_prop_mode', 'SAT'); + $this->db->where('coalesce(col_sat_name,"") != ""'); + $this->db->where_in('station_id', $logbooks_locations_array); + $this->db->group_by('upper(col_sat_name)'); + + $query = $this->db->get($this->config->item('table_name')); + + return $query->result(); + } + function getUniqueSatCallsigns() { $this->load->model('logbooks_model'); $logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); diff --git a/application/views/statistics/satuniquetable.php b/application/views/statistics/satuniquetable.php new file mode 100644 index 000000000..855a477a0 --- /dev/null +++ b/application/views/statistics/satuniquetable.php @@ -0,0 +1,28 @@ + + + '; + echo ''; + foreach($modes as $mode) { + echo ''; + } + echo ''; + echo ' + + '; + foreach ($qsoarray as $sat => $mode) { + echo ''; + foreach ($mode as $singlemode) { + echo ''; + } + echo ''; + echo ''; + } + echo ''; + foreach($modes as $mode) { + echo ''; + } +echo ''; + echo '
' . $mode . ''.lang('statistics_total').'
'. $sat .''.$singlemode.'' . $satunique[$sat] . '
'.lang('statistics_total').'' . $modeunique[$mode] . '' . $total->calls . '
'; +}