From bf12d931b4b29d346c0b4baef21e76ad85a651d7 Mon Sep 17 00:00:00 2001
From: AndreasK79 <andreask@online.no>
Date: Sat, 21 Mar 2020 07:53:12 +0100
Subject: [PATCH] Fixed for DXCC award. Removed SAT QSOs from each band. Only
 counts for SAT.

---
 application/models/Dxcc.php          | 6 ++++++
 application/models/Logbook_model.php | 1 +
 2 files changed, 7 insertions(+)

diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php
index 3a0993fb..6cfd44cc 100644
--- a/application/models/Dxcc.php
+++ b/application/models/Dxcc.php
@@ -243,6 +243,7 @@ class DXCC extends CI_Model {
 			$sql .= " and col_prop_mode ='" . $band . "'";
 		}
 		else {
+			$sql .= " and col_prop_mode !='SAT'";
 			$sql .= " and col_band ='" . $band . "'";
 		}
 
@@ -273,6 +274,7 @@ class DXCC extends CI_Model {
 			$sql .= " and col_prop_mode ='" . $band . "'";
 		}
 		else {
+			$sql .= " and col_prop_mode !='SAT'";
 			$sql .= " and col_band ='" . $band . "'";
 		}
 
@@ -306,6 +308,7 @@ class DXCC extends CI_Model {
 					$sql .= " and col_prop_mode ='" . $postdata['band'] . "'";
 				}
 				else {
+					$sql .= " and col_prop_mode !='SAT'";
 					$sql .= " and col_band ='" . $postdata['band'] . "'";
 				}
 			}
@@ -340,6 +343,7 @@ class DXCC extends CI_Model {
 				$sql .= " and col_prop_mode ='" . $postdata['band'] . "'";
 			}
 			else {
+				$sql .= " and col_prop_mode !='SAT'";
 				$sql .= " and col_band ='" . $postdata['band'] . "'";
 			}
 		}
@@ -351,6 +355,7 @@ class DXCC extends CI_Model {
 				$sql .= " and col_prop_mode ='" . $postdata['band'] . "'";
 			}
 			else {
+				$sql .= " and col_prop_mode !='SAT'";
 				$sql .= " and col_band ='" . $postdata['band'] . "'";
 			}
 		}
@@ -387,6 +392,7 @@ class DXCC extends CI_Model {
 				$sql .= " and col_prop_mode ='" . $postdata['band'] . "'";
 			}
 			else {
+				$sql .= " and col_prop_mode !='SAT'";
 				$sql .= " and col_band ='" . $postdata['band'] . "'";
 			}
 		}
diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 6660bc5c..f5afb369 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -183,6 +183,7 @@ class Logbook_model extends CI_Model {
     $this->db->where('station_id', $station_id); 
     $this->db->where('COL_COUNTRY', $country);
     if($band != "SAT") {
+      $this->db->where('COL_PROP_MODE !=', 'SAT');
       $this->db->where('COL_BAND', $band);
     } else {
       $this->db->where('COL_PROP_MODE', "SAT");