kopia lustrzana https://github.com/magicbug/Cloudlog
Added total for the DXCC award.
rodzic
93730f37e7
commit
1696656082
|
@ -480,6 +480,12 @@ class DXCC extends CI_Model {
|
||||||
$dxccSummary['confirmed'][$band] = $confirmed[0]->count;
|
$dxccSummary['confirmed'][$band] = $confirmed[0]->count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$workedTotal = $this->getSummaryByBand('All', $station_id);
|
||||||
|
$confirmedTotal = $this->getSummaryByBandConfirmed('All', $station_id);
|
||||||
|
|
||||||
|
$dxccSummary['worked']['Total'] = $workedTotal[0]->count;
|
||||||
|
$dxccSummary['confirmed']['Total'] = $confirmedTotal[0]->count;
|
||||||
|
|
||||||
return $dxccSummary;
|
return $dxccSummary;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -489,12 +495,14 @@ class DXCC extends CI_Model {
|
||||||
|
|
||||||
$sql .= " where station_id = " . $station_id;
|
$sql .= " where station_id = " . $station_id;
|
||||||
|
|
||||||
|
|
||||||
if ($band == 'SAT') {
|
if ($band == 'SAT') {
|
||||||
$sql .= " and thcv.col_prop_mode ='" . $band . "'";
|
$sql .= " and thcv.col_prop_mode ='" . $band . "'";
|
||||||
|
} else if ($band == 'All') {
|
||||||
|
$sql .= " and thcv.col_prop_mode !='SAT'";
|
||||||
} else {
|
} else {
|
||||||
$sql .= " and thcv.col_prop_mode !='SAT'";
|
$sql .= " and thcv.col_prop_mode !='SAT'";
|
||||||
$sql .= " and thcv.col_band ='" . $band . "'";
|
$sql .= " and thcv.col_band ='" . $band . "'";
|
||||||
|
|
||||||
}
|
}
|
||||||
$query = $this->db->query($sql);
|
$query = $this->db->query($sql);
|
||||||
|
|
||||||
|
@ -509,6 +517,8 @@ class DXCC extends CI_Model {
|
||||||
|
|
||||||
if ($band == 'SAT') {
|
if ($band == 'SAT') {
|
||||||
$sql .= " and thcv.col_prop_mode ='" . $band . "'";
|
$sql .= " and thcv.col_prop_mode ='" . $band . "'";
|
||||||
|
} else if ($band == 'All') {
|
||||||
|
$sql .= " and thcv.col_prop_mode !='SAT'";
|
||||||
} else {
|
} else {
|
||||||
$sql .= " and thcv.col_prop_mode !='SAT'";
|
$sql .= " and thcv.col_prop_mode !='SAT'";
|
||||||
$sql .= " and thcv.col_band ='" . $band . "'";
|
$sql .= " and thcv.col_band ='" . $band . "'";
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
foreach($bands as $band) {
|
foreach($bands as $band) {
|
||||||
echo '<td>' . $band . '</td>';
|
echo '<td>' . $band . '</td>';
|
||||||
}
|
}
|
||||||
echo '</tr>';
|
echo '<td>Total</td></tr>';
|
||||||
|
|
||||||
echo '</tr>
|
echo '</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|
Ładowanie…
Reference in New Issue