From 2005ff7f552126b9a68d58d4f220a9fb9e72c409 Mon Sep 17 00:00:00 2001 From: Andreas Date: Sun, 13 Dec 2020 09:18:47 +0100 Subject: [PATCH] [DXCC Award] Adjusted queries for mode. --- application/models/Dxcc.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php index 0d0f3e74..bce17ea3 100644 --- a/application/models/Dxcc.php +++ b/application/models/Dxcc.php @@ -259,6 +259,10 @@ class DXCC extends CI_Model { $sql .= " and col_band ='" . $band . "'"; } + if ($postdata['mode'] != 'All') { + $sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')"; + } + $sql .= $this->addQslToQuery($postdata); $sql .= " group by col_dxcc @@ -290,6 +294,10 @@ class DXCC extends CI_Model { $sql .= " and col_band ='" . $band . "'"; } + if ($postdata['mode'] != 'All') { + $sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')"; + } + $sql .= " group by col_dxcc ) x on dxcc_entities.adif = x.col_dxcc";; @@ -325,6 +333,10 @@ class DXCC extends CI_Model { } } + if ($postdata['mode'] != 'All') { + $sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')"; + } + $sql .= ' group by col_dxcc) x on dxcc_entities.adif = x.col_dxcc'; } @@ -360,6 +372,10 @@ class DXCC extends CI_Model { } } + if ($postdata['mode'] != 'All') { + $sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')"; + } + $sql .= " and not exists (select 1 from ".$this->config->item('table_name')." where station_id = $station_id and col_dxcc = thcv.col_dxcc"; if ($postdata['band'] != 'All') { @@ -372,6 +388,10 @@ class DXCC extends CI_Model { } } + if ($postdata['mode'] != 'All') { + $sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')"; + } + $sql .= $this->addQslToQuery($postdata); $sql .= ')'; @@ -409,6 +429,10 @@ class DXCC extends CI_Model { } } + if ($postdata['mode'] != 'All') { + $sql .= " and (col_mode = '" . $postdata['mode'] . "' or col_submode = '" . $postdata['mode'] . "')"; + } + $sql .= $this->addQslToQuery($postdata); $sql .= " group by col_dxcc