kopia lustrzana https://github.com/magicbug/Cloudlog
Merge pull request #661 from AndreasK79/cq_total_summary
Added total to CQ award summarypull/666/head
commit
b5112c8de9
|
@ -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>
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue