Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore old counting (SAT not counted in summary but at band)

Browse Source
This commit is contained in:
int2001
2024-05-27 14:05:33 +00:00
parent e4f46473e0
commit 4550b4cd00
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/models/Waja.php
View File

@@ -190,7 +190,6 @@ class WAJA extends CI_Model {
}
$sql .= $this->addStateToQuery();
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= " and not exists (select 1 from ". $this->config->item('table_name') .
@@ -202,13 +201,9 @@ class WAJA extends CI_Model {
}
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
$sql .= ")";
$query = $this->db->query($sql);
return $query->result();
@@ -227,16 +222,12 @@ class WAJA extends CI_Model {
}
$sql .= $this->addStateToQuery();
$sql .= $this->genfunctions->addBandToQuery($band);
$sql .= $this->genfunctions->addQslToQuery($postdata);
$query = $this->db->query($sql);
return $query->result();
}
/*
* Function gets worked and confirmed summary on each band on the active stationprofile
@@ -272,6 +263,7 @@ class WAJA extends CI_Model {
$bandslots_list = "'".implode("','",$bandslots)."'";
$sql .= " and thcv.col_band in (" . $bandslots_list . ")";
$sql .= " and thcv.col_prop_mode !='SAT'";
} else {
$sql .= " and thcv.col_prop_mode !='SAT'";
$sql .= " and thcv.col_band ='" . $band . "'";
@@ -296,12 +288,10 @@ class WAJA extends CI_Model {
$sql .= " and thcv.col_prop_mode ='" . $band . "'";
} else if ($band == 'All') {
$this->load->model('bands');
$bandslots = $this->bands->get_worked_bands('waja');
$bandslots_list = "'".implode("','",$bandslots)."'";
$sql .= " and thcv.col_band in (" . $bandslots_list . ")";
$sql .= " and thcv.col_prop_mode !='SAT'";
} else {
$sql .= " and thcv.col_prop_mode !='SAT'";
$sql .= " and thcv.col_band ='" . $band . "'";
@@ -312,9 +302,7 @@ class WAJA extends CI_Model {
}
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->addStateToQuery();
$query = $this->db->query($sql);
return $query->result();