diff --git a/application/models/Stations.php b/application/models/Stations.php index 7d9e8823..dca8cd88 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -372,14 +372,14 @@ class Stations extends CI_Model { $sql=" SELECT station_profile.station_id, station_profile.station_profile_name, station_profile.station_callsign, notc.c notcount, totc.c totcount FROM station_profile - INNER JOIN ( + LEFT OUTER JOIN ( SELECT qsos.station_id, COUNT(qsos.COL_PRIMARY_KEY) c FROM %s qsos LEFT JOIN webadif ON qsos.COL_PRIMARY_KEY = webadif.qso_id WHERE webadif.qso_id IS NULL AND qsos.COL_SAT_NAME = 'QO-100' GROUP BY qsos.station_id ) notc ON station_profile.station_id = notc.station_id - INNER JOIN ( + LEFT JOIN ( SELECT qsos.station_id, COUNT(qsos.COL_PRIMARY_KEY) c FROM %s qsos WHERE qsos.COL_SAT_NAME = 'QO-100' diff --git a/application/views/webadif/export.php b/application/views/webadif/export.php index 11756f21..f968d582 100644 --- a/application/views/webadif/export.php +++ b/application/views/webadif/export.php @@ -24,6 +24,11 @@ result()) { + $queuedqsos = 0; + foreach ($station_profile->result() as $count) { // Fills the table with the data + $queuedqsos += $count->notcount; + } + if ($queuedqsos > 0) { ?>
You need to set a QO-100 Dx Club API key in your station profile. Only station profiles with an API Key are displayed.
Warning This might take a while as QSO uploads are processed sequentially.
@@ -41,15 +46,25 @@ '; foreach ($station_profile->result() as $station) { // Fills the table with the data - echo '