From 1b563b7eb0de52d33b47e3f50f128a251a8e4cfe Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Sat, 12 Nov 2022 10:50:46 +0100
Subject: [PATCH] [DXCC Map] Fixed popup and added datatable to QSO table

---
 application/controllers/Awards.php              |  5 ++++-
 application/views/interface_assets/footer.php   | 13 +++++++++++++
 application/views/view_log/partial/log_ajax.php |  7 +++++--
 assets/js/sections/dxccmap.js                   |  5 +++--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php
index a418d9af..eccea206 100644
--- a/application/controllers/Awards.php
+++ b/application/controllers/Awards.php
@@ -638,7 +638,10 @@ class Awards extends CI_Controller {
         foreach ($dxcclist as $dxcc) {
             $newdxcc[$i]['adif'] = $dxcc->adif;
             $newdxcc[$i]['prefix'] = $dxcc->prefix;
-            $newdxcc[$i]['name'] = $dxcc->name;
+            $newdxcc[$i]['name'] = ucwords(strtolower($dxcc->name), "- (/");
+            if ($dxcc->Enddate!=null) {
+                $newdxcc[$i]['name'] .= ' (deleted)';
+            }
             $newdxcc[$i]['lat'] = $dxcc->lat;
             $newdxcc[$i]['long'] = $dxcc->long;
             $newdxcc[$i++]['status'] = $this->returnStatus($dxcc_array[$dxcc->adif]);
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 92edbd56..10fece96 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -2545,6 +2545,19 @@ function deleteQsl(id) {
                     message: html,
                     onshown: function(dialog) {
                        $('[data-toggle="tooltip"]').tooltip();
+                       $('.contacttable').DataTable({
+                            "pageLength": 25,
+                            responsive: false,
+                            ordering: false,
+                            "scrollY":        "550px",
+                            "scrollCollapse": true,
+                            "paging":         false,
+                            "scrollX": true,
+                            dom: 'Bfrtip',
+                            buttons: [
+                                'csv'
+                            ]
+                        });
                     },
                     buttons: [{
                         label: 'Close',
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index ae0959f8..9edcae54 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -44,7 +44,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
 <?php if ($results) { ?>
 
 <div class="table-responsive">
-    <table class="table table-striped table-hover">
+    <table style="width:100%" class="table contacttable table-striped table-hover">
+        <thead>
         <tr class="titles">
             <td><?php echo $this->lang->line('general_word_date'); ?></td>
             <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE || ($this->config->item('show_time'))) { ?>
@@ -72,6 +73,8 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
                 <td></td>
             <?php } ?>
         </tr>
+        <thead>
+            <tbody>
 
         <?php  $i = 0;  
             foreach ($results->result() as $row) {
@@ -246,7 +249,7 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) {
             <?php } ?>
             </tr>
             <?php $i++; } ?>
-
+                            </tbody>
     </table></div>
     <?php } ?>
 
diff --git a/assets/js/sections/dxccmap.js b/assets/js/sections/dxccmap.js
index 2c0d1aa2..3620b134 100644
--- a/assets/js/sections/dxccmap.js
+++ b/assets/js/sections/dxccmap.js
@@ -91,7 +91,8 @@ function load_dxcc_map2(data) {
         L.marker(
             [D['lat'], D['long']], {
                 icon: icon,
-                title: D['adif']
+                adif: D['adif'],
+                title: D['prefix'] + ' - ' + D['name'],
             }
           ).addTo(map).on('click', onClick);
     }
@@ -115,5 +116,5 @@ function load_dxcc_map2(data) {
 
 function onClick(e) {
     var marker = e.target;
-    displayContacts(marker.options.title, $('#band2').val(), $('#mode').val(), 'DXCC2');
+    displayContacts(marker.options.adif, $('#band2').val(), $('#mode').val(), 'DXCC2');
 }