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

Added total to WAS summary

Browse Source
This commit is contained in:
Andreas
2020-10-15 12:24:20 +02:00
parent 93730f37e7
commit 503ac06599
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/models/Was.php
View File

@@ -148,6 +148,12 @@ class was extends CI_Model {
$wasSummary['confirmed'][$band] = $confirmed[0]->count;
}
$workedTotal = $this->getSummaryByBand('All', $station_id);
$confirmedTotal = $this->getSummaryByBandConfirmed('All', $station_id);
$wasSummary['worked']['Total'] = $workedTotal[0]->count;
$wasSummary['confirmed']['Total'] = $confirmedTotal[0]->count;
return $wasSummary;
}
@@ -159,6 +165,8 @@ class was 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 . "'";
@@ -179,6 +187,8 @@ class was 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 . "'";

4
application/views/awards/was/index.php
View File

@@ -100,9 +100,7 @@
foreach($bands as $band) {
echo '<td>' . $band . '</td>';
}
echo '</tr>';
echo '</tr>
echo '<td>Total</td></tr>
</thead>
<tbody>