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

Fix band selection

Browse Source
This commit is contained in:
Andreas Kristiansen
2025-10-14 14:09:08 +02:00
parent 399e2a79c1
commit 27f6fbe4d4
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
application/models/Wpx.php
View File

@@ -121,7 +121,7 @@ class WPX extends CI_Model {
$bindings[] = $postdata['mode'];
$bindings[] = $postdata['mode'];
}
$sql .= $this->genfunctions->addBandToQuery($band, $bindings);
$sql .= $this->addBandToQuery($band, $bindings);
$sql .= $this->addContinentsToQuery($postdata);
@@ -217,7 +217,7 @@ class WPX extends CI_Model {
WHERE station_id in (" . $location_list . ") ";
$sql .= $this->genfunctions->addQslToQuery($postdata);
$sql .= $this->genfunctions->addBandToQuery($band, $bindings);
$sql .= $this->addBandToQuery($band, $bindings);
$sql .= $this->addContinentsToQuery($postdata);
@@ -304,10 +304,7 @@ class WPX extends CI_Model {
$this->db->where('station_id', $station_id);
}
// filter by band (skip if "Total")
if ($band !== 'Total') {
$this->db->where('col_band', $band);
}
$this->db->where('col_band', $band);
// filter by status
if ($status === 'confirmed') {
@@ -430,10 +427,7 @@ class WPX extends CI_Model {
$bindings[] = $postdata['mode'];
$bindings[] = $postdata['mode'];
}
// filter by band (skip if "Total")
if ($postdata['band'] !== 'Total') {
$sql .= $this->genfunctions->addBandToQuery($postdata['band'], $bindings);
}
$sql .= $this->addBandToQuery($postdata['band'], $bindings);
if ($postdata['status'] === 'confirmed') {
$sql .= $this->addQslToQuery($postdata);
@@ -496,5 +490,23 @@ class WPX extends CI_Model {
return $sql;
}
function addBandToQuery($band,&$binding) {
$sql = '';
if ($band == 'SAT') {
$sql .= " and col_prop_mode = ?";
$binding[]=$band;
} else {
if ($band == 'All' || $band == 'Total') {
$sql .= " and col_prop_mode !='SAT'";
} else {
$sql .= " and col_prop_mode !='SAT'";
$sql .= " and col_band = ?";
$binding[]=$band;
}
}
return $sql;
}
}
?>