mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Added total count for summary in Iota award

pull/659/head
Andreas 2020-10-15 09:49:55 +02:00
rodzic 93730f37e7
commit dbdbbdebf3
2 zmienionych plików z 12 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
application/models/Iota.php
Wyświetl plik

@ -324,6 +324,12 @@ class IOTA extends CI_Model {
$iotaSummary['confirmed'][$band] = $confirmed[0]->count;
}
$workedTotal = $this->getSummaryByBand('All', $station_id);
$confirmedTotal = $this->getSummaryByBandConfirmed('All', $station_id);
$iotaSummary['worked']['Total'] = $workedTotal[0]->count;
$iotaSummary['confirmed']['Total'] = $confirmedTotal[0]->count;
return $iotaSummary;
}
@ -335,6 +341,8 @@ class IOTA 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 . "'";
@ -353,6 +361,8 @@ class IOTA 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 . "'";

5
application/views/awards/iota/index.php
Wyświetl plik

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