diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index ac9bde3a..d1e4d9cf 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -346,7 +346,6 @@ class Awards extends CI_Controller { } $data['was_array'] = $this->was->get_was_array($bands, $postdata); - $data['was_summary'] = $this->was->get_was_summary(); // Render Page $data['page_title'] = "Awards - WAS (Worked all states)"; diff --git a/application/models/Was.php b/application/models/Was.php index 0e63d42a..451e342d 100644 --- a/application/models/Was.php +++ b/application/models/Was.php @@ -132,39 +132,6 @@ class was extends CI_Model { } } - /* - * Function gets worked and confirmed summary on each band on the active stationprofile - */ - function get_was_summary() { - $CI =& get_instance(); - $CI->load->model('Stations'); - $station_id = $CI->Stations->find_active(); - - $stateArray = explode(',', $this->stateString); - - $states = array(); // Used for keeping track of which states that are not worked - - $sql = "SELECT thcv.col_band, count(distinct thcv.col_state) as count, coalesce (cfmwas.count, 0) as cfmwas FROM " . $this->config->item('table_name') . " thcv"; - - $sql .= " left outer join ( - select col_band, count(distinct col_state) as count from " . $this->config->item('table_name') . " thcv"; - $sql .= " where station_id = " . $station_id; - $sql .= $this->addStateToQuery(); - - $sql .= " and (col_qsl_rcvd = 'Y' or col_lotw_qsl_rcvd = 'Y') - group by col_band"; - $sql .= ") cfmwas on thcv.col_band = cfmwas.col_band "; - - $sql .= " where station_id = " . $station_id; - - $sql .= $this->addStateToQuery(); - $sql .= " group by thcv.col_band order by thcv.col_band+0 desc"; - - $query = $this->db->query($sql); - - return $query->result(); - } - /* * Function returns all worked, but not confirmed states * $postdata contains data from the form, in this case Lotw or QSL are used diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php index b6ec561d..2afa5450 100644 --- a/application/views/awards/was/index.php +++ b/application/views/awards/was/index.php @@ -92,37 +92,8 @@ } echo ''; } - echo ' + echo ''; -

Summary

- - - - '; - - foreach ($was_summary as $was) { // Fills the table with the data - echo ''; - } - - echo ' - - - - '; - - foreach ($was_summary as $was) { // Fills the table with the data - echo ''; - } - - echo ' - '; - foreach ($was_summary as $was) { // Fills the table with the data - echo ''; - } - - echo ' -
' . $was->col_band . '
Total worked' . $was->count . '
Total confirmed' . $was->cfmwas . '
- '; } else { echo '';