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

Added QRZ-Logic to activated gridsquare map

pull/2792/head
int2001 2023-12-08 12:51:10 +00:00
rodzic 0ca4320264
commit 609527b22d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: DFB1C13CD2DB037B
2 zmienionych plików z 31 dodań i 42 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
application/controllers/Activated_gridmap.php
Wyświetl plik

@ -50,6 +50,7 @@ class Activated_gridmap extends CI_Controller {
$qsl = $this->security->xss_clean($this->input->post('qsl'));
$lotw = $this->security->xss_clean($this->input->post('lotw'));
$eqsl = $this->security->xss_clean($this->input->post('eqsl'));
$qrz = $this->security->xss_clean($this->input->post('qrz'));
$sat = $this->security->xss_clean($this->input->post('sat'));
$this->load->model('activated_gridmap_model');
@ -69,7 +70,7 @@ class Activated_gridmap extends CI_Controller {
$grid_4char_confirmed = "";
$grid_6char_confirmed = "";
$query = $this->activated_gridmap_model->get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $sat);
$query = $this->activated_gridmap_model->get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
if ($query && $query->num_rows() > 0) {
foreach ($query->result() as $row) {
@ -99,7 +100,7 @@ class Activated_gridmap extends CI_Controller {
}
}
$query = $this->activated_gridmap_model->get_band($band, $mode, $qsl, $lotw, $eqsl, $sat);
$query = $this->activated_gridmap_model->get_band($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
if ($query && $query->num_rows() > 0) {
foreach ($query->result() as $row) {
@ -129,7 +130,7 @@ class Activated_gridmap extends CI_Controller {
}
}
}
$query_vucc = $this->activated_gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $sat);
$query_vucc = $this->activated_gridmap_model->get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
if ($query_vucc && $query_vucc->num_rows() > 0) {
foreach ($query_vucc->result() as $row) {
@ -154,7 +155,7 @@ class Activated_gridmap extends CI_Controller {
}
// // Confirmed Squares
$query_vucc = $this->activated_gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $sat);
$query_vucc = $this->activated_gridmap_model->get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat);
if ($query_vucc && $query_vucc->num_rows() > 0) {
foreach ($query_vucc->result() as $row) {

64
application/models/Activated_gridmap_model.php
Wyświetl plik

@ -2,7 +2,7 @@
class Activated_gridmap_model extends CI_Model {
function get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $sat) {
function get_band_confirmed($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -35,11 +35,11 @@ class Activated_gridmap_model extends CI_Model {
$sql .= " and (col_mode ='" . $mode . "' or col_submode ='" . $mode . "')";
}
$sql .= $this->addQslToQuery($qsl, $lotw, $eqsl);
$sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $qrz);
return $this->db->query($sql);
}
function get_band($band, $mode, $qsl, $lotw, $eqsl, $sat) {
function get_band($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -75,7 +75,7 @@ class Activated_gridmap_model extends CI_Model {
return $this->db->query($sql);
}
function get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $sat) {
function get_band_worked_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -112,7 +112,7 @@ class Activated_gridmap_model extends CI_Model {
return $this->db->query($sql);
}
function get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $sat) {
function get_band_confirmed_vucc_squares($band, $mode, $qsl, $lotw, $eqsl, $qrz, $sat) {
$CI =& get_instance();
$CI->load->model('logbooks_model');
$logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
@ -145,48 +145,36 @@ class Activated_gridmap_model extends CI_Model {
$sql .= " and (col_mode ='" . $mode . "' or col_submode ='" . $mode . "')";
}
$sql .= $this->addQslToQuery($qsl, $lotw, $eqsl);
$sql .= $this->addQslToQuery($qsl, $lotw, $eqsl, $qrz);
return null;
return $this->db->query($sql);
}
// Adds confirmation to query
function addQslToQuery($qsl, $lotw, $eqsl) {
$sql = '';
if ($lotw == "true" && $qsl == "false" && $eqsl == "false") {
$sql .= " and col_lotw_qsl_sent = 'Y'";
}
// Adds confirmation to query
function addQslToQuery($qsl, $lotw, $eqsl, $qrz) {
$sql = '';
if ($lotw == "true") {
$sql .= " or col_lotw_qsl_sent = 'Y'";
}
if ($qsl == "true" && $lotw == "false" && $eqsl == "false") {
$sql .= " and col_qsl_true = 'Y'";
}
if ($qsl == "true") {
$sql .= " or col_qsl_sent = 'Y'";
}
if ($eqsl == "true" && $lotw == "false" && $qsl == "false") {
$sql .= " and col_eqsl_qsl_sent = 'Y'";
}
if ($eqsl == "true") {
$sql .= " or col_eqsl_qsl_sent = 'Y'";
}
if ($lotw == "true" && $qsl == "true" && $eqsl == "false") {
$sql .= " and (col_lotw_qsl_sent = 'Y' or col_qsl_sent = 'Y')";
}
if ($qrz == "true") {
$sql .= " or col_qrzcom_qso_upload_status = 'Y'";
}
if ($sql != '') {
$sql='and (1=0 '.$sql.')';
}
return $sql;
}
if ($qsl == "true" && $lotw == "false" && $eqsl == "true") {
$sql .= " and (col_qsl_sent = 'Y' or col_eqsl_qsl_sent = 'Y')";
}
if ($eqsl == "true" && $lotw == "true" && $qsl == "false") {
$sql .= " and (col_eqsl_qsl_sent = 'Y' or col_lotw_qsl_sent = 'Y')";
}
if ($qsl == "true" && $lotw == "true" && $eqsl == "true") {
$sql .= " and (col_qsl_sent = 'Y' or col_lotw_qsl_sent = 'Y' or col_eqsl_qsl_sent = 'Y')";
}
if ($qsl == "false" && $lotw == "false" && $eqsl == "false") {
$sql .= " and (col_qsl_sent != 'Y' and col_lotw_qsl_sent != 'Y' and col_eqsl_qsl_sent != 'Y')";
}
return $sql;
}
/*
* Get's the worked modes from the log