diff --git a/application/models/Stationsetup_model.php b/application/models/Stationsetup_model.php index 8dd581b06..1ad4e3986 100644 --- a/application/models/Stationsetup_model.php +++ b/application/models/Stationsetup_model.php @@ -234,10 +234,12 @@ class Stationsetup_model extends CI_Model { } function list_all_locations() { - $sql = "select dxcc_entities.end, station_profile.station_id, station_profile_name, station_profile.hrdlog_username, station_gridsquare, station_city, station_iota, station_sota, station_callsign, station_power, station_dxcc, dxcc_entities.name as dxccname, dxcc_entities.prefix as dxccprefix, station_cnty, station_cq, station_itu, station_active, eqslqthnickname, state, county, station_sig, station_sig_info, qrzrealtime, station_wwff, station_pota, oqrs, oqrs_text, oqrs_email, webadifrealtime, clublogrealtime, clublogignore, hrdlogrealtime, creation_date, last_modified, station_uuid + $sql = "select dxcc_entities.end, station_profile.station_id, station_profile_name, count(".$this->config->item('table_name').".station_id) as qso_total, station_profile.hrdlog_username, station_gridsquare, station_city, station_iota, station_sota, station_callsign, station_power, station_dxcc, dxcc_entities.name as dxccname, dxcc_entities.prefix as dxccprefix, station_cnty, station_cq, station_itu, station_active, eqslqthnickname, state, county, station_sig, station_sig_info, qrzrealtime, station_wwff, station_pota, oqrs, oqrs_text, oqrs_email, webadifrealtime, clublogrealtime, clublogignore, hrdlogrealtime, station_profile.creation_date, station_profile.last_modified, station_uuid from station_profile - join dxcc_entities on station_profile.station_dxcc = dxcc_entities.adif - where user_id = ?"; + left join ".$this->config->item('table_name')." on station_profile.station_id = ".$this->config->item('table_name').".station_id + left outer join dxcc_entities on station_profile.station_dxcc = dxcc_entities.adif + where user_id = ? + group by station_profile.station_id;"; $query = $this->db->query($sql, array($this->session->userdata('user_id'))); diff --git a/application/views/stationsetup/locationlist.php b/application/views/stationsetup/locationlist.php index 1d1149649..c003820a4 100644 --- a/application/views/stationsetup/locationlist.php +++ b/application/views/stationsetup/locationlist.php @@ -6,7 +6,8 @@ ID - Active + Active + QSO Count Name Callsign Grid @@ -24,7 +25,7 @@ SIG SIG Info eQSL Nickname - eQSL default QSLmsg + eQSL default QSLmsg QRZ realtime upload OQRS enabled OQRS Text @@ -33,7 +34,7 @@ ClubLog realtime upload ClubLog Ignore HRDLog realtime upload - HRDLog username + HRDLog username Created Last Modified @@ -41,17 +42,18 @@ - station_id; ?> + station_id; ?> station_active ? 'Yes' : 'No' ?> + qso_total; ?> station_id; ?>">station_profile_name; ?> station_callsign; ?> station_gridsquare; ?> station_city; ?> dxccname), "- (/") . ($loc->dxccprefix ? ' (' . $loc->dxccprefix . ') ' : ''); ?> end)) { - echo ''.__("Deleted DXCC").''; - } ?> - + echo ''.__("Deleted DXCC").''; + } ?> + station_iota; ?> station_sota; ?> station_power; ?> @@ -64,7 +66,7 @@ station_sig; ?> station_sig_info; ?> eqslqthnickname; ?> - eqsl_default_qslmsg; ?> + eqsl_default_qslmsg; ?> qrzrealtime ? 'Yes' : 'No'; ?> oqrs ? 'Yes' : 'No'; ?> oqrs_text; ?>