From 234bdc01db687fd53b537dc4e187644de3799c1c Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 27 Mar 2023 15:03:11 +0100 Subject: [PATCH] [QO-100 Club] Only use QO-100 contacts from logbook --- application/models/Logbook_model.php | 1 + application/models/Stations.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 060cef71..1d8e6e7d 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -1287,6 +1287,7 @@ class Logbook_model extends CI_Model { INNER JOIN station_profile ON qsos.station_id = station_profile.station_id LEFT JOIN webadif ON qsos.COL_PRIMARY_KEY = webadif.qso_id WHERE qsos.station_id = %d + AND qsos.COL_SAT_NAME = 'QO-100' AND webadif.upload_date IS NULL "; $sql = sprintf( diff --git a/application/models/Stations.php b/application/models/Stations.php index 2bf0c938..4cab378b 100644 --- a/application/models/Stations.php +++ b/application/models/Stations.php @@ -353,12 +353,13 @@ class Stations extends CI_Model { 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 + 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 ( SELECT qsos.station_id, COUNT(qsos.COL_PRIMARY_KEY) c FROM %s qsos + WHERE qsos.COL_SAT_NAME = 'QO-100' GROUP BY qsos.station_id ) totc ON station_profile.station_id = totc.station_id WHERE COALESCE(station_profile.webadifapikey, '') <> ''