diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index 2133a304..7c579c02 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -349,6 +349,7 @@ class Awards extends CI_Controller { } $data['cq_array'] = $this->cq->get_cq_array($bands, $postdata); + $data['cq_summary'] = $this->cq->get_cq_summary($bands); // Render page $data['page_title'] = "Awards - CQ Magazine"; diff --git a/application/models/Cq.php b/application/models/Cq.php index e62ee86f..d5d47d38 100644 --- a/application/models/Cq.php +++ b/application/models/Cq.php @@ -212,4 +212,58 @@ class CQ extends CI_Model{ return $sql; } + /* + * Function gets worked and confirmed summary on each band on the active stationprofile + */ + function get_cq_summary($bands) { + $CI =& get_instance(); + $CI->load->model('Stations'); + $station_id = $CI->Stations->find_active(); + + foreach ($bands as $band) { + $worked = $this->getSummaryByBand($band, $station_id); + $confirmed = $this->getSummaryByBandConfirmed($band, $station_id); + $cqSummary['worked'][$band] = $worked[0]->count; + $cqSummary['confirmed'][$band] = $confirmed[0]->count; + } + + return $cqSummary; + } + + function getSummaryByBand($band, $station_id) { + $sql = "SELECT count(distinct thcv.col_cqz) as count FROM " . $this->config->item('table_name') . " thcv"; + + $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(); + } + + function getSummaryByBandConfirmed($band, $station_id){ + $sql = "SELECT count(distinct thcv.col_cqz) as count FROM " . $this->config->item('table_name') . " thcv"; + + $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 . "'"; + } + + $sql .= " and (col_qsl_rcvd = 'Y' or col_lotw_qsl_rcvd = 'Y')"; + + $query = $this->db->query($sql); + + return $query->result(); + } + } diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index 0fc9fc35..cdb5a718 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -164,7 +164,37 @@ } echo ''; } - echo ''; + echo ' +

Summary

+ + + + '; + + foreach($bands as $band) { + echo ''; + } + echo ''; + + echo ' + + + + '; + + foreach ($cq_summary['worked'] as $dxcc) { // Fills the table with the data + echo ''; + } + + echo ' + '; + foreach ($cq_summary['confirmed'] as $dxcc) { // Fills the table with the data + echo ''; + } + + echo ' +
' . $band . '
Total worked' . $dxcc . '
Total confirmed' . $dxcc . '
+ '; } else {