From fe5ccb0ea2de5fa755951b0fb51f0b2d0b6d710b Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Sun, 20 Sep 2020 06:00:54 +0200
Subject: [PATCH] Added bootstrapdialog for DXCC award.

---
 application/controllers/Awards.php            | 13 +++++++++
 application/models/Dxcc.php                   |  4 +--
 .../views/awards/dxcc/details_ajax.php        |  3 ++
 application/views/interface_assets/footer.php | 29 +++++++++++++++++++
 4 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 application/views/awards/dxcc/details_ajax.php

diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php
index 40a1c91a..0e58533c 100644
--- a/application/controllers/Awards.php
+++ b/application/controllers/Awards.php
@@ -153,6 +153,19 @@ class Awards extends CI_Controller {
 		$this->load->view('interface_assets/footer');
 	}
 
+    public function dxcc_details_ajax(){
+        $this->load->model('logbook_model');
+
+        $country = str_replace('"', "", $this->input->post("Country"));
+        $band = str_replace('"', "", $this->input->post("Band"));
+        $data['results'] = $this->logbook_model->dxcc_qso_details($country, $band);
+
+        // Render Page
+        $data['page_title'] = "Log View - DXCC";
+        $data['filter'] = "country ".$country. " and ".$band;
+        $this->load->view('awards/dxcc/details_ajax', $data);
+    }
+
     public function vucc()	{
         $this->load->model('vucc');
         $data['worked_bands'] = $this->vucc->get_worked_bands();
diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php
index d186b5ae..217b578d 100644
--- a/application/models/Dxcc.php
+++ b/application/models/Dxcc.php
@@ -191,7 +191,7 @@ class DXCC extends CI_Model {
 			if ($postdata['worked'] != NULL) {
 				$workedDXCC = $this->getDxccBandWorked($station_id, $band, $postdata);
 				foreach ($workedDXCC as $wdxcc) {
-					$dxccMatrix[$wdxcc->dxcc][$band] = '<div class="alert-danger"><a href=\'dxcc_details?Country="'.str_replace("&", "%26", $wdxcc->name).'"&Band="'. $band . '"\'>W</a></div>';;
+					$dxccMatrix[$wdxcc->dxcc][$band] = '<div class="alert-danger"><a href=\'javascript:displayDxccContacts("'.str_replace("&", "%26", $wdxcc->name).'","'. $band . '")\'>W</a></div>';
 				}
 			}
 
@@ -199,7 +199,7 @@ class DXCC extends CI_Model {
 			if ($postdata['confirmed'] != NULL) {
 				$confirmedDXCC = $this->getDxccBandConfirmed($station_id, $band, $postdata);
 				foreach ($confirmedDXCC as $cdxcc) {
-					$dxccMatrix[$cdxcc->dxcc][$band] = '<div class="alert-success"><a href=\'dxcc_details?Country="'.str_replace("&", "%26", $cdxcc->name).'"&Band="'. $band . '"\'>C</a></div>';;
+					$dxccMatrix[$cdxcc->dxcc][$band] = '<div class="alert-success"><a href=\'javascript:displayDxccContacts("'.str_replace("&", "%26", $cdxcc->name).'","'. $band . '")\'>C</a></div>';
 				}
 			}
 		}
diff --git a/application/views/awards/dxcc/details_ajax.php b/application/views/awards/dxcc/details_ajax.php
new file mode 100644
index 00000000..2e33a16d
--- /dev/null
+++ b/application/views/awards/dxcc/details_ajax.php
@@ -0,0 +1,3 @@
+    <h3>Filtering on <?php echo $filter ?></h3>
+
+    <?php $this->load->view('view_log/partial/log_ajax') ?>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index f33e36b4..fe8a90f0 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -1457,6 +1457,35 @@ $(document).ready(function(){
                 });
             }
 
+    <?php if ($this->uri->segment(2) == "dxcc") { ?>
+
+        function displayDxccContacts(country, band) {
+            var baseURL= "<?php echo base_url();?>";
+            $.ajax({
+                url: baseURL + 'index.php/awards/dxcc_details_ajax',
+                type: 'post',
+                data: {'Country': country,
+                    'Band': band
+                },
+                success: function(html) {
+                    BootstrapDialog.show({
+                        title: 'QSO Data',
+                        size: BootstrapDialog.SIZE_WIDE,
+                        cssClass: 'qso-dxcc-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();?>";