Added bootstrapdialog for CQ award.

pull/624/head
Andreas 2020-09-20 11:02:29 +02:00
rodzic fe5ccb0ea2
commit f138d84dc1
5 zmienionych plików z 52 dodań i 5 usunięć

Wyświetl plik

@ -324,6 +324,19 @@ class Awards extends CI_Controller {
$this->load->view('interface_assets/footer');
}
public function cq_details_ajax(){
$this->load->model('logbook_model');
$cqzone = str_replace('"', "", $this->input->post("CQZone"));
$band = str_replace('"', "", $this->input->post("Band"));
$data['results'] = $this->logbook_model->cq_qso_details($cqzone, $band);
// Render Page
$data['page_title'] = "Log View - DXCC";
$data['filter'] = "CQZone ".$cqzone. " and ".$band;;
$this->load->view('awards/cq/details_ajax', $data);
}
public function was() {
$this->load->model('was');
$data['worked_bands'] = $this->was->get_worked_bands();

Wyświetl plik

@ -97,14 +97,14 @@ class CQ extends CI_Model{
if ($postdata['worked'] != NULL) {
$cqBand = $this->getCQWorked($station_id, $band, $postdata);
foreach ($cqBand as $line) {
$bandCq[$line->col_cqz][$band] = '<div class="alert-danger"><a href=\'cq_details?CQZone="' . str_replace("&", "%26", $line->col_cqz) . '"&Band="' . $band . '"\'>W</a></div>';
$bandCq[$line->col_cqz][$band] = '<div class="alert-danger"><a href=\'javascript:displayCqContacts("' . str_replace("&", "%26", $line->col_cqz) . '","' . $band . '")\'>W</a></div>';
$cqZ[$line->col_cqz]['count']++;
}
}
if ($postdata['confirmed'] != NULL) {
$cqBand = $this->getCQConfirmed($station_id, $band, $postdata);
foreach ($cqBand as $line) {
$bandCq[$line->col_cqz][$band] = '<div class="alert-success"><a href=\'cq_details?CQZone="' . str_replace("&", "%26", $line->col_cqz) . '"&Band="' . $band . '"\'>C</a></div>';
$bandCq[$line->col_cqz][$band] = '<div class="alert-success"><a href=\'javascript:displayCqContacts("' . str_replace("&", "%26", $line->col_cqz) . '","' . $band . '")\'>C</a></div>';
$cqZ[$line->col_cqz]['count']++;
}
}

Wyświetl plik

@ -0,0 +1,3 @@
<h3>Filtering on <?php echo $filter ?></h3>
<?php $this->load->view('view_log/partial/log_ajax') ?>

Wyświetl plik

@ -11,12 +11,12 @@
<a class="nav-link active" id="table-tab" data-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
</li>
<li class="nav-item">
<a class="nav-link" id="map-tab" data-toggle="tab" href="#map" role="tab" aria-controls="home" aria-selected="false">Map</a>
<a class="nav-link" id="map-tab" data-toggle="tab" href="#cqmap" role="tab" aria-controls="home" aria-selected="false">Map</a>
</li>
</ul>
<div class="tab-content" id="myTabContent">
<div class="tab-pane fade" id="map" role="tabpanel" aria-labelledby="home-tab">
<div class="tab-pane fade" id="cqmap" role="tabpanel" aria-labelledby="home-tab">
<br />
<map name="CQ">
<area href="cq_details?CQZone=1" title="zone_1" class="zone_1" shape="poly" coords="306,0,306,25,322,37,322,41,291,62,291,76,291,84,364,84,364,67,368,64,373,60,378,60,378,57,377,57,372,52,366,52,366,51,393,51,419,51,419,37,422,35,422,33,420,33,417,30,417,26,408,17,408,0">

Wyświetl plik

@ -1440,7 +1440,6 @@ $(document).ready(function(){
id: 'mapbox.streets'
}).addTo(mymap);
var redIcon = L.icon({
iconUrl: icon_dot_url,
iconSize: [18, 18], // size of the icon
@ -1486,6 +1485,37 @@ $(document).ready(function(){
}
<?php } ?>
<?php if ($this->uri->segment(2) == "cq") { ?>
function displayCqContacts(cqzone, band) {
var baseURL= "<?php echo base_url();?>";
$.ajax({
url: baseURL + 'index.php/awards/cq_details_ajax',
type: 'post',
data: {'CQZone': cqzone,
'Band': band
},
success: function(html) {
BootstrapDialog.show({
title: 'QSO Data',
size: BootstrapDialog.SIZE_WIDE,
cssClass: 'qso-cq-dialog',
nl2br: false,
message: html,
buttons: [{
label: 'Close',
action: function (dialogItself) {
dialogItself.close();
}
}]
});
}
});
}
<?php } ?>
<?php if ($this->uri->segment(2) == "was") { ?>
function displayWasContacts(was, band) {
var baseURL= "<?php echo base_url();?>";
@ -1513,6 +1543,7 @@ $(document).ready(function(){
});
}
<?php } ?>
function qsl_rcvd(id, method) {
var baseURL= "<?php echo base_url();?>";
$.ajax({