From a759675800171299deaa5c1b2b317f3746e38101 Mon Sep 17 00:00:00 2001
From: Andreas <andreask@online.no>
Date: Tue, 22 Sep 2020 21:08:26 +0200
Subject: [PATCH] Datatable added to tables in DXCC, IOTA and VUCC (in band
 page).

---
 application/views/awards/dxcc/index.php       |  2 +-
 application/views/awards/iota/index.php       |  2 +-
 application/views/awards/vucc/band.php        |  4 +-
 application/views/interface_assets/footer.php | 84 ++++++++++++++-----
 application/views/interface_assets/header.php |  4 +
 5 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
index d796b558..98b7ff88 100644
--- a/application/views/awards/dxcc/index.php
+++ b/application/views/awards/dxcc/index.php
@@ -115,7 +115,7 @@
     $i = 1;
     if ($dxcc_array) {
         echo '
-                <table class="table-sm table tabledxcc table-bordered table-hover table-striped table-condensed text-center">
+                <table style="width:100%" class="table-sm table tabledxcc table-bordered table-hover table-striped table-condensed text-center">
                     <thead>
                     <tr>
                         <td>#</td>
diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php
index 74487a61..75681124 100644
--- a/application/views/awards/iota/index.php
+++ b/application/views/awards/iota/index.php
@@ -103,7 +103,7 @@
     if ($iota_array) {
         echo '
                 
-                <table class="table table-sm table-bordered table-hover table-striped table-condensed text-center">
+                <table style="width:100%;" class="table table-sm tableiota table-bordered table-hover table-striped table-condensed text-center">
                     <thead>
                     <tr>
                         <td>#</td>
diff --git a/application/views/awards/vucc/band.php b/application/views/awards/vucc/band.php
index 4afdf905..fd724266 100644
--- a/application/views/awards/vucc/band.php
+++ b/application/views/awards/vucc/band.php
@@ -1,11 +1,11 @@
 <div class="container">
-    <h1><?php echo $page_title; ?></h1>
+    <h2><?php echo $page_title; ?></h2>
 
     <h3>Filtering on <?php echo $filter ?></h3>
     <?php
     $i = 1;
     if ($vucc_array) {
-        echo '<table class="table table-sm tablevucc table-bordered table-hover table-striped table-condensed text-center">
+        echo '<table style="width:100%" class="table table-sm tablevucc table-bordered table-hover table-striped table-condensed text-center">
         <thead>
         <tr>
             <td>#</td>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index 95fb1f64..a69d82b5 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -6,7 +6,7 @@
 <script src="<?php echo base_url(); ?>assets/js/jquery.jclock.js"></script>
 <script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.js"></script>
 <script type="text/javascript" src="<?php echo base_url() ;?>assets/js/radiohelpers.js"></script>
-
+<script src="<?php echo base_url(); ?>assets/js/bootstrapdialog/js/bootstrap-dialog.min.js"></script>
 <script type="text/javascript">
   /*
   *
@@ -31,6 +31,10 @@
     <script src="<?php echo base_url() ;?>assets/js/sections/notes.js"></script>
 <?php } ?>
 
+<?php if ($this->uri->segment(1) == "awards") { ?>
+    <script type="text/javascript" src="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.22/fc-3.3.1/fh-3.1.7/r-2.2.6/sc-2.0.3/datatables.min.js"></script>
+<?php } ?>
+
 <?php if ($this->uri->segment(1) == "search" && $this->uri->segment(2) == "filter") { ?>
 
 <script type="text/javascript" src="<?php echo base_url() ;?>assets/js/query-builder.standalone.min.js"></script>
@@ -1410,8 +1414,6 @@ $(document).ready(function(){
         </script>
     <?php } ?>
 
-
-    <script src="<?php echo base_url(); ?>assets/js/bootstrapdialog/js/bootstrap-dialog.min.js"></script>
         <script>
             function displayQso(id) {
                 var baseURL= "<?php echo base_url();?>";
@@ -1455,18 +1457,31 @@ $(document).ready(function(){
                     }
                 });
             }
+            </script>
 
-    <?php if ($this->uri->segment(2) == "dxcc") { ?>
+
+<?php if ($this->uri->segment(2) == "dxcc") { ?>
+<script>
+    $('.tabledxcc').DataTable({
+        "pageLength": 25,
+        responsive: false,
+        ordering: false,
+        "scrollY":        "400px",
+        "scrollCollapse": true,
+        "paging":         false,
+        "scrollX": true
+    });
 
         function displayDxccContacts(country, band) {
-            var baseURL= "<?php echo base_url();?>";
+            var baseURL = "<?php echo base_url();?>";
             $.ajax({
                 url: baseURL + 'index.php/awards/dxcc_details_ajax',
                 type: 'post',
-                data: {'Country': country,
+                data: {
+                    'Country': country,
                     'Band': band
                 },
-                success: function(html) {
+                success: function (html) {
                     BootstrapDialog.show({
                         title: 'QSO Data',
                         size: BootstrapDialog.SIZE_WIDE,
@@ -1483,10 +1498,20 @@ $(document).ready(function(){
                 }
             });
         }
-
+ </script>
     <?php } ?>
 
-            <?php if ($this->uri->segment(2) == "vucc_band") { ?>
+<?php if ($this->uri->segment(2) == "vucc_band") { ?>
+    <script>
+    $('.tablevucc').DataTable({
+        "pageLength": 25,
+        responsive: false,
+        ordering: false,
+        "scrollY":        "400px",
+        "scrollCollapse": true,
+        "paging":         false,
+        "scrollX": true
+    });
 
             function displayVuccContacts(gridsquare, band) {
                 var baseURL= "<?php echo base_url();?>";
@@ -1513,12 +1538,12 @@ $(document).ready(function(){
                     }
                 });
             }
-
-            <?php } ?>
+    </script>
+<?php } ?>
 
 
-        <?php if ($this->uri->segment(2) == "dok") { ?>
-
+<?php if ($this->uri->segment(2) == "dok") { ?>
+    <script>
         function displayDokContacts(dok, band) {
             var baseURL= "<?php echo base_url();?>";
             $.ajax({
@@ -1544,10 +1569,21 @@ $(document).ready(function(){
                 }
             });
         }
+    </script>
+<?php } ?>
 
-        <?php } ?>
+<?php if ($this->uri->segment(2) == "iota") { ?>
+    <script>
 
-        <?php if ($this->uri->segment(2) == "iota") { ?>
+        $('.tableiota').DataTable({
+            "pageLength": 25,
+            responsive: false,
+            ordering: false,
+            "scrollY":        "400px",
+            "scrollCollapse": true,
+            "paging":         false,
+            "scrollX": true
+        });
 
         function displayIotaContacts(iota, band) {
             var baseURL= "<?php echo base_url();?>";
@@ -1574,11 +1610,12 @@ $(document).ready(function(){
                 }
             });
         }
+    </script>
 
-        <?php } ?>
-
-            <?php if ($this->uri->segment(2) == "cq") { ?>
+<?php } ?>
 
+<?php if ($this->uri->segment(2) == "cq") { ?>
+    <script>
             function displayCqContacts(cqzone, band) {
                 var baseURL= "<?php echo base_url();?>";
                 $.ajax({
@@ -1604,10 +1641,11 @@ $(document).ready(function(){
                     }
                 });
             }
+    </script>
+<?php } ?>
 
-            <?php } ?>
-
-    <?php if ($this->uri->segment(2) == "was") { ?>
+<?php if ($this->uri->segment(2) == "was") { ?>
+    <script>
         function displayWasContacts(was, band) {
             var baseURL= "<?php echo base_url();?>";
             $.ajax({
@@ -1633,8 +1671,10 @@ $(document).ready(function(){
                 }
             });
         }
-    <?php } ?>
+    </script>
+<?php } ?>
 
+<script>
         function qsl_rcvd(id, method) {
             var baseURL= "<?php echo base_url();?>";
             $.ajax({
diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php
index a7d09fcb..bae0669f 100644
--- a/application/views/interface_assets/header.php
+++ b/application/views/interface_assets/header.php
@@ -31,6 +31,10 @@
 
     <link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/bootstrapdialog/css/bootstrap-dialog.min.css" />
 
+      <?php if ($this->uri->segment(1) == "awards") { ?>
+          <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs4/jq-3.3.1/dt-1.10.22/fc-3.3.1/fh-3.1.7/r-2.2.6/sc-2.0.3/datatables.min.css"/>
+      <?php } ?>
+
  	<?php if ($this->uri->segment(1) == "adif") { ?>
   	<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/datepicker.css" />
   	<?php } ?>