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) {
| lang->line('general_word_date'); ?> | 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) {