Added total to CQ award summary

这个提交包含在:
Andreas 2020-10-15 12:27:45 +02:00
父节点 93730f37e7
当前提交 1af82d5dea
共有 2 个文件被更改,包括 11 次插入3 次删除

查看文件

@ -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 . "'";

查看文件

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