Merge pull request #577 from AndreasK79/award_was_summary

Added summary on the WAS award page.
这个提交包含在:
Peter Goodhall 2020-08-18 16:03:45 +01:00 提交者 GitHub
当前提交 488a4e1748
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改,包括 64 次插入1 次删除

查看文件

@ -346,6 +346,7 @@ class Awards extends CI_Controller {
} }
$data['was_array'] = $this->was->get_was_array($bands, $postdata); $data['was_array'] = $this->was->get_was_array($bands, $postdata);
$data['was_summary'] = $this->was->get_was_summary();
// Render Page // Render Page
$data['page_title'] = "Awards - WAS (Worked all states)"; $data['page_title'] = "Awards - WAS (Worked all states)";

查看文件

@ -132,6 +132,39 @@ class was extends CI_Model {
} }
} }
/*
* Function gets worked and confirmed summary on each band on the active stationprofile
*/
function get_was_summary() {
$CI =& get_instance();
$CI->load->model('Stations');
$station_id = $CI->Stations->find_active();
$stateArray = explode(',', $this->stateString);
$states = array(); // Used for keeping track of which states that are not worked
$sql = "SELECT thcv.col_band, count(distinct thcv.col_state) as count, coalesce (cfmwas.count, 0) as cfmwas FROM " . $this->config->item('table_name') . " thcv";
$sql .= " left outer join (
select col_band, count(distinct col_state) as count from " . $this->config->item('table_name') . " thcv";
$sql .= " where station_id = " . $station_id;
$sql .= $this->addStateToQuery();
$sql .= " and (col_qsl_rcvd = 'Y' or col_lotw_qsl_rcvd = 'Y')
group by col_band";
$sql .= ") cfmwas on thcv.col_band = cfmwas.col_band ";
$sql .= " where station_id = " . $station_id;
$sql .= $this->addStateToQuery();
$sql .= " group by thcv.col_band order by thcv.col_band+0 desc";
$query = $this->db->query($sql);
return $query->result();
}
/* /*
* Function returns all worked, but not confirmed states * Function returns all worked, but not confirmed states
* $postdata contains data from the form, in this case Lotw or QSL are used * $postdata contains data from the form, in this case Lotw or QSL are used

查看文件

@ -92,8 +92,37 @@
} }
echo '</tr>'; echo '</tr>';
} }
echo '</tfoot></table></div>'; echo '</table>
<h1>Summary</h1>
<table class="table table-bordered table-hover table-striped table-condensed text-center">
<thead>
<tr><td></td>';
foreach ($was_summary as $was) { // Fills the table with the data
echo '<td style="text-align: center">' . $was->col_band . '</td>';
}
echo '</tr>
</thead>
<tbody>
<tr><td>Total worked</td>';
foreach ($was_summary as $was) { // Fills the table with the data
echo '<td style="text-align: center">' . $was->count . '</td>';
}
echo '</tr><tr>
<td>Total confirmed</td>';
foreach ($was_summary as $was) { // Fills the table with the data
echo '<td style="text-align: center">' . $was->cfmwas . '</td>';
}
echo '</tr>
</table>
</div>';
} }
else { else {
echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>'; echo '<div class="alert alert-danger" role="alert"><a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>Nothing found!</div>';