diff --git a/application/models/Cq.php b/application/models/Cq.php index d5d47d38..1acea86c 100644 --- a/application/models/Cq.php +++ b/application/models/Cq.php @@ -227,6 +227,12 @@ class CQ extends CI_Model{ $cqSummary['confirmed'][$band] = $confirmed[0]->count; } + $workedTotal = $this->getSummaryByBand('All', $station_id); + $confirmedTotal = $this->getSummaryByBandConfirmed('All', $station_id); + + $cqSummary['worked']['Total'] = $workedTotal[0]->count; + $cqSummary['confirmed']['Total'] = $confirmedTotal[0]->count; + return $cqSummary; } @@ -237,6 +243,8 @@ class CQ extends CI_Model{ if ($band == 'SAT') { $sql .= " and thcv.col_prop_mode ='" . $band . "'"; + } else if ($band == 'All') { + $sql .= " and thcv.col_prop_mode !='SAT'"; } else { $sql .= " and thcv.col_prop_mode !='SAT'"; $sql .= " and thcv.col_band ='" . $band . "'"; @@ -254,6 +262,8 @@ class CQ extends CI_Model{ if ($band == 'SAT') { $sql .= " and thcv.col_prop_mode ='" . $band . "'"; + } else if ($band == 'All') { + $sql .= " and thcv.col_prop_mode !='SAT'"; } else { $sql .= " and thcv.col_prop_mode !='SAT'"; $sql .= " and thcv.col_band ='" . $band . "'"; diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index 24de609a..04d356df 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -175,9 +175,7 @@ foreach($bands as $band) { echo '