From f4296b2c24b9e03fb99015c6d613a0cea527feeb Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Thu, 29 Jun 2023 22:05:04 +0200
Subject: [PATCH] Add error message for no outstanding QO-100 QSOs

---
 application/models/Stations.php      |  4 ++--
 application/views/webadif/export.php | 29 +++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 9 deletions(-)

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 @@
 
 <?php
             if ($station_profile->result()) {
+               $queuedqsos = 0;
+               foreach ($station_profile->result() as $count) {      // Fills the table with the data
+                   $queuedqsos += $count->notcount;
+               }
+               if ($queuedqsos > 0) {
 				?>
 				<p>You need to set a QO-100 Dx Club API key in your station profile. Only station profiles with an API Key are displayed.</p>
 				<p><span class="badge badge-warning">Warning</span> This might take a while as QSO uploads are processed sequentially.</p>
@@ -41,15 +46,25 @@
                 </thead>
                 <tbody>';
                 foreach ($station_profile->result() as $station) {      // Fills the table with the data
-                echo '<tr>';
-                    echo '<td>' . $station->station_profile_name . '</td>';
-                    echo '<td>' . $station->station_callsign . '</td>';
-                    echo '<td id ="notcount'.$station->station_id.'">' . $station->notcount . '</td>';
-                    echo '<td id ="totcount'.$station->station_id.'">' . $station->totcount . '</td>';
-                    echo '<td><button id="webadifUpload" type="button" name="webadifUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportWebADIF('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
-                    echo '</tr>';
+                   if ($station->notcount != null) {
+                       echo '<tr>';
+                           echo '<td>' . $station->station_profile_name . '</td>';
+                           echo '<td>' . $station->station_callsign . '</td>';
+                           echo '<td id ="notcount'.$station->station_id.'">' . $station->notcount . '</td>';
+                           echo '<td id ="totcount'.$station->station_id.'">' . $station->totcount . '</td>';
+                           echo '<td><button id="webadifUpload" type="button" name="webadifUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportWebADIF('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
+                       echo '</tr>';
+                   }
                 }
                 echo '</tfoot></table>';
+               } else {
+                  ?>
+                  <div class="alert alert-success">
+                  There are currently no outstanding QSOs that need to be uploaded to the QO-100 Dx Club's API.<br />
+                  Go ahead and turn on your QO-100 station!
+                  </div>
+                  <?php
+               }
 
         }
         else {