mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

[DXCC Award] Adjusted queries for mode.

pull/752/head
Andreas 2020-12-13 09:18:47 +01:00
rodzic 44909aec5d
commit 2005ff7f55
1 zmienionych plików z 24 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
application/models/Dxcc.php
Wyświetl plik

@ -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