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

Merge pull request #441 from AndreasK79/dxcc_sat_fix 

Fixed for DXCC award. Removed SAT QSOs from each band. SAT should only count fo…
pull/449/head
Peter Goodhall 2020-03-21 11:11:28 +00:00 zatwierdzone przez GitHub
rodzic 22aac29bf5 bf12d931b4
commit b8c8255568
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 7 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -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'] . "'";
}
}

1
application/models/Logbook_model.php
Wyświetl plik

@ -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");