From d490a31097744ab297ea219953203410e2aefcd9 Mon Sep 17 00:00:00 2001
From: Andreas Kristiansen <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 28 Oct 2025 09:44:12 +0100
Subject: [PATCH] Added deleted dxcc banner

---
 application/models/Stationsetup_model.php       |  2 +-
 application/views/stationsetup/locationlist.php | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/models/Stationsetup_model.php b/application/models/Stationsetup_model.php
index 239dc2070..534adbf04 100644
--- a/application/models/Stationsetup_model.php
+++ b/application/models/Stationsetup_model.php
@@ -234,7 +234,7 @@ class Stationsetup_model extends CI_Model {
 	}
 
 	function list_all_locations() {
-		$sql = "select station_profile.station_id, station_profile_name, station_gridsquare, station_city, station_iota, station_sota, station_callsign, station_power, station_dxcc, dxcc_entities.name as dxccname, dxcc_entities.prefix as dxccprefix, station_cnty, station_cq, station_itu, station_active, eqslqthnickname, state, county, station_sig, station_sig_info, qrzrealtime, station_wwff, station_pota, oqrs, oqrs_text, oqrs_email, webadifrealtime, clublogrealtime, clublogignore, hrdlogrealtime, creation_date, last_modified
+		$sql = "select dxcc_entities.end, station_profile.station_id, station_profile_name, station_gridsquare, station_city, station_iota, station_sota, station_callsign, station_power, station_dxcc, dxcc_entities.name as dxccname, dxcc_entities.prefix as dxccprefix, station_cnty, station_cq, station_itu, station_active, eqslqthnickname, state, county, station_sig, station_sig_info, qrzrealtime, station_wwff, station_pota, oqrs, oqrs_text, oqrs_email, webadifrealtime, clublogrealtime, clublogignore, hrdlogrealtime, creation_date, last_modified
 	 from station_profile
 	 join dxcc_entities on station_profile.station_dxcc = dxcc_entities.adif
 	 where user_id = ?";
diff --git a/application/views/stationsetup/locationlist.php b/application/views/stationsetup/locationlist.php
index 5dfa4767b..1572ce653 100644
--- a/application/views/stationsetup/locationlist.php
+++ b/application/views/stationsetup/locationlist.php
@@ -20,12 +20,12 @@
                         <th>ITU Zone</th>
                         <th>State</th>
                         <th>County</th>
+                        <th>WWFF</th>
+                        <th>POTA</th>
                         <th>SIG</th>
                         <th>SIG Info</th>
                         <th>eQSL Nick</th>
                         <th>QRZ Live</th>
-                        <th>WWFF</th>
-                        <th>POTA</th>
                         <th>OQRS</th>
                         <th>OQRS Text</th>
                         <th>OQRS Email</th>
@@ -46,7 +46,11 @@
                             <td><?php echo $loc->station_callsign; ?></td>
                             <td><?php echo $loc->station_gridsquare; ?></td>
                             <td><?php echo $loc->station_city; ?></td>
-                            <td><?php echo ucwords(strtolower($loc->dxccname), "- (/") . ' (' . $loc->dxccprefix . ') '; ?></td>
+                            <td><?php echo ucwords(strtolower($loc->dxccname), "- (/") . ' (' . $loc->dxccprefix . ') '; ?>
+                            <?php if (isset($loc->end)) {
+								echo '<span class="badge text-bg-danger">'.__("Deleted DXCC").'</span>';
+							} ?>
+							</td>
                             <td><?php echo $loc->station_iota; ?></td>
                             <td><?php echo $loc->station_sota; ?></td>
                             <td><?php echo $loc->station_power; ?></td>
@@ -55,12 +59,12 @@
                             <td><?php echo $loc->station_itu; ?></td>
                             <td><?php echo $loc->state; ?></td>
                             <td><?php echo $loc->county; ?></td>
+                            <td><?php echo $loc->station_wwff; ?></td>
+                            <td><?php echo $loc->station_pota; ?></td>
                             <td><?php echo $loc->station_sig; ?></td>
                             <td><?php echo $loc->station_sig_info; ?></td>
                             <td><?php echo $loc->eqslqthnickname; ?></td>
                             <td><?php echo $loc->qrzrealtime ? 'Yes' : 'No'; ?></td>
-                            <td><?php echo ($loc->station_wwff); ?></td>
-                            <td><?php echo ($loc->station_pota); ?></td>
                             <td><?php echo $loc->oqrs ? 'Yes' : 'No'; ?></td>
                             <td><?php echo $loc->oqrs_text; ?></td>
                             <td><?php echo $loc->oqrs_email; ?></td>