diff --git a/application/models/Iota.php b/application/models/Iota.php index c62b06adc..32822fc68 100644 --- a/application/models/Iota.php +++ b/application/models/Iota.php @@ -71,6 +71,11 @@ class IOTA extends CI_Model { $binding[] = $postdata['mode']; $binding[] = $postdata['mode']; } + if ($band == 'SAT') { + $sql .= " and col_prop_mode='SAT'"; + } else { + $sql.=" and (col_prop_mode!='SAT' or col_prop_mode is null)"; + } $sql .= $this->genfunctions->addBandToQuery($band,$binding); @@ -99,6 +104,11 @@ class IOTA extends CI_Model { $binding[] = $postdata['mode']; $binding[] = $postdata['mode']; } + if ($band == 'SAT') { + $sql .= " and col_prop_mode='SAT'"; + } else { + $sql.=" and (col_prop_mode!='SAT' or col_prop_mode is null)"; + } $sql .= $this->genfunctions->addBandToQuery($band,$binding); @@ -142,6 +152,8 @@ class IOTA extends CI_Model { $sql .= " and col_band = ?"; $binding[] = $postdata['band']; } + } else { + $sql.=" and (col_prop_mode != 'SAT' or col_prop_mode is null)"; } $sql .= ")"; } @@ -165,6 +177,11 @@ class IOTA extends CI_Model { $binding[] = $postdata['mode']; $binding[] = $postdata['mode']; } + if ($postdata['band'] == 'SAT') { + $sql .= " and col_prop_mode='SAT'"; + } else { + $sql.=" and (col_prop_mode!='SAT' or col_prop_mode is null)"; + } $sql .= $this->genfunctions->addBandToQuery($postdata['band'],$binding); @@ -198,6 +215,11 @@ class IOTA extends CI_Model { $binding[] = $postdata['mode']; $binding[] = $postdata['mode']; } + if ($postdata['band'] == 'SAT') { + $sql .= " and col_prop_mode='SAT'"; + } else { + $sql.=" and (col_prop_mode!='SAT' or col_prop_mode is null)"; + } if ($postdata['includedeleted'] == NULL) { $sql .= " and coalesce(iota.status, '') <> 'D'";