diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 6a62fe81..74c96547 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1265,7 +1265,12 @@ class Logbook_model extends CI_Model { $CI->load->model('Stations'); $station_id = $CI->Stations->find_active(); - $query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE COL_COUNTRY != "Invalid" AND station_id = '.$station_id.' AND COL_QSL_RCVD =\'Y\''); + $sql = 'SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' + WHERE COL_COUNTRY != "Invalid" + AND COL_DXCC > 0 + AND station_id = '.$station_id.' AND COL_QSL_RCVD =\'Y\''; + + $query = $this->db->query($sql); return $query->num_rows(); } @@ -1276,7 +1281,12 @@ class Logbook_model extends CI_Model { $CI->load->model('Stations'); $station_id = $CI->Stations->find_active(); - $query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE COL_COUNTRY != "Invalid" AND station_id = '.$station_id.' AND COL_EQSL_QSL_RCVD =\'Y\''); + $sql = 'SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' + WHERE COL_COUNTRY != "Invalid" + AND COL_DXCC > 0 + AND station_id = '.$station_id.' AND COL_EQSL_QSL_RCVD =\'Y\''; + + $query = $this->db->query($sql); return $query->num_rows(); } @@ -1287,7 +1297,13 @@ class Logbook_model extends CI_Model { $CI->load->model('Stations'); $station_id = $CI->Stations->find_active(); - $query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE COL_COUNTRY != "Invalid" AND station_id = '.$station_id.' AND COL_LOTW_QSL_RCVD =\'Y\''); + $sql = 'SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' + WHERE COL_COUNTRY != "Invalid" + AND COL_DXCC > 0 + AND station_id = '.$station_id.' + AND COL_LOTW_QSL_RCVD =\'Y\''; + + $query = $this->db->query($sql); return $query->num_rows(); } diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php index 272e3944..b21ef4aa 100644 --- a/application/views/view_log/partial/log.php +++ b/application/views/view_log/partial/log.php @@ -1,5 +1,5 @@
- +
config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?> diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 1b895f79..6532976e 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -1,5 +1,5 @@
-
Date
+
config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
Date