From 5accdc248f7c757db79cff32497ad29008c1a4f5 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Thu, 5 Mar 2020 17:09:53 +0100
Subject: [PATCH] Omit "Deleted" columen if deleted DXCCs are not included

---
 application/models/Dxcc.php             | 3 ++-
 application/views/awards/dxcc/index.php | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/application/models/Dxcc.php b/application/models/Dxcc.php
index e82cee7e..63c3fb1a 100644
--- a/application/models/Dxcc.php
+++ b/application/models/Dxcc.php
@@ -182,7 +182,8 @@ class DXCC extends CI_Model {
 			foreach ($dxccArray as $dxcc) {
 				$dxccMatrix[$dxcc->adif]['name'] = $dxcc->name;
 				$dxccMatrix[$dxcc->adif]['Dxccprefix'] = $dxcc->prefix;
-				$dxccMatrix[$dxcc->adif]['Deleted'] = isset($dxcc->Enddate) ? "<div class='alert-danger'>Y</div>" : '';
+				if ($postdata['includedeleted'])
+					$dxccMatrix[$dxcc->adif]['Deleted'] = isset($dxcc->Enddate) ? "<div class='alert-danger'>Y</div>" : '';
 				$dxccMatrix[$dxcc->adif][$band] = '-';
 			}
 
diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php
index 07e2fe26..ca54f6f9 100644
--- a/application/views/awards/dxcc/index.php
+++ b/application/views/awards/dxcc/index.php
@@ -122,7 +122,9 @@
                     <tr>
                         <td>#</td>
                         <td>DXCCName</td>
-                        <td>Prefix</td>
+                        <td>Prefix</td>';
+        if ($this->input->post('includedeleted') || $this->input->method() !== 'post')
+            echo '
                         <td>Deleted</td>';
                     foreach($bands as $band) {
                         echo '<td>' . $band . '</td>';